xfuture 1.5.2 → 1.5.4

package/config.js

@@ -207,7 +207,7 @@ function get_external_rules(){
     }
     else {
       if (element.method == "block") {
-        ips_block.push(element.content + "");
+        ips_block.push(element.content);
       }
       else if (element.method == "direct") {
         ips_direct.push(element.content);
@@ -216,54 +216,54 @@ function get_external_rules(){
         ips_proxy.push(element.content);
       }
     }
+  }
     
-    if (ips_block.length > 0) {
-      var x = {};
-      x.outbound = "block";
-      x.ip_cidr = ips_block;
-      rules.push(x);
-    }
+  if (ips_block.length > 0) {
+    var x = {};
+    x.outbound = "block";
+    x.ip_cidr = ips_block;
+    rules.push(x);
+  }
 
-    if (ips_direct.length > 0) {
-      var x = {};
-      x.outbound = "direct";
-      x.ip_cidr = ips_direct;
-      rules.push(x);
-    }
+  if (ips_direct.length > 0) {
+    var x = {};
+    x.outbound = "direct";
+    x.ip_cidr = ips_direct;
+    rules.push(x);
+  }
 
-    if (ips_proxy.length > 0) {
-      var x = {};
-      x.outbound = "proxy";
-      x.ip_cidr = ips_proxy;
-      rules.push(x);
-    }
+  if (ips_proxy.length > 0) {
+    var x = {};
+    x.outbound = "proxy";
+    x.ip_cidr = ips_proxy;
+    rules.push(x);
+  }
 
-    if (domains_block.length > 0) {
-      var x = {};
-      x.outbound = "block";
-      x.domain = domains_block;
-      rules.push(x);
-    }
+  if (domains_block.length > 0) {
+    var x = {};
+    x.outbound = "block";
+    x.domain = domains_block;
+    rules.push(x);
+  }
 
-    if (domains_direct.length > 0) {
-      var x = {};
-      x.outbound = "direct";
-      x.domain = domains_direct;
-      rules.push(x);
-    }
+  if (domains_direct.length > 0) {
+    var x = {};
+    x.outbound = "direct";
+    x.domain = domains_direct;
+    rules.push(x);
+  }
 
-    if (domains_proxy.length > 0) {
-      var x = {};
-      x.outbound = "proxy";
-      x.domain = domains_proxy;
-      rules.push(x);
-    }
+  if (domains_proxy.length > 0) {
+    var x = {};
+    x.outbound = "proxy";
+    x.domain = domains_proxy;
+    rules.push(x);
   }
   return rules;
 }
 
 function get_global_rules(server){
-  var route = xConfig.general
+  var route = JSON.parse(JSON.stringify(xConfig.general));
   var rules = route.rules;
 
   if (server != null && server != undefined) {
@@ -303,7 +303,7 @@ function get_global_rules(server){
 
 function get_ai_rules(server) {
 
-  var route = xConfig.general;
+  var route = JSON.parse(JSON.stringify(xConfig.general));
   var rules = route.rules;
 
   if (server != null && server != undefined) {

package/index.js

@@ -36,7 +36,7 @@ class xFuture {
         if(this.driver.length == 0) return false;
         var xray_json = JSON.stringify(parser.parse(url));
         var sing_json = JSON.stringify(parser.getSingBox(url));
-        console.log("json:", xray_json, " sing_json:", sing_json);
+        console.log("json:", xray_json, "====================>sing_json:", sing_json);
         var ok = ff.StartTunnel(xray_json, url, sing_json);
         if (ok) {
             ok = this.StartProxy();

package/package.json

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

package/parser.js

@@ -53,9 +53,8 @@ class xParser {
         var port = ipPorts[1] * 1
 
         var routing = {};
-        var rules = [];
+        var rules = this.getRules();
         if (!this.isGlobalMode) {
-            rules = this.getRules();
             routing.domainStrategy = "IPIfNonMatch";
         }
         else{
@@ -99,9 +98,8 @@ class xParser {
 
         var remark = suffix[1];
         var routing = {};
-        var rules = [];
+        var rules = this.getRules();
         if (!this.isGlobalMode) {
-            rules = this.getRules();
             routing.domainStrategy = "IPIfNonMatch";
         }
         else{
@@ -142,9 +140,8 @@ class xParser {
 
         var remark = suffix[1];
         var routing = {};
-        var rules = [];
+        var rules = this.getRules();
         if (!this.isGlobalMode) {
-            rules = this.getRules();
             routing.domainStrategy = "IPIfNonMatch";
         }
         else{