doc: README

1. 新增SUB_STORE_BACKEND_MERGE配置变量，支持功能整合模式：
   - 当设置SUB_STORE_BACKEND_MERGE为非空任意值时，后端支持同时处理API和前端资源请求
   - 新增配置示例：
     #合并前后端端口
     SUB_STORE_BACKEND_MERGE=true
     #设置接口安全地址
     SUB_STORE_FRONTEND_BACKEND_PATH=/safe-api
     #设置前端文件的路径
     SUB_STORE_FRONTEND_PATH=./dist
     #后端监听的端口
     SUB_STORE_BACKEND_API_PORT=3000
     #后端监听的HOST
     SUB_STORE_BACKEND_API_HOST="127.0.0.1"

2. 合并后支持前端在子路由界面刷新：
   - 原前端在subs、files、sync等页面刷新时会出现404问题，合并后修复了该问题

README.md

@@ -32,15 +32,18 @@ Core functionalities:
 
   example: `socks5+tls://user:pass@ip:port#name`
 
-- [x] URI(SS, SSR, VMess, VLESS, Trojan, Hysteria, Hysteria 2, TUIC v5, WireGuard)
+- [x] URI(AnyTLS, SOCKS, SS, SSR, VMess, VLESS, Trojan, Hysteria, Hysteria 2, TUIC v5, WireGuard)
 - [x] Clash Proxies YAML
 - [x] Clash Proxy JSON(single line)
 - [x] QX (SS, SSR, VMess, Trojan, HTTP, SOCKS5, VLESS)
 - [x] Loon (SS, SSR, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard, VLESS, Hysteria 2)
 - [x] Surge (Direct, SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, TUIC, Snell, Hysteria 2, SSH(Password authentication only), External Proxy Program(only for macOS), WireGuard(Surge to Surge))
 - [x] Surfboard (SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard(Surfboard to Surfboard))
-- [x] Clash.Meta (Direct, SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC, SSH, mieru)
+- [x] Clash.Meta (Direct, SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC, SSH, mieru, AnyTLS)
 - [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC, Juicity, SSH)
+
+Deprecated(The frontend doesn't show it, but the backend still supports it, with the query parameter `target=Clash`):
+
 - [x] Clash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard)
 
 ### Supported Target Platforms
@@ -48,7 +51,6 @@ Core functionalities:
 - [x] Plain JSON
 - [x] Stash
 - [x] Clash.Meta(mihomo)
-- [x] Clash
 - [x] Surfboard
 - [x] Surge
 - [x] SurgeMac(Use mihomo to support protocols that are not supported by Surge itself)
@@ -60,6 +62,10 @@ Core functionalities:
 - [x] V2Ray
 - [x] V2Ray URI
 
+Deprecated:
+
+- [x] Clash
+
 ## 2. Subscription Formatting
 
 ### Filtering
@@ -122,3 +128,9 @@ This project is under the GPL V3 LICENSE.
 
 - Special thanks to @KOP-XIAO for his awesome resource-parser. Please give a [star](https://github.com/KOP-XIAO/QuantumultX) for his great work!
 - Special thanks to @Orz-3 and @58xinian for their awesome icons.
+
+## Sponsors
+
+[![image](./support.nodeseek.com_page_promotion_id=8.png)](https://yxvm.com)
+
+[NodeSupport](https://github.com/NodeSeekDev/NodeSupport) sponsored this project.

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.16.32",
+  "version": "2.19.60",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
   "main": "src/main.js",
   "scripts": {
@@ -17,25 +17,32 @@
   },
   "author": "Peng-YM",
   "license": "GPL-3.0",
+  "pnpm": {
+    "patchedDependencies": {
+      "http-proxy@1.18.1": "patches/http-proxy@1.18.1.patch"
+    }
+  },
   "dependencies": {
     "@maxmind/geoip2-node": "^5.0.0",
     "automerge": "1.0.1-preview.7",
     "body-parser": "^1.19.0",
     "buffer": "^6.0.3",
+    "dotenv": "^16.4.7",
     "connect-history-api-fallback": "^2.0.0",
     "cron": "^3.1.6",
     "dns-packet": "^5.6.1",
     "express": "^4.17.1",
-    "http-proxy-middleware": "^2.0.6",
+    "mime-types": "^2.1.35",
+    "http-proxy-middleware": "^3.0.3",
     "ip-address": "^9.0.5",
     "js-base64": "^3.7.2",
     "jsrsasign": "^11.1.0",
     "lodash": "^4.17.21",
     "ms": "^2.1.3",
     "nanoid": "^3.3.3",
-    "request": "^2.88.2",
     "semver": "^7.6.3",
-    "static-js-yaml": "^1.0.0"
+    "static-js-yaml": "^1.0.0",
+    "undici": "^7.4.0"
   },
   "devDependencies": {
     "@babel/core": "^7.18.0",

backend/patches/http-proxy@1.18.1.patch

@@ -0,0 +1,46 @@
+diff --git a/lib/http-proxy/common.js b/lib/http-proxy/common.js
+index 6513e81d80d5250ea249ea833f819ece67897c7e..486d4c896d65a3bb7cf63307af68facb3ddb886b 100644
+--- a/lib/http-proxy/common.js
++++ b/lib/http-proxy/common.js
+@@ -1,6 +1,5 @@
+ var common   = exports,
+     url      = require('url'),
+-    extend   = require('util')._extend,
+     required = require('requires-port');
+ 
+ var upgradeHeader = /(^|,)\s*upgrade\s*($|,)/i,
+@@ -40,10 +39,10 @@ common.setupOutgoing = function(outgoing, options, req, forward) {
+   );
+ 
+   outgoing.method = options.method || req.method;
+-  outgoing.headers = extend({}, req.headers);
++  outgoing.headers = Object.assign({}, req.headers);
+ 
+   if (options.headers){
+-    extend(outgoing.headers, options.headers);
++    Object.assign(outgoing.headers, options.headers);
+   }
+ 
+   if (options.auth) {
+diff --git a/lib/http-proxy/index.js b/lib/http-proxy/index.js
+index 977a4b3622b9eaac27689f06347ea4c5173a96cd..88b2d0fcfa03c3aafa47c7e6d38e64412c45a7cc 100644
+--- a/lib/http-proxy/index.js
++++ b/lib/http-proxy/index.js
+@@ -1,5 +1,4 @@
+ var httpProxy = module.exports,
+-    extend    = require('util')._extend,
+     parse_url = require('url').parse,
+     EE3       = require('eventemitter3'),
+     http      = require('http'),
+@@ -47,9 +46,9 @@ function createRightProxy(type) {
+         args[cntr] !== res
+       ) {
+         //Copy global options
+-        requestOptions = extend({}, options);
++        requestOptions = Object.assign({}, options);
+         //Overwrite with request options
+-        extend(requestOptions, args[cntr]);
++        Object.assign(requestOptions, args[cntr]);
+ 
+         cntr--;
+       }

backend/pnpm-lock.yaml

@@ -4,6 +4,11 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+patchedDependencies:
+  http-proxy@1.18.1:
+    hash: 8071c23044f455271f4d4074ae4c7b81beec17a03aefd158d5f4edd4ef751c11
+    path: patches/http-proxy@1.18.1.patch
+
 importers:
 
   .:
@@ -33,8 +38,8 @@ importers:
         specifier: ^4.17.1
         version: 4.21.2
       http-proxy-middleware:
-        specifier: ^2.0.6
+        specifier: ^3.0.3
-        version: 2.0.7
+        version: 3.0.3
       ip-address:
         specifier: ^9.0.5
         version: 9.0.5
@@ -53,15 +58,15 @@ importers:
       nanoid:
         specifier: ^3.3.3
         version: 3.3.8
-      request:
-        specifier: ^2.88.2
-        version: 2.88.2
       semver:
         specifier: ^7.6.3
         version: 7.6.3
       static-js-yaml:
         specifier: ^1.0.0
         version: 1.0.0
+      undici:
+        specifier: ^7.4.0
+        version: 7.4.0
     devDependencies:
       '@babel/core':
         specifier: ^7.18.0
@@ -1072,9 +1077,6 @@ packages:
   asn1.js@4.10.1:
     resolution: {integrity: sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==}
 
-  asn1@0.2.6:
-    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
-
   assert-plus@1.0.0:
     resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
     engines: {node: '>=0.8'}
@@ -1100,9 +1102,6 @@ packages:
     resolution: {integrity: sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==}
     engines: {node: '>= 0.10'}
 
-  asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-
   atob@2.1.2:
     resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
     engines: {node: '>= 4.5.0'}
@@ -1115,12 +1114,6 @@ packages:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
 
-  aws-sign2@0.7.0:
-    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
-
-  aws4@1.13.2:
-    resolution: {integrity: sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==}
-
   axios@0.21.4:
     resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
 
@@ -1168,9 +1161,6 @@ packages:
     resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
     engines: {node: '>=0.10.0'}
 
-  bcrypt-pbkdf@1.0.2:
-    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
-
   binary-extensions@1.13.1:
     resolution: {integrity: sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==}
     engines: {node: '>=0.10.0'}
@@ -1327,9 +1317,6 @@ packages:
   caniuse-lite@1.0.30001692:
     resolution: {integrity: sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==}
 
-  caseless@0.12.0:
-    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
-
   chai@4.5.0:
     resolution: {integrity: sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==}
     engines: {node: '>=4'}
@@ -1410,10 +1397,6 @@ packages:
   combine-source-map@0.8.0:
     resolution: {integrity: sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==}
 
-  combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
-
   commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
@@ -1535,10 +1518,6 @@ packages:
   dash-ast@2.0.1:
     resolution: {integrity: sha512-5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ==}
 
-  dashdash@1.14.1:
-    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
-    engines: {node: '>=0.10'}
-
   data-view-buffer@1.0.2:
     resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==}
     engines: {node: '>= 0.4'}
@@ -1633,10 +1612,6 @@ packages:
   defined@1.0.1:
     resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==}
 
-  delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
-
   depd@2.0.0:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
     engines: {node: '>= 0.8'}
@@ -1702,9 +1677,6 @@ packages:
   each-props@1.3.2:
     resolution: {integrity: sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==}
 
-  ecc-jsbn@0.1.2:
-    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
-
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
@@ -2074,16 +2046,9 @@ packages:
     resolution: {integrity: sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==}
     engines: {node: '>=0.10.0'}
 
-  forever-agent@0.6.1:
-    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
-
   fork-stream@0.0.4:
     resolution: {integrity: sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==}
 
-  form-data@2.3.3:
-    resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
-    engines: {node: '>= 0.12'}
-
   forwarded@0.2.0:
     resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
     engines: {node: '>= 0.6'}
@@ -2167,9 +2132,6 @@ packages:
     resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
     engines: {node: '>=0.10.0'}
 
-  getpass@0.1.7:
-    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
-
   glob-parent@3.1.0:
     resolution: {integrity: sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==}
 
@@ -2273,15 +2235,6 @@ packages:
     resolution: {integrity: sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==}
     engines: {node: '>= 0.10'}
 
-  har-schema@2.0.0:
-    resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
-    engines: {node: '>=4'}
-
-  har-validator@5.1.5:
-    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==}
-    engines: {node: '>=6'}
-    deprecated: this library is no longer supported
-
   has-ansi@2.0.0:
     resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
     engines: {node: '>=0.10.0'}
@@ -2366,23 +2319,14 @@ packages:
     resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
     engines: {node: '>= 0.8'}
 
-  http-proxy-middleware@2.0.7:
+  http-proxy-middleware@3.0.3:
-    resolution: {integrity: sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==}
+    resolution: {integrity: sha512-usY0HG5nyDUwtqpiZdETNbmKtw3QQ1jwYFZ9wi5iHzX2BcILwQKtYDJPo7XHTsu5Z0B2Hj3W9NNnbd+AjFWjqg==}
-    engines: {node: '>=12.0.0'}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@types/express': ^4.17.13
-    peerDependenciesMeta:
-      '@types/express':
-        optional: true
 
   http-proxy@1.18.1:
     resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==}
     engines: {node: '>=8.0.0'}
 
-  http-signature@1.2.0:
-    resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
-    engines: {node: '>=0.8', npm: '>=1.3.7'}
-
   https-browserify@1.0.0:
     resolution: {integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==}
 
@@ -2597,10 +2541,6 @@ packages:
     resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
     engines: {node: '>=8'}
 
-  is-plain-obj@3.0.0:
-    resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==}
-    engines: {node: '>=10'}
-
   is-plain-object@2.0.4:
     resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
     engines: {node: '>=0.10.0'}
@@ -2637,9 +2577,6 @@ packages:
     resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==}
     engines: {node: '>= 0.4'}
 
-  is-typedarray@1.0.0:
-    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
-
   is-unc-path@1.0.0:
     resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
     engines: {node: '>=0.10.0'}
@@ -2691,9 +2628,6 @@ packages:
     resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
     engines: {node: '>=0.10.0'}
 
-  isstream@0.1.2:
-    resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
-
   js-base64@3.7.7:
     resolution: {integrity: sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==}
 
@@ -2708,9 +2642,6 @@ packages:
     resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
     hasBin: true
 
-  jsbn@0.1.1:
-    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
-
   jsbn@1.1.0:
     resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}
 
@@ -2736,9 +2667,6 @@ packages:
   json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
-  json-stringify-safe@5.0.1:
-    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
-
   json5@2.2.3:
     resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
     engines: {node: '>=6'}
@@ -2748,10 +2676,6 @@ packages:
     resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
     engines: {'0': node >= 0.2.0}
 
-  jsprim@1.4.2:
-    resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
-    engines: {node: '>=0.6.0'}
-
   jsprim@2.0.2:
     resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
     engines: {'0': node >=0.6.0}
@@ -3065,9 +2989,6 @@ packages:
     resolution: {integrity: sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==}
     engines: {node: '>=0.10.0'}
 
-  oauth-sign@0.9.0:
-    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
-
   object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
@@ -3272,9 +3193,6 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  performance-now@2.1.0:
-    resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
-
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
@@ -3360,9 +3278,6 @@ packages:
     resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
     engines: {node: '>= 0.10'}
 
-  psl@1.15.0:
-    resolution: {integrity: sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==}
-
   pstree.remy@1.1.8:
     resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}
 
@@ -3390,10 +3305,6 @@ packages:
     resolution: {integrity: sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==}
     engines: {node: '>=0.6'}
 
-  qs@6.5.3:
-    resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
-    engines: {node: '>=0.6'}
-
   querystring-es3@0.2.1:
     resolution: {integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==}
     engines: {node: '>=0.4.x'}
@@ -3524,11 +3435,6 @@ packages:
     resolution: {integrity: sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==}
     engines: {node: '>= 0.10'}
 
-  request@2.88.2:
-    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
-    engines: {node: '>= 6'}
-    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
-
   require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -3790,11 +3696,6 @@ packages:
   sprintf-js@1.1.3:
     resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
 
-  sshpk@1.18.0:
-    resolution: {integrity: sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-
   stack-trace@0.0.10:
     resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}
 
@@ -4010,22 +3911,12 @@ packages:
     resolution: {integrity: sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==}
     hasBin: true
 
-  tough-cookie@2.5.0:
-    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
-    engines: {node: '>=0.8'}
-
   transform-ast@2.4.4:
     resolution: {integrity: sha512-AxjeZAcIOUO2lev2GDe3/xZ1Q0cVGjIMk5IsriTy8zbWlsEnjeB025AhkhBJHoy997mXpLd4R+kRbvnnQVuQHQ==}
 
   tty-browserify@0.0.1:
     resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==}
 
-  tunnel-agent@0.6.0:
-    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
-
-  tweetnacl@0.14.5:
-    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
-
   type-check@0.3.2:
     resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==}
     engines: {node: '>= 0.8.0'}
@@ -4112,6 +4003,10 @@ packages:
   undici-types@6.20.0:
     resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
 
+  undici@7.4.0:
+    resolution: {integrity: sha512-PUQM3/es3noM24oUn10u3kNNap0AbxESOmnssmW+dOi9yGwlUSi5nTNYl3bNbTkWOF8YZDkx2tCmj9OtQ3iGGw==}
+    engines: {node: '>=20.18.1'}
+
   unicode-canonical-property-names-ecmascript@2.0.1:
     resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
     engines: {node: '>=4'}
@@ -5376,10 +5271,6 @@ snapshots:
       inherits: 2.0.4
       minimalistic-assert: 1.0.1
 
-  asn1@0.2.6:
-    dependencies:
-      safer-buffer: 2.1.2
-
   assert-plus@1.0.0: {}
 
   assert@1.5.1:
@@ -5404,8 +5295,6 @@ snapshots:
     dependencies:
       async-done: 1.3.2
 
-  asynckit@0.4.0: {}
-
   atob@2.1.2: {}
 
   automerge@1.0.1-preview.7:
@@ -5418,13 +5307,9 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.0.0
 
-  aws-sign2@0.7.0: {}
-
-  aws4@1.13.2: {}
-
   axios@0.21.4:
     dependencies:
-      follow-redirects: 1.15.9
+      follow-redirects: 1.15.9(debug@4.4.0)
     transitivePeerDependencies:
       - debug
 
@@ -5491,10 +5376,6 @@ snapshots:
       mixin-deep: 1.3.2
       pascalcase: 0.1.1
 
-  bcrypt-pbkdf@1.0.2:
-    dependencies:
-      tweetnacl: 0.14.5
-
   binary-extensions@1.13.1: {}
 
   binary-extensions@2.3.0: {}
@@ -5779,8 +5660,6 @@ snapshots:
 
   caniuse-lite@1.0.30001692: {}
 
-  caseless@0.12.0: {}
-
   chai@4.5.0:
     dependencies:
       assertion-error: 1.1.0
@@ -5908,10 +5787,6 @@ snapshots:
       lodash.memoize: 3.0.4
       source-map: 0.5.7
 
-  combined-stream@1.0.8:
-    dependencies:
-      delayed-stream: 1.0.0
-
   commander@2.20.3: {}
 
   commander@6.2.1: {}
@@ -6050,10 +5925,6 @@ snapshots:
 
   dash-ast@2.0.1: {}
 
-  dashdash@1.14.1:
-    dependencies:
-      assert-plus: 1.0.0
-
   data-view-buffer@1.0.2:
     dependencies:
       call-bound: 1.0.3
@@ -6144,8 +6015,6 @@ snapshots:
 
   defined@1.0.1: {}
 
-  delayed-stream@1.0.0: {}
-
   depd@2.0.0: {}
 
   deps-sort@2.0.1:
@@ -6223,11 +6092,6 @@ snapshots:
       is-plain-object: 2.0.4
       object.defaults: 1.1.0
 
-  ecc-jsbn@0.1.2:
-    dependencies:
-      jsbn: 0.1.1
-      safer-buffer: 2.1.2
-
   ee-first@1.1.1: {}
 
   electron-to-chromium@1.5.80: {}
@@ -6767,7 +6631,9 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 2.3.8
 
-  follow-redirects@1.15.9: {}
+  follow-redirects@1.15.9(debug@4.4.0):
+    optionalDependencies:
+      debug: 4.4.0(supports-color@8.1.1)
 
   for-each@0.3.3:
     dependencies:
@@ -6779,16 +6645,8 @@ snapshots:
     dependencies:
       for-in: 1.0.2
 
-  forever-agent@0.6.1: {}
-
   fork-stream@0.0.4: {}
 
-  form-data@2.3.3:
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-
   forwarded@0.2.0: {}
 
   fragment-cache@0.2.1:
@@ -6876,10 +6734,6 @@ snapshots:
 
   get-value@2.0.6: {}
 
-  getpass@0.1.7:
-    dependencies:
-      assert-plus: 1.0.0
-
   glob-parent@3.1.0:
     dependencies:
       is-glob: 3.1.0
@@ -7060,13 +6914,6 @@ snapshots:
     dependencies:
       glogg: 1.0.2
 
-  har-schema@2.0.0: {}
-
-  har-validator@5.1.5:
-    dependencies:
-      ajv: 6.12.6
-      har-schema: 2.0.0
-
   has-ansi@2.0.0:
     dependencies:
       ansi-regex: 2.1.1
@@ -7150,30 +6997,25 @@ snapshots:
       statuses: 2.0.1
       toidentifier: 1.0.1
 
-  http-proxy-middleware@2.0.7:
+  http-proxy-middleware@3.0.3:
     dependencies:
       '@types/http-proxy': 1.17.15
-      http-proxy: 1.18.1
+      debug: 4.4.0(supports-color@8.1.1)
+      http-proxy: 1.18.1(patch_hash=8071c23044f455271f4d4074ae4c7b81beec17a03aefd158d5f4edd4ef751c11)(debug@4.4.0)
       is-glob: 4.0.3
-      is-plain-obj: 3.0.0
+      is-plain-object: 5.0.0
       micromatch: 4.0.8
     transitivePeerDependencies:
-      - debug
+      - supports-color
 
-  http-proxy@1.18.1:
+  http-proxy@1.18.1(patch_hash=8071c23044f455271f4d4074ae4c7b81beec17a03aefd158d5f4edd4ef751c11)(debug@4.4.0):
     dependencies:
       eventemitter3: 4.0.7
-      follow-redirects: 1.15.9
+      follow-redirects: 1.15.9(debug@4.4.0)
       requires-port: 1.0.0
     transitivePeerDependencies:
       - debug
 
-  http-signature@1.2.0:
-    dependencies:
-      assert-plus: 1.0.0
-      jsprim: 1.4.2
-      sshpk: 1.18.0
-
   https-browserify@1.0.0: {}
 
   iconv-lite@0.4.24:
@@ -7382,8 +7224,6 @@ snapshots:
 
   is-plain-obj@2.1.0: {}
 
-  is-plain-obj@3.0.0: {}
-
   is-plain-object@2.0.4:
     dependencies:
       isobject: 3.0.1
@@ -7422,8 +7262,6 @@ snapshots:
     dependencies:
       which-typed-array: 1.1.18
 
-  is-typedarray@1.0.0: {}
-
   is-unc-path@1.0.0:
     dependencies:
       unc-path-regex: 0.1.2
@@ -7461,8 +7299,6 @@ snapshots:
 
   isobject@3.0.1: {}
 
-  isstream@0.1.2: {}
-
   js-base64@3.7.7: {}
 
   js-tokens@4.0.0: {}
@@ -7476,8 +7312,6 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
-  jsbn@0.1.1: {}
-
   jsbn@1.1.0: {}
 
   jsesc@3.0.2: {}
@@ -7492,19 +7326,10 @@ snapshots:
 
   json-stable-stringify-without-jsonify@1.0.1: {}
 
