xtunnel 1.1.1 → 1.1.5

package/index.js

@@ -9,9 +9,11 @@ const config = JSON.parse(fs.readFileSync(path.join(__dirname, './config/default
 
 let rayProcess = null
 
-[`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `uncaughtException`].forEach((eventType) => {
-    process.on(eventType, stop.bind(null, eventType))
-})
+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))
@@ -42,21 +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()
-    }
+    process.exit(1)
     return true
 }
 

package/package.json

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