xfuture 1.5.3 → 1.5.5

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,48 +216,48 @@ 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;
 }
@@ -420,7 +420,7 @@ xConfig.inbounds = [
 xConfig.ai = function(address){
   var x = {
     "log": {
-      "level": "warn",
+      "level": "error",
       "timestamp": true
     },
     "dns": xConfig.dns,

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();
@@ -86,7 +86,7 @@ class xFuture {
         
         var xray_json = JSON.stringify(parser.parse(url));
         var sing_json = JSON.stringify(parser.getSingBox(url));
-        console.log("ChangeURL: ", xray_json, " sing-box:", sing_json);
+        // console.log("ChangeURL: ", xray_json, " sing-box:", sing_json);
         return ff.ChangeURL(xray_json, url, false, sing_json);
     }
 
@@ -104,7 +104,7 @@ class xFuture {
           var xray_json = JSON.stringify(parser.parse(url));
           var sing_json = JSON.stringify(parser.getSingBox(url));
           ff.ChangeURL(xray_json, url, true, sing_json);
-          console.log("Change URL:", url, " force:", true, " xray_json:", xray_json, " sing-box:", sing_json);
+          // console.log("Change URL:", url, " force:", true, " xray_json:", xray_json, " sing-box:", sing_json);
         }
     }
 

package/package.json

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

package/parser.js

@@ -297,7 +297,7 @@ class xParser {
         var base = {
             "remark": "Mao Dou",
             "log": {
-                "loglevel": "info"
+                "loglevel": "error"
             },
             "inbounds": [
                 {