xfuture
Advanced tools
Comparing version 1.6.4 to 1.6.8
28
index.js
@@ -23,2 +23,3 @@ let xFuturePath = ""; | ||
this.isTunMode = true; | ||
this.systemProxyIsStop = true; | ||
} | ||
@@ -55,4 +56,6 @@ | ||
if (isMac || this.isTunMode) return true; | ||
if (this.systemProxyIsStop == false) return true; | ||
var ret = true; | ||
try { | ||
this.systemProxyIsStop = false; | ||
let process = spawn(this.driver, ["global", "socks=127.0.0.1:40008"]) | ||
@@ -68,2 +71,3 @@ process.on('close', (code) => { | ||
ret = false; | ||
this.systemProxyIsStop = true; | ||
} | ||
@@ -76,2 +80,3 @@ return ret; | ||
if (!isMac && !this.isTunMode) { | ||
this.systemProxyIsStop = true; | ||
try { | ||
@@ -89,26 +94,7 @@ let process = spawn(this.driver, ["off"]) | ||
ChangeURL(url){ | ||
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); | ||
return ff.ChangeURL(xray_json, url, false, sing_json); | ||
} | ||
SetGlobalMode(isGlobalMode, ipdir){ | ||
console.log("isGlobalMode:", isGlobalMode, " dir:", ipdir); | ||
parser.workingDir = ipdir | ||
parser.workingDir = ipdir; | ||
parser.isGlobalMode = isGlobalMode; | ||
ff.SetGlobalMode(isGlobalMode, ipdir); | ||
if (isGlobalMode == parser.isGlobalMode) { | ||
return; | ||
} | ||
parser.isGlobalMode = isGlobalMode; | ||
let K_Connected = 2; | ||
if (this.GetCurrentStatus() == K_Connected) { | ||
var url = this.GetCurrentURI(); | ||
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); | ||
} | ||
} | ||
@@ -115,0 +101,0 @@ |
{ | ||
"name": "xfuture", | ||
"version": "1.6.4", | ||
"version": "1.6.8", | ||
"description": "electron vpn sdk", | ||
@@ -5,0 +5,0 @@ "main": "x.js", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
153517525
1002