xfuture 1.2.3 → 1.2.5

package/index.js

@@ -37,6 +37,7 @@ class xFuture {
 
     StopTunnel(){
         ff.StopTunnel();
+        this.StopProxy();
     }
 
     StartProxy(){
@@ -78,11 +79,12 @@ class xFuture {
     }
 
     SetGlobalMode(isGlobalMode, ipdir){
+        console.log("isGlobalMode:", isGlobalMode, " dir:", ipdir);
+        ff.SetGlobalMode(isGlobalMode, ipdir);
         if (isGlobalMode == parser.isGlobalMode) {
           return;
         }
         parser.isGlobalMode = isGlobalMode;
-        ff.SetGlobalMode(isGlobalMode, ipdir);
         let K_Connected = 2;
         if (this.GetCurrentStatus() == K_Connected) {
           var url = this.GetCurrentURI();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xfuture",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "electron vpn sdk",
   "main": "x.js",
   "scripts": {
@@ -30,8 +30,8 @@
     "package/windows/sysproxy.exe",
     "package/windows/xFuture.node",
     "package/windows/xray.dll",
-    "package/resources/geoip.dat",
-    "package/resources/geosite.dat"
+    "resources/geoip.dat",
+    "resources/geosite.dat"
   ],
   "build": {
     "mac": {

package/parser.js

@@ -58,7 +58,7 @@ class xParser {
         var password = accountPasswords[1];
         var routing = {};
         var rules = [];
-        if (this.isGlobalMode) {
+        if (!this.isGlobalMode) {
             rules = this.getRules();
             routing.domainStrategy = "IPIfNonMatch";
         }
@@ -110,7 +110,7 @@ class xParser {
 
         var routing = {};
         var rules = [];
-        if (this.isGlobalMode) {
+        if (!this.isGlobalMode) {
             rules = this.getRules();
             routing.domainStrategy = "IPIfNonMatch";
         }
@@ -154,7 +154,7 @@ class xParser {
         var remark = suffix[1];
         var routing = {};
         var rules = [];
-        if (this.isGlobalMode) {
+        if (!this.isGlobalMode) {
             rules = this.getRules();
             routing.domainStrategy = "IPIfNonMatch";
         }
@@ -184,7 +184,7 @@ class xParser {
         }
         var routing = {};
         var rules = [];
-        if (this.isGlobalMode) {
+        if (!this.isGlobalMode) {
             rules = this.getRules();
             routing.domainStrategy = "IPIfNonMatch";
         }
@@ -202,7 +202,7 @@ class xParser {
 
     getRules() {
         var rules = [];
-        if (this.isGlobalMode) {
+        if (!this.isGlobalMode) {
             var A = {};
             A.type = "field";
             A.domain = ["geosite:cn"];
@@ -211,13 +211,13 @@ class xParser {
 
             var B = {};
             B.type = "field";
-            B.domain = ["geosite:cn"];
+            B.ip = ["geoip:private", "geoip:cn"];
             B.outboundTag = "direct";
             rules.push(B);
 
             var C = {};
             C.type = "field";
-            C.domain = ["geosite:cn"];
+            C.domain = ["geosite:geolocation-!cn"];
             C.outboundTag = "direct";
             rules.push(C);
         }
@@ -261,7 +261,7 @@ class xParser {
             "outbounds":[
                 {
                     "protocol": "freedom",
-                    "tag": "direct"
+                    "tag": "proxy"
                 },
                 {
                     "protocol": "freedom",
@@ -270,8 +270,8 @@ class xParser {
                 {
                     "settings": {
                     "response": {
-                        "type": "http"
-                    }
+                            "type": "http"
+                        }
                     },
                     "protocol": "blackhole",
                     "tag": "block"