-  json-stringify-safe@5.0.1: {}
-
   json5@2.2.3: {}
 
   jsonparse@1.3.1: {}
 
-  jsprim@1.4.2:
-    dependencies:
-      assert-plus: 1.0.0
-      extsprintf: 1.3.0
-      json-schema: 0.4.0
-      verror: 1.10.0
-
   jsprim@2.0.2:
     dependencies:
       assert-plus: 1.0.0
@@ -7889,8 +7714,6 @@ snapshots:
 
   number-is-nan@1.0.1: {}
 
-  oauth-sign@0.9.0: {}
-
   object-assign@4.1.1: {}
 
   object-copy@0.1.0:
@@ -8104,8 +7927,6 @@ snapshots:
       commander: 9.5.0
       source-map-generator: 0.8.0
 
-  performance-now@2.1.0: {}
-
   picocolors@1.1.1: {}
 
   picomatch@2.3.1: {}
@@ -8165,10 +7986,6 @@ snapshots:
       forwarded: 0.2.0
       ipaddr.js: 1.9.1
 
-  psl@1.15.0:
-    dependencies:
-      punycode: 2.3.1
-
   pstree.remy@1.1.8: {}
 
   public-encrypt@4.0.3:
@@ -8203,8 +8020,6 @@ snapshots:
     dependencies:
       side-channel: 1.1.0
 
-  qs@6.5.3: {}
-
   querystring-es3@0.2.1: {}
 
   queue-microtask@1.2.3: {}
@@ -8374,29 +8189,6 @@ snapshots:
       is-absolute: 1.0.0
       remove-trailing-separator: 1.1.0
 
-  request@2.88.2:
-    dependencies:
-      aws-sign2: 0.7.0
-      aws4: 1.13.2
-      caseless: 0.12.0
-      combined-stream: 1.0.8
-      extend: 3.0.2
-      forever-agent: 0.6.1
-      form-data: 2.3.3
-      har-validator: 5.1.5
-      http-signature: 1.2.0
-      is-typedarray: 1.0.0
-      isstream: 0.1.2
-      json-stringify-safe: 5.0.1
-      mime-types: 2.1.35
-      oauth-sign: 0.9.0
-      performance-now: 2.1.0
-      qs: 6.5.3
-      safe-buffer: 5.2.1
-      tough-cookie: 2.5.0
-      tunnel-agent: 0.6.0
-      uuid: 3.4.0
-
   require-directory@2.1.1: {}
 
   require-main-filename@1.0.1: {}
@@ -8694,18 +8486,6 @@ snapshots:
 
   sprintf-js@1.1.3: {}
 
-  sshpk@1.18.0:
-    dependencies:
-      asn1: 0.2.6
-      assert-plus: 1.0.0
-      bcrypt-pbkdf: 1.0.2
-      dashdash: 1.14.1
-      ecc-jsbn: 0.1.2
-      getpass: 0.1.7
-      jsbn: 0.1.1
-      safer-buffer: 2.1.2
-      tweetnacl: 0.14.5
-
   stack-trace@0.0.10: {}
 
   static-eval@0.2.4:
@@ -8993,11 +8773,6 @@ snapshots:
 
   touch@3.1.1: {}
 
-  tough-cookie@2.5.0:
-    dependencies:
-      psl: 1.15.0
-      punycode: 2.3.1
-
   transform-ast@2.4.4:
     dependencies:
       acorn-node: 1.8.2
@@ -9010,12 +8785,6 @@ snapshots:
 
   tty-browserify@0.0.1: {}
 
-  tunnel-agent@0.6.0:
-    dependencies:
-      safe-buffer: 5.2.1
-
-  tweetnacl@0.14.5: {}
-
   type-check@0.3.2:
     dependencies:
       prelude-ls: 1.1.2
@@ -9137,6 +8906,8 @@ snapshots:
 
   undici-types@6.20.0: {}
 
+  undici@7.4.0: {}
+
   unicode-canonical-property-names-ecmascript@2.0.1: {}
 
   unicode-match-property-ecmascript@2.0.0:

backend/src/core/proxy-utils/index.js

@@ -1,11 +1,13 @@
+import { Base64 } from 'js-base64';
 import { Buffer } from 'buffer';
 import rs from '@/utils/rs';
 import YAML from '@/utils/yaml';
