feat: Loon 解析器支持参数 resourceUrlOnly 仅使用远程资源, 忽略 Loon 自身解析数据

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问题，合并后修复了该问题

.gitignore

@@ -1,7 +1,6 @@
 .DS_Store
 # json config
 sub-store.json
-sub-store_*.json
 root.json
 
 # Logs

README.md

@@ -26,14 +26,13 @@ Core functionalities:
 
 ### Supported Input Formats
 
-> ⚠️ Do not use `Shadowrocket` or `NekoBox` to export URI and then import it as input. The URIs exported in this way may not be standard URIs. However, we have already supported some very common non-standard URIs (such as VMess, VLESS).
+> ⚠️ Do not use `Shadowrocket` or `NekoBox` to export URI and then import it as input. The URIs exported in this way may not be standard URIs.
 
 - [x] Proxy URI Scheme(`socks5`, `socks5+tls`, `http`, `https`(it's ok))
 
   example: `socks5+tls://user:pass@ip:port#name`
 
 - [x] URI(AnyTLS, SOCKS, SS, SSR, VMess, VLESS, Trojan, Hysteria, Hysteria 2, TUIC v5, WireGuard)
-  > Please note, HTTP(s) does not have a standard URI format, so it is not supported. Please use other formats.
 - [x] Clash Proxies YAML
 - [x] Clash Proxy JSON(single line)
 - [x] QX (SS, SSR, VMess, Trojan, HTTP, SOCKS5, VLESS)
@@ -42,9 +41,6 @@ Core functionalities:
 - [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, 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
@@ -52,6 +48,7 @@ Deprecated(The frontend doesn't show it, but the backend still supports it, with
 - [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)
@@ -63,10 +60,6 @@ Deprecated(The frontend doesn't show it, but the backend still supports it, with
 - [x] V2Ray
 - [x] V2Ray URI
 
-Deprecated:
-
-- [x] Clash
-
 ## 2. Subscription Formatting
 
 ### Filtering
@@ -99,16 +92,22 @@ Go to `backend` directories, install node dependencies:
 pnpm i
 ```
 
+1. In `backend`, run the backend server on http://localhost:3000
+
+babel(old school)
+
+```
+pnpm start
+```
+
+or
+
+esbuild(experimental)
+
 ```
 SUB_STORE_BACKEND_API_PORT=3000 pnpm run --parallel "/^dev:.*/"
 ```
 
-### Build
-
-```
-pnpm bundle:esbuild
-```
-
 ## LICENSE
 
 This project is under the GPL V3 LICENSE.
@@ -123,9 +122,3 @@ 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.20.2",
+  "version": "2.19.9",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
   "main": "src/main.js",
   "scripts": {
@@ -27,19 +27,17 @@
     "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",
-    "dotenv": "^16.4.7",
     "express": "^4.17.1",
-    "fetch-socks": "^1.3.2",
+    "mime-types": "^2.1.35",
     "http-proxy-middleware": "^3.0.3",
     "ip-address": "^9.0.5",
     "js-base64": "^3.7.2",
-    "json5": "^2.2.3",
     "jsrsasign": "^11.1.0",
     "lodash": "^4.17.21",
-    "mime-types": "^2.1.35",
     "ms": "^2.1.3",
     "nanoid": "^3.3.3",
     "semver": "^7.6.3",

backend/pnpm-lock.yaml

@@ -34,15 +34,9 @@ importers:
       dns-packet:
         specifier: ^5.6.1
         version: 5.6.1
-      dotenv:
-        specifier: ^16.4.7
-        version: 16.5.0
       express:
         specifier: ^4.17.1
         version: 4.21.2
-      fetch-socks:
-        specifier: ^1.3.2
-        version: 1.3.2
       http-proxy-middleware:
         specifier: ^3.0.3
         version: 3.0.3
@@ -52,18 +46,12 @@ importers:
       js-base64:
         specifier: ^3.7.2
         version: 3.7.7
-      json5:
-        specifier: ^2.2.3
-        version: 2.2.3
       jsrsasign:
         specifier: ^11.1.0
         version: 11.1.0
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
-      mime-types:
-        specifier: ^2.1.35
-        version: 2.1.35
       ms:
         specifier: ^2.1.3
         version: 2.1.3
@@ -1667,10 +1655,6 @@ packages:
     resolution: {integrity: sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==}
     engines: {node: '>=0.4', npm: '>=1.2'}
 
-  dotenv@16.5.0:
-    resolution: {integrity: sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==}
-    engines: {node: '>=12'}
-
   dunder-proto@1.0.1:
     resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
     engines: {node: '>= 0.4'}
@@ -1977,9 +1961,6 @@ packages:
   fastq@1.18.0:
     resolution: {integrity: sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==}
 
-  fetch-socks@1.3.2:
-    resolution: {integrity: sha512-vkH5+Zgj2yEbU57Cei0iyLgTZ4OkEKJj56Xu3ViB5dpsl599JgEooQ3x6NVagIFRHWnWJ+7K0MO0aIV1TMgvnw==}
-
   file-entry-cache@6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -3642,10 +3623,6 @@ packages:
     resolution: {integrity: sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==}
     engines: {node: '>=0.10.0'}
 
-  smart-buffer@4.2.0:
-    resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
-    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
-
   snapdragon-node@2.1.1:
     resolution: {integrity: sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==}
     engines: {node: '>=0.10.0'}
@@ -3658,10 +3635,6 @@ packages:
     resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
     engines: {node: '>=0.10.0'}
 
-  socks@2.8.6:
-    resolution: {integrity: sha512-pe4Y2yzru68lXCb38aAqRf5gvN8YdjP1lok5o0J7BOHljkyCGKVz7H3vpVIXKD27rj2giOJ7DwVyk/GWrPHDWA==}
-    engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
-
   source-map-generator@0.8.0:
     resolution: {integrity: sha512-psgxdGMwl5MZM9S3FWee4EgsEaIjahYV5AzGnwUvPhWeITz/j6rKpysQHlQ4USdxvINlb8lKfWGIXwfkrgtqkA==}
     engines: {node: '>= 10'}
@@ -6084,8 +6057,6 @@ snapshots:
 
   domain-browser@1.2.0: {}
 
-  dotenv@16.5.0: {}
-
   dunder-proto@1.0.1:
     dependencies:
       call-bind-apply-helpers: 1.0.1
@@ -6567,11 +6538,6 @@ snapshots:
     dependencies:
       reusify: 1.0.4
 
-  fetch-socks@1.3.2:
-    dependencies:
-      socks: 2.8.6
-      undici: 7.4.0
-
   file-entry-cache@6.0.1:
     dependencies:
       flat-cache: 3.2.0
@@ -8443,8 +8409,6 @@ snapshots:
 
   slash@1.0.0: {}
 
-  smart-buffer@4.2.0: {}
-
   snapdragon-node@2.1.1:
     dependencies:
       define-property: 1.0.0
@@ -8468,11 +8432,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  socks@2.8.6:
-    dependencies:
-      ip-address: 9.0.5
-      smart-buffer: 4.2.0
-
   source-map-generator@0.8.0: {}
 
   source-map-resolve@0.5.3:

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

@@ -1,8 +1,7 @@
-import { Base64 } from 'js-base64';
 import { Buffer } from 'buffer';
 import rs from '@/utils/rs';
 import YAML from '@/utils/yaml';
-import download, { downloadFile } from '@/utils/download';
+import download from '@/utils/download';
 import {
     isIPv4,
     isIPv6,
@@ -25,7 +24,6 @@ import { getFlag, removeFlag, getISO, MMDB } from '@/utils/geo';
 import Gist from '@/utils/gist';
 import { isPresent } from './producers/utils';
 import { doh } from '@/utils/dns';
-import JSON5 from 'json5';
 
 function preprocess(raw) {
     for (const processor of PROXY_PREPROCESSORS) {
@@ -116,7 +114,12 @@ 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) {
@@ -135,17 +138,10 @@ async function processFn(
                         }
                     }
                 }
-                url = `${url.split('#')[0]}${
-                    rawArgs[2]
-                        ? `#${rawArgs[2]}`
-                        : $arguments?.noCache != null ||
-                          $arguments?.insecure != null
-                        ? `#${rawArgs[1]}`
-                        : ''
-                }`;
-                const downloadUrlMatch = url
-                    .split('#')[0]
-                    .match(/^\/api\/(file|module)\/(.+)/);
+                url = `${url.split('#')[0]}${noCache ? '#noCache' : ''}`;
+                const downloadUrlMatch = url.match(
+                    /^\/api\/(file|module)\/(.+)/,
+                );
                 if (downloadUrlMatch) {
                     let type = '';
                     try {
@@ -175,17 +171,6 @@ 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 {
@@ -343,12 +328,8 @@ export const ProxyUtils = {
     MMDB,
     Gist,
     download,
-    downloadFile,
     isValidUUID,
     doh,
-    Buffer,
-    Base64,
-    JSON5,
 };
 
 function tryParse(parser, line) {

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

@@ -12,8 +12,6 @@ import getLoonParser from './peggy/loon';
 import getQXParser from './peggy/qx';
 import getTrojanURIParser from './peggy/trojan-uri';
 import $ from '@/core/app';
-import JSON5 from 'json5';
-import YAML from '@/utils/yaml';
 
 import { Base64 } from 'js-base64';
 
@@ -130,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;
@@ -262,10 +260,6 @@ function URI_SS() {
         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 };
@@ -441,16 +435,7 @@ function URI_VMess() {
                 type: 'vmess',
                 server,
                 port,
-                // 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',
+                cipher: getIfPresent(params.scy, 'auto'),
                 uuid: params.id,
                 alterId: parseInt(
                     getIfPresent(params.aid ?? params.alterId, 0),
@@ -467,12 +452,8 @@ 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) {
-                if (params.sni && params.sni !== '') {
-                    proxy.sni = params.sni;
-                } else if (params.peer && params.peer !== '') {
-                    proxy.sni = params.peer;
-                }
+            if (proxy.tls && params.sni && params.sni !== '') {
+                proxy.sni = params.sni;
             }
             let httpupgrade = false;
             // handle obfs
@@ -484,8 +465,8 @@ function URI_VMess() {
                 ['http'].includes(params.type)
             ) {
                 proxy.network = 'http';
-            } else if (['grpc', 'kcp', 'quic'].includes(params.net)) {
-                proxy.network = params.net;
+            } else if (['grpc'].includes(params.net)) {
+                proxy.network = 'grpc';
             } else if (
                 params.net === 'httpupgrade' ||
                 proxy.network === 'httpupgrade'
@@ -511,11 +492,6 @@ 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中间逗号(,)隔开
@@ -535,28 +511,13 @@ function URI_VMess() {
                     }
                 }
                 // 传输层应该有配置, 暂时不考虑兼容不给配置的节点
-                if (
-                    transportPath ||
-                    transportHost ||
-                    ['kcp', 'quic'].includes(proxy.network)
-                ) {
+                if (transportPath || transportHost) {
                     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),
@@ -572,12 +533,6 @@ 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;
         }
     };
@@ -784,8 +739,6 @@ function URI_AnyTLS() {
                 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;
             }
@@ -1004,9 +957,6 @@ function URI_TUIC() {
                 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;
             }
@@ -1131,21 +1081,15 @@ function URI_Trojan() {
 function Clash_All() {
     const name = 'Clash Parser';
     const test = (line) => {
-        let proxy;
         try {
-            proxy = JSON5.parse(line);
+            JSON.parse(line);
         } catch (e) {
-            proxy = YAML.parse(line);
+            return false;
         }
-        return !!proxy?.type;
+        return true;
     };
     const parse = (line) => {
-        let proxy;
-        try {
-            proxy = JSON5.parse(line);
-        } catch (e) {
-            proxy = YAML.parse(line);
-        }
+        const proxy = JSON.parse(line);
         if (
             ![
                 'anytls',

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/block_quic/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/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/block_quic/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/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_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/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/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_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/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/others)* {
     proxy.type = "vless";
     handleTransport();
 }
-trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/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/others)* {
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/block_quic/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/others)* {
     proxy.type = "hysteria2";
 }
-https = tag equals "https"i address (username password)? (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/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/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/block_quic/others)* {
+http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "http";
 }
-socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/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/others)* {
     proxy.type = "socks5";
 }
 
@@ -175,8 +175,7 @@ shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-s
 shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
 
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }
-tls_name = comma sni:("tls-name") equals host:domain { proxy.sni = host; }
-sni = comma sni:("sni") equals host:domain { proxy.sni = host; }
+tls_host = comma sni:("tls-name"/"sni") equals host:domain { proxy.sni = host; }
 tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-verify"] = flag; }
 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'); }
@@ -193,8 +192,6 @@ 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/block_quic/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/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/block_quic/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/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_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/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/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_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/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/others)* {
     proxy.type = "vless";
     handleTransport();
 }
-trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/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/others)* {
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/block_quic/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/others)* {
     proxy.type = "hysteria2";
 }
-https = tag equals "https"i address (username password)? (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/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/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/block_quic/others)* {
+http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "http";
 }
-socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/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/others)* {
     proxy.type = "socks5";
 }
 
@@ -173,8 +173,7 @@ shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-s
 shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
 
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }
-tls_name = comma sni:("tls-name") equals host:domain { proxy.sni = host; }
-sni = comma sni:("sni") equals host:domain { proxy.sni = host; }
+tls_host = comma sni:("tls-name"/"sni") equals host:domain { proxy.sni = host; }
 tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-verify"] = flag; }
 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'); }
@@ -191,8 +190,6 @@ 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_new/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/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 === false) {
-        proxy.alterId = 1;
-    } else {
+    if (proxy.aead) {
         proxy.alterId = 0;
+    } else {
+        proxy.alterId = proxy.alterId || 0;
     }
     handleObfs();
 }
@@ -145,20 +145,18 @@ port = digits:[0-9]+ {
     }
 }
 
-username = comma "username" equals username:[^,]+ { proxy.username = username.join("").trim(); }
-password = comma "password" equals password:[^,]+ { proxy.password = password.join("").trim(); }
-uuid = comma "password" equals uuid:[^,]+ { proxy.uuid = uuid.join("").trim(); }
+username = comma "username" equals username:[^=,]+ { proxy.username = username.join("").trim(); }
+password = comma "password" equals password:[^=,]+ { proxy.password = password.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"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
+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");
 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_new/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/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 === false) {
-        proxy.alterId = 1;
-    } else {
+    if (proxy.aead) {
         proxy.alterId = 0;
+    } else {
+        proxy.alterId = proxy.alterId || 0;
     }
     handleObfs();
 }
@@ -143,20 +143,18 @@ port = digits:[0-9]+ {
     }
 }
 
-username = comma "username" equals username:[^,]+ { proxy.username = username.join("").trim(); }
-password = comma "password" equals password:[^,]+ { proxy.password = password.join("").trim(); }
-uuid = comma "password" equals uuid:[^,]+ { proxy.uuid = uuid.join("").trim(); }
+username = comma "username" equals username:[^=,]+ { proxy.username = username.join("").trim(); }
+password = comma "password" equals password:[^=,]+ { proxy.password = password.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"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
+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");
 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,11 +55,10 @@ 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 = 1;
+        proxy.alterId = proxy.alterId || 0;
     }
     handleWebsocket();
     handleShadowTLS();
@@ -105,11 +104,11 @@ wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/under
     proxy.type = "wireguard-surge";
     handleShadowTLS();
 }
-hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/sni/tls_verification/passwordk/tls_fingerprint/download_bandwidth/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/port_hopping_interval/others)* {
+hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/sni/fast_open/tfo/tls_verification/passwordk/tls_fingerprint/download_bandwidth/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/port_hopping_interval/others)* {
     proxy.type = "hysteria2";
     handleShadowTLS();
 }
-socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (udp_relay/no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/fast_open/tfo/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (udp_relay/no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/tfo/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "socks5";
     handleShadowTLS();
 }
@@ -121,6 +120,7 @@ socks5_tls = tag equals "socks5-tls" address (username password)? (usernamek pas
 direct = tag equals "direct" (udp_relay/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/block_quic/others)* {
     proxy.type = "direct";
 }
+
 address = comma server:server comma port:port {
     proxy.server = server;
     proxy.port = port;
@@ -178,8 +178,8 @@ username = & {
         peg$currPos = end;
         return true;
     }
-} { proxy.username = $.username.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
-password = comma match:[^,]+ { proxy.password = match.join("").replace(/^"(.*)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+} { proxy.username = $.username; }
+password = comma match:[^,]+ { proxy.password = match.join(""); }
 
 tls = comma "tls" equals flag:bool { proxy.tls = flag; }
 sni = comma "sni" equals sni:("off"/domain) { 
@@ -195,7 +195,7 @@ tls_fingerprint = comma "server-cert-fingerprint-sha256" equals tls_fingerprint:
 snell_psk = comma "psk" equals match:[^,]+ { proxy.psk = match.join(""); }
 snell_version = comma "version" equals match:$[0-9]+ { proxy.version = parseInt(match.trim()); }
 
-usernamek = comma "username" equals match:[^,]+ { proxy.username = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+usernamek = comma "username" equals match:[^,]+ { proxy.username = match.join(""); }
 passwordk = comma "password" equals match:[^,]+ { proxy.password = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
 vmess_uuid = comma "username" equals match:[^,]+ { proxy.uuid = match.join(""); }
 vmess_aead = comma "vmess-aead" equals flag:bool { proxy.aead = flag; }
@@ -211,11 +211,11 @@ ws_headers = comma "ws-headers" equals headers:$[^,]+ {
     const result = {};
     pairs.forEach(pair => {
         const [key, value] = pair.trim().split(":");
-        result[key.trim()] = value.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1');
+        result[key.trim()] = value.trim();
     })
     obfs["ws-headers"] = result;
 }
-ws_path = comma "ws-path" equals path:uri { obfs.path = path.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+ws_path = comma "ws-path" equals path:uri { obfs.path = path; }
 
 obfs = comma "obfs" equals type:("http"/"tls") { obfs.type = type; }
 obfs_host = comma "obfs-host" equals host:domain { obfs.host = host; };

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

@@ -53,11 +53,10 @@ 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 = 1;
+        proxy.alterId = proxy.alterId || 0;
     }
     handleWebsocket();
     handleShadowTLS();
@@ -176,8 +175,8 @@ username = & {
         peg$currPos = end;
         return true;
     }
-} { proxy.username = $.username.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
-password = comma match:[^,]+ { proxy.password = match.join("").replace(/^"(.*)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+} { proxy.username = $.username; }
+password = comma match:[^,]+ { proxy.password = match.join(""); }
 
 tls = comma "tls" equals flag:bool { proxy.tls = flag; }
 sni = comma "sni" equals sni:("off"/domain) { 
@@ -193,7 +192,7 @@ tls_fingerprint = comma "server-cert-fingerprint-sha256" equals tls_fingerprint:
 snell_psk = comma "psk" equals match:[^,]+ { proxy.psk = match.join(""); }
 snell_version = comma "version" equals match:$[0-9]+ { proxy.version = parseInt(match.trim()); }
 
-usernamek = comma "username" equals match:[^,]+ { proxy.username = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+usernamek = comma "username" equals match:[^,]+ { proxy.username = match.join(""); }
 passwordk = comma "password" equals match:[^,]+ { proxy.password = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
 vmess_uuid = comma "username" equals match:[^,]+ { proxy.uuid = match.join(""); }
 vmess_aead = comma "vmess-aead" equals flag:bool { proxy.aead = flag; }
@@ -209,11 +208,11 @@ ws_headers = comma "ws-headers" equals headers:$[^,]+ {
     const result = {};
     pairs.forEach(pair => {
         const [key, value] = pair.trim().split(":");
-        result[key.trim()] = value.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1');
+        result[key.trim()] = value.trim();
     })
     obfs["ws-headers"] = result;
 }
-ws_path = comma "ws-path" equals path:uri { obfs.path = path.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+ws_path = comma "ws-path" equals path:uri { obfs.path = path; }
 
 obfs = comma "obfs" equals type:("http"/"tls") { obfs.type = type; }
 obfs_host = comma "obfs-host" equals host:domain { obfs.host = host; };

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

@@ -50,26 +50,6 @@ 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) {
@@ -183,11 +163,4 @@ function FullConfig() {
     return { name, test, parse };
 }
 
-export default [
-    HTML(),
-    Clash(),
-    Base64Encoded(),
-    SSD(),
-    FullConfig(),
-    fallbackBase64Encoded(),
-];
+export default [HTML(), Clash(), Base64Encoded(), SSD(), FullConfig()];

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

@@ -284,15 +284,7 @@ function SortOperator(order = 'asc') {
 }
 
 // sort by regex
-function RegexSortOperator(input) {
-    const order = input.order || 'asc';
-    let expressions = input.expressions;
-    if (Array.isArray(input)) {
-        expressions = input;
-    }
-    if (!Array.isArray(expressions)) {
-        expressions = [];
-    }
+function RegexSortOperator(expressions) {
     return {
         name: 'Regex Sort Operator',
         func: (proxies) => {
@@ -303,13 +295,8 @@ function RegexSortOperator(input) {
                 if (oA && !oB) return -1;
                 if (oB && !oA) return 1;
                 if (oA && oB) return oA < oB ? -1 : 1;
-                if (order === 'original') {
-                    return 0;
-                } else if (order === 'desc') {
-                    return a.name < b.name ? 1 : -1;
-                } else {
-                    return a.name < b.name ? -1 : 1;
-                }
+                if ((!oA && !oB) || (oA && oB && oA === oB))
+                    return a.name < b.name ? -1 : 1; // fallback to normal sort
             });
         },
     };
@@ -623,11 +610,9 @@ const DOMAIN_RESOLVERS = {
         const cached = resourceCache.get(id);
         if (!noCache && cached) return cached;
         const resp = await $.http.get({
-            url: `http://223.6.6.6/resolve?edns_client_subnet=${edns}/${
-                isIPv4(edns) ? 24 : 56
-            }&name=${encodeURIComponent(domain)}&type=${
-                type === 'IPv6' ? 'AAAA' : 'A'
-            }&short=1`,
+            url: `http://223.6.6.6/resolve?edns_client_subnet=${edns}/24&name=${encodeURIComponent(
+                domain,
+            )}&type=${type === 'IPv6' ? 'AAAA' : 'A'}&short=1`,
             headers: {
                 accept: 'application/dns-json',
             },
@@ -1143,10 +1128,6 @@ function createDynamicFunction(name, script, $arguments, $options) {
             '$httpClient',
             '$notification',
             'ProxyUtils',
-            'yaml',
-            'Buffer',
-            'b64d',
-            'b64e',
             'scriptResourceCache',
             'flowUtils',
             'produceArtifact',
@@ -1164,10 +1145,6 @@ 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,
@@ -1180,10 +1157,6 @@ function createDynamicFunction(name, script, $arguments, $options) {
             '$substore',
             'lodash',
             'ProxyUtils',
-            'yaml',
-            'Buffer',
-            'b64d',
-            'b64e',
             'scriptResourceCache',
             'flowUtils',
             'produceArtifact',
@@ -1195,10 +1168,6 @@ 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,5 +1,4 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
-import $ from '@/core/app';
 
 export default function Clash_Producer() {
     const type = 'ALL';
@@ -41,17 +40,12 @@ export default function Clash_Producer() {
                             'chacha20-ietf-poly1305',
                             'xchacha20-ietf-poly1305',
                         ].includes(proxy.cipher)) ||
-                    (proxy.type === 'snell' && proxy.version >= 4) ||
+                    (proxy.type === 'snell' && String(proxy.version) === '4') ||
                     (proxy.type === 'vless' &&
                         (typeof proxy.flow !== 'undefined' ||
                             proxy['reality-opts']))
                 ) {
                     return false;
-                } else if (proxy['underlying-proxy'] || proxy['dialer-proxy']) {
-                    $.error(
-                        `Clash 不支持前置代理字段. 已过滤节点 ${proxy.name}`,
-                    );
-                    return false;
                 }
                 return true;
             })
@@ -134,18 +128,6 @@ export default function Clash_Producer() {
                         proxy['h2-opts'].headers.host = [host];
                     }
                 }
-                if (proxy.network === 'ws') {
-                    const wsPath = proxy['ws-opts']?.path;
-                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
-                    // eslint-disable-next-line no-unused-vars
-                    const [_, path = '', ed = ''] = reg.exec(wsPath);
-                    proxy['ws-opts'].path = path;
-                    if (ed !== '') {
-                        proxy['ws-opts']['early-data-header-name'] =
-                            'Sec-WebSocket-Protocol';
-                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
-                    }
-                }
                 if (proxy['plugin-opts']?.tls) {
                     if (isPresent(proxy, 'skip-cert-verify')) {
                         proxy['plugin-opts']['skip-cert-verify'] =
@@ -170,6 +152,11 @@ 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

@@ -1,20 +1,12 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
 
-const ipVersions = {
-    dual: 'dual',
-    'v4-only': 'ipv4',
-    'v6-only': 'ipv6',
-    'prefer-v4': 'ipv4-prefer',
-    'prefer-v6': 'ipv6-prefer',
-};
-
 export default function ClashMeta_Producer() {
     const type = 'ALL';
     const produce = (proxies, type, opts = {}) => {
         const list = proxies
             .filter((proxy) => {
                 if (opts['include-unsupported-proxy']) return true;
-                if (proxy.type === 'snell' && proxy.version >= 4) {
+                if (proxy.type === 'snell' && String(proxy.version) === '4') {
                     return false;
                 } else if (['juicity'].includes(proxy.type)) {
                     return false;
@@ -198,18 +190,6 @@ export default function ClashMeta_Producer() {
                         proxy['h2-opts'].headers.host = [host];
                     }
                 }
-                if (proxy.network === 'ws') {
-                    const wsPath = proxy['ws-opts']?.path;
-                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
-                    // eslint-disable-next-line no-unused-vars
-                    const [_, path = '', ed = ''] = reg.exec(wsPath);
-                    proxy['ws-opts'].path = path;
-                    if (ed !== '') {
-                        proxy['ws-opts']['early-data-header-name'] =
-                            'Sec-WebSocket-Protocol';
-                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
-                    }
-                }
 
                 if (proxy['plugin-opts']?.tls) {
                     if (isPresent(proxy, 'skip-cert-verify')) {
@@ -262,11 +242,6 @@ export default function ClashMeta_Producer() {
                     delete proxy[`${proxy.network}-opts`]['_grpc-type'];
                     delete proxy[`${proxy.network}-opts`]['_grpc-authority'];
                 }
-
-                if (proxy['ip-version']) {
-                    proxy['ip-version'] =
-                        ipVersions[proxy['ip-version']] || proxy['ip-version'];
-                }
                 return proxy;
             });
 

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

@@ -371,37 +371,12 @@ export default function Egern_Producer() {
                         };
                     }
                 }
-                if (
-                    ['ss'].includes(original.type) &&
-                    proxy.shadow_tls &&
-                    original['udp-port'] > 0 &&
-                    original['udp-port'] <= 65535
-                ) {
-                    proxy['udp_port'] = original['udp-port'];
-                }
 
                 delete proxy.subName;
                 delete proxy.collectionName;
                 delete proxy.id;
                 delete proxy.resolved;
                 delete proxy['no-resolve'];
-
-                if (proxy.transport) {
-                    for (const key in proxy.transport) {
-                        if (
-                            Object.keys(proxy.transport[key]).length === 0 ||
-                            Object.values(proxy.transport[key]).every(
-                                (v) => v == null,
-                            )
-                        ) {
-                            delete proxy.transport[key];
-                        }
-                    }
-                    if (Object.keys(proxy.transport).length === 0) {
-                        delete proxy.transport;
-                    }
-                }
-
                 if (type !== 'internal') {
                     for (const key in proxy) {
                         if (proxy[key] == null || /^_/i.test(key)) {

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

@@ -21,7 +21,7 @@ export default function Loon_Producer() {
             case 'trojan':
                 return trojan(proxy);
             case 'vmess':
-                return vmess(proxy, opts['include-unsupported-proxy']);
+                return vmess(proxy);
             case 'vless':
                 return vless(proxy, opts['include-unsupported-proxy']);
             case 'http':
@@ -133,13 +133,6 @@ 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`);
@@ -151,7 +144,7 @@ function shadowsocks(proxy) {
     return result.toString();
 }
 
-function shadowsocksr(proxy) {
+function shadowsocksr(proxy, includeUnsupportedProxy) {
     const result = new Result(proxy);
     result.append(
         `${proxy.name}=shadowsocksr,${proxy.server},${proxy.port},${proxy.cipher},"${proxy.password}"`,
@@ -210,13 +203,6 @@ function shadowsocksr(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`);
@@ -273,13 +259,6 @@ 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`);
@@ -291,8 +270,6 @@ 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}"`,
@@ -340,32 +317,20 @@ 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(
-            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-            'tls-fingerprint',
-        );
-        result.appendIfPresent(
-            `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
-            'tls-pubkey-sha256',
-        );
-    }
+    // sni
+    result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
+    result.appendIfPresent(
+        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+        'tls-fingerprint',
+    );
+    result.appendIfPresent(
+        `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
+        'tls-pubkey-sha256',
+    );
 
     // AEAD
     if (isPresent(proxy, 'aead')) {
-        result.append(`,alterId=${proxy.aead ? 0 : 1}`);
+        result.append(`,alterId=0`);
     } else {
         result.append(`,alterId=${proxy.alterId}`);
     }
@@ -373,13 +338,6 @@ 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`);
@@ -389,18 +347,28 @@ function vmess(proxy) {
     return result.toString();
 }
 
-function vless(proxy) {
-    let isXtls = false;
-    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`);
+function vless(proxy, includeUnsupportedProxy) {
+    if (
+        !includeUnsupportedProxy &&
+        (typeof proxy.flow !== 'undefined' || proxy['reality-opts'])
+    ) {
+        throw new Error(`VLESS XTLS/REALITY is not supported`);
+    }
+    let isReality = false;
+    if (includeUnsupportedProxy) {
+        if (
+            proxy['reality-opts'] &&
+            ['xtls-rprx-vision'].includes(proxy.flow)
+        ) {
+            isReality = true;
+        } else if (proxy['reality-opts']) {
+            throw new Error(
+                `VLESS REALITY with flow(${proxy.flow}) is not supported`,
+            );
+        } else if (proxy.flow) {
+            throw new Error(`VLESS XTLS is not supported`);
         }
     }
-
     const result = new Result(proxy);
     result.append(
         `${proxy.name}=vless,${proxy.server},${proxy.port},"${proxy.uuid}"`,
@@ -448,10 +416,9 @@ function vless(proxy) {
         'skip-cert-verify',
     );
 
-    if (isXtls) {
-        result.appendIfPresent(`,flow=${proxy.flow}`, 'flow');
-    }
+    // sni
     if (isReality) {
+        result.appendIfPresent(`,flow=${proxy.flow}`, 'flow');
         result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
         result.appendIfPresent(
             `,public-key="${proxy['reality-opts']['public-key']}"`,
@@ -462,28 +429,21 @@ function vless(proxy) {
             'reality-opts.short-id',
         );
     } else {
-        // sni
         result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
-        result.appendIfPresent(
-            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-            'tls-fingerprint',
-        );
-        result.appendIfPresent(
-            `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
-            'tls-pubkey-sha256',
-        );
     }
 
+    result.appendIfPresent(
+        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+        'tls-fingerprint',
+    );
+    result.appendIfPresent(
+        `,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`);
@@ -511,14 +471,6 @@ 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');
 
@@ -545,13 +497,6 @@ 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`);
@@ -626,13 +571,6 @@ 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();
 }
 
@@ -667,13 +605,6 @@ 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,8 +58,6 @@ 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`);
@@ -130,20 +128,6 @@ 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']}`,
@@ -405,8 +389,6 @@ 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,5 +1,4 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
-import $ from '@/core/app';
 
 export default function Shadowrocket_Producer() {
     const type = 'ALL';
@@ -7,9 +6,9 @@ export default function Shadowrocket_Producer() {
         const list = proxies
             .filter((proxy) => {
                 if (opts['include-unsupported-proxy']) return true;
-                if (proxy.type === 'snell' && proxy.version >= 4) {
+                if (proxy.type === 'snell' && String(proxy.version) === '4') {
                     return false;
-                } else if (['mieru'].includes(proxy.type)) {
+                } else if (['mieru', 'anytls'].includes(proxy.type)) {
                     return false;
                 }
                 return true;
@@ -166,18 +165,6 @@ export default function Shadowrocket_Producer() {
                         proxy['h2-opts'].headers.host = [host];
                     }
                 }
-                if (proxy.network === 'ws') {
-                    const wsPath = proxy['ws-opts']?.path;
-                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
-                    // eslint-disable-next-line no-unused-vars
-                    const [_, path = '', ed = ''] = reg.exec(wsPath);
-                    proxy['ws-opts'].path = path;
-                    if (ed !== '') {
-                        proxy['ws-opts']['early-data-header-name'] =
-                            'Sec-WebSocket-Protocol';
-                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
-                    }
-                }
                 if (proxy['plugin-opts']?.tls) {
                     if (isPresent(proxy, 'skip-cert-verify')) {
                         proxy['plugin-opts']['skip-cert-verify'] =

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

@@ -2,26 +2,6 @@ import ClashMeta_Producer from './clashmeta';
 import $ from '@/core/app';
 import { isIPv4, isIPv6 } from '@/utils';
 
-const ipVersions = {
-    ipv4: 'ipv4_only',
-    ipv6: 'ipv6_only',
-    'v4-only': 'ipv4_only',
-    'v6-only': 'ipv6_only',
-    'ipv4-prefer': 'prefer_ipv4',
-    'ipv6-prefer': 'prefer_ipv6',
-    'prefer-v4': 'prefer_ipv4',
-    'prefer-v6': 'prefer_ipv6',
-};
-
-const ipVersionParser = (proxy, parsedProxy) => {
-    const strategy = ipVersions[proxy['ip-version']];
-    if (proxy._dns_server && strategy) {
-        parsedProxy.domain_resolver = {
-            server: proxy._dns_server,
-            strategy,
-        };
-    }
-};
 const detourParser = (proxy, parsedProxy) => {
     parsedProxy.detour = proxy['dialer-proxy'] || proxy.detour;
 };
@@ -51,34 +31,12 @@ 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) => {
     const transport = { type: 'ws', headers: {} };
     if (proxy['ws-opts']) {
-        const {
-            path: wsPath = '',
-            headers: wsHeaders = {},
-            'max-early-data': max_early_data,
-            'early-data-header-name': early_data_header_name,
-        } = proxy['ws-opts'];
-        transport.early_data_header_name = early_data_header_name;
-        transport.max_early_data = parseInt(max_early_data, 10);
+        const { path: wsPath = '', headers: wsHeaders = {} } = proxy['ws-opts'];
         if (wsPath !== '') transport.path = `${wsPath}`;
         if (Object.keys(wsHeaders).length > 0) {
             const headers = {};
@@ -181,7 +139,7 @@ const h1Parser = (proxy, parsedProxy) => {
             host = `${host}`.split(',').map((i) => i.trim());
         if (host.length > 0) transport.host = host;
     }
-    // if (!transport.host) return;
+    if (!transport.host) return;
     if (proxy['http-path'] && proxy['http-path'] !== '') {
         const path = proxy['http-path'];
         if (Array.isArray(path)) {
@@ -190,7 +148,7 @@ const h1Parser = (proxy, parsedProxy) => {
     }
     if (parsedProxy.tls.insecure)
         parsedProxy.tls.server_name = transport.host[0];
-    if (transport.host?.length === 1) transport.host = transport.host[0];
+    if (transport.host.length === 1) transport.host = transport.host[0];
     for (const key of Object.keys(transport.headers)) {
         const value = transport.headers[key];
         if (value.length === 1) transport.headers[key] = value[0];
@@ -305,7 +263,6 @@ const sshParser = (proxy = {}) => {
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     tfoParser(proxy, parsedProxy);
     detourParser(proxy, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
 
@@ -333,7 +290,6 @@ const httpParser = (proxy = {}) => {
     tfoParser(proxy, parsedProxy);
     detourParser(proxy, parsedProxy);
     tlsParser(proxy, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
 
@@ -356,7 +312,6 @@ const socks5Parser = (proxy = {}) => {
     networkParser(proxy, parsedProxy);
     tfoParser(proxy, parsedProxy);
     detourParser(proxy, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
 
@@ -368,17 +323,6 @@ const shadowTLSParser = (proxy = {}) => {
         password: proxy.password,
         detour: `${proxy.name}_shadowtls`,
     };
-    if (proxy.uot) ssPart.udp_over_tcp = true;
-    if (proxy['udp-over-tcp']) {
-        ssPart.udp_over_tcp = {
-            enabled: true,
-            version:
-                !proxy['udp-over-tcp-version'] ||
-                proxy['udp-over-tcp-version'] === 1
-                    ? 1
-                    : 2,
-        };
-    }
     const stPart = {
         tag: `${proxy.name}_shadowtls`,
         type: 'shadowtls',
@@ -401,7 +345,6 @@ const shadowTLSParser = (proxy = {}) => {
     tfoParser(proxy, stPart);
     detourParser(proxy, stPart);
     smuxParser(proxy.smux, ssPart);
-    ipVersionParser(proxy, stPart);
     return { type: 'ss-with-st', ssPart, stPart };
 };
 const ssParser = (proxy = {}) => {
@@ -416,22 +359,12 @@ 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 = {
-            enabled: true,
-            version:
-                !proxy['udp-over-tcp-version'] ||
-                proxy['udp-over-tcp-version'] === 1
-                    ? 1
-                    : 2,
-        };
-    }
+    if (proxy['udp-over-tcp']) parsedProxy.udp_over_tcp = true;
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     networkParser(proxy, parsedProxy);
     tfoParser(proxy, parsedProxy);
     detourParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     if (proxy.plugin) {
         const optArr = [];
         if (proxy.plugin === 'obfs') {
@@ -510,7 +443,6 @@ const ssrParser = (proxy = {}) => {
     tfoParser(proxy, parsedProxy);
     detourParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
 
@@ -549,7 +481,6 @@ const vmessParser = (proxy = {}) => {
     detourParser(proxy, parsedProxy);
     tlsParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
 
@@ -564,20 +495,15 @@ 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 (['xtls-rprx-vision', ''].includes(proxy.flow)) parsedProxy.flow = proxy.flow;
-    if (proxy.flow != null) parsedProxy.flow = proxy.flow;
+    if (proxy.flow === 'xtls-rprx-vision') parsedProxy.flow = proxy.flow;
     if (proxy.network === 'ws') wsParser(proxy, parsedProxy);
-    if (proxy.network === 'h2') h2Parser(proxy, parsedProxy);
-    if (proxy.network === 'http') h1Parser(proxy, parsedProxy);
     if (proxy.network === 'grpc') grpcParser(proxy, parsedProxy);
     networkParser(proxy, parsedProxy);
     tfoParser(proxy, parsedProxy);
     detourParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
     tlsParser(proxy, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
 const trojanParser = (proxy = {}) => {
@@ -599,7 +525,6 @@ const trojanParser = (proxy = {}) => {
     detourParser(proxy, parsedProxy);
     tlsParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
 const hysteriaParser = (proxy = {}) => {
@@ -618,13 +543,12 @@ 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$');
-    // sing-box 跟文档不一致, 但是懒得全转, 只处理最常见的 Mbps
-    if (reg.test(`${proxy.up}`) && !`${proxy.up}`.endsWith('Mbps')) {
+    if (reg.test(`${proxy.up}`)) {
         parsedProxy.up = `${proxy.up}`;
     } else {
         parsedProxy.up_mbps = parseInt(`${proxy.up}`, 10);
     }
-    if (reg.test(`${proxy.down}`) && !`${proxy.down}`.endsWith('Mbps')) {
+    if (reg.test(`${proxy.down}`)) {
         parsedProxy.down = `${proxy.down}`;
     } else {
         parsedProxy.down_mbps = parseInt(`${proxy.down}`, 10);
@@ -649,10 +573,9 @@ const hysteriaParser = (proxy = {}) => {
     detourParser(proxy, parsedProxy);
     tfoParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
-const hysteria2Parser = (proxy = {}) => {
+const hysteria2Parser = (proxy = {}, includeUnsupportedProxy) => {
     const parsedProxy = {
         tag: proxy.name,
         type: 'hysteria2',
@@ -683,7 +606,6 @@ const hysteria2Parser = (proxy = {}) => {
     tfoParser(proxy, parsedProxy);
     detourParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
 const tuic5Parser = (proxy = {}) => {
@@ -715,7 +637,6 @@ const tuic5Parser = (proxy = {}) => {
     detourParser(proxy, parsedProxy);
     tlsParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
 const anytlsParser = (proxy = {}) => {
@@ -731,14 +652,8 @@ const anytlsParser = (proxy = {}) => {
         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`;
-    if (/^\d+$/.test(proxy['min-idle-session']))
-        parsedProxy.min_idle_session = parseInt(
-            `${proxy['min-idle-session']}`,
-            10,
-        );
     detourParser(proxy, parsedProxy);
     tlsParser(proxy, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
 
@@ -796,7 +711,6 @@ const wireguardParser = (proxy = {}) => {
     tfoParser(proxy, parsedProxy);
     detourParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
 

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

@@ -1,5 +1,4 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
-import $ from '@/core/app';
 
 export default function Stash_Producer() {
     const type = 'ALL';
@@ -40,20 +39,21 @@ export default function Stash_Producer() {
                             'xchacha20',
                             'chacha20-ietf-poly1305',
                             'xchacha20-ietf-poly1305',
-                            '2022-blake3-aes-128-gcm',
-                            '2022-blake3-aes-256-gcm',
+                            ...(opts['include-unsupported-proxy']
+                                ? [
+                                      '2022-blake3-aes-128-gcm',
+                                      '2022-blake3-aes-256-gcm',
+                                  ]
+                                : []),
                         ].includes(proxy.cipher)) ||
-                    (proxy.type === 'snell' && proxy.version >= 4) ||
-                    (proxy.type === 'vless' &&
-                        proxy['reality-opts'] &&
-                        !['xtls-rprx-vision'].includes(proxy.flow))
+                    (proxy.type === 'snell' && String(proxy.version) === '4') ||
+                    (opts['include-unsupported-proxy']
+                        ? proxy.type === 'vless' &&
+                          proxy['reality-opts'] &&
+                          !['xtls-rprx-vision'].includes(proxy.flow)
+                        : proxy.type === 'vless' && proxy['reality-opts'])
                 ) {
                     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;
             })
@@ -238,18 +238,6 @@ export default function Stash_Producer() {
                         proxy['h2-opts'].headers.host = [host];
                     }
                 }
-                if (proxy.network === 'ws') {
-                    const wsPath = proxy['ws-opts']?.path;
-                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
-                    // eslint-disable-next-line no-unused-vars
-                    const [_, path = '', ed = ''] = reg.exec(wsPath);
-                    proxy['ws-opts'].path = path;
-                    if (ed !== '') {
-                        proxy['ws-opts']['early-data-header-name'] =
-                            'Sec-WebSocket-Protocol';
-                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
-                    }
-                }
                 if (proxy['plugin-opts']?.tls) {
                     if (isPresent(proxy, 'skip-cert-verify')) {
                         proxy['plugin-opts']['skip-cert-verify'] =
@@ -273,6 +261,11 @@ 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

@@ -370,9 +370,9 @@ function vmess(proxy, includeUnsupportedProxy) {
 function ssh(proxy) {
     const result = new Result(proxy);
     result.append(`${proxy.name}=ssh,${proxy.server},${proxy.port}`);
-    result.appendIfPresent(`,username="${proxy.username}"`, 'username');
+    result.appendIfPresent(`,${proxy.username}`, 'username');
     // 所有的类似的字段都有双引号的问题 暂不处理
-    result.appendIfPresent(`,password="${proxy.password}"`, 'password');
+    result.appendIfPresent(`,"${proxy.password}"`, 'password');
 
     // https://manual.nssurge.com/policy/ssh.html
     // 需配合 Keystore
@@ -439,8 +439,8 @@ function http(proxy) {
     const result = new Result(proxy);
     const type = proxy.tls ? 'https' : 'http';
     result.append(`${proxy.name}=${type},${proxy.server},${proxy.port}`);
-    result.appendIfPresent(`,username="${proxy.username}"`, 'username');
-    result.appendIfPresent(`,password="${proxy.password}"`, 'password');
+    result.appendIfPresent(`,${proxy.username}`, 'username');
+    result.appendIfPresent(`,"${proxy.password}"`, 'password');
 
     const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
     result.appendIfPresent(`,ip-version=${ip_version}`, 'ip-version');
@@ -565,8 +565,8 @@ function socks5(proxy) {
     const result = new Result(proxy);
     const type = proxy.tls ? 'socks5-tls' : 'socks5';
     result.append(`${proxy.name}=${type},${proxy.server},${proxy.port}`);
-    result.appendIfPresent(`,username="${proxy.username}"`, 'username');
-    result.appendIfPresent(`,password="${proxy.password}"`, 'password');
+    result.appendIfPresent(`,${proxy.username}`, 'username');
+    result.appendIfPresent(`,"${proxy.password}"`, 'password');
 
     const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
     result.appendIfPresent(`,ip-version=${ip_version}`, 'ip-version');

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) {
+            if (proxy[key] == null || /^_/i.test(key)) {
                 delete proxy[key];
             }
         }
@@ -33,9 +33,7 @@ export default function URI_Producer() {
         switch (proxy.type) {
             case 'socks5':
                 result = `socks://${encodeURIComponent(
-                    Base64.encode(
-                        `${proxy.username ?? ''}:${proxy.password ?? ''}`,
-                    ),
+                    Base64.encode(`${proxy.username}:${proxy.password}`),
                 )}@${proxy.server}:${proxy.port}#${proxy.name}`;
                 break;
             case 'ss':
@@ -119,17 +117,12 @@ export default function URI_Producer() {
                     v: '2',
                     ps: proxy.name,
                     add: proxy.server,
-                    port: `${proxy.port}`,
+                    port: proxy.port,
                     id: proxy.uuid,
-                    aid: `${proxy.alterId || 0}`,
-                    scy: proxy.cipher,
-                    net,
                     type,
+                    aid: proxy.alterId || 0,
+                    net,
                     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;
@@ -140,7 +133,16 @@ 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`]?.[
@@ -152,31 +154,6 @@ 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));
@@ -501,7 +478,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] && !/^_/i.test(key)) {
+                        } else if (proxy[key]) {
                             hysteriaParams.push(
                                 `${i}=${encodeURIComponent(proxy[key])}`,
                             );
@@ -558,13 +535,7 @@ export default function URI_Producer() {
                                 proxy[key]
                             ) {
                                 tuicParams.push(`${i.replace(/-/g, '_')}=1`);
-                            } else if (
-                                ['congestion-controller'].includes(key)
-                            ) {
-                                tuicParams.push(
-                                    `congestion_control=${proxy[key]}`,
-                                );
-                            } else if (proxy[key] && !/^_/i.test(key)) {
+                            } else if (proxy[key]) {
                                 tuicParams.push(
                                     `${i.replace(
                                         /-/g,
@@ -612,11 +583,7 @@ export default function URI_Producer() {
                             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)) {
+                        } else if (proxy[key]) {
                             anytlsParams.push(
                                 `${i.replace(/-/g, '_')}=${encodeURIComponent(
                                     proxy[key],
@@ -653,7 +620,7 @@ export default function URI_Producer() {
                             if (proxy[key]) {
                                 wireguardParams.push(`${key}=1`);
                             }
-                        } else if (proxy[key] && !/^_/i.test(key)) {
+                        } else if (proxy[key]) {
                             wireguardParams.push(
                                 `${key}=${encodeURIComponent(proxy[key])}`,
                             );

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

@@ -44,7 +44,7 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
                 let proxies = ProxyUtils.parse(resource);
                 result = ProxyUtils.produce(proxies, 'Loon', undefined, {
                     'include-unsupported-proxy':
-                        arg?.includeUnsupportedProxy || build >= 842,
+                        arg?.includeUnsupportedProxy || build >= 838,
                 });
             } catch (e) {
                 console.log('解析器: 使用 resource 出现错误');
@@ -67,7 +67,7 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
                 let proxies = ProxyUtils.parse(raw);
                 result = ProxyUtils.produce(proxies, 'Loon', undefined, {
                     'include-unsupported-proxy':
-                        arg?.includeUnsupportedProxy || build >= 842,
+                        arg?.includeUnsupportedProxy || build >= 838,
                 });
             } catch (e) {
                 console.log(e.message ?? e);

backend/src/restful/artifacts.js

@@ -112,6 +112,7 @@ function replaceArtifact(req, res) {
 
 async function getArtifact(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     const allArtifacts = $.read(ARTIFACTS_KEY);
     const artifact = findByName(allArtifacts, name);
 
@@ -162,6 +163,7 @@ function createArtifact(req, res) {
 function updateArtifact(req, res) {
     const allArtifacts = $.read(ARTIFACTS_KEY);
     let oldName = req.params.name;
+    oldName = decodeURIComponent(oldName);
     const artifact = findByName(allArtifacts, oldName);
     if (artifact) {
         $.info(`正在更新远程配置：${artifact.name}`);
@@ -195,6 +197,7 @@ function updateArtifact(req, res) {
 
 async function deleteArtifact(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     $.info(`正在删除远程配置：${name}`);
     const allArtifacts = $.read(ARTIFACTS_KEY);
     try {

backend/src/restful/collections.js

@@ -52,6 +52,7 @@ function createCollection(req, res) {
 function getCollection(req, res) {
     let { name } = req.params;
     let { raw } = req.query;
+    name = decodeURIComponent(name);
     const allCols = $.read(COLLECTIONS_KEY);
     const collection = findByName(allCols, name);
     if (collection) {
@@ -83,6 +84,7 @@ function getCollection(req, res) {
 
 function updateCollection(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     let collection = req.body;
     const allCols = $.read(COLLECTIONS_KEY);
     const oldCol = findByName(allCols, name);
@@ -135,6 +137,7 @@ function updateCollection(req, res) {
 
 function deleteCollection(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     $.info(`正在删除组合订阅：${name}`);
     let allCols = $.read(COLLECTIONS_KEY);
     deleteByName(allCols, name);

backend/src/restful/download.js

@@ -88,6 +88,8 @@ export default function register($app) {
 
 async function downloadSubscription(req, res) {
     let { name, nezhaIndex } = req.params;
+    name = decodeURIComponent(name);
+    nezhaIndex = decodeURIComponent(nezhaIndex);
 
     const useMihomoExternal = req.query.target === 'SurgeMac';
 
@@ -109,17 +111,7 @@ async function downloadSubscription(req, res) {
         proxy,
         noCache,
     } = req.query;
-    let $options = {
-        _req: {
-            method: req.method,
-            url: req.url,
-            path: req.path,
-            query: req.query,
-            params: req.params,
-            headers: req.headers,
-            body: req.body,
-        },
-    };
+    let $options = {};
     if (req.query.$options) {
         try {
             // 支持 `#${encodeURIComponent(JSON.stringify({arg1: "1"}))}`
@@ -138,6 +130,7 @@ async function downloadSubscription(req, res) {
         $.info(`传入 $options: ${JSON.stringify($options)}`);
     }
     if (url) {
+        url = decodeURIComponent(url);
         $.info(`指定远程订阅 URL: ${url}`);
         if (!/^https?:\/\//.test(url)) {
             content = url;
@@ -145,25 +138,32 @@ async function downloadSubscription(req, res) {
         }
     }
     if (content) {
+        content = decodeURIComponent(content);
         $.info(`指定本地订阅: ${content}`);
     }
     if (proxy) {
+        proxy = decodeURIComponent(proxy);
         $.info(`指定远程订阅使用代理/策略 proxy: ${proxy}`);
     }
     if (ua) {
+        ua = decodeURIComponent(ua);
         $.info(`指定远程订阅 User-Agent: ${ua}`);
     }
 
     if (mergeSources) {
+        mergeSources = decodeURIComponent(mergeSources);
         $.info(`指定合并来源: ${mergeSources}`);
     }
     if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
+        ignoreFailedRemoteSub = decodeURIComponent(ignoreFailedRemoteSub);
         $.info(`指定忽略失败的远程订阅: ${ignoreFailedRemoteSub}`);
     }
     if (produceType) {
+        produceType = decodeURIComponent(produceType);
         $.info(`指定生产类型: ${produceType}`);
     }
     if (includeUnsupportedProxy) {
+        includeUnsupportedProxy = decodeURIComponent(includeUnsupportedProxy);
         $.info(
             `包含官方/商店版/未续费订阅不支持的协议: ${includeUnsupportedProxy}`,
         );
@@ -249,7 +249,7 @@ async function downloadSubscription(req, res) {
                             }
                         }
                     }
-                    if (!$arguments.noFlow && /^https?/.test(url)) {
+                    if (!$arguments.noFlow) {
                         // forward flow headers
                         flowInfo = await getFlowHeaders(
                             $arguments?.insecure ? `${url}#insecure` : url,
@@ -352,6 +352,8 @@ async function downloadSubscription(req, res) {
 
 async function downloadCollection(req, res) {
     let { name, nezhaIndex } = req.params;
+    name = decodeURIComponent(name);
+    nezhaIndex = decodeURIComponent(nezhaIndex);
 
     const useMihomoExternal = req.query.target === 'SurgeMac';
 
@@ -374,17 +376,7 @@ async function downloadCollection(req, res) {
         noCache,
     } = req.query;
 
-    let $options = {
-        _req: {
-            method: req.method,
-            url: req.url,
-            path: req.path,
-            query: req.query,
-            params: req.params,
-            headers: req.headers,
-            body: req.body,
-        },
-    };
+    let $options = {};
     if (req.query.$options) {
         try {
             // 支持 `#${encodeURIComponent(JSON.stringify({arg1: "1"}))}`
@@ -404,17 +396,21 @@ async function downloadCollection(req, res) {
     }
 
     if (proxy) {
+        proxy = decodeURIComponent(proxy);
         $.info(`指定远程订阅使用代理/策略 proxy: ${proxy}`);
     }
 
     if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
+        ignoreFailedRemoteSub = decodeURIComponent(ignoreFailedRemoteSub);
         $.info(`指定忽略失败的远程订阅: ${ignoreFailedRemoteSub}`);
     }
     if (produceType) {
+        produceType = decodeURIComponent(produceType);
         $.info(`指定生产类型: ${produceType}`);
     }
 
     if (includeUnsupportedProxy) {
+        includeUnsupportedProxy = decodeURIComponent(includeUnsupportedProxy);
         $.info(
             `包含官方/商店版/未续费订阅不支持的协议: ${includeUnsupportedProxy}`,
         );
@@ -490,7 +486,7 @@ async function downloadCollection(req, res) {
                                 }
                             }
                         }
-                        if (!$arguments.noFlow && /^https?:/.test(url)) {
+                        if (!$arguments.noFlow) {
                             subUserInfoOfSub = await getFlowHeaders(
                                 $arguments?.insecure ? `${url}#insecure` : url,
                                 $arguments.flowUserAgent,

backend/src/restful/file.js

@@ -51,8 +51,9 @@ function createFile(req, res) {
 
 async function getFile(req, res) {
     let { name } = req.params;
-    const reqUA = req.headers['user-agent'] || req.headers['User-Agent'];
-    $.info(`正在下载文件：${name}\n请求 User-Agent: ${reqUA}`);
+    name = decodeURIComponent(name);
+
+    $.info(`正在下载文件：${name}`);
     let {
         url,
         subInfoUrl,
@@ -63,19 +64,8 @@ async function getFile(req, res) {
         ignoreFailedRemoteFile,
         proxy,
         noCache,
-        produceType,
     } = req.query;
-    let $options = {
-        _req: {
-            method: req.method,
-            url: req.url,
-            path: req.path,
-            query: req.query,
-            params: req.params,
-            headers: req.headers,
-            body: req.body,
-        },
-    };
+    let $options = {};
     if (req.query.$options) {
         try {
             // 支持 `#${encodeURIComponent(JSON.stringify({arg1: "1"}))}`
@@ -94,35 +84,40 @@ async function getFile(req, res) {
         $.info(`传入 $options: ${JSON.stringify($options)}`);
     }
     if (url) {
+        url = decodeURIComponent(url);
         $.info(`指定远程文件 URL: ${url}`);
     }
     if (proxy) {
+        proxy = decodeURIComponent(proxy);
         $.info(`指定远程订阅使用代理/策略 proxy: ${proxy}`);
     }
     if (ua) {
+        ua = decodeURIComponent(ua);
         $.info(`指定远程文件 User-Agent: ${ua}`);
     }
     if (subInfoUrl) {
+        subInfoUrl = decodeURIComponent(subInfoUrl);
         $.info(`指定获取流量的 subInfoUrl: ${subInfoUrl}`);
     }
     if (subInfoUserAgent) {
+        subInfoUserAgent = decodeURIComponent(subInfoUserAgent);
         $.info(`指定获取流量的 subInfoUserAgent: ${subInfoUserAgent}`);
     }
     if (content) {
+        content = decodeURIComponent(content);
         $.info(`指定本地文件: ${content}`);
     }
     if (mergeSources) {
+        mergeSources = decodeURIComponent(mergeSources);
         $.info(`指定合并来源: ${mergeSources}`);
     }
     if (ignoreFailedRemoteFile != null && ignoreFailedRemoteFile !== '') {
+        ignoreFailedRemoteFile = decodeURIComponent(ignoreFailedRemoteFile);
         $.info(`指定忽略失败的远程文件: ${ignoreFailedRemoteFile}`);
     }
     if (noCache) {
         $.info(`指定不使用缓存: ${noCache}`);
     }
-    if (produceType) {
-        $.info(`指定生产类型: ${produceType}`);
-    }
 
     const allFiles = $.read(FILES_KEY);
     const file = findByName(allFiles, name);
@@ -139,8 +134,6 @@ async function getFile(req, res) {
                 $options,
                 proxy,
                 noCache,
-                produceType,
-                all: true,
             });
 
             try {
@@ -175,15 +168,9 @@ async function getFile(req, res) {
                     )}`,
                 );
             }
-            res.set('Content-Type', 'text/plain; charset=utf-8');
-            if (output?.$options?._res?.headers) {
-                Object.entries(output.$options._res.headers).forEach(
-                    ([key, value]) => {
-                        res.set(key, value);
-                    },
-                );
-            }
-            res.send(output?.$content ?? '');
+            res.set('Content-Type', 'text/plain; charset=utf-8').send(
+                output ?? '',
+            );
         } catch (err) {
             $.notify(
                 `🌍 Sub-Store 下载文件失败`,
@@ -215,6 +202,7 @@ async function getFile(req, res) {
 function getWholeFile(req, res) {
     let { name } = req.params;
     let { raw } = req.query;
+    name = decodeURIComponent(name);
     const allFiles = $.read(FILES_KEY);
     const file = findByName(allFiles, name);
     if (file) {
@@ -246,6 +234,7 @@ function getWholeFile(req, res) {
 
 function updateFile(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     let file = req.body;
     const allFiles = $.read(FILES_KEY);
     const oldFile = findByName(allFiles, name);
@@ -287,6 +276,7 @@ function updateFile(req, res) {
 
 function deleteFile(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     $.info(`正在删除文件：${name}`);
     let allFiles = $.read(FILES_KEY);
     deleteByName(allFiles, name);

backend/src/restful/index.js

@@ -1,9 +1,7 @@
-import { Base64 } from 'js-base64';
-import _ from 'lodash';
 import express from '@/vendor/express';
 import $ from '@/core/app';
 import migrate from '@/utils/migration';
-import download, { downloadFile } from '@/utils/download';
+import download from '@/utils/download';
 import { syncArtifacts, produceArtifact } from '@/restful/sync';
 import { gistBackupAction } from '@/restful/miscs';
 import { TOKENS_KEY } from '@/constants';
@@ -37,7 +35,7 @@ export default function serve() {
         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('/')) {
+            if(!fe_be_path.startsWith('/')){
                 throw new Error(
                     'SUB_STORE_FRONTEND_BACKEND_PATH should start with /',
                 );
@@ -50,20 +48,15 @@ export default function serve() {
             $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/')) {
+                    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') {
+                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;
                     }
@@ -74,14 +67,14 @@ export default function serve() {
                             `/share/${t.type}/${t.name}` === pathname &&
                             (t.exp == null || t.exp > Date.now()),
                     );
-                    if (token) {
+                    if (token){
                         next();
                         return;
                     }
                 }
-                if (be_merge && fe_path && req.path.indexOf('/', 1) == -1) {
-                    if (req.path.indexOf('.') == -1) {
-                        req.url = '/index.html';
+                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")`);
@@ -92,12 +85,12 @@ export default function serve() {
                             if (type) {
                                 res.set('Content-Type', type);
                             }
-                        },
+                        }
                     });
                     staticFileMiddleware(req, res, next);
                     return;
                 }
-                res.status(404).end();
+                res.status(403).end('Forbbiden');
                 return;
             });
         }
@@ -121,11 +114,10 @@ export default function serve() {
     $app.start();
 
     if ($.env.isNode) {
-        // Deprecated: SUB_STORE_BACKEND_CRON, SUB_STORE_CRON
-        const backend_sync_cron = eval(
-            'process.env.SUB_STORE_BACKEND_SYNC_CRON',
-        );
-
+        // Deprecated: SUB_STORE_BACKEND_CRON
+        const backend_sync_cron =
+            eval('process.env.SUB_STORE_BACKEND_SYNC_CRON') ||
+            eval('process.env.SUB_STORE_BACKEND_CRON');
         if (backend_sync_cron) {
             $.info(`[SYNC CRON] ${backend_sync_cron} enabled`);
             const { CronJob } = eval(`require("cron")`);
@@ -148,17 +140,6 @@ export default function serve() {
                 true, // start
                 // 'Asia/Shanghai' // timeZone
             );
-        } else {
-            if (eval('process.env.SUB_STORE_BACKEND_CRON')) {
-                $.error(
-                    `[SYNC CRON] SUB_STORE_BACKEND_CRON 已弃用, 请使用 SUB_STORE_BACKEND_SYNC_CRON`,
-                );
-            }
-            if (eval('process.env.SUB_STORE_CRON')) {
-                $.error(
-                    `[SYNC CRON] SUB_STORE_CRON 已弃用, 请使用 SUB_STORE_BACKEND_SYNC_CRON`,
-                );
-            }
         }
         // 格式: 0 */2 * * *,sub,a;0 */3 * * *,col,b
         // 每 2 小时处理一次单条订阅 a, 每 3 小时处理一次组合订阅 b
@@ -249,64 +230,9 @@ 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');
-        const data_url_post = eval('process.env.SUB_STORE_DATA_URL_POST');
         const fe_be_path = eval('process.env.SUB_STORE_FRONTEND_BACKEND_PATH');
         const fe_port = eval('process.env.SUB_STORE_FRONTEND_PORT') || 3001;
         const fe_host =
@@ -427,39 +353,10 @@ export default function serve() {
         if (data_url) {
             $.info(`[BACKEND] downloading data from ${data_url}`);
             download(data_url)
-                .then(async (content) => {
-                    try {
-                        content = JSON.parse(Base64.decode(content));
-                        if (Object.keys(content.settings).length === 0) {
-                            throw new Error(
-                                '备份文件应该至少包含 settings 字段',
-                            );
-                        }
-                    } catch (err) {
-                        try {
-                            content = JSON.parse(content);
-                            if (Object.keys(content.settings).length === 0) {
-                                throw new Error(
-                                    '备份文件应该至少包含 settings 字段',
-                                );
-                            }
-                        } catch (err) {
-                            $.error(
-                                `Gist 备份文件校验失败, 无法还原\nReason: ${
-                                    err.message ?? err
-                                }`,
-                            );
-                            throw new Error('Gist 备份文件校验失败, 无法还原');
-                        }
-                    }
-                    if (data_url_post) {
-                        $.info('[BACKEND] executing post-processing script');
-                        eval(data_url_post);
-                    }
+                .then((content) => {
+                    $.write(content, '#sub-store');
 
-                    $.write(JSON.stringify(content, null, `  `), '#sub-store');
-
-                    $.cache = content;
+                    $.cache = JSON.parse(content);
                     $.persistCache();
 
                     migrate();

backend/src/restful/miscs.js

@@ -1,5 +1,3 @@
-import { Base64 } from 'js-base64';
-import _ from 'lodash';
 import $ from '@/core/app';
 import { ENV } from '@/vendor/open-api';
 import { failed, success } from '@/restful/response';
@@ -41,47 +39,21 @@ export default function register($app) {
                 );
         })
         .post((req, res) => {
-            let { content } = req.body;
-            try {
-                content = JSON.parse(Base64.decode(content));
-                if (Object.keys(content.settings).length === 0) {
-                    throw new Error('备份文件应该至少包含 settings 字段');
-                }
-            } catch (err) {
-                try {
-                    content = JSON.parse(content);
-                    if (Object.keys(content.settings).length === 0) {
-                        throw new Error('备份文件应该至少包含 settings 字段');
-                    }
-                } catch (err) {
-                    $.error(
-                        `备份文件校验失败, 无法还原\nReason: ${
-                            err.message ?? err
-                        }`,
-                    );
-                    throw new Error('备份文件校验失败, 无法还原');
-                }
-            }
-            $.write(JSON.stringify(content, null, `  `), '#sub-store');
+            const { content } = req.body;
+            $.write(content, '#sub-store');
             if ($.env.isNode) {
-                $.cache = content;
+                $.cache = JSON.parse(content);
                 $.persistCache();
             }
             migrate();
             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();
-        });
-    }
+    // Redirect sub.store to vercel webpage
+    $app.get('/', async (req, res) => {
+        // 302 redirect
+        res.set('location', 'https://sub-store.vercel.app/').status(302).end();
+    });
 
     // handle preflight request for QX
     if (ENV().isQX) {
@@ -99,19 +71,7 @@ function getEnv(req, res) {
     if (req.query.share) {
         env.feature.share = true;
     }
-    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,
-        ),
-    );
+    success(res, env);
 }
 
 async function refresh(_, res) {
@@ -126,7 +86,7 @@ async function refresh(_, res) {
     success(res);
 }
 
-async function gistBackupAction(action, keep, encode) {
+async function gistBackupAction(action) {
     // read token
     const { gistToken, syncPlatform } = $.read(SETTINGS_KEY);
     if (!gistToken) throw new Error('GitHub Token is required for backup!');
@@ -136,9 +96,6 @@ async function gistBackupAction(action, keep, encode) {
         key: GIST_BACKUP_KEY,
         syncPlatform,
     });
-    let currentContent = $.read('#sub-store');
-    currentContent = currentContent ? JSON.parse(currentContent) : {};
-    if ($.env.isNode) currentContent = JSON.parse(JSON.stringify($.cache));
     let content;
     const settings = $.read(SETTINGS_KEY);
     const updated = settings.syncTime;
@@ -146,18 +103,7 @@ async function gistBackupAction(action, keep, encode) {
         case 'upload':
             try {
                 content = $.read('#sub-store');
-                content = content ? JSON.parse(content) : {};
-                if ($.env.isNode) content = JSON.parse(JSON.stringify($.cache));
-                if (encode === 'plaintext') {
-                    content.settings.gistToken =
-                        '恢复后请重新设置 GitHub Token';
-                    content = JSON.stringify(content, null, `  `);
-                } else {
-                    content = Base64.encode(
-                        JSON.stringify(content, null, `  `),
-                    );
-                }
-
+                if ($.env.isNode) content = JSON.stringify($.cache, null, `  `);
                 $.info(`下载备份, 与本地内容对比...`);
                 const onlineContent = await gist.download(
                     GIST_BACKUP_FILE_NAME,
@@ -174,14 +120,7 @@ async function gistBackupAction(action, keep, encode) {
             settings.syncTime = new Date().getTime();
             $.write(settings, SETTINGS_KEY);
             content = $.read('#sub-store');
-            content = content ? JSON.parse(content) : {};
-            if ($.env.isNode) content = JSON.parse(JSON.stringify($.cache));
-            if (encode === 'plaintext') {
-                content.settings.gistToken = '恢复后请重新设置 GitHub Token';
-                content = JSON.stringify(content, null, `  `);
-            } else {
-                content = Base64.encode(JSON.stringify(content, null, `  `));
-            }
+            if ($.env.isNode) content = JSON.stringify($.cache, null, `  `);
             $.info(`上传备份中...`);
             try {
                 await gist.upload({
@@ -199,34 +138,21 @@ async function gistBackupAction(action, keep, encode) {
             $.info(`还原备份中...`);
             content = await gist.download(GIST_BACKUP_FILE_NAME);
             try {
-                content = JSON.parse(Base64.decode(content));
-                if (Object.keys(content.settings).length === 0) {
+                if (Object.keys(JSON.parse(content).settings).length === 0) {
                     throw new Error('备份文件应该至少包含 settings 字段');
                 }
             } catch (err) {
-                try {
-                    content = JSON.parse(content);
-                    if (Object.keys(content.settings).length === 0) {
-                        throw new Error('备份文件应该至少包含 settings 字段');
-                    }
-                } catch (err) {
-                    $.error(
-                        `Gist 备份文件校验失败, 无法还原\nReason: ${
-                            err.message ?? err
-                        }`,
-                    );
-                    throw new Error('Gist 备份文件校验失败, 无法还原');
-                }
-            }
-            if (keep) {
-                $.info(`保留原有设置 ${keep}`);
-                keep.split(',').forEach((path) => {
-                    _.set(content, path, _.get(currentContent, path));
-                });
+                $.error(
+                    `Gist 备份文件校验失败, 无法还原\nReason: ${
+                        err.message ?? err
+                    }`,
+                );
+                throw new Error('Gist 备份文件校验失败, 无法还原');
             }
             // restore settings
-            $.write(JSON.stringify(content, null, `  `), '#sub-store');
+            $.write(content, '#sub-store');
             if ($.env.isNode) {
+                content = JSON.parse(content);
                 $.cache = content;
                 $.persistCache();
             }
@@ -238,7 +164,7 @@ async function gistBackupAction(action, keep, encode) {
     }
 }
 async function gistBackup(req, res) {
-    const { action, keep, encode } = req.query;
+    const { action } = req.query;
     // read token
     const { gistToken } = $.read(SETTINGS_KEY);
     if (!gistToken) {
@@ -251,7 +177,7 @@ async function gistBackup(req, res) {
         );
     } else {
         try {
-            await gistBackupAction(action, keep, encode);
+            await gistBackupAction(action);
             success(res);
         } catch (err) {
             $.error(

backend/src/restful/module.js

@@ -43,6 +43,7 @@ function createModule(req, res) {
 
 function getModule(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     const allModules = $.read(MODULES_KEY);
     const module = findByName(allModules, name);
     if (module) {
@@ -63,6 +64,7 @@ function getModule(req, res) {
 
 function updateModule(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     let module = req.body;
     const allModules = $.read(MODULES_KEY);
     const oldModule = findByName(allModules, name);
@@ -90,6 +92,7 @@ function updateModule(req, res) {
 
 function deleteModule(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     $.info(`正在删除模块：${name}`);
     let allModules = $.read(MODULES_KEY);
     deleteByName(allModules, name);

backend/src/restful/preview.js

@@ -47,22 +47,15 @@ async function previewFile(req, res) {
                         }),
                 );
 
-                if (Object.keys(errors).length > 0) {
-                    if (!file.ignoreFailedRemoteFile) {
-                        throw new Error(
-                            `文件 ${file.name} 的远程文件 ${Object.keys(
-                                errors,
-                            ).join(', ')} 发生错误, 请查看日志`,
-                        );
-                    } else if (file.ignoreFailedRemoteFile === 'enabled') {
-                        $.notify(
-                            `🌍 Sub-Store 预览文件失败`,
-                            `❌ ${file.name}`,
-                            `远程文件 ${Object.keys(errors).join(
-                                ', ',
-                            )} 发生错误, 请查看日志`,
-                        );
-                    }
+                if (
+                    !file.ignoreFailedRemoteFile &&
+                    Object.keys(errors).length > 0
+                ) {
+                    throw new Error(
+                        `文件 ${file.name} 的远程文件 ${Object.keys(
+                            errors,
+                        ).join(', ')} 发生错误, 请查看日志`,
+                    );
                 }
                 if (file.mergeSources === 'localFirst') {
                     content.unshift(file.content);
@@ -143,22 +136,12 @@ async function compareSub(req, res) {
                     }),
             );
 
-            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.ignoreFailedRemoteSub && Object.keys(errors).length > 0) {
+                throw new Error(
+                    `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
+                        ', ',
+                    )} 发生错误, 请查看日志`,
+                );
             }
             if (sub.mergeSources === 'localFirst') {
                 content.unshift(sub.content);
@@ -261,25 +244,15 @@ async function compareCollection(req, res) {
                                     }
                                 }),
                         );
-
-                        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.ignoreFailedRemoteSub &&
+                            Object.keys(errors).length > 0
+                        ) {
+                            throw new Error(
+                                `订阅 ${sub.name} 的远程订阅 ${Object.keys(
+                                    errors,
+                                ).join(', ')} 发生错误, 请查看日志`,
+                            );
                         }
                         if (sub.mergeSources === 'localFirst') {
                             raw.unshift(sub.content);
@@ -311,28 +284,20 @@ async function compareCollection(req, res) {
                     errors[name] = err;
 
                     $.error(
-                        `❌ 处理组合订阅 ${collection.name} 中的子订阅: ${sub.name} 时出现错误：${err}！`,
+                        `❌ 处理组合订阅 ${collection.name} 中的子订阅: ${sub.name}时出现错误：${err}！`,
                     );
                 }
             }),
         );
-
-        if (Object.keys(errors).length > 0) {
-            if (!collection.ignoreFailedRemoteSub) {
-                throw new Error(
-                    `组合订阅 ${collection.name} 的子订阅 ${Object.keys(
-                        errors,
-                    ).join(', ')} 发生错误, 请查看日志`,
-                );
-            } else if (collection.ignoreFailedRemoteSub === 'enabled') {
-                $.notify(
-                    `🌍 Sub-Store 预览组合订阅失败`,
-                    `❌ ${collection.name}`,
-                    `子订阅 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
-                );
-            }
+        if (
+            !collection.ignoreFailedRemoteSub &&
+            Object.keys(errors).length > 0
+        ) {
+            throw new Error(
+                `组合订阅 ${collection.name} 中的子订阅 ${Object.keys(
+                    errors,
+                ).join(', ')} 发生错误, 请查看日志`,
+            );
         }
         // merge proxies with the original order
         const original = Array.prototype.concat.apply(

backend/src/restful/response.js

@@ -12,9 +12,7 @@ export function failed(resp, error, statusCode) {
             code: error.code,
             type: error.type,
             message: error.message,
-            details: resp.req?.route?.path?.startsWith('/share/')
-                ? '详情请查看日志'
-                : error.details,
+            details: error.details,
         },
     });
 }

backend/src/restful/settings.js

@@ -61,7 +61,7 @@ async function updateSettings(req, res) {
 
 export async function updateAvatar() {
     const settings = $.read(SETTINGS_KEY);
-    const { githubUser: username, syncPlatform, githubProxy } = settings;
+    const { githubUser: username, syncPlatform } = settings;
     if (username) {
         if (syncPlatform === 'gitlab') {
             try {
@@ -92,9 +92,7 @@ export async function updateAvatar() {
             try {
                 const data = await $.http
                     .get({
-                        url: `${
-                            githubProxy ? `${githubProxy}/` : ''
-                        }https://api.github.com/users/${encodeURIComponent(
+                        url: `https://api.github.com/users/${encodeURIComponent(
                             username,
                         )}`,
                         headers: {

backend/src/restful/subscriptions.js

@@ -39,8 +39,10 @@ export default function register($app) {
 // subscriptions API
 async function getFlowInfo(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     let { url } = req.query;
     if (url) {
+        url = decodeURIComponent(url);
         $.info(`指定远程订阅 URL: ${url}`);
     }
     const allSubs = $.read(SUBS_KEY);
@@ -138,7 +140,7 @@ async function getFlowInfo(req, res) {
                 }
             }
         }
-        if ($arguments.noFlow || !/^https?/.test(url)) {
+        if ($arguments.noFlow) {
             failed(
                 res,
                 new RequestInvalidError(
@@ -230,7 +232,6 @@ async function getFlowInfo(req, res) {
 
 function createSubscription(req, res) {
     const sub = req.body;
-    delete sub.subscriptions;
     $.info(`正在创建订阅： ${sub.name}`);
     if (/\//.test(sub.name)) {
         failed(
@@ -261,9 +262,9 @@ function createSubscription(req, res) {
 function getSubscription(req, res) {
     let { name } = req.params;
     let { raw } = req.query;
+    name = decodeURIComponent(name);
     const allSubs = $.read(SUBS_KEY);
     const sub = findByName(allSubs, name);
-    delete sub.subscriptions;
     if (sub) {
         if (raw) {
             res.set('content-type', 'application/json')
@@ -293,8 +294,8 @@ function getSubscription(req, res) {
 
 function updateSubscription(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name); // the original name
     let sub = req.body;
-    delete sub.subscriptions;
     const allSubs = $.read(SUBS_KEY);
     const oldSub = findByName(allSubs, name);
     if (oldSub) {
@@ -356,6 +357,7 @@ function updateSubscription(req, res) {
 
 function deleteSubscription(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     $.info(`删除订阅：${name}...`);
     // delete from subscriptions
     let allSubs = $.read(SUBS_KEY);

backend/src/restful/sync.js

@@ -40,7 +40,6 @@ async function produceArtifact({
     $options,
     proxy,
     noCache,
-    all,
 }) {
     platform = platform || 'JSON';
 
@@ -90,23 +89,12 @@ async function produceArtifact({
             if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
                 subIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
             }
-
-            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 (!subIgnoreFailedRemoteSub && Object.keys(errors).length > 0) {
+                throw new Error(
+                    `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
+                        ', ',
+                    )} 发生错误, 请查看日志`,
+                );
             }
             if (mergeSources === 'localFirst') {
                 raw.unshift(content);
@@ -150,23 +138,12 @@ async function produceArtifact({
             if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
                 subIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
             }
-
-            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 (!subIgnoreFailedRemoteSub && Object.keys(errors).length > 0) {
+                throw new Error(
+                    `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
+                        ', ',
+                    )} 发生错误, 请查看日志`,
+                );
             }
             if (sub.mergeSources === 'localFirst') {
                 raw.unshift(sub.content);
@@ -174,9 +151,6 @@ 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))
@@ -290,25 +264,15 @@ async function produceArtifact({
                                     }
                                 }),
                         );
-
-                        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.ignoreFailedRemoteSub &&
+                            Object.keys(errors).length > 0
+                        ) {
+                            throw new Error(
+                                `订阅 ${sub.name} 的远程订阅 ${Object.keys(
+                                    errors,
+                                ).join(', ')} 发生错误, 请查看日志`,
+                            );
                         }
                         if (sub.mergeSources === 'localFirst') {
                             raw.unshift(sub.content);
@@ -363,23 +327,15 @@ async function produceArtifact({
         if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
             collectionIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
         }
-
-        if (Object.keys(errors).length > 0) {
-            if (!collectionIgnoreFailedRemoteSub) {
-                throw new Error(
-                    `组合订阅 ${collection.name} 的子订阅 ${Object.keys(
-                        errors,
-                    ).join(', ')} 发生错误, 请查看日志`,
-                );
-            } else if (collectionIgnoreFailedRemoteSub === 'enabled') {
-                $.notify(
-                    `🌍 Sub-Store 处理组合订阅失败`,
-                    `❌ ${collection.name}`,
-                    `子订阅 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
-                );
-            }
+        if (
+            !collectionIgnoreFailedRemoteSub &&
+            Object.keys(errors).length > 0
+        ) {
+            throw new Error(
+                `组合订阅 ${name} 中的子订阅 ${Object.keys(errors).join(
+                    ', ',
+                )} 发生错误, 请查看日志`,
+            );
         }
 
         // merge proxies with the original order
@@ -549,23 +505,15 @@ async function produceArtifact({
                 ) {
                     fileIgnoreFailedRemoteFile = ignoreFailedRemoteFile;
                 }
-
-                if (Object.keys(errors).length > 0) {
-                    if (!fileIgnoreFailedRemoteFile) {
-                        throw new Error(
-                            `文件 ${file.name} 的远程文件 ${Object.keys(
-                                errors,
-                            ).join(', ')} 发生错误, 请查看日志`,
-                        );
-                    } else if (fileIgnoreFailedRemoteFile === 'enabled') {
-                        $.notify(
-                            `🌍 Sub-Store 处理文件失败`,
-                            `❌ ${file.name}`,
-                            `远程文件 ${Object.keys(errors).join(
-                                ', ',
-                            )} 发生错误, 请查看日志`,
-                        );
-                    }
+                if (
+                    !fileIgnoreFailedRemoteFile &&
+                    Object.keys(errors).length > 0
+                ) {
+                    throw new Error(
+                        `文件 ${file.name} 的远程文件 ${Object.keys(
+                            errors,
+                        ).join(', ')} 发生错误, 请查看日志`,
+                    );
                 }
                 if (file.mergeSources === 'localFirst') {
                     raw.unshift(file.content);
@@ -574,9 +522,6 @@ async function produceArtifact({
                 }
             }
         }
-        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 !== '')
@@ -596,7 +541,7 @@ async function produceArtifact({
                   )
                 : { $content: filesContent, $files: files, $options };
 
-        return (all ? processed : processed?.$content) ?? '';
+        return processed?.$content ?? '';
     }
 }
 
@@ -792,6 +737,7 @@ async function syncAllArtifacts(_, res) {
 
 async function syncArtifact(req, res) {
     let { name } = req.params;
+    name = decodeURIComponent(name);
     $.info(`开始同步远程配置 ${name}...`);
     const allArtifacts = $.read(ARTIFACTS_KEY);
     const artifact = findByName(allArtifacts, name);

backend/src/restful/token.js

@@ -17,6 +17,7 @@ export default function register($app) {
 
 function deleteToken(req, res) {
     let { token } = req.params;
+    token = decodeURIComponent(token);
     $.info(`正在删除：${token}`);
     let allTokens = $.read(TOKENS_KEY);
     deleteByName(allTokens, token, 'token');
@@ -52,16 +53,6 @@ async function signToken(req, res) {
     try {
         const { payload, options } = req.body;
         const ms = eval(`require("ms")`);
-        const type = payload?.type;
-        const name = payload?.name;
-        if (!type || !name)
-            return failed(
-                res,
-                new RequestInvalidError(
-                    'INVALID_PAYLOAD',
-                    `payload type and name are required`,
-                ),
-            );
         let token = payload?.token;
         if (token != null) {
             if (typeof token !== 'string' || token.length < 1) {
@@ -74,12 +65,7 @@ async function signToken(req, res) {
                 );
             }
             const tokens = $.read(TOKENS_KEY) || [];
-            if (
-                tokens.find(
-                    (t) =>
-                        t.token === token && t.type === type && t.name === name,
-                )
-            ) {
+            if (tokens.find((t) => t.token === token)) {
                 return failed(
                     res,
                     new RequestInvalidError(
@@ -89,7 +75,16 @@ async function signToken(req, res) {
                 );
             }
         }
-
+        const type = payload?.type;
+        const name = payload?.name;
+        if (!type || !name)
+            return failed(
+                res,
+                new RequestInvalidError(
+                    'INVALID_PAYLOAD',
+                    `payload type and name are required`,
+                ),
+            );
         if (type === 'col') {
             const collections = $.read(COLLECTIONS_KEY) || [];
             const collection = collections.find((c) => c.name === name);
@@ -158,12 +153,7 @@ async function signToken(req, res) {
         if (!token) {
             do {
                 token = nanoid.customAlphabet(nanoid.urlAlphabet)();
-            } while (
-                tokens.find(
-                    (t) =>
-                        t.token === token && t.type === type && t.name === name,
-                )
-            );
+            } while (tokens.find((t) => t.token === token));
         }
         tokens.push({
             ...payload,

backend/src/utils/download.js

@@ -1,4 +1,4 @@
-import { SETTINGS_KEY, FILES_KEY, MODULES_KEY } from '@/constants';
+import { SETTINGS_KEY } from '@/constants';
 import { HTTP, ENV } from '@/vendor/open-api';
 import { hex_md5 } from '@/vendor/md5';
 import { getPolicyDescriptor } from '@/utils';
@@ -11,11 +11,7 @@ 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';
-import { ProxyUtils } from '@/core/proxy-utils';
-
 const clashPreprocessor = PROXY_PREPROCESSORS.find(
     (processor) => processor.name === 'Clash Pre-processor',
 );
@@ -134,53 +130,22 @@ export default async function download(
         }
     }
 
-    const downloadUrlMatch = url
-        .split('#')[0]
-        .match(/^\/api\/(file|module)\/(.+)/);
-    if (downloadUrlMatch) {
-        let type = '';
-        try {
-            type = downloadUrlMatch?.[1];
-            let name = downloadUrlMatch?.[2];
-            if (name == null) {
-                throw new Error(`本地 ${type} URL 无效: ${url}`);
-            }
-            name = decodeURIComponent(name);
-            const key = type === 'module' ? MODULES_KEY : FILES_KEY;
-            const item = findByName($.read(key), name);
-            if (!item) {
-                throw new Error(`找不到 ${type}: ${name}`);
-            }
+    // const downloadUrlMatch = url.match(/^\/api\/(file|module)\/(.+)/);
+    // if (downloadUrlMatch) {
+    //     let type = downloadUrlMatch?.[1];
+    //     let name = downloadUrlMatch?.[2];
+    //     if (name == null) {
+    //         throw new Error(`本地 ${type} URL 无效: ${url}`);
+    //     }
+    //     name = decodeURIComponent(name);
+    //     const key = type === 'module' ? MODULES_KEY : FILES_KEY;
+    //     const item = findByName($.read(key), name);
+    //     if (!item) {
+    //         throw new Error(`找不到本地 ${type}: ${name}`);
+    //     }
 
-            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}`);
-        }
-    }
+    //     return item.content;
+    // }
 
     if (!isNode && tasks.has(id)) {
         return tasks.get(id);
@@ -260,20 +225,6 @@ export default async function download(
                     shouldCache = false;
                 }
             }
-            if (preprocess) {
-                try {
-                    const proxies = ProxyUtils.parse(body);
-                    if (!Array.isArray(proxies) || proxies.length === 0) {
-                        $.error(`URL ${url} 不包含有效节点, 不缓存`);
-                        shouldCache = false;
-                    }
-                } catch (e) {
-                    $.error(
-                        `URL ${url} 尝试解析节点失败 ${e.message ?? e}, 不缓存`,
-                    );
-                    shouldCache = false;
-                }
-            }
             if (shouldCache) {
                 resourceCache.set(id, body);
                 if (customCacheKey) {
@@ -322,25 +273,3 @@ 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 || !/^https?/.test(url)) {
+    if ($arguments?.noFlow) {
         return;
     }
     const { isStash, isLoon, isShadowRocket, isQX } = ENV();
@@ -230,7 +230,7 @@ export function flowTransfer(flow, unit = 'B') {
     let unitIndex = unitList.indexOf(unit);
 
     return flow < 1024 || unitIndex === unitList.length - 1
-        ? { value: (Math.round(flow * 100) / 100).toString(), unit: unit }
+        ? { value: flow.toFixed(1), unit: unit }
         : flowTransfer(flow / 1024, unitList[++unitIndex]);
 }
 
@@ -334,28 +334,7 @@ export function normalizeFlowHeader(flowHeaders) {
                 if (!kvMap.has(key)) {
                     try {
                         // 解码 URI 组件并保留原始值作为 fallback
-                        let decodedValue = decodeURIComponent(encodedValue);
-                        if (
-                            ['upload', 'download', 'total', 'expire'].includes(
-                                key,
-                            )
-                        ) {
-                            try {
-                                decodedValue = Number(decodedValue).toFixed(0);
-                                if (
-                                    ['expire'].includes(key) &&
-                                    decodedValue <= 0
-                                ) {
-                                    decodedValue = '';
-                                }
-                            } catch (e) {
-                                $.error(
-                                    `Failed to convert value for key "${key}=${encodedValue}": ${
-                                        e.message ?? e
-                                    }`,
-                                );
-                            }
-                        }
+                        const decodedValue = decodeURIComponent(encodedValue);
                         kvMap.set(key, decodedValue);
                     } catch (e) {
                         kvMap.set(key, encodedValue);

backend/src/utils/geo.js

@@ -46,7 +46,6 @@ const ISOFlags = {
     '🇭🇰': ['HK', 'HKG', 'HKT', 'HKBN', 'HGC', 'WTT', 'CMI'],
     '🇭🇷': ['HR', 'HRV'],
     '🇭🇺': ['HU', 'HUN'],
-    '🇮🇶': ['IQ', 'IRQ'], // 伊拉克
     '🇯🇴': ['JO', 'JOR'],
     '🇯🇵': ['JP', 'JPN', 'TYO'],
     '🇰🇪': ['KE', 'KEN'],
@@ -100,7 +99,6 @@ const ISOFlags = {
     '🇸🇬': ['SG', 'SGP'],
     '🇸🇮': ['SI', 'SVN'],
     '🇸🇰': ['SK', 'SVK'],
-    '🇹🇬': ['TG', 'TGO'], // 多哥
     '🇹🇭': ['TH', 'THA'],
     '🇹🇳': ['TN', 'TUN'],
     '🇹🇷': ['TR', 'TUR'],
@@ -222,7 +220,6 @@ export function getFlag(name) {
         ],
         '🇭🇷': ['Croatia', '克罗地亚', '克羅地亞'],
         '🇭🇺': ['Hungary', '匈牙利'],
-        '🇮🇶': ['Iraq', '伊拉克', '巴格达', 'Baghdad'], // 伊拉克
         '🇯🇴': ['Jordan', '约旦'],
         '🇯🇵': [
             'Japan',
@@ -341,7 +338,6 @@ export function getFlag(name) {
         ],
         '🇸🇮': ['Slovenia', '斯洛文尼亚'],
         '🇸🇰': ['Slovakia', '斯洛伐克'],
-        '🇹🇬': ['Togo', '多哥', '洛美', 'Lomé', 'Lome'], // 多哥
         '🇹🇭': ['Thailand', '泰国', '泰國', '曼谷'],
         '🇹🇳': ['Tunisia', '突尼斯'],
         '🇹🇷': ['Turkey', '土耳其', '伊斯坦布尔', 'Istanbul'],

backend/src/utils/gist.js

@@ -9,11 +9,7 @@ import { SETTINGS_KEY } from '@/constants';
 export default class Gist {
     constructor({ token, key, syncPlatform }) {
         const { isStash, isLoon, isShadowRocket, isQX } = ENV();
-        const {
-            defaultProxy,
-            defaultTimeout: timeout,
-            githubProxy,
-        } = $.read(SETTINGS_KEY);
+        const { defaultProxy, defaultTimeout: timeout } = $.read(SETTINGS_KEY);
         let proxy = defaultProxy;
         if ($.env.isNode) {
             proxy =
@@ -67,9 +63,7 @@ export default class Gist {
                     'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.141 Safari/537.36',
             };
             this.http = HTTP({
-                baseURL: `${
-                    githubProxy ? `${githubProxy}/` : ''
-                }https://api.github.com`,
+                baseURL: 'https://api.github.com',
                 headers: {
                     ...this.headers,
                     ...(isStash && proxy

backend/src/utils/user-agent.js

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

backend/src/utils/yaml.js

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

backend/src/vendor/express.js

@@ -17,12 +17,10 @@ export default function express({ substore: $, port, host }) {
         const express_ = eval(`require("express")`);
         const bodyParser = eval(`require("body-parser")`);
         const app = express_();
-        const limit = eval('process.env.SUB_STORE_BODY_JSON_LIMIT') || '1mb';
-        $.info(`[BACKEND] body JSON limit: ${limit}`);
         app.use(
             bodyParser.json({
                 verify: rawBodySaver,
-                limit,
+                limit: eval('process.env.SUB_STORE_BODY_JSON_LIMIT') || '1mb',
             }),
         );
         app.use(
@@ -36,12 +34,9 @@ export default function express({ substore: $, port, host }) {
 
         // adapter
         app.start = () => {
-            app.get('*', function (req, res) {
-                res.status(404).end();
-            });
             const listener = app.listen(port, host, () => {
                 const { address, port } = listener.address();
-                $.info(`[BACKEND] listening on ${address}:${port}`);
+                $.info(`[BACKEND] ${address}:${port}`);
             });
         };
         return app;
@@ -270,7 +265,7 @@ function extractURL(url) {
         let hashes = url.slice(url.indexOf('?') + 1).split('&');
         for (let i = 0; i < hashes.length; i++) {
             const hash = hashes[i].split('=');
-            query[hash[0]] = decodeURIComponent(hash[1]);
+            query[hash[0]] = hash[1];
         }
     }
     return {
@@ -294,7 +289,7 @@ function extractPathParams(pattern, path) {
                 while (path[j] !== '/' && j < path.length) {
                     val.push(path[j++]);
                 }
-                params[key.join('')] = decodeURIComponent(val.join(''));
+                params[key.join('')] = val.join('');
             } else {
                 if (pattern[i] !== path[j]) {
                     return null;

backend/src/vendor/open-api.js

@@ -9,36 +9,7 @@ const isShadowRocket = 'undefined' !== typeof $rocket;
 const isEgern = 'object' == typeof egern;
 const isLanceX = 'undefined' != typeof $native;
 const isGUIforCores = typeof $Plugins !== 'undefined';
-import { Base64 } from 'js-base64';
 
-function isPlainObject(obj) {
-    return (
-        obj !== null &&
-        typeof obj === 'object' &&
-        [null, Object.prototype].includes(Object.getPrototypeOf(obj))
-    );
-}
-
-function parseSocks5Uri(uri) {
-    // eslint-disable-next-line no-unused-vars
-    let [__, username, password, server, port, query, name] = uri.match(
-        /^socks5:\/\/(?:(.*?):(.*?)@)?(.*?)(?::(\d+?))?(\?.*?)?(?:#(.*?))?$/,
-    );
-    if (port) {
-        port = parseInt(port, 10);
-    } else {
-        $.error(`port is not present in line: ${uri}`);
-        throw new Error(`port is not present in line: ${uri}`);
-    }
-    return {
-        type: 5,
-        host: server,
-        port,
-
-        userId: username != null ? decodeURIComponent(username) : undefined,
-        password: password != null ? decodeURIComponent(password) : undefined,
-    };
-}
 export class OpenAPI {
     constructor(name = 'untitled', debug = false) {
         this.name = name;
@@ -91,64 +62,29 @@ 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)) {
-                try {
-                    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)) {
+            if (!this.node.fs.existsSync(rootPath)) {
                 this.node.fs.writeFileSync(rootPath, JSON.stringify({}), {
-                    flag: 'w',
+                    flag: 'wx',
                 });
                 this.root = {};
+            } else {
+                this.root = JSON.parse(
+                    this.node.fs.readFileSync(`${rootPath}`),
+                );
             }
 
             // 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)) {
-                try {
-                    this.cache = JSON.parse(
-                        this.node.fs.readFileSync(`${fpath}`, 'utf-8'),
-                    );
-                    if (!isPlainObject(this.cache))
-                        throw new Error('Invalid Data');
-                } catch (e) {
-                    try {
-                        const str = Base64.decode(
-                            this.node.fs.readFileSync(`${fpath}`, 'utf-8'),
-                        );
-                        this.cache = JSON.parse(str);
-                        this.node.fs.writeFileSync(fpath, str, {
-                            flag: 'w',
-                        });
-                        if (!isPlainObject(this.cache))
-                            throw new Error('Invalid Data');
-                    } catch (e) {
-                        this.node.fs.copyFileSync(fpath, backupPath);
-                        this.error(
-                            `Failed to parse ${fpath}: ${e.message}. Backup created at ${backupPath}`,
-                        );
-                    }
-                }
-            }
-            if (!isPlainObject(this.cache)) {
+            if (!this.node.fs.existsSync(fpath)) {
                 this.node.fs.writeFileSync(fpath, JSON.stringify({}), {
-                    flag: 'w',
+                    flag: 'wx',
                 });
                 this.cache = {};
+            } else {
+                this.cache = JSON.parse(this.node.fs.readFileSync(`${fpath}`));
             }
         }
     }
@@ -428,7 +364,6 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                 }
                 if (isNode) {
                     const undici = eval("require('undici')");
-                    const { socksDispatcher } = eval("require('fetch-socks')");
                     const {
                         ProxyAgent,
                         EnvHttpProxyAgent,
@@ -458,34 +393,16 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                                 ).toString('base64')}`,
                             };
                         }
-                        let dispatcher;
-                        if (!opts.proxy) {
-                            const allProxy =
-                                eval('process.env.all_proxy') ||
-                                eval('process.env.ALL_PROXY');
-                            if (allProxy && /^socks5:\/\//.test(allProxy)) {
-                                opts.proxy = allProxy;
-                            }
-                        }
-                        if (opts.proxy) {
-                            if (/^socks5:\/\//.test(opts.proxy)) {
-                                dispatcher = socksDispatcher(
-                                    parseSocks5Uri(opts.proxy),
-                                    agentOpts,
-                                );
-                            } else {
-                                dispatcher = new ProxyAgent({
-                                    ...agentOpts,
-                                    uri: opts.proxy,
-                                });
-                            }
-                        } else {
-                            dispatcher = new EnvHttpProxyAgent(agentOpts);
-                        }
                         const response = await request(opts.url, {
                             ...opts,
                             method: method.toUpperCase(),
-                            dispatcher: dispatcher.compose(
+                            dispatcher: (opts.proxy
+                                ? new ProxyAgent({
+                                      ...agentOpts,
+                                      uri: opts.proxy,
+                                  })
+                                : new EnvHttpProxyAgent(agentOpts)
+                            ).compose(
                                 interceptors.redirect({
                                     maxRedirections: 3,
                                     throwOnMaxRedirects: true,
@@ -538,7 +455,6 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                         url: options.url,
                         headers: options.headers,
                         body: options.body,
-                        autoTransformBody: false,
                         options: {
                             Proxy: options.proxy,
                             Timeout: options.timeout

nginx/front.conf

@@ -0,0 +1,40 @@
+upstream api {
+  server 0.0.0.0:3000;
+}
+
+server {
+  listen 6080;  
+#   allow 127.0.0.1;
+#   allow 0.0.0.0;               
+#   deny all; 
+
+  gzip on;
+  gzip_static on;
+  gzip_types text/plain application/json application/javascript application/x-javascript text/css application/xml text/javascript;
+  gzip_proxied  any;
+  gzip_vary on;
+  gzip_comp_level 6;
+  gzip_buffers 16 8k;
+  gzip_http_version 1.0;
+
+  location / {
+    root /Sub-Store/web/dist;
+    index  index.html index.htm;
+    try_files $uri $uri/ /index.html;
+  }
+ 
+  location /api {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass http://api;
+  }
+
+  location /download {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass http://api;
+  }
+
+}

scripts/demo.js

@@ -13,22 +13,15 @@ function operator(proxies = [], targetPlatform, context) {
   // 5. `_subName` 为单条订阅名, `_subDisplayName` 为单条订阅显示名
   // 6. `_collectionName` 为组合订阅名, `_collectionDisplayName` 为组合订阅显示名
   // 7. `tls-fingerprint` 为 tls 指纹
-  // 8. `underlying-proxy` 为前置代理, 不同平台会自动转换
-  //    例如 $server['underlying-proxy'] = '名称'
-  //    只给 mihomo 输出的话, `dialer-proxy` 也行
-  //    只给 sing-box 输出的话, `detour` 也行
-  //    只给 Egern 输出的话, `prev_hop` 也行
-  //    只给 Shadowrocket 输出的话, `chain` 也行
-  //    输出到 Clash/Stash 时, 会过滤掉配置了前置代理的节点, 并提示使用对应的功能.
+  // 8. `underlying-proxy` 为前置代理
   // 9. `trojan`, `tuic`, `hysteria`, `hysteria2`, `juicity` 会在解析时设置 `tls`: true (会使用 tls 类协议的通用逻辑),  输出时删除
   // 10. `sni` 在某些协议里会自动与 `servername` 转换
   // 11. 读取节点的 ca-str 和 _ca (后端文件路径) 字段, 自动计算 fingerprint (参考 https://t.me/zhetengsha/1512)
   // 12. 以 Surge 为例, 最新的参数一般我都会跟进, 以 Surge 文档为例, 一些常用的: TUIC/Hysteria 2 的 `ecn`, Snell 的 `reuse` 连接复用, QUIC 策略 block-quic`, Hysteria 2 下载带宽 `down`
   // 13. `test-url` 为测延迟链接, `test-timeout` 为测延迟超时
   // 14. `ports` 为端口跳跃, `hop-interval` 变换端口号的时间间隔
-  // 15. `ip-version` 设置节点使用 IP 版本，兼容各家的值. 会进行内部转换. sing-box 以外: 若无法匹配则使用原始值. sing-box: 需有匹配且节点上设置 `_dns_server` 字段, 将自动设置 `domain_resolver.server`
+  // 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 文件
@@ -47,27 +40,8 @@ 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
@@ -105,12 +79,6 @@ function operator(proxies = [], targetPlatform, context) {
 
   // 其他平台同理, 持久化缓存数据在 JSON 里
 
-  // 当配合脚本使用时, 可以在脚本的前面添加一个脚本操作, 实现保留 1 小时的缓存. 这样比较灵活
-
-  // async function operator() {
-  //     scriptResourceCache._cleanup(undefined, 1 * 3600 * 1000);
-  // }
-
   // ProxyUtils 为节点处理工具
   // 可参考 https://t.me/zhetengsha/1066
   // const ProxyUtils = {
@@ -128,14 +96,9 @@ 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
-  //     JSON5, // https://github.com/json5/json5
   // }
-  //  为兼容 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) 只能二选一
@@ -151,18 +114,6 @@ function operator(proxies = [], targetPlatform, context) {
   // });
   // $server.sni = sni
 
-  // 示例: 从 config 文件中读取配置项并进行节点操作
-  // config 的本地内容为
-  // {
-  //   "reuse": false
-  // }
-  // 脚本操作为
-  // const config = (ProxyUtils.JSON5 || JSON).parse(await produceArtifact({
-  //     type: 'file',
-  //     name: 'config' // 文件名
-  // }))
-  // $server.reuse = config.reuse
-
   // 1. Surge 输出 WireGuard 完整配置
 
   // let proxies = await produceArtifact({
@@ -247,14 +198,14 @@ function operator(proxies = [], targetPlatform, context) {
   // 这个历史遗留原因, 是有点复杂. 提供一个例子, 用来取当前脚本所在的组合订阅或单条订阅名称
 
   // let name = ''
-  // for (const [key, value] of Object.entries(context.source)) {
+  // for (const [key, value] of Object.entries(env.source)) {
   //   if (!key.startsWith('_')) {
   //     name = value.displayName || value.name
   //     break
   //   }
   // }
   // if (!name) {
-  //   const collection = context.source._collection
+  //   const collection = env.source._collection
   //   name = collection.displayName || collection.name
   // }