xtunnel 1.0.0 → 1.0.4

package/config/default.json

@@ -114,24 +114,8 @@
         ],
         "dns": {},
         "routing": {
-            "domainStrategy": "IPOnDemand",
-            "rules": [
-                {
-                    "type": "field",
-                    "outboundTag": "direct",
-                    "domain": [
-                        "geosite:cn"
-                    ]
-                },
-                {
-                    "type": "field",
-                    "outboundTag": "direct",
-                    "ip": [
-                        "geoip:cn",
-                        "geoip:private"
-                    ]
-                }
-            ]
+            "domainStrategy": "AsIs",
+            "rules": []
         },
         "transport": {}
     }

package/core/config.json

@@ -1 +1,90 @@
-{"log":{"error":"","loglevel":"warning","access":""},"inbounds":[{"listen":"127.0.0.1","protocol":"socks","settings":{"udp":false,"auth":"noauth"},"port":"1080"},{"listen":"127.0.0.1","protocol":"http","settings":{"timeout":360,"port":"1087"},"port":"1087"}],"outbounds":[{"mux":{"enabled":false,"concurrency":8},"protocol":"vmess","streamSettings":{"wsSettings":{"path":"/v2ray","headers":{"host":""}},"tlsSettings":{"allowInsecure":true},"security":"none","network":"ws"},"tag":"proxy","settings":{"vnext":[{"address":"u3.amazonfeed.net","users":[{"id":"d289df49-72eb-3b11-b83f-928b0a0f0dfc","alterId":2,"level":0,"security":"aes-128-gcm"}],"port":11101}]}},{"tag":"direct","protocol":"freedom","settings":{"domainStrategy":"UseIP","redirect":"","userLevel":0}},{"tag":"block","protocol":"blackhole","settings":{"response":{"type":"none"}}}],"dns":{},"routing":{"domainStrategy":"IPOnDemand","rules":[{"type":"field","outboundTag":"direct","domain":["geosite:cn"]},{"type":"field","outboundTag":"direct","ip":["geoip:cn","geoip:private"]}]},"transport":{}}
+{
+    "log": {
+        "error": "",
+        "loglevel": "warning",
+        "access": ""
+    },
+    "inbounds": [
+        {
+            "listen": "127.0.0.1",
+            "protocol": "socks",
+            "settings": {
+                "udp": false,
+                "auth": "noauth"
+            },
+            "port": "1080"
+        },
+        {
+            "listen": "127.0.0.1",
+            "protocol": "http",
+            "settings": {
+                "timeout": 360,
+                "port": "1087"
+            },
+            "port": "1087"
+        }
+    ],
+    "outbounds": [
+        {
+            "mux": {
+                "enabled": false,
+                "concurrency": 8
+            },
+            "protocol": "vmess",
+            "streamSettings": {
+                "wsSettings": {
+                    "path": "/v2ray",
+                    "headers": {
+                        "host": ""
+                    }
+                },
+                "tlsSettings": {
+                    "allowInsecure": true
+                },
+                "security": "none",
+                "network": "ws"
+            },
+            "tag": "proxy",
+            "settings": {
+                "vnext": [
+                    {
+                        "address": "u3.amazonfeed.net",
+                        "users": [
+                            {
+                                "id": "d289df49-72eb-3b11-b83f-928b0a0f0dfc",
+                                "alterId": 2,
+                                "level": 0,
+                                "security": "aes-128-gcm"
+                            }
+                        ],
+                        "port": 11101
+                    }
+                ]
+            }
+        },
+        {
+            "tag": "direct",
+            "protocol": "freedom",
+            "settings": {
+                "domainStrategy": "UseIP",
+                "redirect": "",
+                "userLevel": 0
+            }
+        },
+        {
+            "tag": "block",
+            "protocol": "blackhole",
+            "settings": {
+                "response": {
+                    "type": "none"
+                }
+            }
+        }
+    ],
+    "dns": {},
+    "routing": {
+        "domainStrategy": "AsIs",
+        "rules": []
+    },
+    "transport": {}
+}

package/index.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 const program = require('commander')
 const axios = require('axios')
 const config = require('config')
@@ -9,15 +11,10 @@ let rayProcess = null
 
 process.on('SIGINT', () => stop())
 
-program
-    .version('1.0.0')
-    .description('Tunnel CLI')
-program
-    .command('* <url>')
-    .action(url => url && init(url))
+program.version('1.0.0').description('Tunnel CLI')
+program.command('* <url>').action(url => url && init(url))
 program.parse(process.argv)
 
-
 async function init(url) {
     try {
         let res = await axios.get(url)
@@ -39,7 +36,6 @@ async function init(url) {
 function switchServer(server) {
     // 切换服务器
     config.tpl.inbounds[1].settings.port = config.setting.localHttpPort
-    config.tpl.routing = config.routingGlobal
     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
@@ -50,6 +46,7 @@ function start() {
     // 关闭上个进程
     rayProcess && rayProcess.kill('SIGINT')
     // 设置系统代理
+    console.log(config.setting.localHttpPort)
     setSystemProxy(config.setting.localHttpPort)
     // 根据操作系统平台-启动新进程
     rayProcess = child_process.exec(path.join(__dirname, './core/xray-linux-x64'), (error, stdout, stderr) => error && stop() && console.error('启动失败，请检查权限/端口占用'))

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "xtunnel",
-  "version": "1.0.0",
+  "version": "1.0.4",
   "description": "xtunnel",
   "main": "index.js",
   "scripts": {},
   "bin": {
-    "tunnel": "./index.js"
+    "tunnel": "index.js"
   },
   "author": "cheney",
   "license": "ISC",