xfuture 1.9.4 → 1.9.5

package/index-for-win32-ia32.js

@@ -28,13 +28,8 @@ class xFuture {
       
     }
 
-    SetTunModeEnable(enable, workingDir){
+    SetTunModeEnable(enable){
         this.isTunMode = enable;
-        this.workingDir = workingDir;
-    }
-
-    SetWorkingDir(workingDir){
-      this.workingDir = workingDir
     }
 
     StartTunnel(url){
@@ -109,16 +104,17 @@ class xFuture {
       }
     }
 
-    SetGlobalMode(isGlobalMode, ipdir){
-        console.log("isGlobalMode:", isGlobalMode, " dir:", ipdir);
-        parser.workingDir = ipdir;
+    SetGlobalMode(isGlobalMode){
+        console.log("isGlobalMode:", isGlobalMode);
         parser.isGlobalMode = isGlobalMode;
     }
 
     // 1. Mac 请传 install_helper.sh 和 xfuture_helper 的绝对路径
     // 2. Windows 请传 "maodou" 固定字符串 和 sysproxy.exe 的绝对路径
-    InstallDriver(shell_path, helper_path){
+    InstallDriver(shell_path, helper_path, workingDir){
         this.driver = helper_path;
+        this.workingDir = workingDir;
+        parser.workingDir = workingDir;
     }
 
     GetCurrentStatus(){

package/index.js

@@ -26,14 +26,10 @@ class xFuture {
         ff.SetPassword(password);
     }
 
-    SetTunModeEnable(enable, workingDir){
+    SetTunModeEnable(enable){
         this.isTunMode = enable;
         parser.isTunMode = enable;
-        ff.SetTunModeEnable(enable, workingDir);
-    }
-
-    SetWorkingDir(workingDir){
-      this.workingDir = workingDir
+        ff.SetTunModeEnable(enable, this.workingDir);
     }
 
     StartTunnel(url){
@@ -90,17 +86,18 @@ class xFuture {
       ff.StopProxy();
     }
 
-    SetGlobalMode(isGlobalMode, ipdir){
+    SetGlobalMode(isGlobalMode){
         console.log("isGlobalMode:", isGlobalMode, " dir:", ipdir);
-        parser.workingDir = ipdir;
         parser.isGlobalMode = isGlobalMode;
-        ff.SetGlobalMode(isGlobalMode, ipdir);
+        ff.SetGlobalMode(isGlobalMode, this.workingDir);
     }
 
     // 1. Mac 请传 install_helper.sh 和 xfuture_helper 的绝对路径
     // 2. Windows 请传 "maodou" 固定字符串 和 sysproxy.exe 的绝对路径
-    InstallDriver(shell_path, helper_path){
+    InstallDriver(shell_path, helper_path, workingDir){
         this.driver = helper_path;
+        this.workingDir = workingDir;
+        parser.workingDir = ipdir;
         return ff.InstallDriver(shell_path, helper_path);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xfuture",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "description": "electron vpn sdk",
   "main": "x.js",
   "scripts": {