xtunnel 1.5.1 → 1.5.3

package/config/default.json

@@ -5,118 +5,5 @@
         "subscribeLink": "",
         "selectedServer": "",
         "selectedMode": "GLOBAL"
-    },
-    "routingPac": {
-        "domainStrategy": "IPOnDemand",
-        "rules": [
-            {
-                "type": "field",
-                "outboundTag": "direct",
-                "domain": [
-                    "geosite:cn"
-                ]
-            },
-            {
-                "type": "field",
-                "outboundTag": "direct",
-                "ip": [
-                    "geoip:cn",
-                    "geoip:private"
-                ]
-            }
-        ]
-    },
-    "routingGlobal": {
-        "domainStrategy": "AsIs",
-        "rules": []
-    },
-    "tpl": {
-        "log": {
-            "error": "",
-            "loglevel": "error",
-            "access": ""
-        },
-        "inbounds": [
-            {
-                "listen": "127.0.0.1",
-                "protocol": "socks",
-                "settings": {
-                    "udp": false,
-                    "auth": "noauth"
-                },
-                "port": "10800"
-            },
-            {
-                "listen": "127.0.0.1",
-                "protocol": "http",
-                "settings": {
-                    "timeout": 360
-                },
-                "port": "10870"
-            }
-        ],
-        "outbounds": [
-            {
-                "tag": "proxy",
-                "protocol": "vmess",
-                "mux": {
-                    "enabled": false,
-                    "concurrency": 8
-                },
-                "streamSettings": {
-                    "wsSettings": {
-                        "path": "/v2ray",
-                        "headers": {
-                            "host": ""
-                        }
-                    },
-                    "tlsSettings": {
-                        "allowInsecure": true
-                    },
-                    "security": "none",
-                    "network": "ws"
-                },
-                "settings": {
-                    "vnext": [
-                        {
-                            "address": "u4.amazonfeed.net",
-                            "port": 3106,
-                            "users": [
-                                {
-                                    "id": "d289df49-72eb-3b11-b83f-928b0a0f0dfc",
-                                    "alterId": 0,
-                                    "level": 0,
-                                    "security": "auto"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            },
-            {
-                "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

@@ -23,13 +23,21 @@ async function run(url) {
     try {
         let res = await get(url)
         if (res.data) {
-            subItems = Buffer.from(res.data, 'base64').toString().split("vmess://").map(o => Buffer.from(o, 'base64').toString()).filter(o => o)
+            let data = JSON.parse(res.data)
+            let remoteConfig = data.config
+            subItems = Buffer.from(data.sub, '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].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
-            fs.writeFile(path.join(__dirname, './core/config.json'), JSON.stringify(config.tpl), err => !err && start())
+            remoteConfig.tpl.inbounds[1].port = config.setting.localHttpPort
+            remoteConfig.tpl.outbounds[0].settings.vnext[0].address = server.add
+            remoteConfig.tpl.outbounds[0].settings.vnext[0].port = server.port
+            remoteConfig.tpl.outbounds[0].settings.vnext[0].users[0].id = server.id
+
+            remoteConfig.tpl.outbounds[0].streamSettings.network = server.net
+            remoteConfig.tpl.outbounds[0].settings.vnext[0].users[0].alterId = server.aid
+            if (server.aid > 0) {
+                delete remoteConfig.tpl.outbounds[0].settings.vnext[0].users[0].security
+            }
+            fs.writeFile(path.join(__dirname, './core/config.json'), JSON.stringify(remoteConfig.tpl), err => !err && start())
         }
     } catch (error) {
         console.error(error)
@@ -63,7 +71,7 @@ function setSystemProxy(port) {
         let command1 = `git config --global http.sslBackend "openssl" && git config --global http.proxy "http://127.0.0.1:${port}"`
         child_process.exec(command1)
     } else {
-        let command1 = `git config --global --unset  http.sslBackend && git config --global --unset http.proxy`
+        let command1 = `git config --global --unset http.sslBackend && git config --global --unset http.proxy`
         child_process.exec(command1)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xtunnel",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "xtunnel",
   "main": "index.js",
   "scripts": {},
@@ -10,6 +10,6 @@
   "author": "cheney",
   "license": "ISC",
   "dependencies": {
-    "commander": "^8.3.0"
+    "commander": "^9.0.0"
   }
 }