xtunnel 1.0.7 → 1.1.1

package/core/config.json

@@ -18,8 +18,7 @@
             "listen": "127.0.0.1",
             "protocol": "http",
             "settings": {
-                "timeout": 360,
-                "port": "1087"
+                "timeout": 360
             },
             "port": "1087"
         }

package/index.js

@@ -9,7 +9,9 @@ const config = JSON.parse(fs.readFileSync(path.join(__dirname, './config/default
 
 let rayProcess = null
 
-process.on('exit', () => stop())
+[`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `uncaughtException`].forEach((eventType) => {
+    process.on(eventType, stop.bind(null, eventType))
+})
 
 program.version('1.0.0').description('Tunnel CLI')
 program.command('* <url>').action(url => url && run(url))
@@ -21,7 +23,7 @@ async function run(url) {
         if (res.data) {
             subItems = Buffer.from(res.data, 'base64').toString().split("vmess://").map(o => Buffer.from(o, 'base64').toString()).filter(o => o)
             let server = subItems.map(o => JSON.parse(o)).filter(o => o.verify_cert)[0]
-            config.tpl.inbounds[1].settings.port = config.setting.localHttpPort
+            config.tpl.inbounds[1].port = config.setting.localHttpPort
             config.tpl.outbounds[0].settings.vnext[0].address = server.add
             config.tpl.outbounds[0].settings.vnext[0].port = server.port
             config.tpl.outbounds[0].settings.vnext[0].users[0].id = server.id
@@ -29,25 +31,32 @@ async function run(url) {
         }
     } catch (error) {
         console.error(error)
+        console.error('SUBSCRIBE LINK ERROR')
     }
 }
 
 function start() {
+    console.log('TUNNEL START')
     // 关闭上个进程
     rayProcess && rayProcess.kill('SIGINT')
     // 设置系统代理
     setSystemProxy(config.setting.localHttpPort)
     // 根据操作系统平台-启动新进程
-    rayProcess = child_process.exec(path.join(__dirname, './core/xray-linux-x64'), (error, stdout, stderr) => error && stop() && console.error('启动失败，请检查权限/端口占用'))
+    rayProcess = child_process.exec(path.join(__dirname, './core/xray-linux-x64'), (error, stdout, stderr) => error && stop(true))
     rayProcess.stdout.on('data', console.log)
     rayProcess.stderr.on('data', console.error)
 }
 
-function stop() {
+function stop(isRestart) {
+    console.log('TUNNEL STOP')
     // 关闭上个进程
     rayProcess && rayProcess.kill('SIGINT')
     // 取消系统代理
     setSystemProxy()
+    if (isRestart) {
+        console.error('启动失败(请检查权限/端口占用)，重新启动中...')
+        start()
+    }
     return true
 }
 

package/package.json

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