fix: importFromHTTPSubscription supports base64String decoding #28

tzmax · Apr 2, 2023 · add14cd · add14cd
1 parent 2281bf4
commit add14cd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/V2RayX/AppDelegate.h b/V2RayX/AppDelegate.h
@@ -97,6 +97,7 @@ int runCommandLine(NSString* launchPath, NSArray* arguments);
 @property (weak, nonatomic) IBOutlet NSMenu *serverListMenu;
 @property (weak, nonatomic) IBOutlet NSMenu *pacListMenu;
 @property (weak) IBOutlet NSMenuItem *editPacMenuItem;
+@property (weak) IBOutlet NSMenuItem *resetPacMenuItem;
 
 @property (weak) IBOutlet NSMenu *authMenu;
 

diff --git a/V2RayX/AppDelegate.m b/V2RayX/AppDelegate.m
@@ -660,6 +660,7 @@ - (void)updatePacMenuList {
     }
     [_pacListMenu addItem:[NSMenuItem separatorItem]];
     [_pacListMenu addItem:_editPacMenuItem];
+    [_pacListMenu addItem:_resetPacMenuItem];
 }
 
 - (IBAction)editPac:(id)sender {
@@ -795,6 +796,9 @@ - (IBAction)updateSubscriptions:(id)sender {
                 for (ServerProfile* p in r[@"vmess"]) {
                     [self.subsOutbounds addObject:[p outboundProfile]];
                 }
+                for (ServerProfile* p in r[@"vless"]) {
+                    [self.subsOutbounds addObject:[p outboundProfile]];
+                }
                 [self.subsOutbounds addObjectsFromArray:r[@"other"]];
             }
         }

diff --git a/V2RayX/Base.lproj/MainMenu.xib b/V2RayX/Base.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -21,6 +21,7 @@
                 <outlet property="manualModeItem" destination="P4q-kj-6fs" id="5XH-9p-w3e"/>
                 <outlet property="pacListMenu" destination="yno-KX-HOj" id="qzq-pN-ala"/>
                 <outlet property="pacModeItem" destination="Cm9-3e-L2z" id="IvE-nJ-dW0"/>
+                <outlet property="resetPacMenuItem" destination="oGZ-uP-dny" id="vkO-eN-sa9"/>
                 <outlet property="ruleSetMenuList" destination="8Ld-d4-m0U" id="DNS-66-cYT"/>
                 <outlet property="serverListMenu" destination="eqU-gH-G4L" id="unc-2a-DIW"/>
                 <outlet property="serversItem" destination="3wi-Co-2Kd" id="kKi-8l-dDJ"/>
@@ -760,12 +761,6 @@
                         <action selector="copyExportCmd:" target="Voe-Tx-rLC" id="OMz-Lv-Wmr"/>
                     </connections>
                 </menuItem>
-                <menuItem title="Reset pac file" id="oGZ-uP-dny">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <connections>
-                        <action selector="resetPac:" target="Voe-Tx-rLC" id="WUw-A2-aU5"/>
-                    </connections>
-                </menuItem>
                 <menuItem title="Authorize xray_sysconf..." id="mOc-zi-Beb">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
@@ -807,6 +802,12 @@
                 <action selector="editPac:" target="Voe-Tx-rLC" id="4jX-Hv-SpU"/>
             </connections>
         </menuItem>
+        <menuItem title="Reset pac file" id="oGZ-uP-dny">
+            <modifierMask key="keyEquivalentModifierMask"/>
+            <connections>
+                <action selector="resetPac:" target="Voe-Tx-rLC" id="WUw-A2-aU5"/>
+            </connections>
+        </menuItem>
         <menuItem title="Update subscription" id="C3a-eC-bFQ">
             <modifierMask key="keyEquivalentModifierMask"/>
             <connections>

diff --git a/V2RayX/ConfigImporter.m b/V2RayX/ConfigImporter.m
@@ -286,8 +286,13 @@ + (NSMutableDictionary*)importFromStandardConfigFiles:(NSArray*)files {
 }
 
 + (NSMutableDictionary*)importFromHTTPSubscription: (NSString*)httpLink {
+    // decode base64String
+    NSString *base64String = [self decodeBase64String:httpLink];
+    if(base64String != nil && ![base64String isEqual: @""]) {
+        httpLink = base64String;
+    }
     // https://blog.csdn.net/yi_zz32/article/details/48769487
-    NSMutableDictionary* result = [@{@"vmess": @[], @"other": @[]} mutableDeepCopy];
+    NSMutableDictionary* result = [@{@"vmess": @[], @"other": @[], @"vless": @[]} mutableDeepCopy];
     if ([httpLink length] < 4) {
         return nil;
     }