-import download from '@/utils/download';
+import download, { downloadFile } from '@/utils/download';
 import {
     isIPv4,
     isIPv6,
     isValidPortNumber,
+    isValidUUID,
     isNotBlank,
     ipAddress,
     getRandomPort,
@@ -21,6 +23,8 @@ import { findByName } from '@/utils/database';
 import { produceArtifact } from '@/restful/sync';
 import { getFlag, removeFlag, getISO, MMDB } from '@/utils/geo';
 import Gist from '@/utils/gist';
+import { isPresent } from './producers/utils';
+import { doh } from '@/utils/dns';
 
 function preprocess(raw) {
     for (const processor of PROXY_PREPROCESSORS) {
@@ -75,7 +79,16 @@ function parse(raw) {
             $.error(`Failed to parse line: ${line}`);
         }
     }
-    return proxies;
+    return proxies.filter((proxy) => {
+        if (['vless', 'vmess'].includes(proxy.type)) {
+            const isProxyUUIDValid = isValidUUID(proxy.uuid);
+            if (!isProxyUUIDValid) {
+                $.error(`UUID may be invalid: ${proxy.name} ${proxy.uuid}`);
+            }
+            // return isProxyUUIDValid;
+        }
+        return true;
+    });
 }
 
 async function processFn(
@@ -102,12 +115,7 @@ async function processFn(
         if (item.type.indexOf('Script') !== -1) {
             const { mode, content } = item.args;
             if (mode === 'link') {
-                let noCache;
                 let url = content || '';
-                if (url.endsWith('#noCache')) {
-                    url = url.replace(/#noCache$/, '');
-                    noCache = true;
-                }
                 // extract link arguments
                 const rawArgs = url.split('#');
                 if (rawArgs.length > 1) {
@@ -126,10 +134,17 @@ async function processFn(
                         }
                     }
                 }
-                url = `${url.split('#')[0]}${noCache ? '#noCache' : ''}`;
+                url = `${url.split('#')[0]}${
-                const downloadUrlMatch = url.match(
+                    rawArgs[2]
-                    /^\/api\/(file|module)\/(.+)/,
+                        ? `#${rawArgs[2]}`
-                );
+                        : $arguments?.noCache != null ||
+                          $arguments?.insecure != null
+                        ? `#${rawArgs[1]}`
+                        : ''
+                }`;
+                const downloadUrlMatch = url
+                    .split('#')[0]
+                    .match(/^\/api\/(file|module)\/(.+)/);
                 if (downloadUrlMatch) {
                     let type = '';
                     try {
@@ -159,6 +174,17 @@ async function processFn(
                         );
                         throw new Error(`无法加载 ${type}: ${url}`);
                     }
+                } else if (url?.startsWith('/')) {
+                    try {
+                        const fs = eval(`require("fs")`);
+                        script = fs.readFileSync(url.split('#')[0], 'utf8');
+                        // $.info(`Script loaded: >>>\n ${script}`);
+                    } catch (err) {
+                        $.error(
+                            `Error when reading local script: ${item.args.content}.\n Reason: ${err}`,
+                        );
+                        throw new Error(`无法从该路径读取脚本文件: ${url}`);
+                    }
                 } else {
                     // if this is a remote script, download it
                     try {
@@ -173,6 +199,7 @@ async function processFn(
                 }
             } else {
                 script = content;
+                $arguments = item.args.arguments || {};
             }
         }
 
@@ -214,10 +241,22 @@ function produce(proxies, targetPlatform, type, opts = {}) {
     );
 
     // filter unsupported proxies
-    proxies = proxies.filter(
+    proxies = proxies.filter((proxy) => {
-        (proxy) =>
+        // 检查代理是否支持目标平台
-            !(proxy.supported && proxy.supported[targetPlatform] === false),
+        if (proxy.supported && proxy.supported[targetPlatform] === false) {
-    );
+            return false;
+        }
+
+        // 对于 vless 和 vmess 代理,需要额外验证 UUID
+        if (['vless', 'vmess'].includes(proxy.type)) {
+            const isProxyUUIDValid = isValidUUID(proxy.uuid);
+            if (!isProxyUUIDValid)
+                $.error(`UUID may be invalid: ${proxy.name} ${proxy.uuid}`);
+            // return isProxyUUIDValid;
+        }
+
+        return true;
+    });
 
     proxies = proxies.map((proxy) => {
         proxy._resolved = proxy.resolved;
@@ -303,6 +342,11 @@ export const ProxyUtils = {
     MMDB,
     Gist,
     download,
+    downloadFile,
+    isValidUUID,
+    doh,
+    Buffer,
+    Base64,
 };
 
 function tryParse(parser, line) {
@@ -400,9 +444,14 @@ function lastParse(proxy) {
         }
     }
     if (
-        ['trojan', 'tuic', 'hysteria', 'hysteria2', 'juicity'].includes(
+        [
-            proxy.type,
+            'trojan',
-        )
+            'tuic',
+            'hysteria',
+            'hysteria2',
+            'juicity',
+            'anytls',
+        ].includes(proxy.type)
     ) {
         proxy.tls = true;
     }
@@ -486,6 +535,14 @@ function lastParse(proxy) {
         proxy['obfs-password'] = proxy.obfs;
         proxy.obfs = 'salamander';
     }
+    if (
+        ['hysteria2'].includes(proxy.type) &&
+        !proxy['obfs-password'] &&
+        proxy['obfs_password']
+    ) {
+        proxy['obfs-password'] = proxy['obfs_password'];
+        delete proxy['obfs_password'];
+    }
     if (['vless'].includes(proxy.type)) {
         // 删除 reality-opts: {}
         if (
@@ -572,6 +629,20 @@ function lastParse(proxy) {
     if (!proxy['tls-fingerprint'] && caStr) {
         proxy['tls-fingerprint'] = rs.generateFingerprint(caStr);
     }
+    if (
+        ['ss'].includes(proxy.type) &&
+        isPresent(proxy, 'shadow-tls-password')
+    ) {
+        proxy.plugin = 'shadow-tls';
+        proxy['plugin-opts'] = {
+            host: proxy['shadow-tls-sni'],
+            password: proxy['shadow-tls-password'],
+            version: proxy['shadow-tls-version'],
+        };
+        delete proxy['shadow-tls-sni'];
+        delete proxy['shadow-tls-password'];
+        delete proxy['shadow-tls-version'];
+    }
     return proxy;
 }
 

backend/src/core/proxy-utils/parsers/index.js

@@ -76,7 +76,46 @@ function URI_PROXY() {
     };
     return { name, test, parse };
 }
+function URI_SOCKS() {
+    const name = 'URI SOCKS Parser';
+    const test = (line) => {
+        return /^socks:\/\//.test(line);
+    };
+    const parse = (line) => {
+        // parse url
+        // eslint-disable-next-line no-unused-vars
+        let [__, type, auth, server, port, query, name] = line.match(
+            /^(socks)?:\/\/(?:(.*)@)?(.*?)(?::(\d+?))?(\?.*?)?(?:#(.*?))?$/,
+        );
+        if (port) {
+            port = parseInt(port, 10);
+        } else {
+            $.error(`port is not present in line: ${line}`);
+            throw new Error(`port is not present in line: ${line}`);
+        }
+        let username, password;
+        if (auth) {
+            const parsed = Base64.decode(decodeURIComponent(auth)).split(':');
+            username = parsed[0];
+            password = parsed[1];
+        }
 
+        const proxy = {
+            name:
+                name != null
+                    ? decodeURIComponent(name)
+                    : `${type} ${server}:${port}`,
+            type: 'socks5',
+            server,
+            port,
+            username,
+            password,
+        };
+
+        return proxy;
+    };
+    return { name, test, parse };
+}
 // Parse SS URI format (only supports new SIP002, legacy format is depreciated).
 // reference: https://github.com/shadowsocks/shadowsocks-org/wiki/SIP002-URI-Scheme
 function URI_SS() {
@@ -89,13 +128,13 @@ function URI_SS() {
         // parse url
         let content = line.split('ss://')[1];
 
+        let name = line.split('#')[1];
         const proxy = {
-            name: decodeURIComponent(line.split('#')[1]),
             type: 'ss',
         };
         content = content.split('#')[0]; // strip proxy name
         // handle IPV4 and IPV6
-        let serverAndPortArray = content.match(/@([^/]*)(\/|$)/);
+        let serverAndPortArray = content.match(/@([^/?]*)(\/|\?|$)/);
 
         let rawUserInfoStr = decodeURIComponent(content.split('@')[0]); // 其实应该分隔之后, 用户名和密码再 decodeURIComponent. 但是问题不大
         let userInfoStr;
@@ -113,6 +152,7 @@ function URI_SS() {
                 query = parsed[2];
             }
             content = Base64.decode(content);
+
             if (query) {
                 if (/(&|\?)v2ray-plugin=/.test(query)) {
                     const parsed = query.match(/(&|\?)v2ray-plugin=(.*?)(&|$)/);
@@ -126,8 +166,11 @@ function URI_SS() {
                 }
                 content = `${content}${query}`;
             }
-            userInfoStr = content.split('@')[0];
+            userInfoStr = content.match(/(^.*)@/)?.[1];
-            serverAndPortArray = content.match(/@([^/]*)(\/|$)/);
+            serverAndPortArray = content.match(/@([^/@]*)(\/|$)/);
+        } else if (content.includes('?')) {
+            const parsed = content.match(/(\?.*)$/);
+            query = parsed[1];
         }
 
         const serverAndPort = serverAndPortArray[1];
@@ -147,6 +190,8 @@ function URI_SS() {
 
         // handle obfs
         const pluginMatch = content.match(/[?&]plugin=([^&]+)/);
+        const shadowTlsMatch = content.match(/[?&]shadow-tls=([^&]+)/);
+
         if (pluginMatch) {
             const pluginInfo = (
                 'plugin=' + decodeURIComponent(pluginMatch[1])
@@ -190,12 +235,35 @@ function URI_SS() {
                     );
             }
         }
+        // Shadowrocket
+        if (shadowTlsMatch) {
+            const params = JSON.parse(Base64.decode(shadowTlsMatch[1]));
+            const version = getIfNotBlank(params['version']);
+            const address = getIfNotBlank(params['address']);
+            const port = getIfNotBlank(params['port']);
+            proxy.plugin = 'shadow-tls';
+            proxy['plugin-opts'] = {
+                host: getIfNotBlank(params['host']),
+                password: getIfNotBlank(params['password']),
+                version: version ? parseInt(version, 10) : undefined,
+            };
+            if (address) {
+                proxy.server = address;
+            }
+            if (port) {
+                proxy.port = parseInt(port, 10);
+            }
+        }
         if (/(&|\?)uot=(1|true)/i.test(query)) {
             proxy['udp-over-tcp'] = true;
         }
         if (/(&|\?)tfo=(1|true)/i.test(query)) {
             proxy.tfo = true;
         }
+        if (name != null) {
+            name = decodeURIComponent(name);
+        }
+        proxy.name = name ?? `SS ${proxy.server}:${proxy.port}`;
         return proxy;
     };
     return { name, test, parse };
@@ -278,7 +346,7 @@ function URI_VMess() {
     };
     const parse = (line) => {
         line = line.split('vmess://')[1];
-        let content = Base64.decode(line);
+        let content = Base64.decode(line.replace(/\?.*?$/, ''));
         if (/=\s*vmess/.test(content)) {
             // Quantumult VMess URI format
             const partitions = content.split(',').map((p) => p.trim());
@@ -371,7 +439,16 @@ function URI_VMess() {
                 type: 'vmess',
                 server,
                 port,
-                cipher: getIfPresent(params.scy, 'auto'),
+                // https://github.com/2dust/v2rayN/wiki/Description-of-VMess-share-link
+                // https://github.com/XTLS/Xray-core/issues/91
+                cipher: [
+                    'auto',
+                    'aes-128-gcm',
+                    'chacha20-poly1305',
+                    'none',
+                ].includes(params.scy)
+                    ? params.scy
+                    : 'auto',
                 uuid: params.id,
                 alterId: parseInt(
                     getIfPresent(params.aid ?? params.alterId, 0),
@@ -388,8 +465,12 @@ function URI_VMess() {
                 );
             }
             // https://github.com/2dust/v2rayN/wiki/%E5%88%86%E4%BA%AB%E9%93%BE%E6%8E%A5%E6%A0%BC%E5%BC%8F%E8%AF%B4%E6%98%8E(ver-2)
-            if (proxy.tls && params.sni && params.sni !== '') {
+            if (proxy.tls) {
+                if (params.sni && params.sni !== '') {
                     proxy.sni = params.sni;
+                } else if (params.peer && params.peer !== '') {
+                    proxy.sni = params.peer;
+                }
             }
             let httpupgrade = false;
             // handle obfs
@@ -401,8 +482,8 @@ function URI_VMess() {
                 ['http'].includes(params.type)
             ) {
                 proxy.network = 'http';
-            } else if (['grpc'].includes(params.net)) {
+            } else if (['grpc', 'kcp', 'quic'].includes(params.net)) {
-                proxy.network = 'grpc';
+                proxy.network = params.net;
             } else if (
                 params.net === 'httpupgrade' ||
                 proxy.network === 'httpupgrade'
@@ -428,6 +509,11 @@ function URI_VMess() {
                 } catch (e) {}
                 let transportPath = params.path;
 
+                // 补上默认 path
+                if (['ws'].includes(proxy.network)) {
+                    transportPath = transportPath || '/';
+                }
+
                 if (proxy.network === 'http') {
                     if (transportHost) {
                         // 1)http(tcp)->host中间逗号(,)隔开
@@ -447,13 +533,28 @@ function URI_VMess() {
                     }
                 }
                 // 传输层应该有配置, 暂时不考虑兼容不给配置的节点
-                if (transportPath || transportHost) {
+                if (
+                    transportPath ||
+                    transportHost ||
+                    ['kcp', 'quic'].includes(proxy.network)
+                ) {
                     if (['grpc'].includes(proxy.network)) {
                         proxy[`${proxy.network}-opts`] = {
                             'grpc-service-name': getIfNotBlank(transportPath),
                             '_grpc-type': getIfNotBlank(params.type),
                             '_grpc-authority': getIfNotBlank(params.authority),
                         };
+                    } else if (['kcp', 'quic'].includes(proxy.network)) {
+                        proxy[`${proxy.network}-opts`] = {
+                            [`_${proxy.network}-type`]: getIfNotBlank(
+                                params.type,
+                            ),
+                            [`_${proxy.network}-host`]: getIfNotBlank(
+                                getIfNotBlank(transportHost),
+                            ),
+                            [`_${proxy.network}-path`]:
+                                getIfNotBlank(transportPath),
+                        };
                     } else {
                         const opts = {
                             path: getIfNotBlank(transportPath),
@@ -469,6 +570,12 @@ function URI_VMess() {
                     delete proxy.network;
                 }
             }
+
+            proxy['client-fingerprint'] = params.fp;
+            proxy.alpn = params.alpn ? params.alpn.split(',') : undefined;
+            // 然而 wiki 和 app 实测中都没有字段表示这个
+            // proxy['skip-cert-verify'] = /(TRUE)|1/i.test(params.allowInsecure);
+
             return proxy;
         }
     };
@@ -570,6 +677,9 @@ function URI_VLESS() {
         }
         if (!proxy.network && isShadowrocket && params.obfs) {
             proxy.network = params.obfs;
+            if (['none'].includes(proxy.network)) {
+                proxy.network = 'tcp';
+            }
         }
         if (['websocket'].includes(proxy.network)) {
             proxy.network = 'ws';
@@ -635,6 +745,54 @@ function URI_VLESS() {
     };
     return { name, test, parse };
 }
+function URI_AnyTLS() {
+    const name = 'URI AnyTLS Parser';
+    const test = (line) => {
+        return /^anytls:\/\//.test(line);
+    };
+    const parse = (line) => {
+        line = line.split(/anytls:\/\//)[1];
+        // eslint-disable-next-line no-unused-vars
+        let [__, password, server, port, addons = '', name] =
+            /^(.*?)@(.*?)(?::(\d+))?\/?(?:\?(.*?))?(?:#(.*?))?$/.exec(line);
+        password = decodeURIComponent(password);
+        port = parseInt(`${port}`, 10);
+        if (isNaN(port)) {
+            port = 443;
+        }
+        password = decodeURIComponent(password);
+        if (name != null) {
+            name = decodeURIComponent(name);
+        }
+        name = name ?? `AnyTLS ${server}:${port}`;
+
+        const proxy = {
+            type: 'anytls',
+            name,
+            server,
+            port,
+            password,
+        };
+
+        for (const addon of addons.split('&')) {
+            let [key, value] = addon.split('=');
+            key = key.replace(/_/g, '-');
+            value = decodeURIComponent(value);
+            if (['alpn'].includes(key)) {
+                proxy[key] = value ? value.split(',') : undefined;
+            } else if (['insecure'].includes(key)) {
+                proxy['skip-cert-verify'] = /(TRUE)|1/i.test(value);
+            } else if (['udp'].includes(key)) {
+                proxy[key] = /(TRUE)|1/i.test(value);
+            } else {
+                proxy[key] = value;
+            }
+        }
+
+        return proxy;
+    };
+    return { name, test, parse };
+}
 function URI_Hysteria2() {
     const name = 'URI Hysteria2 Parser';
     const test = (line) => {
@@ -665,6 +823,7 @@ function URI_Hysteria2() {
         ] = /^(.*?)@(.*?)(:((\d+(-\d+)?)([,;]\d+(-\d+)?)*))?\/?(\?(.*?))?(?:#(.*?))?$/.exec(
             line,
         );
+
         /* eslint-enable no-unused-vars */
         if (/^\d+$/.test(port)) {
             port = parseInt(`${port}`, 10);
@@ -708,12 +867,23 @@ function URI_Hysteria2() {
         if (params.obfs && params.obfs !== 'none') {
             proxy.obfs = params.obfs;
         }
-
+        if (params.mport) {
             proxy.ports = params.mport;
+        }
         proxy['obfs-password'] = params['obfs-password'];
         proxy['skip-cert-verify'] = /(TRUE)|1/i.test(params.insecure);
         proxy.tfo = /(TRUE)|1/i.test(params.fastopen);
         proxy['tls-fingerprint'] = params.pinSHA256;
+        let hop_interval = params['hop-interval'] || params['hop_interval'];
+
+        if (/^\d+$/.test(hop_interval)) {
+            proxy['hop-interval'] = parseInt(`${hop_interval}`, 10);
+        }
+        let keepalive = params['keepalive'];
+
+        if (/^\d+$/.test(keepalive)) {
+            proxy['keepalive'] = parseInt(`${keepalive}`, 10);
+        }
 
         return proxy;
     };
@@ -796,8 +966,11 @@ function URI_TUIC() {
     const parse = (line) => {
         line = line.split(/tuic:\/\//)[1];
         // eslint-disable-next-line no-unused-vars
-        let [__, uuid, password, server, ___, port, ____, addons = '', name] =
+        let [__, auth, server, port, addons = '', name] =
-            /^(.*?):(.*?)@(.*?)(:(\d+))?\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
+            /^(.*?)@(.*?)(?::(\d+))?\/?(?:\?(.*?))?(?:#(.*?))?$/.exec(line);
+        auth = decodeURIComponent(auth);
+        let [uuid, ...passwordParts] = auth.split(':');
+        let password = passwordParts.join(':');
         port = parseInt(`${port}`, 10);
         if (isNaN(port)) {
             port = 443;
@@ -819,14 +992,19 @@ function URI_TUIC() {
 
         for (const addon of addons.split('&')) {
             let [key, value] = addon.split('=');
-            key = key.replace(/_/, '-');
+            key = key.replace(/_/g, '-');
             value = decodeURIComponent(value);
             if (['alpn'].includes(key)) {
                 proxy[key] = value ? value.split(',') : undefined;
             } else if (['allow-insecure'].includes(key)) {
                 proxy['skip-cert-verify'] = /(TRUE)|1/i.test(value);
+            } else if (['fast-open'].includes(key)) {
+                proxy.tfo = true;
             } else if (['disable-sni', 'reduce-rtt'].includes(key)) {
                 proxy[key] = /(TRUE)|1/i.test(value);
+            } else if (key === 'congestion-control') {
+                proxy['congestion-controller'] = value;
+                delete proxy[key];
             } else {
                 proxy[key] = value;
             }
@@ -962,6 +1140,7 @@ function Clash_All() {
         const proxy = JSON.parse(line);
         if (
             ![
+                'anytls',
                 'mieru',
                 'juicity',
                 'ss',
@@ -1464,6 +1643,7 @@ function isIP(ip) {
 
 export default [
     URI_PROXY(),
+    URI_SOCKS(),
     URI_SS(),
     URI_SSR(),
     URI_VMess(),
@@ -1473,6 +1653,7 @@ export default [
     URI_Hysteria(),
     URI_Hysteria2(),
     URI_Trojan(),
+    URI_AnyTLS(),
     Clash_All(),
     Surge_Direct(),
     Surge_SSH(),

backend/src/core/proxy-utils/parsers/peggy/loon.js

@@ -39,12 +39,12 @@ start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/socks5/hysteria2
     return proxy;
 }
 
-shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/others)*{
+shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/block_quic/others)*{
     proxy.type = "ssr";
     // handle ssr obfs
     proxy.obfs = obfs.type;
 }
-shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/block_quic/others)* {
     proxy.type = "ss";
     // handle ss obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -54,31 +54,31 @@ shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs
         $set(proxy, "plugin-opts.path", obfs.path);
     }
 }
-vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/others)* {
+vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     proxy.alterId = proxy.alterId || 0;
     handleTransport();
 }
-vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
+vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/others)* {
     proxy.type = "vless";
     handleTransport();
 }
-trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
+trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/others)* {
+hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/block_quic/others)* {
     proxy.type = "hysteria2";
 }
-https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
+https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/others)* {
+http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "http";
 }
-socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
+socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "socks5";
 }
 
@@ -180,6 +180,10 @@ tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-
 tls_cert_sha256 = comma "tls-cert-sha256" equals match:[^,]+ { proxy["tls-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals match:[^,]+ { proxy["tls-pubkey-sha256"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 
+flow = comma "flow" equals match:[^,]+ { proxy["flow"] = match.join("").replace(/^"(.*)"$/, '$1'); }
+public_key = comma "public-key" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["public-key"] = match.join("").replace(/^"(.*)"$/, '$1'); }
+short_id = comma "short-id" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["short-id"] = match.join("").replace(/^"(.*)"$/, '$1'); }
+
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
 ip_mode = comma "ip-mode" equals match:[^,]+ { proxy["ip-version"] = match.join(""); }
@@ -188,6 +192,8 @@ ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
 download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
 salamander_password = comma "salamander-password" equals match:[^,]+ { proxy['obfs-password'] = match.join(""); proxy.obfs = 'salamander'; }
 
+block_quic = comma "block-quic" equals flag:bool { if(flag) proxy["block-quic"] = "on"; else proxy["block-quic"] = "off"; }
+
 tag = match:[^=,]* { proxy.name = match.join("").trim(); }
 comma = _ "," _
 equals = _ "=" _

backend/src/core/proxy-utils/parsers/peggy/loon.peg

@@ -37,12 +37,12 @@ start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/socks5/hysteria2
     return proxy;
 }
 
-shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/others)*{
+shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/block_quic/others)*{
     proxy.type = "ssr";
     // handle ssr obfs
     proxy.obfs = obfs.type;
 }
-shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/block_quic/others)* {
     proxy.type = "ss";
     // handle ss obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -52,31 +52,31 @@ shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs
         $set(proxy, "plugin-opts.path", obfs.path);
     }
 }
-vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/others)* {
+vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     proxy.alterId = proxy.alterId || 0;
     handleTransport();
 }
-vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
+vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/others)* {
     proxy.type = "vless";
     handleTransport();
 }
-trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
+trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/others)* {
+hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/block_quic/others)* {
     proxy.type = "hysteria2";
 }
-https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
+https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/others)* {
+http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "http";
 }
-socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
+socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "socks5";
 }
 
@@ -178,6 +178,10 @@ tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-
 tls_cert_sha256 = comma "tls-cert-sha256" equals match:[^,]+ { proxy["tls-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals match:[^,]+ { proxy["tls-pubkey-sha256"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 
+flow = comma "flow" equals match:[^,]+ { proxy["flow"] = match.join("").replace(/^"(.*)"$/, '$1'); }
+public_key = comma "public-key" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["public-key"] = match.join("").replace(/^"(.*)"$/, '$1'); }
+short_id = comma "short-id" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["short-id"] = match.join("").replace(/^"(.*)"$/, '$1'); }
+
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
 ip_mode = comma "ip-mode" equals match:[^,]+ { proxy["ip-version"] = match.join(""); }
@@ -186,6 +190,8 @@ ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
 download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
 salamander_password = comma "salamander-password" equals match:[^,]+ { proxy['obfs-password'] = match.join(""); proxy.obfs = 'salamander'; }
 
+block_quic = comma "block-quic" equals flag:bool { if(flag) proxy["block-quic"] = "on"; else proxy["block-quic"] = "off"; }
+
 tag = match:[^=,]* { proxy.name = match.join("").trim(); }
 comma = _ "," _
 equals = _ "=" _

backend/src/core/proxy-utils/parsers/peggy/qx.js

@@ -49,7 +49,7 @@ trojan = "trojan" equals address
 }
 
 shadowsocks = "shadowsocks" equals address
-    (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp/fast_open/tag/server_check_url/others)* {
+    (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp_new/fast_open/tag/server_check_url/others)* {
     if (proxy.protocol || proxy.type === "ssr") {
         proxy.type = "ssr";
         if (!proxy.protocol) {
@@ -86,10 +86,10 @@ vmess = "vmess" equals address
     (uuid/method/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/tag/obfs/obfs_host/obfs_uri/udp_relay/udp_over_tcp/fast_open/aead/server_check_url/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
-    if (proxy.aead) {
+    if (proxy.aead === false) {
-        proxy.alterId = 0;
+        proxy.alterId = 1;
     } else {
-        proxy.alterId = proxy.alterId || 0;
+        proxy.alterId = 0;
     }
     handleObfs();
 }
@@ -145,18 +145,20 @@ port = digits:[0-9]+ {
     }
 }
 
-username = comma "username" equals username:[^=,]+ { proxy.username = username.join("").trim(); }
+username = comma "username" equals username:[^,]+ { proxy.username = username.join("").trim(); }
-password = comma "password" equals password:[^=,]+ { proxy.password = password.join("").trim(); }
+password = comma "password" equals password:[^,]+ { proxy.password = password.join("").trim(); }
-uuid = comma "password" equals uuid:[^=,]+ { proxy.uuid = uuid.join("").trim(); }
+uuid = comma "password" equals uuid:[^,]+ { proxy.uuid = uuid.join("").trim(); }
 
 method = comma "method" equals cipher:cipher { 
     proxy.cipher = cipher;
 };
-cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"none"/"rc2-cfb"/"rc4-md5-6"/"rc4-md5"/"salsa20"/"xchacha20-ietf-poly1305");
+cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"none"/"rc2-cfb"/"rc4-md5-6"/"rc4-md5"/"salsa20"/"xchacha20-ietf-poly1305"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
 aead = comma "aead" equals flag:bool { proxy.aead = flag; }
 
 udp_relay = comma "udp-relay" equals flag:bool { proxy.udp = flag; }
 udp_over_tcp = comma "udp-over-tcp" equals flag:bool { throw new Error("UDP over TCP is not supported"); }
+udp_over_tcp_new = comma "udp-over-tcp" equals param:$[^=,]+ { if (param === "sp.v1") { proxy["udp-over-tcp"] = true; proxy["udp-over-tcp-version"] = 1; } else if (param === "sp.v2") { proxy["udp-over-tcp"] = true; proxy["udp-over-tcp-version"] = 2; } else if (param === "true") { proxy["_ssr_python_uot"] = true; } else { throw new Error("Invalid value for udp-over-tcp"); } }
+
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }

backend/src/core/proxy-utils/parsers/peggy/qx.peg

@@ -47,7 +47,7 @@ trojan = "trojan" equals address
 }
 
 shadowsocks = "shadowsocks" equals address
-    (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp/fast_open/tag/server_check_url/others)* {
+    (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp_new/fast_open/tag/server_check_url/others)* {
     if (proxy.protocol || proxy.type === "ssr") {
         proxy.type = "ssr";
         if (!proxy.protocol) {
@@ -84,10 +84,10 @@ vmess = "vmess" equals address
     (uuid/method/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/tag/obfs/obfs_host/obfs_uri/udp_relay/udp_over_tcp/fast_open/aead/server_check_url/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
-    if (proxy.aead) {
+    if (proxy.aead === false) {
-        proxy.alterId = 0;
+        proxy.alterId = 1;
     } else {
-        proxy.alterId = proxy.alterId || 0;
+        proxy.alterId = 0;
     }
     handleObfs();
 }
@@ -143,18 +143,20 @@ port = digits:[0-9]+ {
     }
 }
 
-username = comma "username" equals username:[^=,]+ { proxy.username = username.join("").trim(); }
+username = comma "username" equals username:[^,]+ { proxy.username = username.join("").trim(); }
-password = comma "password" equals password:[^=,]+ { proxy.password = password.join("").trim(); }
+password = comma "password" equals password:[^,]+ { proxy.password = password.join("").trim(); }
-uuid = comma "password" equals uuid:[^=,]+ { proxy.uuid = uuid.join("").trim(); }
+uuid = comma "password" equals uuid:[^,]+ { proxy.uuid = uuid.join("").trim(); }
 
 method = comma "method" equals cipher:cipher { 
     proxy.cipher = cipher;
 };
-cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"none"/"rc2-cfb"/"rc4-md5-6"/"rc4-md5"/"salsa20"/"xchacha20-ietf-poly1305");
+cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"none"/"rc2-cfb"/"rc4-md5-6"/"rc4-md5"/"salsa20"/"xchacha20-ietf-poly1305"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
 aead = comma "aead" equals flag:bool { proxy.aead = flag; }
 
 udp_relay = comma "udp-relay" equals flag:bool { proxy.udp = flag; }
 udp_over_tcp = comma "udp-over-tcp" equals flag:bool { throw new Error("UDP over TCP is not supported"); }
+udp_over_tcp_new = comma "udp-over-tcp" equals param:$[^=,]+ { if (param === "sp.v1") { proxy["udp-over-tcp"] = true; proxy["udp-over-tcp-version"] = 1; } else if (param === "sp.v2") { proxy["udp-over-tcp"] = true; proxy["udp-over-tcp-version"] = 2; } else if (param === "true") { proxy["_ssr_python_uot"] = true; } else { throw new Error("Invalid value for udp-over-tcp"); } }
+
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }

backend/src/core/proxy-utils/parsers/peggy/surge.js

@@ -55,10 +55,11 @@ shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/
 vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls/sni/tls_fingerprint/tls_verification/fast_open/tfo/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
+    // Surfboard 与 Surge 默认不一致, 不管 Surfboard https://getsurfboard.com/docs/profile-format/proxy/external-proxy/vmess
     if (proxy.aead) {
         proxy.alterId = 0;
     } else {
-        proxy.alterId = proxy.alterId || 0;
+        proxy.alterId = 1;
     }
     handleWebsocket();
     handleShadowTLS();
@@ -246,7 +247,7 @@ block_quic = comma "block-quic" equals match:[^,]+ { proxy["block-quic"] = match
 udp_port = comma "udp-port" equals match:$[0-9]+ { proxy["udp-port"] = parseInt(match.trim()); }
 shadow_tls_version = comma "shadow-tls-version" equals match:$[0-9]+ { proxy["shadow-tls-version"] = parseInt(match.trim()); }
 shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-sni"] = match.join(""); }
-shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
+shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
 token = comma "token" equals match:[^,]+ { proxy.token = match.join(""); }
 alpn = comma "alpn" equals match:[^,]+ { proxy.alpn = match.join(""); }
 uuidk = comma "uuid" equals match:[^,]+ { proxy.uuid = match.join(""); }

backend/src/core/proxy-utils/parsers/peggy/surge.peg

@@ -53,10 +53,11 @@ shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/
 vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls/sni/tls_fingerprint/tls_verification/fast_open/tfo/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
+    // Surfboard 与 Surge 默认不一致, 不管 Surfboard https://getsurfboard.com/docs/profile-format/proxy/external-proxy/vmess
     if (proxy.aead) {
         proxy.alterId = 0;
     } else {
-        proxy.alterId = proxy.alterId || 0;
+        proxy.alterId = 1;
     }
     handleWebsocket();
     handleShadowTLS();
@@ -243,7 +244,7 @@ block_quic = comma "block-quic" equals match:[^,]+ { proxy["block-quic"] = match
 udp_port = comma "udp-port" equals match:$[0-9]+ { proxy["udp-port"] = parseInt(match.trim()); }
 shadow_tls_version = comma "shadow-tls-version" equals match:$[0-9]+ { proxy["shadow-tls-version"] = parseInt(match.trim()); }
 shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-sni"] = match.join(""); }
-shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
+shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
 token = comma "token" equals match:[^,]+ { proxy.token = match.join(""); }
 alpn = comma "alpn" equals match:[^,]+ { proxy.alpn = match.join(""); }
 uuidk = comma "uuid" equals match:[^,]+ { proxy.uuid = match.join(""); }

backend/src/core/proxy-utils/preprocessors/index.js

@@ -16,6 +16,7 @@ function Base64Encoded() {
     const keys = [
         'dm1lc3M', // vmess
         'c3NyOi8v', // ssr://
+        'c29ja3M6Ly', // socks://
         'dHJvamFu', // trojan
         'c3M6Ly', // ss:/
         'c3NkOi8v', // ssd://
@@ -49,6 +50,26 @@ function Base64Encoded() {
     return { name, test, parse };
 }
 
+function fallbackBase64Encoded() {
+    const name = 'Fallback Base64 Pre-processor';
+
+    const test = function (raw) {
+        return true;
+    };
+    const parse = function (raw) {
+        const decoded = Base64.decode(raw);
+        if (!/^\w+(:\/\/|\s*?=\s*?)\w+/m.test(decoded)) {
+            $.error(
+                `Fallback Base64 Pre-processor error: decoded line does not start with protocol`,
+            );
+            return raw;
+        }
+
+        return decoded;
+    };
+    return { name, test, parse };
+}
+
 function Clash() {
     const name = 'Clash Pre-processor';
     const test = function (raw) {
@@ -62,7 +83,7 @@ function Clash() {
         // 防止 VLESS节点 reality-opts 选项中的 short-id 被解析成 Infinity
         // 匹配 short-id 冒号后面的值(包含空格和引号)
         const afterReplace = raw.replace(
-            /short-id:([ ]*[^,\n}]*)/g,
+            /short-id:([ \t]*[^#\n,}]*)/g,
             (matched, value) => {
                 const afterTrim = value.trim();
 
@@ -74,6 +95,8 @@ function Clash() {
                 // 是否被引号包裹
                 if (/^(['"]).*\1$/.test(afterTrim)) {
                     return `short-id: ${afterTrim}`;
+                } else if (['null'].includes(afterTrim)) {
+                    return `short-id: ${afterTrim}`;
                 } else {
                     return `short-id: "${afterTrim}"`;
                 }
@@ -160,4 +183,11 @@ function FullConfig() {
     return { name, test, parse };
 }
 
-export default [HTML(), Clash(), Base64Encoded(), SSD(), FullConfig()];
+export default [
+    HTML(),
+    Clash(),
+    Base64Encoded(),
+    SSD(),
+    FullConfig(),
+    fallbackBase64Encoded(),
+];

backend/src/core/proxy-utils/processors/index.js

@@ -20,6 +20,7 @@ import {
     validCheck,
     flowTransfer,
     getRmainingDays,
+    normalizeFlowHeader,
 } from '@/utils/flow';
 
 function isObject(item) {
@@ -283,7 +284,15 @@ function SortOperator(order = 'asc') {
 }
 
 // sort by regex
-function RegexSortOperator(expressions) {
+function RegexSortOperator(input) {
+    const order = input.order || 'asc';
+    let expressions = input.expressions;
+    if (Array.isArray(input)) {
+        expressions = input;
+    }
+    if (!Array.isArray(expressions)) {
+        expressions = [];
+    }
     return {
         name: 'Regex Sort Operator',
         func: (proxies) => {
@@ -294,8 +303,13 @@ function RegexSortOperator(expressions) {
                 if (oA && !oB) return -1;
                 if (oB && !oA) return 1;
                 if (oA && oB) return oA < oB ? -1 : 1;
-                if ((!oA && !oB) || (oA && oB && oA === oB))
+                if (order === 'original') {
-                    return a.name < b.name ? -1 : 1; // fallback to normal sort
+                    return 0;
+                } else if (order === 'desc') {
+                    return a.name < b.name ? 1 : -1;
+                } else {
+                    return a.name < b.name ? -1 : 1;
+                }
             });
         },
     };
@@ -365,10 +379,23 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
             if (output?.$file?.type === 'mihomoProfile') {
                 try {
                     let patch = YAML.safeLoad(script);
-                    if (typeof patch !== 'object') patch = {};
+                    let config;
+                    if (output?.$content) {
+                        try {
+                            config = YAML.safeLoad(output?.$content);
+                        } catch (e) {
+                            $.error(e.message ?? e);
+                        }
+                    }
+                    // if (typeof patch !== 'object') patch = {};
+                    if (typeof patch !== 'object')
+                        throw new Error('patch is not an object');
                     output.$content = ProxyUtils.yaml.safeDump(
                         deepMerge(
-                            {
+                            config ||
+                                (output?.$file?.sourceType === 'none'
+                                    ? {}
+                                    : {
                                           proxies: await produceArtifact({
                                               type:
                                                   output?.$file?.sourceType ||
@@ -380,7 +407,7 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
                                                   'delete-underscore-fields': true,
                                               },
                                           }),
-                            },
+                                      }),
                             patch,
                         ),
                     );
@@ -411,7 +438,15 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
                             if($file.type === 'mihomoProfile') {
                                 ${script}
                                 if(typeof main === 'function') {
-                                    const config = {
+                                    let config;
+                                    if ($content) {
+                                        try {
+                                            config = ProxyUtils.yaml.safeLoad($content);
+                                        } catch (e) {
+                                            console.log(e.message ?? e);
+                                        }
+                                    }
+                                    $content = ProxyUtils.yaml.safeDump(await main(config || ($file.sourceType === 'none' ? {} : {
                                         proxies: await produceArtifact({
                                             type: $file.sourceType || 'collection',
                                             name: $file.sourceName,
@@ -421,8 +456,7 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
                                                 'delete-underscore-fields': true
                                             }
                                         }),
-                                    }
+                                    })))
-                                    $content = ProxyUtils.yaml.safeDump(await main(config))
                                 }
                             } else {
                                 ${script}
@@ -828,7 +862,12 @@ function UselessFilter() {
 }
 
 // filter by regions
-function RegionFilter(regions) {
+function RegionFilter(input) {
+    let regions = input?.value || input;
+    if (!Array.isArray(regions)) {
+        regions = [];
+    }
+    const keep = input?.keep ?? true;
     const REGION_MAP = {
         HK: '🇭🇰',
         TW: '🇹🇼',
@@ -845,7 +884,8 @@ function RegionFilter(regions) {
             // this would be high memory usage
             return proxies.map((proxy) => {
                 const flag = getFlag(proxy.name);
-                return regions.some((r) => REGION_MAP[r] === flag);
+                const selected = regions.some((r) => REGION_MAP[r] === flag);
+                return keep ? selected : !selected;
             });
         },
     };
@@ -877,11 +917,19 @@ function buildRegex(str, ...options) {
 }
 
 // filter by proxy types
-function TypeFilter(types) {
+function TypeFilter(input) {
+    let types = input?.value || input;
+    if (!Array.isArray(types)) {
+        types = [];
+    }
+    const keep = input?.keep ?? true;
     return {
         name: 'Type Filter',
         func: (proxies) => {
-            return proxies.map((proxy) => types.some((t) => proxy.type === t));
+            return proxies.map((proxy) => {
+                const selected = types.some((t) => proxy.type === t);
+                return keep ? selected : !selected;
+            });
         },
     };
 }
@@ -1081,6 +1129,7 @@ function createDynamicFunction(name, script, $arguments, $options) {
         flowTransfer,
         validCheck,
         getRmainingDays,
+        normalizeFlowHeader,
     };
     if ($.env.isLoon) {
         return new Function(
@@ -1092,6 +1141,10 @@ function createDynamicFunction(name, script, $arguments, $options) {
             '$httpClient',
             '$notification',
             'ProxyUtils',
+            'yaml',
+            'Buffer',
+            'b64d',
+            'b64e',
             'scriptResourceCache',
             'flowUtils',
             'produceArtifact',
@@ -1109,6 +1162,10 @@ function createDynamicFunction(name, script, $arguments, $options) {
             // eslint-disable-next-line no-undef
             $notification,
             ProxyUtils,
+            ProxyUtils.yaml,
+            ProxyUtils.Buffer,
+            ProxyUtils.Base64.decode,
+            ProxyUtils.Base64.encode,
             scriptResourceCache,
             flowUtils,
             produceArtifact,
@@ -1121,6 +1178,10 @@ function createDynamicFunction(name, script, $arguments, $options) {
             '$substore',
             'lodash',
             'ProxyUtils',
+            'yaml',
+            'Buffer',
+            'b64d',
+            'b64e',
             'scriptResourceCache',
             'flowUtils',
             'produceArtifact',
@@ -1132,6 +1193,10 @@ function createDynamicFunction(name, script, $arguments, $options) {
             $,
             lodash,
             ProxyUtils,
+            ProxyUtils.yaml,
+            ProxyUtils.Buffer,
+            ProxyUtils.Base64.decode,
+            ProxyUtils.Base64.encode,
             scriptResourceCache,
             flowUtils,
             produceArtifact,

backend/src/core/proxy-utils/producers/clash.js

@@ -1,4 +1,5 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
+import $ from '@/core/app';
 
 export default function Clash_Producer() {
     const type = 'ALL';
@@ -46,6 +47,11 @@ export default function Clash_Producer() {
                             proxy['reality-opts']))
                 ) {
                     return false;
+                } else if (proxy['underlying-proxy'] || proxy['dialer-proxy']) {
+                    $.error(
+                        `Clash 不支持前置代理字段. 已过滤节点 ${proxy.name}`,
+                    );
+                    return false;
                 }
                 return true;
             })
@@ -141,6 +147,7 @@ export default function Clash_Producer() {
                         'hysteria',
                         'hysteria2',
                         'juicity',
+                        'anytls',
                     ].includes(proxy.type)
                 ) {
                     delete proxy.tls;
@@ -151,11 +158,6 @@ export default function Clash_Producer() {
                 }
                 delete proxy['tls-fingerprint'];
 
-                if (proxy['underlying-proxy']) {
-                    proxy['dialer-proxy'] = proxy['underlying-proxy'];
-                }
-                delete proxy['underlying-proxy'];
-
                 if (isPresent(proxy, 'tls') && typeof proxy.tls !== 'boolean') {
                     delete proxy.tls;
                 }

backend/src/core/proxy-utils/producers/clashmeta.js

@@ -10,6 +10,47 @@ export default function ClashMeta_Producer() {
                     return false;
                 } else if (['juicity'].includes(proxy.type)) {
                     return false;
+                } else if (
+                    ['ss'].includes(proxy.type) &&
+                    ![
+                        'aes-128-ctr',
+                        'aes-192-ctr',
+                        'aes-256-ctr',
+                        'aes-128-cfb',
+                        'aes-192-cfb',
+                        'aes-256-cfb',
+                        'aes-128-gcm',
+                        'aes-192-gcm',
+                        'aes-256-gcm',
+                        'aes-128-ccm',
+                        'aes-192-ccm',
+                        'aes-256-ccm',
+                        'aes-128-gcm-siv',
+                        'aes-256-gcm-siv',
+                        'chacha20-ietf',
+                        'chacha20',
+                        'xchacha20',
+                        'chacha20-ietf-poly1305',
+                        'xchacha20-ietf-poly1305',
+                        'chacha8-ietf-poly1305',
+                        'xchacha8-ietf-poly1305',
+                        '2022-blake3-aes-128-gcm',
+                        '2022-blake3-aes-256-gcm',
+                        '2022-blake3-chacha20-poly1305',
+                        'lea-128-gcm',
+                        'lea-192-gcm',
+                        'lea-256-gcm',
+                        'rabbit128-poly1305',
+                        'aegis-128l',
+                        'aegis-256',
+                        'aez-384',
+                        'deoxys-ii-256-128',
+                        'rc4-md5',
+                        'none',
+                    ].includes(proxy.cipher)
+                ) {
+                    // https://wiki.metacubex.one/config/proxies/ss/#cipher
+                    return false;
                 }
                 return true;
             })
@@ -105,6 +146,9 @@ export default function ClashMeta_Producer() {
                             password: proxy['shadow-tls-password'],
                             version: proxy['shadow-tls-version'],
                         };
+                        delete proxy['shadow-tls-password'];
+                        delete proxy['shadow-tls-sni'];
+                        delete proxy['shadow-tls-version'];
                     }
                 }
 
@@ -160,6 +204,7 @@ export default function ClashMeta_Producer() {
                         'hysteria',
                         'hysteria2',
                         'juicity',
+                        'anytls',
                     ].includes(proxy.type)
                 ) {
                     delete proxy.tls;

backend/src/core/proxy-utils/producers/egern.js

@@ -1,6 +1,8 @@
+import { isPresent } from './utils';
+
 export default function Egern_Producer() {
     const type = 'ALL';
-    const produce = (proxies, type, opts = {}) => {
+    const produce = (proxies, type) => {
         // https://egernapp.com/zh-CN/docs/configuration/proxies
         const list = proxies
             .filter((proxy) => {
@@ -71,6 +73,7 @@ export default function Egern_Producer() {
                 return true;
             })
             .map((proxy) => {
+                const original = { ...proxy };
                 if (proxy.tls && !proxy.sni) {
                     proxy.sni = proxy.server;
                 }
@@ -120,10 +123,10 @@ export default function Egern_Producer() {
                             proxy.udp || proxy.udp_relay || proxy.udp_relay,
                         next_hop: proxy.next_hop,
                     };
-                    if (proxy.plugin === 'obfs') {
+                    if (original.plugin === 'obfs') {
-                        proxy.obfs = proxy['plugin-opts'].mode;
+                        proxy.obfs = original['plugin-opts'].mode;
-                        proxy.obfs_host = proxy['plugin-opts'].host;
+                        proxy.obfs_host = original['plugin-opts'].host;
-                        proxy.obfs_uri = proxy['plugin-opts'].path;
+                        proxy.obfs_uri = original['plugin-opts'].path;
                     }
                 } else if (proxy.type === 'hysteria2') {
                     proxy = {
@@ -141,9 +144,12 @@ export default function Egern_Producer() {
                         port_hopping: proxy.ports,
                         port_hopping_interval: proxy['hop-interval'],
                     };
-                    if (proxy['obfs-password'] && proxy.obfs == 'salamander') {
+                    if (
+                        original['obfs-password'] &&
+                        original.obfs == 'salamander'
+                    ) {
                         proxy.obfs = 'salamander';
-                        proxy.obfs_password = proxy['obfs-password'];
+                        proxy.obfs_password = original['obfs-password'];
                     }
                 } else if (proxy.type === 'tuic') {
                     proxy = {
@@ -184,6 +190,7 @@ export default function Egern_Producer() {
                         websocket: proxy.websocket,
                     };
                 } else if (proxy.type === 'vmess') {
+                    // Egern：传输层，支持 ws/wss/http1/http2/tls，不配置则为 tcp
                     let security = proxy.cipher;
                     if (
                         security &&
@@ -212,9 +219,11 @@ export default function Egern_Producer() {
                         };
                     } else if (proxy.network === 'http') {
                         proxy.transport = {
-                            http: {
+                            http1: {
                                 method: proxy['http-opts']?.method,
-                                path: proxy['http-opts']?.path,
+                                path: Array.isArray(proxy['http-opts']?.path)
+                                    ? proxy['http-opts']?.path[0]
+                                    : proxy['http-opts']?.path,
                                 headers: {
                                     Host: Array.isArray(
                                         proxy['http-opts']?.headers?.Host,
@@ -225,9 +234,29 @@ export default function Egern_Producer() {
                                 skip_tls_verify: proxy['skip-cert-verify'],
                             },
                         };
-                    } else if (proxy.network === 'tcp' || !proxy.network) {
+                    } else if (proxy.network === 'h2') {
                         proxy.transport = {
-                            [proxy.tls ? 'tls' : 'tcp']: {
+                            http2: {
+                                method: proxy['h2-opts']?.method,
+                                path: Array.isArray(proxy['h2-opts']?.path)
+                                    ? proxy['h2-opts']?.path[0]
+                                    : proxy['h2-opts']?.path,
+                                headers: {
+                                    Host: Array.isArray(
+                                        proxy['h2-opts']?.headers?.Host,
+                                    )
+                                        ? proxy['h2-opts']?.headers?.Host[0]
+                                        : proxy['h2-opts']?.headers?.Host,
+                                },
+                                skip_tls_verify: proxy['skip-cert-verify'],
+                            },
+                        };
+                    } else if (
+                        (proxy.network === 'tcp' || !proxy.network) &&
+                        proxy.tls
+                    ) {
+                        proxy.transport = {
+                            tls: {
                                 sni: proxy.tls ? proxy.sni : undefined,
                                 skip_tls_verify: proxy.tls
                                     ? proxy['skip-cert-verify']
@@ -269,7 +298,9 @@ export default function Egern_Producer() {
                         proxy.transport = {
                             http: {
                                 method: proxy['http-opts']?.method,
-                                path: proxy['http-opts']?.path,
+                                path: Array.isArray(proxy['http-opts']?.path)
+                                    ? proxy['http-opts']?.path[0]
+                                    : proxy['http-opts']?.path,
                                 headers: {
                                     Host: Array.isArray(
                                         proxy['http-opts']?.headers?.Host,
@@ -307,6 +338,39 @@ export default function Egern_Producer() {
                         // skip_tls_verify: proxy['skip-cert-verify'],
                     };
                 }
+                if (
+                    [
+                        'http',
+                        'socks5',
+                        'ss',
+                        'trojan',
+                        'vless',
+                        'vmess',
+                    ].includes(original.type)
+                ) {
+                    if (isPresent(original, 'shadow-tls-password')) {
+                        if (original['shadow-tls-version'] != 3)
+                            throw new Error(
+                                `shadow-tls version ${original['shadow-tls-version']} is not supported`,
+                            );
+                        proxy.shadow_tls = {
+                            password: original['shadow-tls-password'],
+                            sni: original['shadow-tls-sni'],
+                        };
+                    } else if (
+                        ['shadow-tls'].includes(original.plugin) &&
+                        original['plugin-opts']
+                    ) {
+                        if (original['plugin-opts'].version != 3)
+                            throw new Error(
+                                `shadow-tls version ${original['plugin-opts'].version} is not supported`,
+                            );
+                        proxy.shadow_tls = {
+                            password: original['plugin-opts'].password,
+                            sni: original['plugin-opts'].host,
+                        };
+                    }
+                }
 
                 delete proxy.subName;
                 delete proxy.collectionName;

backend/src/core/proxy-utils/producers/loon.js

@@ -21,9 +21,9 @@ export default function Loon_Producer() {
             case 'trojan':
                 return trojan(proxy);
             case 'vmess':
-                return vmess(proxy);
+                return vmess(proxy, opts['include-unsupported-proxy']);
             case 'vless':
-                return vless(proxy);
+                return vless(proxy, opts['include-unsupported-proxy']);
             case 'http':
                 return http(proxy);
             case 'socks5':
@@ -133,6 +133,13 @@ function shadowsocks(proxy) {
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
+    // block-quic
+    if (proxy['block-quic'] === 'on') {
+        result.append(',block-quic=true');
+    } else if (proxy['block-quic'] === 'off') {
+        result.append(',block-quic=false');
+    }
+
     // udp
     if (proxy.udp) {
         result.append(`,udp=true`);
@@ -144,7 +151,7 @@ function shadowsocks(proxy) {
     return result.toString();
 }
 
-function shadowsocksr(proxy, includeUnsupportedProxy) {
+function shadowsocksr(proxy) {
     const result = new Result(proxy);
     result.append(
         `${proxy.name}=shadowsocksr,${proxy.server},${proxy.port},${proxy.cipher},"${proxy.password}"`,
@@ -203,6 +210,13 @@ function shadowsocksr(proxy, includeUnsupportedProxy) {
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
+    // block-quic
+    if (proxy['block-quic'] === 'on') {
+        result.append(',block-quic=true');
+    } else if (proxy['block-quic'] === 'off') {
+        result.append(',block-quic=false');
+    }
+
     // udp
     if (proxy.udp) {
         result.append(`,udp=true`);
@@ -259,6 +273,13 @@ function trojan(proxy) {
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
+    // block-quic
+    if (proxy['block-quic'] === 'on') {
+        result.append(',block-quic=true');
+    } else if (proxy['block-quic'] === 'off') {
+        result.append(',block-quic=false');
+    }
+
     // udp
     if (proxy.udp) {
         result.append(`,udp=true`);
@@ -270,6 +291,8 @@ function trojan(proxy) {
 }
 
 function vmess(proxy) {
+    const isReality = !!proxy['reality-opts'];
+
     const result = new Result(proxy);
     result.append(
         `${proxy.name}=vmess,${proxy.server},${proxy.port},${proxy.cipher},"${proxy.uuid}"`,
@@ -317,6 +340,17 @@ function vmess(proxy) {
         'skip-cert-verify',
     );
 
+    if (isReality) {
+        result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
+        result.appendIfPresent(
+            `,public-key="${proxy['reality-opts']['public-key']}"`,
+            'reality-opts.public-key',
+        );
+        result.appendIfPresent(
+            `,short-id=${proxy['reality-opts']['short-id']}`,
+            'reality-opts.short-id',
+        );
+    } else {
         // sni
         result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
         result.appendIfPresent(
@@ -327,10 +361,11 @@ function vmess(proxy) {
             `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
             'tls-pubkey-sha256',
         );
+    }
 
     // AEAD
     if (isPresent(proxy, 'aead')) {
-        result.append(`,alterId=0`);
+        result.append(`,alterId=${proxy.aead ? 0 : 1}`);
     } else {
         result.append(`,alterId=${proxy.alterId}`);
     }
@@ -338,20 +373,34 @@ function vmess(proxy) {
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
+    // block-quic
+    if (proxy['block-quic'] === 'on') {
+        result.append(',block-quic=true');
+    } else if (proxy['block-quic'] === 'off') {
+        result.append(',block-quic=false');
+    }
+
     // udp
     if (proxy.udp) {
         result.append(`,udp=true`);
-        const ip_version =
-            ipVersions[proxy['ip-version']] || proxy['ip-version'];
-        result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
     }
+    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
+    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
     return result.toString();
 }
 
 function vless(proxy) {
-    if (typeof proxy.flow !== 'undefined' || proxy['reality-opts']) {
+    let isXtls = false;
-        throw new Error(`VLESS XTLS/REALITY is not supported`);
+    const isReality = !!proxy['reality-opts'];
+
+    if (typeof proxy.flow !== 'undefined') {
+        if (['xtls-rprx-vision'].includes(proxy.flow)) {
+            isXtls = true;
+        } else {
+            throw new Error(`VLESS flow(${proxy.flow}) is not supported`);
         }
+    }
+
     const result = new Result(proxy);
     result.append(
         `${proxy.name}=vless,${proxy.server},${proxy.port},"${proxy.uuid}"`,
@@ -399,6 +448,20 @@ function vless(proxy) {
         'skip-cert-verify',
     );
 
+    if (isXtls) {
+        result.appendIfPresent(`,flow=${proxy.flow}`, 'flow');
+    }
+    if (isReality) {
+        result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
+        result.appendIfPresent(
+            `,public-key="${proxy['reality-opts']['public-key']}"`,
+            'reality-opts.public-key',
+        );
+        result.appendIfPresent(
+            `,short-id=${proxy['reality-opts']['short-id']}`,
+            'reality-opts.short-id',
+        );
+    } else {
         // sni
         result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
         result.appendIfPresent(
@@ -409,17 +472,24 @@ function vless(proxy) {
             `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
             'tls-pubkey-sha256',
         );
+    }
 
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
+    // block-quic
+    if (proxy['block-quic'] === 'on') {
+        result.append(',block-quic=true');
+    } else if (proxy['block-quic'] === 'off') {
+        result.append(',block-quic=false');
+    }
+
     // udp
     if (proxy.udp) {
         result.append(`,udp=true`);
-        const ip_version =
-            ipVersions[proxy['ip-version']] || proxy['ip-version'];
-        result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
     }
+    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
+    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
     return result.toString();
 }
 
@@ -441,6 +511,14 @@ function http(proxy) {
 
     // tfo
     result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
+
+    // block-quic
+    if (proxy['block-quic'] === 'on') {
+        result.append(',block-quic=true');
+    } else if (proxy['block-quic'] === 'off') {
+        result.append(',block-quic=false');
+    }
+
     const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
     result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
 
@@ -467,6 +545,13 @@ function socks5(proxy) {
     // tfo
     result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
 
+    // block-quic
+    if (proxy['block-quic'] === 'on') {
+        result.append(',block-quic=true');
+    } else if (proxy['block-quic'] === 'off') {
+        result.append(',block-quic=false');
+    }
+
     // udp
     if (proxy.udp) {
         result.append(`,udp=true`);
@@ -541,6 +626,13 @@ function wireguard(proxy) {
     const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
     result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
 
+    // block-quic
+    if (proxy['block-quic'] === 'on') {
+        result.append(',block-quic=true');
+    } else if (proxy['block-quic'] === 'off') {
+        result.append(',block-quic=false');
+    }
+
     return result.toString();
 }
 
@@ -575,6 +667,13 @@ function hysteria2(proxy) {
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
+    // block-quic
+    if (proxy['block-quic'] === 'on') {
+        result.append(',block-quic=true');
+    } else if (proxy['block-quic'] === 'off') {
+        result.append(',block-quic=false');
+    }
+
     // udp
     if (proxy.udp) {
         result.append(`,udp=true`);

backend/src/core/proxy-utils/producers/qx.js

@@ -58,6 +58,8 @@ function shadowsocks(proxy) {
             'aes-256-gcm',
             'chacha20-ietf-poly1305',
             'xchacha20-ietf-poly1305',
+            '2022-blake3-aes-128-gcm',
+            '2022-blake3-aes-256-gcm',
         ].includes(proxy.cipher)
     ) {
         throw new Error(`cipher ${proxy.cipher} is not supported`);
@@ -128,6 +130,20 @@ function shadowsocks(proxy) {
     // udp
     appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
 
+    // udp over tcp
+    if (proxy['_ssr_python_uot']) {
+        append(`,udp-over-tcp=true`);
+    } else if (proxy['udp-over-tcp']) {
+        if (
+            !proxy['udp-over-tcp-version'] ||
+            proxy['udp-over-tcp-version'] === 1
+        ) {
+            append(`,udp-over-tcp=sp.v1`);
+        } else if (proxy['udp-over-tcp-version'] === 2) {
+            append(`,udp-over-tcp=sp.v2`);
+        }
+    }
+
     // server_check_url
     result.appendIfPresent(
         `,server_check_url=${proxy['test-url']}`,
@@ -389,6 +405,8 @@ function vless(proxy) {
             else append(`,obfs=ws`);
         } else if (proxy.network === 'http') {
             append(`,obfs=http`);
+        } else if (['tcp'].includes(proxy.network)) {
+            if (proxy.tls) append(`,obfs=over-tls`);
         } else if (!['tcp'].includes(proxy.network)) {
             throw new Error(`network ${proxy.network} is unsupported`);
         }

backend/src/core/proxy-utils/producers/shadowrocket.js

@@ -1,4 +1,5 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
+import $ from '@/core/app';
 
 export default function Shadowrocket_Producer() {
     const type = 'ALL';
@@ -110,6 +111,21 @@ export default function Shadowrocket_Producer() {
                         proxy.servername = proxy.sni;
                         delete proxy.sni;
                     }
+                } else if (proxy.type === 'ss') {
+                    if (
+                        isPresent(proxy, 'shadow-tls-password') &&
+                        !isPresent(proxy, 'plugin')
+                    ) {
+                        proxy.plugin = 'shadow-tls';
+                        proxy['plugin-opts'] = {
+                            host: proxy['shadow-tls-sni'],
+                            password: proxy['shadow-tls-password'],
+                            version: proxy['shadow-tls-version'],
+                        };
+                        delete proxy['shadow-tls-password'];
+                        delete proxy['shadow-tls-sni'];
+                        delete proxy['shadow-tls-version'];
+                    }
                 }
 
                 if (
@@ -163,6 +179,7 @@ export default function Shadowrocket_Producer() {
                         'hysteria',
                         'hysteria2',
                         'juicity',
+                        'anytls',
                     ].includes(proxy.type)
                 ) {
                     delete proxy.tls;

backend/src/core/proxy-utils/producers/sing-box.js

@@ -31,6 +31,21 @@ const smuxParser = (smux, proxy) => {
     if (smux['min-streams'])
         proxy.multiplex.min_streams = parseInt(`${smux['min-streams']}`, 10);
     if (smux.padding) proxy.multiplex.padding = true;
+    if (smux['brutal-opts']?.up || smux['brutal-opts']?.down) {
+        proxy.multiplex.brutal = {
+            enabled: true,
+        };
+        if (smux['brutal-opts']?.up)
+            proxy.multiplex.brutal.up_mbps = parseInt(
+                `${smux['brutal-opts']?.up}`,
+                10,
+            );
+        if (smux['brutal-opts']?.down)
+            proxy.multiplex.brutal.down_mbps = parseInt(
+                `${smux['brutal-opts']?.down}`,
+                10,
+            );
+    }
 };
 
 const wsParser = (proxy, parsedProxy) => {
@@ -359,7 +374,16 @@ const ssParser = (proxy = {}) => {
     if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy.uot) parsedProxy.udp_over_tcp = true;
-    if (proxy['udp-over-tcp']) parsedProxy.udp_over_tcp = true;
+    if (proxy['udp-over-tcp']) {
+        parsedProxy.udp_over_tcp = {
+            enabled: true,
+            version:
+                !proxy['udp-over-tcp-version'] ||
+                proxy['udp-over-tcp-version'] === 1
+                    ? 1
+                    : 2,
+        };
+    }
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     networkParser(proxy, parsedProxy);
     tfoParser(proxy, parsedProxy);
@@ -495,6 +519,7 @@ const vlessParser = (proxy = {}) => {
     };
     if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
+    if (proxy.xudp) parsedProxy.packet_encoding = 'xudp';
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     if (proxy.flow === 'xtls-rprx-vision') parsedProxy.flow = proxy.flow;
     if (proxy.network === 'ws') wsParser(proxy, parsedProxy);
@@ -543,12 +568,13 @@ const hysteriaParser = (proxy = {}) => {
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     // eslint-disable-next-line no-control-regex
     const reg = new RegExp('^[0-9]+[ \t]*[KMGT]*[Bb]ps$');
-    if (reg.test(`${proxy.up}`)) {
+    // sing-box 跟文档不一致, 但是懒得全转, 只处理最常见的 Mbps
+    if (reg.test(`${proxy.up}`) && !`${proxy.up}`.endsWith('Mbps')) {
         parsedProxy.up = `${proxy.up}`;
     } else {
         parsedProxy.up_mbps = parseInt(`${proxy.up}`, 10);
     }
-    if (reg.test(`${proxy.down}`)) {
+    if (reg.test(`${proxy.down}`) && !`${proxy.down}`.endsWith('Mbps')) {
         parsedProxy.down = `${proxy.down}`;
     } else {
         parsedProxy.down_mbps = parseInt(`${proxy.down}`, 10);
@@ -575,7 +601,7 @@ const hysteriaParser = (proxy = {}) => {
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
 };
-const hysteria2Parser = (proxy = {}, includeUnsupportedProxy) => {
+const hysteria2Parser = (proxy = {}) => {
     const parsedProxy = {
         tag: proxy.name,
         type: 'hysteria2',
@@ -587,7 +613,6 @@ const hysteria2Parser = (proxy = {}, includeUnsupportedProxy) => {
     };
     if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
-    if (includeUnsupportedProxy) {
     if (proxy['hop-interval'])
         parsedProxy.hop_interval = /^\d+$/.test(proxy['hop-interval'])
             ? `${proxy['hop-interval']}s`
@@ -596,7 +621,6 @@ const hysteria2Parser = (proxy = {}, includeUnsupportedProxy) => {
         parsedProxy.server_ports = proxy['ports']
             .split(/\s*,\s*/)
             .map((p) => p.replace(/\s*-\s*/g, ':'));
-    }
     if (proxy.up) parsedProxy.up_mbps = parseInt(`${proxy.up}`, 10);
     if (proxy.down) parsedProxy.down_mbps = parseInt(`${proxy.down}`, 10);
     if (proxy.obfs === 'salamander') parsedProxy.obfs.type = 'salamander';
@@ -641,6 +665,23 @@ const tuic5Parser = (proxy = {}) => {
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
 };
+const anytlsParser = (proxy = {}) => {
+    const parsedProxy = {
+        tag: proxy.name,
+        type: 'anytls',
+        server: proxy.server,
+        server_port: parseInt(`${proxy.port}`, 10),
+        password: proxy.password,
+        tls: { enabled: true, server_name: proxy.server, insecure: false },
+    };
+    if (/^\d+$/.test(proxy['idle-session-check-interval']))
+        parsedProxy.idle_session_check_interval = `${proxy['idle-session-check-interval']}s`;
+    if (/^\d+$/.test(proxy['idle-session-timeout']))
+        parsedProxy.idle_session_timeout = `${proxy['idle-session-timeout']}s`;
+    detourParser(proxy, parsedProxy);
+    tlsParser(proxy, parsedProxy);
+    return parsedProxy;
+};
 
 const wireguardParser = (proxy = {}) => {
     const local_address = ['ip', 'ipv6']
@@ -829,6 +870,9 @@ export default function singbox_Producer() {
                         case 'wireguard':
                             list.push(wireguardParser(proxy));
                             break;
+                        case 'anytls':
+                            list.push(anytlsParser(proxy));
+                            break;
                         default:
                             throw new Error(
                                 `Platform sing-box does not support proxy type: ${proxy.type}`,

backend/src/core/proxy-utils/producers/stash.js

@@ -1,4 +1,5 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
+import $ from '@/core/app';
 
 export default function Stash_Producer() {
     const type = 'ALL';
@@ -39,17 +40,20 @@ export default function Stash_Producer() {
                             'xchacha20',
                             'chacha20-ietf-poly1305',
                             'xchacha20-ietf-poly1305',
-                            ...(opts['include-unsupported-proxy']
-                                ? [
                             '2022-blake3-aes-128-gcm',
                             '2022-blake3-aes-256-gcm',
-                                  ]
-                                : []),
                         ].includes(proxy.cipher)) ||
                     (proxy.type === 'snell' && String(proxy.version) === '4') ||
-                    (proxy.type === 'vless' && proxy['reality-opts'])
+                    (proxy.type === 'vless' &&
+                        proxy['reality-opts'] &&
+                        !['xtls-rprx-vision'].includes(proxy.flow))
                 ) {
                     return false;
+                } else if (proxy['underlying-proxy'] || proxy['dialer-proxy']) {
+                    $.error(
+                        `Stash 暂不支持前置代理字段. 已过滤节点 ${proxy.name}. 请使用 代理的转发链 https://stash.wiki/proxy-protocols/proxy-groups#relay`,
+                    );
+                    return false;
                 }
                 return true;
             })
@@ -247,6 +251,7 @@ export default function Stash_Producer() {
                         'hysteria',
                         'hysteria2',
                         'juicity',
+                        'anytls',
                     ].includes(proxy.type)
                 ) {
                     delete proxy.tls;
@@ -256,11 +261,6 @@ export default function Stash_Producer() {
                 }
                 delete proxy['tls-fingerprint'];
 
-                if (proxy['underlying-proxy']) {
-                    proxy['dialer-proxy'] = proxy['underlying-proxy'];
-                }
-                delete proxy['underlying-proxy'];
-
                 if (isPresent(proxy, 'tls') && typeof proxy.tls !== 'boolean') {
                     delete proxy.tls;
                 }

backend/src/core/proxy-utils/producers/surge.js

@@ -433,6 +433,9 @@ function ssh(proxy) {
     return result.toString();
 }
 function http(proxy) {
+    if (proxy.headers && Object.keys(proxy.headers).length > 0) {
+        throw new Error(`headers is unsupported`);
+    }
     const result = new Result(proxy);
     const type = proxy.tls ? 'https' : 'http';
     result.append(`${proxy.name}=${type},${proxy.server},${proxy.port}`);

backend/src/core/proxy-utils/producers/surgemac.js

@@ -141,9 +141,18 @@ function mihomo(proxy, type, opts) {
                         dns: {
                             enable: true,
                             ipv6,
-                            nameserver: [
+                            'default-nameserver': opts?.defaultNameserver ||
-                                'https://223.6.6.6/dns-query',
+                                proxy._defaultNameserver || [
-                                'https://120.53.53.53/dns-query',
+                                    '180.76.76.76',
+                                    '52.80.52.52',
+                                    '119.28.28.28',
+                                    '223.6.6.6',
+                                ],
+                            nameserver: opts?.nameserver ||
+                                proxy._nameserver || [
+                                    'https://doh.pub/dns-query',
+                                    'https://dns.alidns.com/dns-query',
+                                    'https://doh-pure.onedns.net/dns-query',
                                 ],
                         },
                         proxies: [

backend/src/core/proxy-utils/producers/uri.js

@@ -12,7 +12,7 @@ export default function URI_Producer() {
         delete proxy.resolved;
         delete proxy['no-resolve'];
         for (const key in proxy) {
-            if (proxy[key] == null || /^_/i.test(key)) {
+            if (proxy[key] == null) {
                 delete proxy[key];
             }
         }
@@ -23,10 +23,21 @@ export default function URI_Producer() {
         ) {
             delete proxy.tls;
         }
-        if (proxy.server && isIPv6(proxy.server)) {
+        if (
+            !['vmess'].includes(proxy.type) &&
+            proxy.server &&
+            isIPv6(proxy.server)
+        ) {
             proxy.server = `[${proxy.server}]`;
         }
         switch (proxy.type) {
+            case 'socks5':
+                result = `socks://${encodeURIComponent(
+                    Base64.encode(
+                        `${proxy.username ?? ''}:${proxy.password ?? ''}`,
+                    ),
+                )}@${proxy.server}:${proxy.port}#${proxy.name}`;
+                break;
             case 'ss':
                 const userinfo = `${proxy.cipher}:${proxy.password}`;
                 result = `ss://${
@@ -108,12 +119,17 @@ export default function URI_Producer() {
                     v: '2',
                     ps: proxy.name,
                     add: proxy.server,
-                    port: proxy.port,
+                    port: `${proxy.port}`,
                     id: proxy.uuid,
-                    type,
+                    aid: `${proxy.alterId || 0}`,
-                    aid: proxy.alterId || 0,
+                    scy: proxy.cipher,
                     net,
+                    type,
                     tls: proxy.tls ? 'tls' : '',
+                    alpn: Array.isArray(proxy.alpn)
+                        ? proxy.alpn.join(',')
+                        : proxy.alpn,
+                    fp: proxy['client-fingerprint'],
                 };
                 if (proxy.tls && proxy.sni) {
                     result.sni = proxy.sni;
@@ -124,16 +140,7 @@ export default function URI_Producer() {
                         proxy[`${proxy.network}-opts`]?.path;
                     let vmessTransportHost =
                         proxy[`${proxy.network}-opts`]?.headers?.Host;
-                    if (vmessTransportPath) {
+
-                        result.path = Array.isArray(vmessTransportPath)
-                            ? vmessTransportPath[0]
-                            : vmessTransportPath;
-                    }
-                    if (vmessTransportHost) {
-                        result.host = Array.isArray(vmessTransportHost)
-                            ? vmessTransportHost[0]
-                            : vmessTransportHost;
-                    }
                     if (['grpc'].includes(proxy.network)) {
                         result.path =
                             proxy[`${proxy.network}-opts`]?.[
@@ -145,6 +152,31 @@ export default function URI_Producer() {
                             'gun';
                         result.host =
                             proxy[`${proxy.network}-opts`]?.['_grpc-authority'];
+                    } else if (['kcp', 'quic'].includes(proxy.network)) {
+                        // https://github.com/XTLS/Xray-core/issues/91
+                        result.type =
+                            proxy[`${proxy.network}-opts`]?.[
+                                `_${proxy.network}-type`
+                            ] || 'none';
+                        result.host =
+                            proxy[`${proxy.network}-opts`]?.[
+                                `_${proxy.network}-host`
+                            ];
+                        result.path =
+                            proxy[`${proxy.network}-opts`]?.[
+                                `_${proxy.network}-path`
+                            ];
+                    } else {
+                        if (vmessTransportPath) {
+                            result.path = Array.isArray(vmessTransportPath)
+                                ? vmessTransportPath[0]
+                                : vmessTransportPath;
+                        }
+                        if (vmessTransportHost) {
+                            result.host = Array.isArray(vmessTransportHost)
+                                ? vmessTransportHost[0]
+                                : vmessTransportHost;
+                        }
                     }
                 }
                 result = 'vmess://' + Base64.encode(JSON.stringify(result));
@@ -382,6 +414,14 @@ export default function URI_Producer() {
                 break;
             case 'hysteria2':
                 let hysteria2params = [];
+                if (proxy['hop-interval']) {
+                    hysteria2params.push(
+                        `hop-interval=${proxy['hop-interval']}`,
+                    );
+                }
+                if (proxy['keepalive']) {
+                    hysteria2params.push(`keepalive=${proxy['keepalive']}`);
+                }
                 if (proxy['skip-cert-verify']) {
                     hysteria2params.push(`insecure=1`);
                 }
@@ -461,7 +501,7 @@ export default function URI_Producer() {
                             hysteriaParams.push(`obfsParam=${proxy[key]}`);
                         } else if (['sni'].includes(key)) {
                             hysteriaParams.push(`peer=${proxy[key]}`);
-                        } else if (proxy[key]) {
+                        } else if (proxy[key] && !/^_/i.test(key)) {
                             hysteriaParams.push(
                                 `${i}=${encodeURIComponent(proxy[key])}`,
                             );
@@ -488,6 +528,7 @@ export default function URI_Producer() {
                                 'password',
                                 'server',
                                 'port',
+                                'tls',
                             ].includes(key)
                         ) {
                             const i = key.replace(/-/, '_');
@@ -516,10 +557,19 @@ export default function URI_Producer() {
                                 ['disable-sni', 'reduce-rtt'].includes(key) &&
                                 proxy[key]
                             ) {
-                                tuicParams.push(`${i}=1`);
+                                tuicParams.push(`${i.replace(/-/g, '_')}=1`);
-                            } else if (proxy[key]) {
+                            } else if (
+                                ['congestion-controller'].includes(key)
+                            ) {
                                 tuicParams.push(
-                                    `${i}=${encodeURIComponent(proxy[key])}`,
+                                    `congestion_control=${proxy[key]}`,
+                                );
+                            } else if (proxy[key] && !/^_/i.test(key)) {
+                                tuicParams.push(
+                                    `${i.replace(
+                                        /-/g,
+                                        '_',
+                                    )}=${encodeURIComponent(proxy[key])}`,
                                 );
                             }
                         }
@@ -534,6 +584,54 @@ export default function URI_Producer() {
                     )}`;
                 }
                 break;
+            case 'anytls':
+                let anytlsParams = [];
+                Object.keys(proxy).forEach((key) => {
+                    if (
+                        ![
+                            'name',
+                            'type',
+                            'password',
+                            'server',
+                            'port',
+                            'tls',
+                        ].includes(key)
+                    ) {
+                        const i = key.replace(/-/, '_');
+                        if (['alpn'].includes(key)) {
+                            if (proxy[key]) {
+                                anytlsParams.push(
+                                    `${i}=${encodeURIComponent(
+                                        Array.isArray(proxy[key])
+                                            ? proxy[key][0]
+                                            : proxy[key],
+                                    )}`,
+                                );
+                            }
+                        } else if (['skip-cert-verify'].includes(key)) {
+                            if (proxy[key]) {
+                                anytlsParams.push(`insecure=1`);
+                            }
+                        } else if (['udp'].includes(key)) {
+                            if (proxy[key]) {
+                                anytlsParams.push(`udp=1`);
+                            }
+                        } else if (proxy[key] && !/^_/i.test(key)) {
+                            anytlsParams.push(
+                                `${i.replace(/-/g, '_')}=${encodeURIComponent(
+                                    proxy[key],
+                                )}`,
+                            );
+                        }
+                    }
+                });
+
+                result = `anytls://${encodeURIComponent(proxy.password)}@${
+                    proxy.server
+                }:${proxy.port}/?${anytlsParams.join('&')}#${encodeURIComponent(
+                    proxy.name,
+                )}`;
+                break;
             case 'wireguard':
                 let wireguardParams = [];
 
@@ -555,7 +653,7 @@ export default function URI_Producer() {
                             if (proxy[key]) {
                                 wireguardParams.push(`${key}=1`);
                             }
-                        } else if (proxy[key]) {
+                        } else if (proxy[key] && !/^_/i.test(key)) {
                             wireguardParams.push(
                                 `${key}=${encodeURIComponent(proxy[key])}`,
                             );

backend/src/main.js

@@ -11,6 +11,7 @@
  * @documentation: https://www.notion.so/Sub-Store-6259586994d34c11a4ced5c406264b46
  */
 import { version } from '../package.json';
+import $ from '@/core/app';
 console.log(
     `
 ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
@@ -18,7 +19,6 @@ console.log(
 ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
 `,
 );
-
 import migrate from '@/utils/migration';
 import serve from '@/restful';
 

backend/src/products/cron-sync-artifacts.js

@@ -89,8 +89,10 @@ async function doSync() {
         const allSubs = $.read(SUBS_KEY);
         const allCols = $.read(COLLECTIONS_KEY);
         const subNames = [];
+        let enabledCount = 0;
         allArtifacts.map((artifact) => {
             if (artifact.sync && artifact.source) {
+                enabledCount++;
                 if (artifact.type === 'subscription') {
                     const subName = artifact.source;
                     const sub = findByName(allSubs, subName);
@@ -111,6 +113,13 @@ async function doSync() {
             }
         });
 
+        if (enabledCount === 0) {
+            $.info(
+                `需同步的配置: ${enabledCount}, 总数: ${allArtifacts.length}`,
+            );
+            return;
+        }
+
         if (subNames.length > 0) {
             await Promise.all(
                 subNames.map(async (subName) => {

backend/src/products/resource-parser.loon.js

@@ -14,10 +14,12 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
         `
     ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
          Sub-Store -- v${version}
+         Loon -- ${$loon}
     ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
     `,
     );
 
+    const build = $loon.match(/\((\d+)\)$/)?.[1];
     let arg;
     if (typeof $argument != 'undefined') {
         arg = Object.fromEntries(
@@ -26,24 +28,29 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
     } else {
         arg = {};
     }
+    console.log(`arg: ${JSON.stringify(arg)}`);
 
     const RESOURCE_TYPE = {
         PROXY: 1,
         RULE: 2,
     };
-
+    if (!arg.resourceUrlOnly) {
         result = resource;
+    }
 
     if (resourceType === RESOURCE_TYPE.PROXY) {
+        if (!arg.resourceUrlOnly) {
             try {
                 let proxies = ProxyUtils.parse(resource);
                 result = ProxyUtils.produce(proxies, 'Loon', undefined, {
-                'include-unsupported-proxy': arg?.includeUnsupportedProxy,
+                    'include-unsupported-proxy':
+                        arg?.includeUnsupportedProxy || build >= 842,
                 });
             } catch (e) {
                 console.log('解析器: 使用 resource 出现错误');
                 console.log(e.message ?? e);
             }
+        }
         if ((!result || /^\s*$/.test(result)) && resourceUrl) {
             console.log(`解析器: 尝试从 ${resourceUrl} 获取订阅`);
             try {
@@ -59,19 +66,22 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
                 );
                 let proxies = ProxyUtils.parse(raw);
                 result = ProxyUtils.produce(proxies, 'Loon', undefined, {
-                    'include-unsupported-proxy': arg?.includeUnsupportedProxy,
+                    'include-unsupported-proxy':
+                        arg?.includeUnsupportedProxy || build >= 842,
                 });
             } catch (e) {
                 console.log(e.message ?? e);
             }
         }
     } else if (resourceType === RESOURCE_TYPE.RULE) {
+        if (!arg.resourceUrlOnly) {
             try {
                 const rules = RuleUtils.parse(resource);
                 result = RuleUtils.produce(rules, 'Loon');
             } catch (e) {
                 console.log(e.message ?? e);
             }
+        }
         if ((!result || /^\s*$/.test(result)) && resourceUrl) {
             console.log(`解析器: 尝试从 ${resourceUrl} 获取规则`);
             try {

backend/src/restful/collections.js

@@ -1,8 +1,9 @@
 import { deleteByName, findByName, updateByName } from '@/utils/database';
-import { COLLECTIONS_KEY, ARTIFACTS_KEY } from '@/constants';
+import { COLLECTIONS_KEY, ARTIFACTS_KEY, FILES_KEY } from '@/constants';
 import { failed, success } from '@/restful/response';
 import $ from '@/core/app';
 import { RequestInvalidError, ResourceNotFoundError } from '@/restful/errors';
+import { formatDateTime } from '@/utils';
 
 export default function register($app) {
     if (!$.read(COLLECTIONS_KEY)) $.write({}, COLLECTIONS_KEY);
@@ -59,7 +60,11 @@ function getCollection(req, res) {
             res.set('content-type', 'application/json')
                 .set(
                     'content-disposition',
-                    `attachment; filename="${encodeURIComponent(name)}.json"`,
+                    `attachment; filename="${encodeURIComponent(
+                        `sub-store_collection_${name}_${formatDateTime(
+                            new Date(),
+                        )}.json`,
+                    )}"`,
                 )
                 .send(JSON.stringify(collection));
         } else {
@@ -101,7 +106,18 @@ function updateCollection(req, res) {
                     artifact.source = newCol.name;
                 }
             }
+            // update all files referring this collection
+            const allFiles = $.read(FILES_KEY) || [];
+            for (const file of allFiles) {
+                if (
+                    file.sourceType === 'collection' &&
+                    file.sourceName === oldCol.name
+                ) {
+                    file.sourceName = newCol.name;
+                }
+            }
             $.write(allArtifacts, ARTIFACTS_KEY);
+            $.write(allFiles, FILES_KEY);
         }
 
         updateByName(allCols, name, newCol);

backend/src/restful/download.js

@@ -5,7 +5,7 @@ import {
 import { ProxyUtils } from '@/core/proxy-utils';
 import { COLLECTIONS_KEY, SUBS_KEY } from '@/constants';
 import { findByName } from '@/utils/database';
-import { getFlowHeaders } from '@/utils/flow';
+import { getFlowHeaders, normalizeFlowHeader } from '@/utils/flow';
 import $ from '@/core/app';
 import { failed } from '@/restful/response';
 import { InternalServerError, ResourceNotFoundError } from '@/restful/errors';
@@ -111,7 +111,17 @@ async function downloadSubscription(req, res) {
         proxy,
         noCache,
     } = req.query;
-    let $options = {};
+    let $options = {
+        _req: {
+            method: req.method,
+            url: req.url,
+            path: req.path,
+            query: req.query,
+            params: req.params,
+            headers: req.headers,
+            body: req.body,
+        },
+    };
     if (req.query.$options) {
         try {
             // 支持 `#${encodeURIComponent(JSON.stringify({arg1: "1"}))}`
@@ -249,7 +259,7 @@ async function downloadSubscription(req, res) {
                             }
                         }
                     }
-                    if (!$arguments.noFlow) {
+                    if (!$arguments.noFlow && /^https?/.test(url)) {
                         // forward flow headers
                         flowInfo = await getFlowHeaders(
                             $arguments?.insecure ? `${url}#insecure` : url,
@@ -259,7 +269,10 @@ async function downloadSubscription(req, res) {
                             $arguments.flowUrl,
                         );
                         if (flowInfo) {
-                            res.set('subscription-userinfo', flowInfo);
+                            res.set(
+                                'subscription-userinfo',
+                                normalizeFlowHeader(flowInfo),
+                            );
                         }
                     }
                 } catch (err) {
@@ -293,10 +306,9 @@ async function downloadSubscription(req, res) {
                 }
                 res.set(
                     'subscription-userinfo',
-                    [subUserInfo, flowInfo]
+                    normalizeFlowHeader(
-                        .filter((i) => i)
+                        [subUserInfo, flowInfo].filter((i) => i).join(';'),
-                        .join('; ')
+                    ),
-                        .replace(/\s*;\s*;\s*/g, ';'),
                 );
             }
 
@@ -374,7 +386,17 @@ async function downloadCollection(req, res) {
         noCache,
     } = req.query;
 
-    let $options = {};
+    let $options = {
+        _req: {
+            method: req.method,
+            url: req.url,
+            path: req.path,
+            query: req.query,
+            params: req.params,
+            headers: req.headers,
+            body: req.body,
+        },
+    };
     if (req.query.$options) {
         try {
             // 支持 `#${encodeURIComponent(JSON.stringify({arg1: "1"}))}`
@@ -484,7 +506,7 @@ async function downloadCollection(req, res) {
                                 }
                             }
                         }
-                        if (!$arguments.noFlow) {
+                        if (!$arguments.noFlow && /^https?:/.test(url)) {
                             subUserInfoOfSub = await getFlowHeaders(
                                 $arguments?.insecure ? `${url}#insecure` : url,
                                 $arguments.flowUserAgent,
@@ -556,7 +578,7 @@ async function downloadCollection(req, res) {
             if (subUserInfo) {
                 res.set(
                     'subscription-userinfo',
-                    subUserInfo.replace(/\s*;\s*;\s*/g, ';'),
+                    normalizeFlowHeader(subUserInfo),
                 );
             }
             if (platform === 'JSON') {

backend/src/restful/file.js

@@ -1,6 +1,6 @@
 import { deleteByName, findByName, updateByName } from '@/utils/database';
-import { getFlowHeaders } from '@/utils/flow';
+import { getFlowHeaders, normalizeFlowHeader } from '@/utils/flow';
-import { FILES_KEY } from '@/constants';
+import { FILES_KEY, ARTIFACTS_KEY } from '@/constants';
 import { failed, success } from '@/restful/response';
 import $ from '@/core/app';
 import {
@@ -9,6 +9,7 @@ import {
     InternalServerError,
 } from '@/restful/errors';
 import { produceArtifact } from '@/restful/sync';
+import { formatDateTime } from '@/utils';
 
 export default function register($app) {
     if (!$.read(FILES_KEY)) $.write([], FILES_KEY);
@@ -51,8 +52,8 @@ function createFile(req, res) {
 async function getFile(req, res) {
     let { name } = req.params;
     name = decodeURIComponent(name);
-
+    const reqUA = req.headers['user-agent'] || req.headers['User-Agent'];
-    $.info(`正在下载文件：${name}`);
+    $.info(`正在下载文件：${name}\n请求 User-Agent: ${reqUA}`);
     let {
         url,
         subInfoUrl,
@@ -63,8 +64,19 @@ async function getFile(req, res) {
         ignoreFailedRemoteFile,
         proxy,
         noCache,
+        produceType,
     } = req.query;
-    let $options = {};
+    let $options = {
+        _req: {
+            method: req.method,
+            url: req.url,
+            path: req.path,
+            query: req.query,
+            params: req.params,
+            headers: req.headers,
+            body: req.body,
+        },
+    };
     if (req.query.$options) {
         try {
             // 支持 `#${encodeURIComponent(JSON.stringify({arg1: "1"}))}`
@@ -117,6 +129,10 @@ async function getFile(req, res) {
     if (noCache) {
         $.info(`指定不使用缓存: ${noCache}`);
     }
+    if (produceType) {
+        produceType = decodeURIComponent(produceType);
+        $.info(`指定生产类型: ${produceType}`);
+    }
 
     const allFiles = $.read(FILES_KEY);
     const file = findByName(allFiles, name);
@@ -133,6 +149,8 @@ async function getFile(req, res) {
                 $options,
                 proxy,
                 noCache,
+                produceType,
+                all: true,
             });
 
             try {
@@ -148,7 +166,7 @@ async function getFile(req, res) {
                     if (flowInfo) {
                         res.set(
                             'subscription-userinfo',
-                            flowInfo.replace(/\s*;\s*;\s*/g, ';'),
+                            normalizeFlowHeader(flowInfo),
                         );
                     }
                 }
@@ -167,9 +185,15 @@ async function getFile(req, res) {
                     )}`,
                 );
             }
-            res.set('Content-Type', 'text/plain; charset=utf-8').send(
+            res.set('Content-Type', 'text/plain; charset=utf-8');
-                output ?? '',
+            if (output?.$options?._res?.headers) {
+                Object.entries(output.$options._res.headers).forEach(
+                    ([key, value]) => {
+                        res.set(key, value);
+                    },
                 );
+            }
+            res.send(output?.$content ?? '');
         } catch (err) {
             $.notify(
                 `🌍 Sub-Store 下载文件失败`,
@@ -209,7 +233,11 @@ function getWholeFile(req, res) {
             res.set('content-type', 'application/json')
                 .set(
                     'content-disposition',
-                    `attachment; filename="${encodeURIComponent(name)}.json"`,
+                    `attachment; filename="${encodeURIComponent(
+                        `sub-store_file_${name}_${formatDateTime(
+                            new Date(),
+                        )}.json`,
+                    )}"`,
                 )
                 .send(JSON.stringify(file));
         } else {
@@ -240,6 +268,20 @@ function updateFile(req, res) {
         };
         $.info(`正在更新文件：${name}...`);
 
+        if (name !== newFile.name) {
+            // update all artifacts referring this collection
+            const allArtifacts = $.read(ARTIFACTS_KEY) || [];
+            for (const artifact of allArtifacts) {
+                if (
+                    artifact.type === 'file' &&
+                    artifact.source === oldFile.name
+                ) {
+                    artifact.source = newFile.name;
+                }
+            }
+            $.write(allArtifacts, ARTIFACTS_KEY);
+        }
+
         updateByName(allFiles, name, newFile);
         $.write(allFiles, FILES_KEY);
         success(res, newFile);

backend/src/restful/index.js

@@ -1,8 +1,8 @@
 import express from '@/vendor/express';
 import $ from '@/core/app';
 import migrate from '@/utils/migration';
-import download from '@/utils/download';
+import download, { downloadFile } from '@/utils/download';
-import { syncArtifacts } from '@/restful/sync';
+import { syncArtifacts, produceArtifact } from '@/restful/sync';
 import { gistBackupAction } from '@/restful/miscs';
 import { TOKENS_KEY } from '@/constants';
 
@@ -29,6 +29,77 @@ export default function serve() {
         host = eval('process.env.SUB_STORE_BACKEND_API_HOST') || '::';
     }
     const $app = express({ substore: $, port, host });
+    if ($.env.isNode) {
+        const be_merge = eval('process.env.SUB_STORE_BACKEND_MERGE');
+        const be_prefix = eval('process.env.SUB_STORE_BACKEND_PREFIX');
+        const fe_be_path = eval('process.env.SUB_STORE_FRONTEND_BACKEND_PATH');
+        const fe_path = eval('process.env.SUB_STORE_FRONTEND_PATH');
+        if (be_prefix || be_merge) {
+            if (!fe_be_path.startsWith('/')) {
+                throw new Error(
+                    'SUB_STORE_FRONTEND_BACKEND_PATH should start with /',
+                );
+            }
+            if (be_merge) {
+                $.info(`[BACKEND] MERGE mode is [ON].`);
+                $.info(`[BACKEND && FRONTEND] ${host}:${port}`);
+            }
+            $.info(`[BACKEND PREFIX] ${host}:${port}${fe_be_path}`);
+            $app.use((req, res, next) => {
+                if (req.path.startsWith(fe_be_path)) {
+                    req.url = req.url.replace(fe_be_path, '') || '/';
+                    if (be_merge && req.url.startsWith('/api/')) {
+                        req.query['share'] = 'true';
+                    }
+                    next();
+                    return;
+                }
+                const pathname =
+                    decodeURIComponent(req._parsedUrl.pathname) || '/';
+                if (
+                    be_merge &&
+                    req.path.startsWith('/share/') &&
+                    req.query.token
+                ) {
+                    if (req.method.toLowerCase() !== 'get') {
+                        res.status(405).send('Method not allowed');
+                        return;
+                    }
+                    const tokens = $.read(TOKENS_KEY) || [];
+                    const token = tokens.find(
+                        (t) =>
+                            t.token === req.query.token &&
+                            `/share/${t.type}/${t.name}` === pathname &&
+                            (t.exp == null || t.exp > Date.now()),
+                    );
+                    if (token) {
+                        next();
+                        return;
+                    }
+                }
+                if (be_merge && fe_path && req.path.indexOf('/', 1) == -1) {
+                    if (req.path.indexOf('.') == -1) {
+                        req.url = '/index.html';
+                    }
+                    const express_ = eval(`require("express")`);
+                    const mime_ = eval(`require("mime-types")`);
+                    const path_ = eval(`require("path")`);
+                    const staticFileMiddleware = express_.static(fe_path, {
+                        setHeaders: (res, path) => {
+                            const type = mime_.contentType(path_.extname(path));
+                            if (type) {
+                                res.set('Content-Type', type);
+                            }
+                        },
+                    });
+                    staticFileMiddleware(req, res, next);
+                    return;
+                }
+                res.status(403).end('Forbbiden');
+                return;
+            });
+        }
+    }
     // register routes
     registerCollectionRoutes($app);
     registerSubscriptionRoutes($app);
@@ -75,6 +146,39 @@ export default function serve() {
                 // 'Asia/Shanghai' // timeZone
             );
         }
+        // 格式: 0 */2 * * *,sub,a;0 */3 * * *,col,b
+        // 每 2 小时处理一次单条订阅 a, 每 3 小时处理一次组合订阅 b
+        const produce_cron = eval('process.env.SUB_STORE_PRODUCE_CRON');
+        if (produce_cron) {
+            $.info(`[PRODUCE CRON] ${produce_cron} enabled`);
+            const { CronJob } = eval(`require("cron")`);
+            produce_cron.split(/\s*;\s*/).map((item) => {
+                const [cron, type, name] = item.split(/\s*,\s*/);
+                new CronJob(
+                    cron.trim(),
+                    async function () {
+                        try {
+                            $.info(
+                                `[PRODUCE CRON] ${type} ${name} ${cron} started`,
+                            );
+                            await produceArtifact({ type, name });
+                            $.info(
+                                `[PRODUCE CRON] ${type} ${name} ${cron} finished`,
+                            );
+                        } catch (e) {
+                            $.error(
+                                `[PRODUCE CRON] ${type} ${name} ${cron} error: ${
+                                    e.message ?? e
+                                }`,
+                            );
+                        }
+                    }, // onTick
+                    null, // onComplete
+                    true, // start
+                    // 'Asia/Shanghai' // timeZone
+                );
+            });
+        }
         const backend_download_cron = eval(
             'process.env.SUB_STORE_BACKEND_DOWNLOAD_CRON',
         );
@@ -131,6 +235,60 @@ export default function serve() {
                 // 'Asia/Shanghai' // timeZone
             );
         }
+        const mmdb_cron = eval('process.env.SUB_STORE_MMDB_CRON');
+        const countryFile = eval('process.env.SUB_STORE_MMDB_COUNTRY_PATH');
+        const countryUrl = eval('process.env.SUB_STORE_MMDB_COUNTRY_URL');
+        const asnFile = eval('process.env.SUB_STORE_MMDB_ASN_PATH');
+        const asnUrl = eval('process.env.SUB_STORE_MMDB_ASN_URL');
+        if (mmdb_cron && ((countryFile && countryUrl) || (asnFile && asnUrl))) {
+            $.info(`[MMDB CRON] ${mmdb_cron} enabled`);
+            const { CronJob } = eval(`require("cron")`);
+            new CronJob(
+                mmdb_cron,
+                async function () {
+                    try {
+                        $.info(`[MMDB CRON] ${mmdb_cron} started`);
+                        if (countryFile && countryUrl) {
+                            try {
+                                $.info(
+                                    `[MMDB CRON] downloading ${countryUrl} to ${countryFile}`,
+                                );
+                                await downloadFile(countryUrl, countryFile);
+                            } catch (e) {
+                                $.error(
+                                    `[MMDB CRON] ${countryUrl} download failed: ${
+                                        e.message ?? e
+                                    }`,
+                                );
+                            }
+                        }
+                        if (asnFile && asnUrl) {
+                            try {
+                                $.info(
+                                    `[MMDB CRON] downloading ${asnUrl} to ${asnFile}`,
+                                );
+                                await downloadFile(asnUrl, asnFile);
+                            } catch (e) {
+                                $.error(
+                                    `[MMDB CRON] ${asnUrl} download failed: ${
+                                        e.message ?? e
+                                    }`,
+                                );
+                            }
+                        }
+
+                        $.info(`[MMDB CRON] ${mmdb_cron} finished`);
+                    } catch (e) {
+                        $.error(
+                            `[MMDB CRON] ${mmdb_cron} error: ${e.message ?? e}`,
+                        );
+                    }
+                }, // onTick
+                null, // onComplete
+                true, // start
+                // 'Asia/Shanghai' // timeZone
+            );
+        }
         const path = eval(`require("path")`);
         const fs = eval(`require("fs")`);
         const data_url = eval('process.env.SUB_STORE_DATA_URL');
@@ -142,7 +300,8 @@ export default function serve() {
         const fe_abs_path = path.resolve(
             fe_path || path.join(__dirname, 'frontend'),
         );
-        if (fe_path) {
+        const be_merge = eval('process.env.SUB_STORE_BACKEND_MERGE');
+        if (fe_path && !be_merge) {
             try {
                 fs.accessSync(path.join(fe_abs_path, 'index.html'));
             } catch (e) {
@@ -161,11 +320,15 @@ export default function serve() {
 
             const staticFileMiddleware = express_.static(fe_path);
 
-            let be_share_rewrite = '/share/:type/:name';
-            let be_api_rewrite = '';
-            let be_download_rewrite = '';
             let be_api = '/api/';
             let be_download = '/download/';
+            let be_share = '/share/';
+            let be_download_rewrite = '';
+            let be_api_rewrite = '';
+            let be_share_rewrite = `${be_share}:type/:name`;
+            let prefix = eval('process.env.SUB_STORE_BACKEND_PREFIX')
+                ? fe_be_path
+                : '';
             if (fe_be_path) {
                 if (!fe_be_path.startsWith('/')) {
                     throw new Error(
@@ -182,9 +345,9 @@ export default function serve() {
                 app.use(
                     be_share_rewrite,
                     createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}`,
+                        target: `http://127.0.0.1:${port}${prefix}`,
                         changeOrigin: true,
-                        pathRewrite: (path, req) => {
+                        pathRewrite: async (path, req) => {
                             if (req.method.toLowerCase() !== 'get')
                                 throw new Error('Method not allowed');
                             const tokens = $.read(TOKENS_KEY) || [];
@@ -196,34 +359,26 @@ export default function serve() {
                                     (t.exp == null || t.exp > Date.now()),
                             );
                             if (!token) throw new Error('Forbbiden');
-                            return path;
+                            return req.originalUrl;
                         },
                     }),
                 );
                 app.use(
                     be_api_rewrite,
                     createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}`,
+                        target: `http://127.0.0.1:${port}${prefix}${be_api}`,
-                        pathRewrite: (path) => {
+                        pathRewrite: async (path) => {
-                            const newPath = path.startsWith(be_api_rewrite)
+                            return path.includes('?')
-                                ? path.replace(be_api_rewrite, be_api)
+                                ? `${path}&share=true`
-                                : path;
+                                : `${path}?share=true`;
-                            return newPath.includes('?')
-                                ? `${newPath}&share=true`
-                                : `${newPath}?share=true`;
                         },
                     }),
                 );
                 app.use(
                     be_download_rewrite,
                     createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}`,
+                        target: `http://127.0.0.1:${port}${prefix}${be_download}`,
                         changeOrigin: true,
-                        pathRewrite: (path) => {
-                            return path.startsWith(be_download_rewrite)
-                                ? path.replace(be_download_rewrite, be_download)
-                                : path;
-                        },
                     }),
                 );
             }
@@ -243,10 +398,10 @@ export default function serve() {
                 $.info(`[FRONTEND] ${fe_address}:${fe_port}`);
                 if (fe_be_path) {
                     $.info(
-                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_api_rewrite} -> http://127.0.0.1:${port}${be_api}`,
+                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_api_rewrite} -> ${host}:${port}${prefix}${be_api}`,
                     );
                     $.info(
-                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_download_rewrite} -> http://127.0.0.1:${port}${be_download}`,
+                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_download_rewrite} -> ${host}:${port}${prefix}${be_download}`,
                     );
                     $.info(
                         `[SHARE BACKEND] ${fe_address}:${fe_port}${be_share_rewrite}`,

backend/src/restful/miscs.js

@@ -14,6 +14,7 @@ import { InternalServerError, RequestInvalidError } from '@/restful/errors';
 import Gist from '@/utils/gist';
 import migrate from '@/utils/migration';
 import env from '@/utils/env';
+import { formatDateTime } from '@/utils';
 
 export default function register($app) {
     // utils
@@ -27,7 +28,9 @@ export default function register($app) {
             res.set('content-type', 'application/json')
                 .set(
                     'content-disposition',
-                    'attachment; filename="sub-store.json"',
+                    `attachment; filename="${encodeURIComponent(
+                        `sub-store_data_${formatDateTime(new Date())}.json`,
+                    )}"`,
                 )
                 .send(
                     $.env.isNode
@@ -46,11 +49,17 @@ export default function register($app) {
             success(res);
         });
 
+    if (ENV().isNode) {
+        $app.get('/', getEnv);
+    } else {
         // Redirect sub.store to vercel webpage
         $app.get('/', async (req, res) => {
             // 302 redirect
-        res.set('location', 'https://sub-store.vercel.app/').status(302).end();
+            res.set('location', 'https://sub-store.vercel.app/')
+                .status(302)
+                .end();
         });
+    }
 
     // handle preflight request for QX
     if (ENV().isQX) {
@@ -68,7 +77,19 @@ function getEnv(req, res) {
     if (req.query.share) {
         env.feature.share = true;
     }
-    success(res, env);
+    res.set('Content-Type', 'application/json;charset=UTF-8').send(
+        JSON.stringify(
+            {
+                status: 'success',
+                data: {
+                    guide: '⚠️⚠️⚠️ 您当前看到的是后端的响应. 若想配合前端使用, 可访问官方前端 https://sub-store.vercel.app 后自行配置后端地址, 或一键配置后端 https://sub-store.vercel.app?api=https://a.com/xxx (假设 https://a.com 是你后端的域名, /xxx 是自定义路径). 需注意 HTTPS 前端无法请求非本地的 HTTP 后端(部分浏览器上也无法访问本地 HTTP 后端). 请配置反代或在局域网自建 HTTP 前端. 如果还有问题, 可查看此排查说明: https://t.me/zhetengsha/1068',
+                    ...env,
+                },
+            },
+            null,
+            2,
+        ),
+    );
 }
 
 async function refresh(_, res) {
@@ -98,6 +119,21 @@ async function gistBackupAction(action) {
     const updated = settings.syncTime;
     switch (action) {
         case 'upload':
+            try {
+                content = $.read('#sub-store');
+                if ($.env.isNode) content = JSON.stringify($.cache, null, `  `);
+                $.info(`下载备份, 与本地内容对比...`);
+                const onlineContent = await gist.download(
+                    GIST_BACKUP_FILE_NAME,
+                );
+                if (onlineContent === content) {
+                    $.info(`内容一致, 无需上传备份`);
+                    return;
+                }
+            } catch (error) {
+                $.error(`${error.message ?? error}`);
+            }
+
             // update syncTime
             settings.syncTime = new Date().getTime();
             $.write(settings, SETTINGS_KEY);

backend/src/restful/preview.js

@@ -15,7 +15,8 @@ export default function register($app) {
 async function previewFile(req, res) {
     try {
         const file = req.body;
-        let content;
+        let content = '';
+        if (file.type !== 'mihomoProfile') {
             if (
                 file.source === 'local' &&
                 !['localFirst', 'remoteFirst'].includes(file.mergeSources)
@@ -30,7 +31,12 @@ async function previewFile(req, res) {
                         .filter((i) => i.length)
                         .map(async (url) => {
                             try {
-                            return await download(url, file.ua);
+                                return await download(
+                                    url,
+                                    file.ua,
+                                    undefined,
+                                    file.proxy,
+                                );
                             } catch (err) {
                                 errors[url] = err;
                                 $.error(
@@ -41,22 +47,30 @@ async function previewFile(req, res) {
                         }),
                 );
 
-            if (
+                if (Object.keys(errors).length > 0) {
-                !file.ignoreFailedRemoteFile &&
+                    if (!file.ignoreFailedRemoteFile) {
-                Object.keys(errors).length > 0
-            ) {
                         throw new Error(
-                    `文件 ${file.name} 的远程文件 ${Object.keys(errors).join(
+                            `文件 ${file.name} 的远程文件 ${Object.keys(
+                                errors,
+                            ).join(', ')} 发生错误, 请查看日志`,
+                        );
+                    } else if (file.ignoreFailedRemoteFile === 'enabled') {
+                        $.notify(
+                            `🌍 Sub-Store 预览文件失败`,
+                            `❌ ${file.name}`,
+                            `远程文件 ${Object.keys(errors).join(
                                 ', ',
                             )} 发生错误, 请查看日志`,
                         );
                     }
+                }
                 if (file.mergeSources === 'localFirst') {
                     content.unshift(file.content);
                 } else if (file.mergeSources === 'remoteFirst') {
                     content.push(file.content);
                 }
             }
+        }
         // parse proxies
         const files = (Array.isArray(content) ? content : [content]).flat();
         let filesContent = files
@@ -129,12 +143,22 @@ async function compareSub(req, res) {
                     }),
             );
 
-            if (!sub.ignoreFailedRemoteSub && Object.keys(errors).length > 0) {
+            if (Object.keys(errors).length > 0) {
+                if (!sub.ignoreFailedRemoteSub) {
                     throw new Error(
                         `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
                             ', ',
                         )} 发生错误, 请查看日志`,
                     );
+                } else if (sub.ignoreFailedRemoteSub === 'enabled') {
+                    $.notify(
+                        `🌍 Sub-Store 预览订阅失败`,
+                        `❌ ${sub.name}`,
+                        `远程订阅 ${Object.keys(errors).join(
+                            ', ',
+                        )} 发生错误, 请查看日志`,
+                    );
+                }
             }
             if (sub.mergeSources === 'localFirst') {
                 content.unshift(sub.content);
@@ -237,15 +261,25 @@ async function compareCollection(req, res) {
                                     }
                                 }),
                         );
-                        if (
+
-                            !sub.ignoreFailedRemoteSub &&
+                        if (Object.keys(errors).length > 0) {
-                            Object.keys(errors).length > 0
+                            if (!sub.ignoreFailedRemoteSub) {
-                        ) {
                                 throw new Error(
                                     `订阅 ${sub.name} 的远程订阅 ${Object.keys(
                                         errors,
                                     ).join(', ')} 发生错误, 请查看日志`,
                                 );
+                            } else if (
+                                sub.ignoreFailedRemoteSub === 'enabled'
+                            ) {
+                                $.notify(
+                                    `🌍 Sub-Store 预览订阅失败`,
+                                    `❌ ${sub.name}`,
+                                    `远程订阅 ${Object.keys(errors).join(
+                                        ', ',
+                                    )} 发生错误, 请查看日志`,
+                                );
+                            }
                         }
                         if (sub.mergeSources === 'localFirst') {
                             raw.unshift(sub.content);
@@ -282,15 +316,23 @@ async function compareCollection(req, res) {
                 }
             }),
         );
-        if (
+
-            !collection.ignoreFailedRemoteSub &&
+        if (Object.keys(errors).length > 0) {
-            Object.keys(errors).length > 0
+            if (!collection.ignoreFailedRemoteSub) {
-        ) {
                 throw new Error(
-                `组合订阅 ${collection.name} 中的子订阅 ${Object.keys(
+                    `组合订阅 ${collection.name} 的子订阅 ${Object.keys(
                         errors,
                     ).join(', ')} 发生错误, 请查看日志`,
                 );
+            } else if (collection.ignoreFailedRemoteSub === 'enabled') {
+                $.notify(
+                    `🌍 Sub-Store 预览组合订阅失败`,
+                    `❌ ${collection.name}`,
+                    `子订阅 ${Object.keys(errors).join(
+                        ', ',
+                    )} 发生错误, 请查看日志`,
+                );
+            }
         }
         // merge proxies with the original order
         const original = Array.prototype.concat.apply(

backend/src/restful/settings.js

@@ -134,11 +134,15 @@ export async function updateArtifactStore() {
                 settings.artifactStore = url;
                 settings.artifactStoreStatus = 'VALID';
             } else {
-                $.error(`找不到 Sub-Store Gist`);
+                $.error(`找不到 Sub-Store Gist (${ARTIFACT_REPOSITORY_KEY})`);
                 settings.artifactStoreStatus = 'NOT FOUND';
             }
         } catch (err) {
-            $.error(`查找 Sub-Store Gist 时发生错误: ${err.message ?? err}`);
+            $.error(
+                `查找 Sub-Store Gist (${ARTIFACT_REPOSITORY_KEY}) 时发生错误: ${
+                    err.message ?? err
+                }`,
+            );
             settings.artifactStoreStatus = 'ERROR';
         }
         $.write(settings, SETTINGS_KEY);

backend/src/restful/subscriptions.js

@@ -5,7 +5,12 @@ import {
     RequestInvalidError,
 } from './errors';
 import { deleteByName, findByName, updateByName } from '@/utils/database';
-import { SUBS_KEY, COLLECTIONS_KEY, ARTIFACTS_KEY } from '@/constants';
+import {
+    SUBS_KEY,
+    COLLECTIONS_KEY,
+    ARTIFACTS_KEY,
+    FILES_KEY,
+} from '@/constants';
 import {
     getFlowHeaders,
     parseFlowHeaders,
@@ -13,6 +18,7 @@ import {
 } from '@/utils/flow';
 import { success, failed } from './response';
 import $ from '@/core/app';
+import { formatDateTime } from '@/utils';
 
 if (!$.read(SUBS_KEY)) $.write({}, SUBS_KEY);
 
@@ -134,7 +140,7 @@ async function getFlowInfo(req, res) {
                 }
             }
         }
-        if ($arguments.noFlow) {
+        if ($arguments.noFlow || !/^https?/.test(url)) {
             failed(
                 res,
                 new RequestInvalidError(
@@ -264,7 +270,11 @@ function getSubscription(req, res) {
             res.set('content-type', 'application/json')
                 .set(
                     'content-disposition',
-                    `attachment; filename="${encodeURIComponent(name)}.json"`,
+                    `attachment; filename="${encodeURIComponent(
+                        `sub-store_subscription_${name}_${formatDateTime(
+                            new Date(),
+                        )}.json`,
+                    )}"`,
                 )
                 .send(JSON.stringify(sub));
         } else {
@@ -315,9 +325,20 @@ function updateSubscription(req, res) {
                     artifact.source = sub.name;
                 }
             }
+            // update all files referring this subscription
+            const allFiles = $.read(FILES_KEY) || [];
+            for (const file of allFiles) {
+                if (
+                    file.sourceType === 'subscription' &&
+                    file.sourceName == name
+                ) {
+                    file.sourceName = sub.name;
+                }
+            }
 
             $.write(allCols, COLLECTIONS_KEY);
             $.write(allArtifacts, ARTIFACTS_KEY);
+            $.write(allFiles, FILES_KEY);
         }
         updateByName(allSubs, name, newSub);
         $.write(allSubs, SUBS_KEY);

backend/src/restful/sync.js

@@ -40,10 +40,11 @@ async function produceArtifact({
     $options,
     proxy,
     noCache,
+    all,
 }) {
     platform = platform || 'JSON';
 
-    if (type === 'subscription') {
+    if (['subscription', 'sub'].includes(type)) {
         let sub;
         if (name) {
             const allSubs = $.read(SUBS_KEY);
@@ -89,12 +90,23 @@ async function produceArtifact({
             if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
                 subIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
             }
-            if (!subIgnoreFailedRemoteSub && Object.keys(errors).length > 0) {
+
+            if (Object.keys(errors).length > 0) {
+                if (!subIgnoreFailedRemoteSub) {
                     throw new Error(
                         `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
                             ', ',
                         )} 发生错误, 请查看日志`,
                     );
+                } else if (subIgnoreFailedRemoteSub === 'enabled') {
+                    $.notify(
+                        `🌍 Sub-Store 处理订阅失败`,
+                        `❌ ${sub.name}`,
+                        `远程订阅 ${Object.keys(errors).join(
+                            ', ',
+                        )} 发生错误, 请查看日志`,
+                    );
+                }
             }
             if (mergeSources === 'localFirst') {
                 raw.unshift(content);
@@ -138,12 +150,23 @@ async function produceArtifact({
             if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
                 subIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
             }
-            if (!subIgnoreFailedRemoteSub && Object.keys(errors).length > 0) {
+
+            if (Object.keys(errors).length > 0) {
+                if (!subIgnoreFailedRemoteSub) {
                     throw new Error(
                         `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
                             ', ',
                         )} 发生错误, 请查看日志`,
                     );
+                } else if (subIgnoreFailedRemoteSub === 'enabled') {
+                    $.notify(
+                        `🌍 Sub-Store 处理订阅失败`,
+                        `❌ ${sub.name}`,
+                        `远程订阅 ${Object.keys(errors).join(
+                            ', ',
+                        )} 发生错误, 请查看日志`,
+                    );
+                }
             }
             if (sub.mergeSources === 'localFirst') {
                 raw.unshift(sub.content);
@@ -151,6 +174,9 @@ async function produceArtifact({
                 raw.push(sub.content);
             }
         }
+        if (produceType === 'raw') {
+            return JSON.stringify((Array.isArray(raw) ? raw : [raw]).flat());
+        }
         // parse proxies
         let proxies = (Array.isArray(raw) ? raw : [raw])
             .map((i) => ProxyUtils.parse(i))
@@ -190,7 +216,7 @@ async function produceArtifact({
         }
         // produce
         return ProxyUtils.produce(proxies, platform, produceType, produceOpts);
-    } else if (type === 'collection') {
+    } else if (['collection', 'col'].includes(type)) {
         const allSubs = $.read(SUBS_KEY);
         const allCols = $.read(COLLECTIONS_KEY);
         const collection = findByName(allCols, name);
@@ -264,15 +290,25 @@ async function produceArtifact({
                                     }
                                 }),
                         );
-                        if (
+
-                            !sub.ignoreFailedRemoteSub &&
+                        if (Object.keys(errors).length > 0) {
-                            Object.keys(errors).length > 0
+                            if (!sub.ignoreFailedRemoteSub) {
-                        ) {
                                 throw new Error(
                                     `订阅 ${sub.name} 的远程订阅 ${Object.keys(
                                         errors,
                                     ).join(', ')} 发生错误, 请查看日志`,
                                 );
+                            } else if (
+                                sub.ignoreFailedRemoteSub === 'enabled'
+                            ) {
+                                $.notify(
+                                    `🌍 Sub-Store 处理订阅失败`,
+                                    `❌ ${sub.name}`,
+                                    `远程订阅 ${Object.keys(errors).join(
+                                        ', ',
+                                    )} 发生错误, 请查看日志`,
+                                );
+                            }
                         }
                         if (sub.mergeSources === 'localFirst') {
                             raw.unshift(sub.content);
@@ -327,16 +363,24 @@ async function produceArtifact({
         if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
             collectionIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
         }
-        if (
+
-            !collectionIgnoreFailedRemoteSub &&
+        if (Object.keys(errors).length > 0) {
-            Object.keys(errors).length > 0
+            if (!collectionIgnoreFailedRemoteSub) {
-        ) {
                 throw new Error(
-                `组合订阅 ${name} 中的子订阅 ${Object.keys(errors).join(
+                    `组合订阅 ${collection.name} 的子订阅 ${Object.keys(
+                        errors,
+                    ).join(', ')} 发生错误, 请查看日志`,
+                );
+            } else if (collectionIgnoreFailedRemoteSub === 'enabled') {
+                $.notify(
+                    `🌍 Sub-Store 处理组合订阅失败`,
+                    `❌ ${collection.name}`,
+                    `子订阅 ${Object.keys(errors).join(
                         ', ',
                     )} 发生错误, 请查看日志`,
                 );
             }
+        }
 
         // merge proxies with the original order
         let proxies = Array.prototype.concat.apply(
@@ -410,8 +454,12 @@ async function produceArtifact({
         const allFiles = $.read(FILES_KEY);
         const file = findByName(allFiles, name);
         if (!file) throw new Error(`找不到文件 ${name}`);
-        let raw;
+        let raw = '';
-        if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) {
+        if (file.type !== 'mihomoProfile') {
+            if (
+                content &&
+                !['localFirst', 'remoteFirst'].includes(mergeSources)
+            ) {
                 raw = content;
             } else if (url) {
                 const errors = {};
@@ -447,11 +495,14 @@ async function produceArtifact({
                 ) {
                     fileIgnoreFailedRemoteFile = ignoreFailedRemoteFile;
                 }
-            if (!fileIgnoreFailedRemoteFile && Object.keys(errors).length > 0) {
+                if (
+                    !fileIgnoreFailedRemoteFile &&
+                    Object.keys(errors).length > 0
+                ) {
                     throw new Error(
-                    `文件 ${file.name} 的远程文件 ${Object.keys(errors).join(
+                        `文件 ${file.name} 的远程文件 ${Object.keys(
-                        ', ',
+                            errors,
-                    )} 发生错误, 请查看日志`,
+                        ).join(', ')} 发生错误, 请查看日志`,
                     );
                 }
                 if (mergeSources === 'localFirst') {
@@ -498,19 +549,34 @@ async function produceArtifact({
                 ) {
                     fileIgnoreFailedRemoteFile = ignoreFailedRemoteFile;
                 }
-            if (!fileIgnoreFailedRemoteFile && Object.keys(errors).length > 0) {
+
+                if (Object.keys(errors).length > 0) {
+                    if (!fileIgnoreFailedRemoteFile) {
                         throw new Error(
-                    `文件 ${file.name} 的远程文件 ${Object.keys(errors).join(
+                            `文件 ${file.name} 的远程文件 ${Object.keys(
+                                errors,
+                            ).join(', ')} 发生错误, 请查看日志`,
+                        );
+                    } else if (fileIgnoreFailedRemoteFile === 'enabled') {
+                        $.notify(
+                            `🌍 Sub-Store 处理文件失败`,
+                            `❌ ${file.name}`,
+                            `远程文件 ${Object.keys(errors).join(
                                 ', ',
                             )} 发生错误, 请查看日志`,
                         );
                     }
+                }
                 if (file.mergeSources === 'localFirst') {
                     raw.unshift(file.content);
                 } else if (file.mergeSources === 'remoteFirst') {
                     raw.push(file.content);
                 }
             }
+        }
+        if (produceType === 'raw') {
+            return JSON.stringify((Array.isArray(raw) ? raw : [raw]).flat());
+        }
         const files = (Array.isArray(raw) ? raw : [raw]).flat();
         let filesContent = files
             .filter((i) => i != null && i !== '')
@@ -530,7 +596,7 @@ async function produceArtifact({
                   )
                 : { $content: filesContent, $files: files, $options };
 
-        return processed?.$content ?? '';
+        return (all ? processed : processed?.$content) ?? '';
     }
 }
 
@@ -545,8 +611,10 @@ async function syncArtifacts() {
         const allSubs = $.read(SUBS_KEY);
         const allCols = $.read(COLLECTIONS_KEY);
         const subNames = [];
+        let enabledCount = 0;
         allArtifacts.map((artifact) => {
             if (artifact.sync && artifact.source) {
+                enabledCount++;
                 if (artifact.type === 'subscription') {
                     const subName = artifact.source;
                     const sub = findByName(allSubs, subName);
@@ -567,6 +635,13 @@ async function syncArtifacts() {
             }
         });
 
+        if (enabledCount === 0) {
+            $.info(
+                `需同步的配置: ${enabledCount}, 总数: ${allArtifacts.length}`,
+            );
+            return;
+        }
+
         if (subNames.length > 0) {
             await Promise.all(
                 subNames.map(async (subName) => {

backend/src/utils/download.js

@@ -1,4 +1,4 @@
-import { SETTINGS_KEY } from '@/constants';
+import { SETTINGS_KEY, FILES_KEY, MODULES_KEY } from '@/constants';
 import { HTTP, ENV } from '@/vendor/open-api';
 import { hex_md5 } from '@/vendor/md5';
 import { getPolicyDescriptor } from '@/utils';
@@ -11,6 +11,8 @@ import {
     validCheck,
 } from '@/utils/flow';
 import $ from '@/core/app';
+import { findByName } from '@/utils/database';
+import { produceArtifact } from '@/restful/sync';
 import PROXY_PREPROCESSORS from '@/core/proxy-utils/preprocessors';
 const clashPreprocessor = PROXY_PREPROCESSORS.find(
     (processor) => processor.name === 'Clash Pre-processor',
@@ -130,22 +132,53 @@ export default async function download(
         }
     }
 
-    // const downloadUrlMatch = url.match(/^\/api\/(file|module)\/(.+)/);
+    const downloadUrlMatch = url
-    // if (downloadUrlMatch) {
+        .split('#')[0]
-    //     let type = downloadUrlMatch?.[1];
+        .match(/^\/api\/(file|module)\/(.+)/);
-    //     let name = downloadUrlMatch?.[2];
+    if (downloadUrlMatch) {
-    //     if (name == null) {
+        let type = '';
-    //         throw new Error(`本地 ${type} URL 无效: ${url}`);
+        try {
-    //     }
+            type = downloadUrlMatch?.[1];
-    //     name = decodeURIComponent(name);
+            let name = downloadUrlMatch?.[2];
-    //     const key = type === 'module' ? MODULES_KEY : FILES_KEY;
+            if (name == null) {
-    //     const item = findByName($.read(key), name);
+                throw new Error(`本地 ${type} URL 无效: ${url}`);
-    //     if (!item) {
+            }
-    //         throw new Error(`找不到本地 ${type}: ${name}`);
+            name = decodeURIComponent(name);
-    //     }
+            const key = type === 'module' ? MODULES_KEY : FILES_KEY;
+            const item = findByName($.read(key), name);
+            if (!item) {
+                throw new Error(`找不到 ${type}: ${name}`);
+            }
 
-    //     return item.content;
+            if (type === 'module') {
-    // }
+                return item.content;
+            } else {
+                return await produceArtifact({
+                    type: 'file',
+                    name,
+                });
+            }
+        } catch (err) {
+            $.error(
+                `Error when loading ${type}: ${
+                    url.split('#')[0]
+                }.\n Reason: ${err}`,
+            );
+            throw new Error(`无法加载 ${type}: ${url}`);
+        }
+    } else if (url?.startsWith('/')) {
+        try {
+            const fs = eval(`require("fs")`);
+            return fs.readFileSync(url.split('#')[0], 'utf8');
+        } catch (err) {
+            $.error(
+                `Error when reading local file: ${
+                    url.split('#')[0]
+                }.\n Reason: ${err}`,
+            );
+            throw new Error(`无法从该路径读取文本内容: ${url}`);
+        }
+    }
 
     if (!isNode && tasks.has(id)) {
         return tasks.get(id);
@@ -273,3 +306,25 @@ export default async function download(
     }
     return result;
 }
+
+export async function downloadFile(url, file) {
+    const undici = eval("require('undici')");
+    const fs = eval("require('fs')");
+    const { pipeline } = eval("require('stream/promises')");
+    const { Agent, interceptors, request } = undici;
+    $.info(`Downloading file...\nURL: ${url}\nFile: ${file}`);
+    const { body, statusCode } = await request(url, {
+        dispatcher: new Agent().compose(
+            interceptors.redirect({
+                maxRedirections: 3,
+                throwOnRedirect: true,
+            }),
+        ),
+    });
+    if (statusCode !== 200)
+        throw new Error(`Failed to download file from ${url}`);
+    const fileStream = fs.createWriteStream(file);
+    await pipeline(body, fileStream);
+    $.info(`File downloaded from ${url} to ${file}`);
+    return file;
+}

backend/src/utils/flow.js

@@ -49,7 +49,7 @@ export async function getFlowHeaders(
             }
         }
     }
-    if ($arguments?.noFlow) {
+    if ($arguments?.noFlow || !/^https?/.test(url)) {
         return;
     }
     const { isStash, isLoon, isShadowRocket, isQX } = ENV();
@@ -313,3 +313,41 @@ export function getRmainingDays(opt = {}) {
         $.error(`getRmainingDays failed: ${e.message ?? e}`);
     }
 }
+
+export function normalizeFlowHeader(flowHeaders) {
+    try {
+        // 使用 Map 保持顺序并处理重复键
+        const kvMap = new Map();
+
+        flowHeaders
+            .split(';')
+            .map((p) => p.trim())
+            .filter(Boolean)
+            .forEach((pair) => {
+                const eqIndex = pair.indexOf('=');
+                if (eqIndex === -1) return;
+
+                const key = pair.slice(0, eqIndex).trim();
+                const encodedValue = pair.slice(eqIndex + 1).trim();
+
+                // 只保留第一个出现的 key
+                if (!kvMap.has(key)) {
+                    try {
+                        // 解码 URI 组件并保留原始值作为 fallback
+                        const decodedValue = decodeURIComponent(encodedValue);
+                        kvMap.set(key, decodedValue);
+                    } catch (e) {
+                        kvMap.set(key, encodedValue);
+                    }
+                }
+            });
+
+        // 拼接标准化字符串
+        return Array.from(kvMap.entries())
+            .map(([k, v]) => `${k}=${encodeURIComponent(v)}`) // 重新编码保持兼容性
+            .join('; ');
+    } catch (e) {
+        $.error(`normalizeFlowHeader failed: ${e.message ?? e}`);
+        return flowHeaders;
+    }
+}

backend/src/utils/geo.js

@@ -18,7 +18,9 @@ const ISOFlags = {
     '🇧🇬': ['BG', 'BGR'],
     '🇧🇭': ['BH', 'BHR'],
     '🇧🇴': ['BO', 'BOL'],
+    '🇧🇳': ['BN', 'BRN'],
     '🇧🇷': ['BR', 'BRA'],
+    '🇧🇹': ['BT', 'BTN'],
     '🇧🇾': ['BY', 'BLR'],
     '🇨🇦': ['CA', 'CAN'],
     '🇨🇭': ['CH', 'CHE'],
@@ -40,6 +42,7 @@ const ISOFlags = {
     '🇬🇪': ['GE', 'GEO'],
     '🇬🇷': ['GR', 'GRC'],
     '🇬🇹': ['GT', 'GTM'],
+    '🇬🇺': ['GU', 'GUM'],
     '🇭🇰': ['HK', 'HKG', 'HKT', 'HKBN', 'HGC', 'WTT', 'CMI'],
     '🇭🇷': ['HR', 'HRV'],
     '🇭🇺': ['HU', 'HUN'],
@@ -59,12 +62,15 @@ const ISOFlags = {
     '🇮🇷': ['IR', 'IRN'],
     '🇮🇸': ['IS', 'ISL'],
     '🇮🇹': ['IT', 'ITA'],
+    '🇱🇦': ['LA', 'LAO'],
+    '🇱🇰': ['LK', 'LKA'],
     '🇱🇹': ['LT', 'LTU'],
     '🇱🇺': ['LU', 'LUX'],
     '🇱🇻': ['LV', 'LVA'],
     '🇲🇦': ['MA', 'MAR'],
     '🇲🇩': ['MD', 'MDA'],
     '🇳🇬': ['NG', 'NGA'],
+    '🇲🇲': ['MM', 'MMR'],
     '🇲🇰': ['MK', 'MKD'],
     '🇲🇳': ['MN', 'MNG'],
     '🇲🇴': ['MO', 'MAC', 'CTM'],
@@ -83,6 +89,7 @@ const ISOFlags = {
     '🇵🇷': ['PR', 'PRI'],
     '🇵🇹': ['PT', 'PRT'],
     '🇵🇾': ['PY', 'PRY'],
+    '🇵🇬': ['PG', 'PNG'],
     '🇷🇴': ['RO', 'ROU'],
     '🇷🇸': ['RS', 'SRB'],
     '🇷🇪': ['RE', 'REU'],
@@ -142,8 +149,10 @@ export function getFlag(name) {
         '🇧🇬': ['Bulgaria', '保加利亚', '保加利亞'],
         '🇧🇭': ['Bahrain', '巴林'],
         '🇧🇷': ['Brazil', '巴西', '圣保罗'],
+        '🇧🇳': ['Brunei', '文莱', '汶萊'],
         '🇧🇾': ['Belarus', '白俄罗斯', '白俄'],
         '🇧🇴': ['Bolivia', '玻利维亚'],
+        '🇧🇹': ['Bhutan', '不丹', '不丹王国'],
         '🇨🇦': [
             'Canada',
             '加拿大',
@@ -194,6 +203,7 @@ export function getFlag(name) {
         ],
         '🇬🇪': ['Georgia', '格鲁吉亚', '格魯吉亞'],
         '🇬🇷': ['Greece', '希腊', '希臘'],
+        '🇬🇺': ['Guam', '关岛', '關島'],
         '🇬🇹': ['Guatemala', '危地马拉'],
         '🇭🇰': [
             'Hongkong',
@@ -254,11 +264,14 @@ export function getFlag(name) {
         '🇮🇷': ['Iran', '伊朗'],
         '🇮🇸': ['Iceland', '冰岛', '冰島'],
         '🇮🇹': ['Italy', '意大利', '義大利', '米兰', 'Nachash'],
+        '🇱🇰': ['Sri Lanka', '斯里兰卡', '斯里蘭卡'],
+        '🇱🇦': ['Laos', '老挝', '老撾'],
         '🇱🇹': ['Lithuania', '立陶宛'],
         '🇱🇺': ['Luxembourg', '卢森堡'],
         '🇱🇻': ['Latvia', '拉脱维亚', 'Latvija'],
         '🇲🇦': ['Morocco', '摩洛哥'],
         '🇲🇩': ['Moldova', '摩尔多瓦', '摩爾多瓦'],
+        '🇲🇲': ['Myanmar', '缅甸', '緬甸'],
         '🇳🇬': ['Nigeria', '尼日利亚', '尼日利亞'],
         '🇲🇰': ['Macedonia', '马其顿', '馬其頓'],
         '🇲🇳': ['Mongolia', '蒙古'],
@@ -284,6 +297,7 @@ export function getFlag(name) {
         '🇵🇱': ['Poland', '波兰', '波蘭', '华沙', 'Warsaw'],
         '🇵🇷': ['Puerto Rico', '波多黎各'],
         '🇵🇹': ['Portugal', '葡萄牙'],
+        '🇵🇬': ['Papua New Guinea', '巴布亚新几内亚'],
         '🇵🇾': ['Paraguay', '巴拉圭'],
         '🇷🇴': ['Romania', '罗马尼亚'],
         '🇷🇸': ['Serbia', '塞尔维亚'],

backend/src/utils/gist.js

@@ -118,6 +118,7 @@ export default class Gist {
                 .get('/gists?per_page=100&page=1')
                 .then((response) => {
                     const gists = JSON.parse(response.body);
+                    $.info(`获取到当前 GitHub 用户的 gist: ${gists.length} 个`);
                     for (let g of gists) {
                         if (g.description === this.key) {
                             return g;
@@ -279,7 +280,7 @@ export default class Gist {
                 return Promise.reject(err);
             }
         } else {
-            return Promise.reject('找不到 Sub-Store Gist');
+            return Promise.reject(`找不到 Sub-Store Gist (${this.key})`);
         }
     }
 }

backend/src/utils/index.js

@@ -117,7 +117,42 @@ function numberToString(value) {
         : BigInt(value).toString();
 }
 
+function isValidUUID(uuid) {
+    return (
+        typeof uuid === 'string' &&
+        /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(
+            uuid,
+        )
+    );
+}
+
+function formatDateTime(date, format = 'YYYY-MM-DD_HH-mm-ss') {
+    const d = date instanceof Date ? date : new Date(date);
+
+    if (isNaN(d.getTime())) {
+        return '';
+    }
+
+    const pad = (num) => String(num).padStart(2, '0');
+
+    const replacements = {
+        YYYY: d.getFullYear(),
+        MM: pad(d.getMonth() + 1),
+        DD: pad(d.getDate()),
+        HH: pad(d.getHours()),
+        mm: pad(d.getMinutes()),
+        ss: pad(d.getSeconds()),
+    };
+
+    return format.replace(
+        /YYYY|MM|DD|HH|mm|ss/g,
+        (match) => replacements[match],
+    );
+}
+
 export {
+    formatDateTime,
+    isValidUUID,
     ipAddress,
     isIPv4,
     isIPv6,

backend/src/utils/migration.js

@@ -4,6 +4,8 @@ import {
     SCHEMA_VERSION_KEY,
     ARTIFACTS_KEY,
     RULES_KEY,
+    FILES_KEY,
+    TOKENS_KEY,
 } from '@/constants';
 import $ from '@/core/app';
 
@@ -55,7 +57,17 @@ function doMigrationV2() {
     const newRules = Object.values(rules);
     $.write(newRules, RULES_KEY);
 
-    // 5. delete builtin rules
+    // 5. migrate files
+    const files = $.read(FILES_KEY) || {};
+    const newFiles = Object.values(files);
+    $.write(newFiles, FILES_KEY);
+
+    // 6. migrate tokens
+    const tokens = $.read(TOKENS_KEY) || {};
+    const newTokens = Object.values(tokens);
+    $.write(newTokens, TOKENS_KEY);
+
+    // 7. delete builtin rules
     delete $.cache.builtin;
     $.info('Migration complete!');
 

backend/src/utils/script-resource-cache.js

@@ -24,7 +24,7 @@ class ResourceCache {
         this._cleanup();
     }
 
-    _cleanup() {
+    _cleanup(prefix, expires) {
         // clear obsolete cached resource
         let clear = false;
         Object.entries(this.resourceCache).forEach((entry) => {
@@ -35,7 +35,11 @@ class ResourceCache {
                 $.delete(`#${id}`);
                 clear = true;
             }
-            if (new Date().getTime() - updated.time > this.expires) {
+            if (
+                new Date().getTime() - updated.time >
+                    (expires ?? this.expires) ||
+                (prefix && id.startsWith(prefix))
+            ) {
                 delete this.resourceCache[id];
                 clear = true;
             }
@@ -52,10 +56,15 @@ class ResourceCache {
         $.write(JSON.stringify(this.resourceCache), SCRIPT_RESOURCE_CACHE_KEY);
     }
 
-    get(id) {
+    get(id, expires, remove) {
         const updated = this.resourceCache[id] && this.resourceCache[id].time;
-        if (updated && new Date().getTime() - updated <= this.expires) {
+        if (updated) {
+            if (new Date().getTime() - updated <= (expires ?? this.expires))
                 return this.resourceCache[id].data;
+            if (remove) {
+                delete this.resourceCache[id];
+                this._persist();
+            }
         }
         return null;
     }

backend/src/utils/user-agent.js

@@ -47,7 +47,7 @@ export function getPlatformFromUserAgent({ ua, UA, accept }) {
         return 'Clash';
     } else if (ua.indexOf('v2ray') !== -1) {
         return 'V2Ray';
-    } else if (ua.indexOf('sing-box') !== -1) {
+    } else if (ua.indexOf('sing-box') !== -1 || ua.indexOf('singbox') !== -1) {
         return 'sing-box';
     } else if (accept.indexOf('application/json') === 0) {
         return 'JSON';
@@ -61,31 +61,41 @@ export function getPlatformFromHeaders(headers) {
     return getPlatformFromUserAgent({ ua, UA, accept });
 }
 export function shouldIncludeUnsupportedProxy(platform, ua) {
-    try {
+    // try {
-        const target = getPlatformFromUserAgent({
+    //     const target = getPlatformFromUserAgent({
-            UA: ua,
+    //         UA: ua,
-            ua: ua.toLowerCase(),
+    //         ua: ua.toLowerCase(),
-        });
+    //     });
-        if (!['Stash', 'Egern'].includes(target)) {
+    //     if (!['Stash', 'Egern', 'Loon'].includes(target)) {
-            return false;
+    //         return false;
-        }
+    //     }
-        const version = coerce(ua).version;
+    //     const coerceVersion = coerce(ua);
-        if (
+    //     $.log(JSON.stringify(coerceVersion, null, 2));
-            platform === 'Stash' &&
+    //     const { version } = coerceVersion;
-            target === 'Stash' &&
+    //     if (
-            gte(version, '2.8.0')
+    //         platform === 'Stash' &&
-        ) {
+    //         target === 'Stash' &&
-            return true;
+    //         gte(version, '3.1.0')
-        }
+    //     ) {
-        if (
+    //         return true;
-            platform === 'Egern' &&
+    //     }
-            target === 'Egern' &&
+    //     if (
-            gte(version, '1.29.0')
+    //         platform === 'Egern' &&
-        ) {
+    //         target === 'Egern' &&
-            return true;
+    //         gte(version, '1.29.0')
-        }
+    //     ) {
-    } catch (e) {
+    //         return true;
-        $.error(`获取版本号失败: ${e}`);
+    //     }
-    }
+    //     // Loon 的 UA 不规范, version 取出来是 build
+    //     if (
+    //         platform === 'Loon' &&
+    //         target === 'Loon' &&
+    //         gte(version, '842.0.0')
+    //     ) {
+    //         return true;
+    //     }
+    // } catch (e) {
+    //     $.error(`获取版本号失败: ${e}`);
+    // }
     return false;
 }

backend/src/utils/yaml.js

@@ -34,4 +34,6 @@ export default {
     load,
     safeDump,
     dump,
+    parse: safeLoad,
+    stringify: safeDump,
 };

backend/src/vendor/express.js

@@ -17,7 +17,14 @@ export default function express({ substore: $, port, host }) {
         const express_ = eval(`require("express")`);
         const bodyParser = eval(`require("body-parser")`);
         const app = express_();
-        app.use(bodyParser.json({ verify: rawBodySaver, limit: '1mb' }));
+        const limit = eval('process.env.SUB_STORE_BODY_JSON_LIMIT') || '1mb';
+        $.info(`[BACKEND] body JSON limit: ${limit}`);
+        app.use(
+            bodyParser.json({
+                verify: rawBodySaver,
+                limit,
+            }),
+        );
         app.use(
             bodyParser.urlencoded({ verify: rawBodySaver, extended: true }),
         );
@@ -31,7 +38,7 @@ export default function express({ substore: $, port, host }) {
         app.start = () => {
             const listener = app.listen(port, host, () => {
                 const { address, port } = listener.address();
-                $.info(`[BACKEND] ${address}:${port}`);
+                $.info(`[BACKEND] listening on ${address}:${port}`);
             });
         };
         return app;

backend/src/vendor/open-api.js

@@ -10,6 +10,14 @@ const isEgern = 'object' == typeof egern;
 const isLanceX = 'undefined' != typeof $native;
 const isGUIforCores = typeof $Plugins !== 'undefined';
 
+function isPlainObject(obj) {
+    return (
+        obj !== null &&
+        typeof obj === 'object' &&
+        [null, Object.prototype].includes(Object.getPrototypeOf(obj))
+    );
+}
+
 export class OpenAPI {
     constructor(name = 'untitled', debug = false) {
         this.name = name;
@@ -18,6 +26,10 @@ export class OpenAPI {
         this.http = HTTP();
         this.env = ENV();
 
+        if (isNode) {
+            const dotenv = eval(`require("dotenv")`);
+            dotenv.config();
+        }
         this.node = (() => {
             if (isNode) {
                 const fs = eval("require('fs')");
@@ -58,29 +70,50 @@ export class OpenAPI {
             const basePath =
                 eval('process.env.SUB_STORE_DATA_BASE_PATH') || '.';
             let rootPath = `${basePath}/root.json`;
+            const backupRootPath = `${basePath}/root_${Date.now()}.json`;
 
             this.log(`Root path: ${rootPath}`);
-            if (!this.node.fs.existsSync(rootPath)) {
+            if (this.node.fs.existsSync(rootPath)) {
-                this.node.fs.writeFileSync(rootPath, JSON.stringify({}), {
+                try {
-                    flag: 'wx',
-                });
-                this.root = {};
-            } else {
                     this.root = JSON.parse(
                         this.node.fs.readFileSync(`${rootPath}`),
                     );
+                } catch (e) {
+                    this.node.fs.copyFileSync(rootPath, backupRootPath);
+                    this.error(
+                        `Failed to parse ${rootPath}: ${e.message}. Backup created at ${backupRootPath}`,
+                    );
+                }
+            }
+            if (!isPlainObject(this.root)) {
+                this.node.fs.writeFileSync(rootPath, JSON.stringify({}), {
+                    flag: 'w',
+                });
+                this.root = {};
             }
 
             // create a json file with the given name if not exists
             let fpath = `${basePath}/${this.name}.json`;
+            const backupPath = `${basePath}/${this.name}_${Date.now()}.json`;
+
             this.log(`Data path: ${fpath}`);
-            if (!this.node.fs.existsSync(fpath)) {
+            if (this.node.fs.existsSync(fpath)) {
+                try {
+                    this.cache = JSON.parse(
+                        this.node.fs.readFileSync(`${fpath}`),
+                    );
+                } catch (e) {
+                    this.node.fs.copyFileSync(fpath, backupPath);
+                    this.error(
+                        `Failed to parse ${fpath}: ${e.message}. Backup created at ${backupPath}`,
+                    );
+                }
+            }
+            if (!isPlainObject(this.cache)) {
                 this.node.fs.writeFileSync(fpath, JSON.stringify({}), {
-                    flag: 'wx',
+                    flag: 'w',
                 });
                 this.cache = {};
-            } else {
-                this.cache = JSON.parse(this.node.fs.readFileSync(`${fpath}`));
             }
         }
     }
@@ -337,16 +370,17 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                 opts: options.opts,
             });
         } else if (isLoon || isSurge || isNode) {
-            worker = new Promise((resolve, reject) => {
+            worker = new Promise(async (resolve, reject) => {
-                const request = isNode
-                    ? eval("require('request')")
-                    : $httpClient;
                 const body = options.body;
                 const opts = JSON.parse(JSON.stringify(options));
                 opts.body = body;
-
+                opts.timeout = opts.timeout || 8000;
-                if (!isNode && opts.timeout) {
+                if (opts.timeout) {
                     opts.timeout++;
+                    if (isNaN(opts.timeout)) {
+                        opts.timeout = 8000;
+                    }
+                    if (!isNode) {
                         let unit = 'ms';
                         // 这些客户端单位为 s
                         if (isSurge || isStash || isShadowRocket) {
@@ -356,7 +390,69 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                         // Loon 为 ms
                         // console.log(`[httpClient timeout] ${opts.timeout}${unit}`);
                     }
-                request[method.toLowerCase()](opts, (err, response, body) => {
+                }
+                if (isNode) {
+                    const undici = eval("require('undici')");
+                    const {
+                        ProxyAgent,
+                        EnvHttpProxyAgent,
+                        request,
+                        interceptors,
+                    } = undici;
+                    const agentOpts = {
+                        connect: {
+                            rejectUnauthorized:
+                                opts.strictSSL === false ||
+                                opts.insecure === true
+                                    ? false
+                                    : true,
+                        },
+                        bodyTimeout: opts.timeout,
+                        headersTimeout: opts.timeout,
+                    };
+                    try {
+                        const url = new URL(opts.url);
+                        if (url.username || url.password) {
+                            opts.headers = {
+                                ...(opts.headers || {}),
+                                Authorization: `Basic ${Buffer.from(
+                                    `${url.username || ''}:${
+                                        url.password || ''
+                                    }`,
+                                ).toString('base64')}`,
+                            };
+                        }
+                        const response = await request(opts.url, {
+                            ...opts,
+                            method: method.toUpperCase(),
+                            dispatcher: (opts.proxy
+                                ? new ProxyAgent({
+                                      ...agentOpts,
+                                      uri: opts.proxy,
+                                  })
+                                : new EnvHttpProxyAgent(agentOpts)
+                            ).compose(
+                                interceptors.redirect({
+                                    maxRedirections: 3,
+                                    throwOnMaxRedirects: true,
+                                }),
+                            ),
+                        });
+                        resolve({
+                            statusCode: response.statusCode,
+                            headers: response.headers,
+                            body:
+                                opts.encoding === null
+                                    ? await response.body.arrayBuffer()
+                                    : await response.body.text(),
+                        });
+                    } catch (e) {
+                        reject(e);
+                    }
+                } else {
+                    $httpClient[method.toLowerCase()](
+                        opts,
+                        (err, response, body) => {
                             // if (err) {
                             //     console.log(err);
                             // } else {
@@ -371,11 +467,14 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                             if (err) reject(err);
                             else
                                 resolve({
-                            statusCode: response.status || response.statusCode,
+                                    statusCode:
+                                        response.status || response.statusCode,
                                     headers: response.headers,
                                     body,
                                 });
-                });
+                        },
+                    );
+                }
             });
         } else if (isGUIforCores) {
             worker = new Promise(async (resolve, reject) => {

scripts/demo.js

@@ -13,7 +13,13 @@ function operator(proxies = [], targetPlatform, context) {
   // 5. `_subName` 为单条订阅名, `_subDisplayName` 为单条订阅显示名
   // 6. `_collectionName` 为组合订阅名, `_collectionDisplayName` 为组合订阅显示名
   // 7. `tls-fingerprint` 为 tls 指纹
-  // 8. `underlying-proxy` 为前置代理
+  // 8. `underlying-proxy` 为前置代理, 不同平台会自动转换
+  //    例如 $server['underlying-proxy'] = '名称'
+  //    只给 mihomo 输出的话, `dialer-proxy` 也行
+  //    只给 sing-box 输出的话, `detour` 也行
+  //    只给 Egern 输出的话, `prev_hop` 也行
+  //    只给 Shadowrocket 输出的话, `chain` 也行
+  //    输出到 Clash/Stash 时, 会过滤掉配置了前置代理的节点, 并提示使用对应的功能.
   // 9. `trojan`, `tuic`, `hysteria`, `hysteria2`, `juicity` 会在解析时设置 `tls`: true (会使用 tls 类协议的通用逻辑),  输出时删除
   // 10. `sni` 在某些协议里会自动与 `servername` 转换
   // 11. 读取节点的 ca-str 和 _ca (后端文件路径) 字段, 自动计算 fingerprint (参考 https://t.me/zhetengsha/1512)
@@ -22,8 +28,13 @@ function operator(proxies = [], targetPlatform, context) {
   // 14. `ports` 为端口跳跃, `hop-interval` 变换端口号的时间间隔
   // 15. `ip-version` 设置节点使用 IP 版本，可选：dual，ipv4，ipv6，ipv4-prefer，ipv6-prefer. 会进行内部转换, 若无法匹配则使用原始值
   // 16. `sing-box` 支持使用 `_network` 来设置 `network`, 例如 `tcp`, `udp`
+  // 17. `block-quic` 支持 `auto`, `on`, `off`. 不同的平台不一定都支持, 会自动转换
 
   // require 为 Node.js 的 require, 在 Node.js 运行环境下 可以用来引入模块
+  // 例如在 Node.js 环境下, 将文件内容写入 /tmp/1.txt 文件
+  // const fs = eval(`require("fs")`)
+  // // const path = eval(`require("path")`)
+  // fs.writeFileSync('/tmp/1.txt', $content, "utf8");
 
   // $arguments 为传入的脚本参数
 
@@ -36,8 +47,27 @@ function operator(proxies = [], targetPlatform, context) {
   // 先这样处理 encodeURIComponent('arg1=a&arg2=b')
   // /api/file/foo?$options=arg1%3Da%26arg2%3Db
 
+  // 默认会带上 _req 字段, 结构为
+  // {
+  //     method,
+  //     url,
+  //     path,
+  //     query,
+  //     params,
+  //     headers,
+  //     body,
+  // }
   // console.log($options)
 
+  // 若设置 $options._res.headers
+  // 则会在输出文件时设置响应头, 例如:
+
+  // $options._res = {
+  //   headers: {
+  //     'X-Custom': '1'
+  //   }
+  // }
+
   // targetPlatform 为输出的目标平台
 
   // lodash
@@ -48,8 +78,38 @@ function operator(proxies = [], targetPlatform, context) {
   // scriptResourceCache 缓存
   // 可参考 https://t.me/zhetengsha/1003
   // const cache = scriptResourceCache
-  // cache.set(id, data)
+  // 设置
-  // cache.get(id)
+  // cache.set('a:1', 1)
+  // cache.set('a:2', 2)
+  // 获取
+  // cache.get('a:1')
+  // 支持第二个参数: 自定义过期时间
+  // 支持第三个参数: 是否删除过期项
+  // cache.get('a:2', 1000, true)
+
+  // 清理
+  // cache._cleanup()
+  // 支持第一个参数: 匹配前缀的项也一起删除
+  // 支持第二个参数: 自定义过期时间
+  // cache._cleanup('a:', 1000)
+
+  // 关于缓存时长
+
+  // 拉取 Sub-Store 订阅时, 会自动拉取远程订阅
+
+  // 远程订阅缓存是 1 小时, 缓存的唯一 key 为 url+ user agent. 可通过前端的刷新按钮刷新缓存. 或使用参数 noCache 来禁用缓存. 例: 内部配置订阅链接时使用 http://a.com#noCache, 外部使用 sub-store 链接时使用 https://sub.store/download/1?noCache=true
+
+  // 当使用相关脚本时, 若在对应的脚本中使用参数开启缓存, 可设置持久化缓存 sub-store-csr-expiration-time 的值来自定义默认缓存时长, 默认为 172800000 (48 * 3600 * 1000, 即 48 小时)
+
+  // 🎈Loon 可在插件中设置
+
+  // 其他平台同理, 持久化缓存数据在 JSON 里
+
+  // 当配合脚本使用时, 可以在脚本的前面添加一个脚本操作, 实现保留 1 小时的缓存. 这样比较灵活
+
+  // async function operator() {
+  //     scriptResourceCache._cleanup(undefined, 1 * 3600 * 1000);
+  // }
 
   // ProxyUtils 为节点处理工具
   // 可参考 https://t.me/zhetengsha/1066
@@ -68,8 +128,13 @@ function operator(proxies = [], targetPlatform, context) {
   //     getISO, // 获取 ISO 3166-1 alpha-2 代码
   //     Gist, // Gist 类
   //     download, // 内部的下载方法, 见 backend/src/utils/download.js
+  //     downloadFile, // 下载二进制文件, 见 backend/src/utils/download.js
   //     MMDB, // Node.js 环境 可用于模拟 Surge/Loon 的 $utils.ipasn, $utils.ipaso, $utils.geoip. 具体见 https://t.me/zhetengsha/1269
+  //     isValidUUID, // 辅助判断是否为有效的 UUID
+  //     Buffer, // https://github.com/feross/buffer
+  //     Base64, // https://github.com/dankogai/js-base64
   // }
+  //  为兼容 https://github.com/xishang0128/sparkle 的 JavaScript 覆写, 也可以直接使用 `b64d`(Base64 解码), `b64e`(Base64 编码), `Buffer`, `yaml`(简单兼容了下 `yaml.parse` 和 `yaml.stringify`)
 
   // 如果只是为了快速修改或者筛选 可以参考 脚本操作支持节点快捷脚本 https://t.me/zhetengsha/970 和 脚本筛选支持节点快捷脚本 https://t.me/zhetengsha/1009
   // ⚠️ 注意: 函数式(即本文件这样的 function operator() {}) 和快捷操作(下面使用 $server) 只能二选一