xtunnel 1.1.2 → 1.2.0

package/config/default.json

@@ -1,10 +1,10 @@
 {
     "setting": {
         "localHttpPort": "10870",
-        "localSockPort": "1080",
+        "localSockPort": "10800",
         "subscribeLink": "",
         "selectedServer": "",
-        "selectedMode": "PAC"
+        "selectedMode": "GLOBAL"
     },
     "routingPac": {
         "domainStrategy": "IPOnDemand",
@@ -44,7 +44,7 @@
                     "udp": false,
                     "auth": "noauth"
                 },
-                "port": "1080"
+                "port": "10800"
             },
             {
                 "listen": "127.0.0.1",
@@ -52,7 +52,7 @@
                 "settings": {
                     "timeout": 360
                 },
-                "port": "1087"
+                "port": "10870"
             }
         ],
         "outbounds": [

package/core/config.json

@@ -12,7 +12,7 @@
                 "udp": false,
                 "auth": "noauth"
             },
-            "port": "1080"
+            "port": "10800"
         },
         {
             "listen": "127.0.0.1",
@@ -20,7 +20,7 @@
             "settings": {
                 "timeout": 360
             },
-            "port": "1087"
+            "port": "10870"
         }
     ],
     "outbounds": [

package/index.js

@@ -9,11 +9,11 @@ const config = JSON.parse(fs.readFileSync(path.join(__dirname, './config/default
 
 let rayProcess = null
 
-process.on('exit', stop())
-process.on('SIGINT', stop())
-process.on('SIGUSR1', stop())
-process.on('SIGUSR2', stop())
-process.on('uncaughtException', err => stop() && process.exit(1))
+process.on('exit', stop)
+process.on('SIGINT', stop)
+process.on('SIGUSR1', stop)
+process.on('SIGUSR2', stop)
+process.on('uncaughtException', err => { stop(); process.exit(1) })
 
 program.version('1.0.0').description('Tunnel CLI')
 program.command('* <url>').action(url => url && run(url))
@@ -44,22 +44,18 @@ function start() {
     // 设置系统代理
     setSystemProxy(config.setting.localHttpPort)
     // 根据操作系统平台-启动新进程
-    rayProcess = child_process.exec(path.join(__dirname, './core/xray-linux-x64'), (error, stdout, stderr) => error && stop(true))
+    rayProcess = child_process.exec(path.join(__dirname, './core/xray-linux-x64'), (error, stdout, stderr) => error && stop())
     rayProcess.stdout.on('data', console.log)
     rayProcess.stderr.on('data', console.error)
 }
 
-function stop(isRestart) {
+function stop() {
     console.log('TUNNEL STOP')
     // 关闭上个进程
     rayProcess && rayProcess.kill('SIGINT')
     // 取消系统代理
     setSystemProxy()
-    if (isRestart) {
-        console.error('启动失败(请检查权限/端口占用)，重新启动中...')
-        start()
-    }
-    return true
+    process.exit(1)
 }
 
 function setSystemProxy(port) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xtunnel",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "xtunnel",
   "main": "index.js",
   "scripts": {},