xfuture 1.1.5 → 1.1.7

package/index.js

@@ -1,36 +1,88 @@
 let xFuturePath = "";
 let os = require("os");
-var isMac = true;
+const { spawn } = require('child_process')
+var isMac = false;
 if (os.platform() === "win32") {
-    xFuturePath = "./package/win/xFuture";
-    isMac = false;
+    xFuturePath = "./package/windows/xFuture";
 } else if (os.platform() === "darwin") {
     xFuturePath = "./package/mac/xFuture"
+    isMac = true;
 } else {
     throw ("Platform not supported")
 }
 
 const ff = require(xFuturePath);
+const parser = require('./parser');
+parser.isGlobalMode = false;
 
 class xFuture {
 
+    SetPassword(password) {
+        ff.SetPassword(password);
+    }
+
     StartTunnel(url){
-        return ff.StartTunnel(url);
+        if(this.driver.length == 0) return false;
+        var json = JSON.stringify(parser.parse(url));
+        console.log("json:", json);
+        var ret = ff.StartTunnel(json, url);
+        if (ret) {
+            ret = this.StartProxy();
+        }
+        return ret;
     }
 
     StopTunnel(){
         ff.StopTunnel();
     }
 
+    StartProxy(){
+        if (isMac) return true;
+        var ret = true;
+        try {
+            let process = spawn(this.driver, ["global", "socks=127.0.0.1:1081"])
+            process.on('close', (code) => {
+              console.info('[sysproxy open] close:', code)
+              this.invoke(2);
+            });
+          } catch(err) {
+            console.warn('[sysproxy open] failed', err)
+            this.invoke(3);
+            this.StopTunnel();
+            ret = false;
+        }
+        return ret;
+    }
+
+    // App 进程退出时调用该接口，否则会导致电脑出现断网情况
+    StopProxy(){
+      if (!isMac) {
+        try {
+          let process = spawn(this.driver, ["off"])
+          process.on('close', function (code) {
+            console.info('[sysproxy stop] close:', code)
+          });
+        } catch(err) {
+          console.warn('[sysproxy stop] failed', err)
+        }
+      }
+      ff.StopProxy();
+    }
+
     ChangeURL(url){
-        ff.ChangeURL(url);
+        var json = JSON.stringify(parser.parse(url));
+        return ff.ChangeURL(json, url);
     }
 
-    SetGlobalMode(isGlobalMode){
-        ff.SetGlobalMode(isGlobalMode);
+    SetGlobalMode(isGlobalMode, ipdir){
+        parser.isGlobalMode = isGlobalMode;
+        ff.SetGlobalMode(isGlobalMode, ipdir);
     }
 
+    // 1. Mac 请传 install_helper.sh 和 xfuture_helper 的绝对路径
+    // 2. Windows 请传 "maodou" 固定字符串 和 sysproxy.exe 的绝对路径
     InstallDriver(shell_path, helper_path){
+        this.driver = helper_path;
         return ff.InstallDriver(shell_path, helper_path);
     }
 
@@ -55,6 +107,10 @@ class xFuture {
     SetEventCallback(name, func){
         ff.SetEventCallback(name, func);
     }
+
+    invoke(status) {
+      ff.invoke(status);
+    }
 }
 
 const xFutureInstance = new xFuture;

package/package/mac/xFuture.framework/{Versions/A/Headers → Headers}/YDLinkManager.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 +(instancetype)sharedManager;
 
--(void)setGlobalProxyEnable:(BOOL)enable;
+-(void)setGlobalProxyEnable:(BOOL)enable dir:(NSString *)dir;
 
 -(BOOL)startTunnel:(NSString *)url;
 

package/package/mac/xFuture.framework/{Versions/A/_CodeSignature → _CodeSignature}/CodeResources

@@ -11,20 +11,11 @@
 	</dict>
 	<key>files2</key>
 	<dict>
-		<key>Frameworks/ExtParser.framework</key>
-		<dict>
-			<key>cdhash</key>
-			<data>
-			LFatOKRon24FRRDzucwtgHdQZFI=
-			</data>
-			<key>requirement</key>
-			<string>identifier "com.maodou.ExtParser" and anchor apple generic and certificate leaf[subject.CN] = "Apple Development: Casey Cristich (7U948C49D2)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
-		</dict>
 		<key>Headers/YDLinkManager.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			vTuBFysTP+SJof+PsBZr0ccOdmrQUQ20yEVjOcjYDwo=
+			fg8MWdsOFHa8jehaqM37qZbkcsL4Q43UUK1K77v6uMc=
 			</data>
 		</dict>
 		<key>Headers/xFuture.h</key>

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "xfuture",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "electron vpn sdk",
-  "main": "index.js",
+  "main": "x.js",
   "scripts": {
-    "test": "test"
+    "test": "test",
+    "start": "electron ."
   },
   "keywords": [
     "chatgpt"
@@ -23,8 +24,12 @@
     "package/mac/xfuture_helper",
     "package/mac/install_helper.sh",
     "index.js",
+    "parser.js",
     "package.json",
-    "package/mac/xFuture.framework"
+    "package/mac/xFuture.framework",
+    "package/windows/sysproxy.exe",
+    "package/windows/xFuture.node",
+    "package/windows/xray.dll"
   ],
   "build": {
     "mac": {

package/parser.js

@@ -0,0 +1,286 @@
+
+
+class xParser {
+
+    parse(uri){
+        if (this.isGlobalMode == null || this.isGlobalMode == undefined) {
+            this.isGlobalMode = false;
+        }
+        if (uri.startsWith("vmess://")) {
+            return this.parseVMess(uri);
+        }
+        else if (uri.startsWith("vless://")) {
+            return this.parseVless(uri);
+        }
+        else if (uri.startsWith("ss://")) {
+            return this.parseSS(uri);
+        }
+        else if (uri.startsWith("trojan://")) {
+            return this.parseTrojan(uri);
+        }
+        return {};
+    }
+
+    parseSS(url){
+        url = url.substring(5);
+        if (url.includes("@")) {
+            var list = url.split("@");
+            var prefix = list[0];
+            var prefix = this.decode(prefix);
+            url = prefix + "@" + list[1];
+        }
+        else {
+            var list = url.split("#");
+            var prefix = list[0];
+            var prefix = this.decode(prefix);
+            url = prefix + "#" + list[1];
+        }
+
+        var list = url.split("#");
+        if (list.length != 2) return {};
+        var remark = list[1];
+        var userInfos =  list[0].split("@");
+        if (userInfos.length != 2) return {};
+
+        var userInfo = userInfos[0];
+        var serverInfo = userInfos[1];
+
+        var accountPasswords = userInfo.split(":");
+        var ipPorts = serverInfo.split(":");
+        if (accountPasswords.length != 2 || ipPorts.length != 2) {
+            return {};
+        }
+        var address = ipPorts[0];
+        var port = Integer.parseInt(ipPorts[1]);
+
+        var security = "";
+        var method = accountPasswords[0];
+        var password = accountPasswords[1];
+        var routing = {};
+        var rules = [];
+        if (this.isGlobalMode) {
+            rules = this.getRules();
+            routing.domainStrategy = "IPIfNonMatch";
+        }
+        else{
+            routing.domainStrategy = "AsIs";
+        }
+        routing.rules = rules;
+        var base = this.getBase();
+        base.routing = routing;
+        base.remark = remark;
+        base.address = address;
+        base.port = port;
+        return base;
+    }
+
+    decode(str) {
+        var buffer = Buffer.from(str, 'base64');
+        var raw = buffer.toString('utf-8');
+        return raw;
+    }
+
+    parseVless(url){
+        url = url.substring(8);
+        var raw = url;
+
+        var info = raw.split("@");
+        if (info.length < 2) {
+            raw = this.decode(url);
+            info = raw.split("@");
+        }
+        if (info.length < 2) return {};
+
+        var uuid = info[0];
+        var config = info[1].split("?");
+        if (config.length < 2) return {};
+
+        var ipAddress = config[0].split(":");
+        if (ipAddress.length < 2) return {};
+
+        var address = ipAddress[0];
+        var port = ipAddress[1];
+        var suffix = config[1].split("#");
+        if (suffix.length < 2) return {};
+
+        var remark = suffix[1];
+        
+        var tag = "proxy";
+        var parameters = suffix[0].split("&");
+
+        var routing = {};
+        var rules = [];
+        if (this.isGlobalMode) {
+            rules = this.getRules();
+            routing.domainStrategy = "IPIfNonMatch";
+        }
+        else{
+            routing.domainStrategy = "AsIs";
+        }
+        routing.rules = rules;
+        var base = this.getBase();
+        base.routing = routing;
+        base.remark = remark;
+        base.address = address;
+        base.port = port;
+        return base;
+    }
+
+    parseTrojan(url){
+        url = url.substring(9);
+        var info = url.split("@");
+        if (info.length < 2) {
+            return {};
+        }
+
+        var uuid = info[0];
+        var config = info[1].split("?");
+        if (config.length < 2) {
+            return {};
+        }
+
+        var ipAddress = config[0].split(":");
+        if (ipAddress.length < 2) {
+            return {};
+        }
+        var address = ipAddress[0];
+        var port = Integer.parseInt(ipAddress[1]);
+
+        var suffix = config[1].split("#");
+        if (suffix.length < 2) {
+            return {};
+        }
+
+        var remark = suffix[1];
+        var routing = {};
+        var rules = [];
+        if (this.isGlobalMode) {
+            rules = this.getRules();
+            routing.domainStrategy = "IPIfNonMatch";
+        }
+        else{
+            routing.domainStrategy = "AsIs";
+        }
+        routing.rules = rules;
+        var base = this.getBase();
+        base.routing = routing;
+        base.remark = remark;
+        base.address = address;
+        base.port = port;
+        return base;
+
+
+    }
+
+    parseVMess(url){
+        var url = url.substring(8);
+        var vmess = this.decode(url);
+        var info = JSON.parse(vmess);
+        var address = info.add;
+        var port = info.port;
+        var remark = info.remark;
+        if (remark == null || remark == undefined) {
+            remark = info.ps;
+        }
+        var routing = {};
+        var rules = [];
+        if (this.isGlobalMode) {
+            rules = this.getRules();
+            routing.domainStrategy = "IPIfNonMatch";
+        }
+        else{
+            routing.domainStrategy = "AsIs";
+        }
+        routing.rules = rules;
+        var base = this.getBase();
+        base.routing = routing;
+        base.remark = remark;
+        base.address = address;
+        base.port = port;
+        return base;
+    }
+
+    getRules() {
+        var rules = [];
+        if (this.isGlobalMode) {
+            A = {};
+            A.type = "field";
+            A.domain = ["geosite:cn"];
+            A.outboundTag = "direct";
+            rules.push(A);
+
+            B = {};
+            B.type = "field";
+            B.domain = ["geosite:cn"];
+            B.outboundTag = "direct";
+            rules.push(B);
+
+            C = {};
+            C.type = "field";
+            C.domain = ["geosite:cn"];
+            C.outboundTag = "direct";
+            rules.push(C);
+        }
+        return rules;
+    }
+
+    getBase(){
+        var base = {
+            "remark": "Unknown",
+            "log": {
+                "loglevel": "info"
+            },
+            "inbounds": [
+                {
+                    "settings": {
+                    "userLevel": 8
+                    },
+                    "protocol": "http",
+                    "port": 1082,
+                    "tag": "http",
+                    "listen": "127.0.0.1"
+                },
+                {
+                    "settings": {
+                    "udp": true,
+                    "auth": "noauth"
+                    },
+                    "protocol": "socks",
+                    "port": 1081,
+                    "sniffing": {
+                    "enabled": true,
+                    "destOverride": [
+                        "http",
+                        "tls"
+                    ]
+                    },
+                    "tag": "socks",
+                    "listen": "127.0.0.1"
+                }
+            ],
+            "outbounds":[
+                {
+                    "protocol": "freedom",
+                    "tag": "direct"
+                },
+                {
+                    "protocol": "freedom",
+                    "tag": "direct"
+                },
+                {
+                    "settings": {
+                    "response": {
+                        "type": "http"
+                    }
+                    },
+                    "protocol": "blackhole",
+                    "tag": "block"
+                }
+            ]
+        }
+        return base;
+    }
+}
+
+const xParserInstance = new xParser;
+module.exports = xParserInstance;

package/x.js

@@ -0,0 +1,56 @@
+/** main.js */
+const { app, BrowserWindow, crashReporter, ipcMain} = require("electron");
+var engine = require("./index");
+
+// app.commandLine.appendArgument("--enable-features=Metal");
+crashReporter.start({ submitURL: 'http://82.157.38.31:1127/crashreports' })
+
+ let log = crashReporter.getLastCrashReport();
+ let path = app.getPath('crashDumps');
+ console.log(path);
+
+app.on('before-quit', () => {
+  engine.InstallDriver("/Users/yangyudong/Documents/dream/xfuture/package/mac/install_helper.sh", "D:\\linkv\\xfuture\\package\\windows\\sysproxy.exe");
+  engine.StopProxy();
+})
+
+app.on("ready", () => {
+  mainWindow = new BrowserWindow({ 
+    width: 800,
+    height: 500,  
+    webPreferences: {
+      nodeIntegration: true,
+      // nodeIntegrationInWorker: true,
+      contextIsolation : false
+    } 
+  });
+
+  mainWindow.setMenu(null);
+
+  mainWindow.loadFile("index.html"); // 隐藏Chromium菜单
+  mainWindow.webContents.openDevTools() // 开启调试模式
+
+  mainWindow.on("closed", () => {
+    mainWindow = null;
+  });
+  mainWindow.on("show", () => {
+    mainWindow.webContents.send('window-show');
+  });
+  mainWindow.on("hide", () => {
+    mainWindow.webContents.send('window-hide');
+  });
+});
+
+app.on("window-all-closed", () => {
+  /* 在Mac系统用户通过Cmd+Q显式退出之前，保持应用程序和菜单栏处于激活状态。*/
+  if (process.platform !== "darwin") {
+    app.quit();
+  }
+});
+
+app.on("activate", () => {
+  /* 当dock图标被点击并且不会有其它窗口被打开的时候，在Mac系统上重新建立一个应用内的window。*/
+  if (mainWindow === null) {
+    createWindow();
+  }
+});

package/package/mac/xFuture.framework/Versions/A/Frameworks/ExtParser.framework/Versions/A/Resources/Info.plist

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>23A344</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>ExtParser</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.maodou.ExtParser</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>ExtParser</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string></string>
-	<key>DTPlatformName</key>
-	<string>macosx</string>
-	<key>DTPlatformVersion</key>
-	<string>14.0</string>
-	<key>DTSDKBuild</key>
-	<string>23A334</string>
-	<key>DTSDKName</key>
-	<string>macosx14.0</string>
-	<key>DTXcode</key>
-	<string>1500</string>
-	<key>DTXcodeBuild</key>
-	<string>15A240d</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>11.0</string>
-</dict>
-</plist>

package/package/mac/xFuture.framework/Versions/A/Frameworks/ExtParser.framework/Versions/A/_CodeSignature/CodeResources

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>Resources/Info.plist</key>
-		<data>
-		0X1vRvDmL9aHVYXeuivfDeE1wQ8=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Resources/Info.plist</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			7GexduFiy5SGHRjiqRrsks7ZiZnzbWL+MZbVv6r/yek=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>