feat: 带参数 includeUnsupportedProxy 时, 支持输出 Surge WireGuard Section

2026-03-21 10:02:35 +08:00 · 2024-02-13 14:59:40 +08:00
21 changed files with 99 additions and 553 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "web"]
+	path = web
+	url = https://github.com/sub-store-org/Sub-Store-Front-End.git
--- a/README.md
+++ b/README.md
@@ -26,13 +26,15 @@ Core functionalities:

 ### Supported Input Formats

- [x] URI(SS, SSR, VMess, VLESS, Trojan, Hysteria, Hysteria 2, TUIC v5)
- [x] Clash Proxies YAML
- [x] Clash Proxy JSON(single line)
+- [x] SS URI
+- [x] SSR URI
+- [x] SSD URI
+- [x] V2RayN URI
+- [x] Hysteria 2 URI
 - [x] QX (SS, SSR, VMess, Trojan, HTTP, SOCKS5, VLESS)
 - [x] Loon (SS, SSR, VMess, Trojan, HTTP, SOCKS5, WireGuard, VLESS, Hysteria 2)
- [x] Surge (SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, TUIC, Snell, Hysteria 2, SSH(Password authentication only), SSR(external, only for macOS), External Proxy Program(only for macOS), WireGuard(Surge to Surge))
- [x] Surfboard (SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard(Surfboard to Surfboard))
+- [x] Surge (SS, VMess, Trojan, HTTP, SOCKS5, TUIC, Snell, Hysteria 2, SSR(external, only for macOS), External Proxy Program(only for macOS), WireGuard(Surge to Surge))
+- [x] Surfboard (SS, VMess, Trojan, HTTP, SOCKS5, WireGuard(Surfboard to Surfboard))
 - [x] Shadowrocket (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC)
 - [x] Clash.Meta (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC)
 - [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC)
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sub-store",
-  "version": "2.14.226",
+  "version": "2.14.216",
  "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
  "main": "src/main.js",
  "scripts": {
--- a/backend/src/core/proxy-utils/index.js
+++ b/backend/src/core/proxy-utils/index.js
@@ -1,14 +1,11 @@
 import YAML from '@/utils/yaml';
 import download from '@/utils/download';
-import { isIPv4, isIPv6, isValidPortNumber, isNotBlank } from '@/utils';
+import { isIPv4, isIPv6, isValidPortNumber } from '@/utils';
 import PROXY_PROCESSORS, { ApplyProcessor } from './processors';
 import PROXY_PREPROCESSORS from './preprocessors';
 import PROXY_PRODUCERS from './producers';
 import PROXY_PARSERS from './parsers';
 import $ from '@/core/app';
-import { FILES_KEY, MODULES_KEY } from '@/constants';
-import { findByName } from '@/utils/database';
-import { produceArtifact } from '@/restful/sync';

 function preprocess(raw) {
    for (const processor of PROXY_PREPROCESSORS) {
@@ -98,50 +95,18 @@ async function processFn(proxies, operators = [], targetPlatform, source) {
                        }
                    }
                }
-                url = `${url.split('#')[0]}${noCache ? '#noCache' : ''}`;
-                const downloadUrlMatch = url.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}`);
-                        }

-                        if (type === 'module') {
-                            script = item.content;
-                        } else {
-                            script = await produceArtifact({
-                                type: 'file',
-                                name,
-                            });
-                        }
-                    } catch (err) {
-                        $.error(
-                            `Error when loading ${type}: ${item.args.content}.\n Reason: ${err}`,
-                        );
-                        throw new Error(`无法加载 ${type}: ${url}`);
-                    }
-                } else {
-                    // if this is a remote script, download it
-                    try {
-                        script = await download(url);
-                        // $.info(`Script loaded: >>>\n ${script}`);
-                    } catch (err) {
-                        $.error(
-                            `Error when downloading remote script: ${item.args.content}.\n Reason: ${err}`,
-                        );
-                        throw new Error(`无法下载脚本: ${url}`);
-                    }
+                // if this is a remote script, download it
+                try {
+                    script = await download(
+                        `${url.split('#')[0]}${noCache ? '#noCache' : ''}`,
+                    );
+                    // $.info(`Script loaded: >>>\n ${script}`);
+                } catch (err) {
+                    $.error(
+                        `Error when downloading remote script: ${item.args.content}.\n Reason: ${err}`,
+                    );
+                    throw new Error(`无法下载脚本: ${url}`);
                }
            } else {
                script = content;
@@ -186,13 +151,6 @@ function produce(proxies, targetPlatform, type, opts = {}) {
            !(proxy.supported && proxy.supported[targetPlatform] === false),
    );

-    proxies = proxies.map((proxy) => {
-        if (!isNotBlank(proxy.name)) {
-            proxy.name = `${proxy.type} ${proxy.server}:${proxy.port}`;
-        }
-        return proxy;
-    });
-
    $.info(`Producing proxies for target: ${targetPlatform}`);
    if (typeof producer.type === 'undefined' || producer.type === 'SINGLE') {
        let localPort = 10000;
--- a/backend/src/core/proxy-utils/parsers/index.js
+++ b/backend/src/core/proxy-utils/parsers/index.js
@@ -273,17 +273,11 @@ function URI_VMess() {
                params.port = port;
                params.add = server;
            }
-            const server = params.add;
-            const port = parseInt(getIfPresent(params.port), 10);
            const proxy = {
-                name:
-                    params.ps ??
-                    params.remarks ??
-                    params.remark ??
-                    `VMess ${server}:${port}`,
+                name: params.ps ?? params.remarks,
                type: 'vmess',
-                server,
-                port,
+                server: params.add,
+                port: parseInt(getIfPresent(params.port), 10),
                cipher: getIfPresent(params.scy, 'auto'),
                uuid: params.id,
                alterId: parseInt(
@@ -405,18 +399,14 @@ function URI_VLESS() {
            params[key] = value;
        }

-        proxy.name =
-            name ??
-            params.remarks ??
-            params.remark ??
-            `VLESS ${server}:${port}`;
+        proxy.name = name ?? params.remarks ?? `VLESS ${server}:${port}`;

        proxy.tls = params.security && params.security !== 'none';
        if (isShadowrocket && /TRUE|1/i.test(params.tls)) {
            proxy.tls = true;
            params.security = params.security ?? 'reality';
        }
-        proxy.sni = params.sni || params.peer;
+        proxy.sni = params.sni ?? params.peer;
        proxy.flow = params.flow;
        if (!proxy.flow && isShadowrocket && params.xtls) {
            // "none" is undefined
@@ -752,9 +742,6 @@ function Clash_All() {
        if (proxy['benchmark-url']) {
            proxy['test-url'] = proxy['benchmark-url'];
        }
-        if (proxy['benchmark-timeout']) {
-            proxy['test-timeout'] = proxy['benchmark-timeout'];
-        }

        return proxy;
    };
@@ -1016,14 +1003,6 @@ function Loon_WireGuard() {
    return { name, test, parse };
 }

-function Surge_SSH() {
-    const name = 'Surge SSH Parser';
-    const test = (line) => {
-        return /^.*=\s*ssh/.test(line.split(',')[0]);
-    };
-    const parse = (line) => getSurgeParser().parse(line);
-    return { name, test, parse };
-}
 function Surge_SS() {
    const name = 'Surge SS Parser';
    const test = (line) => {
@@ -1194,7 +1173,6 @@ export default [
    URI_Hysteria2(),
    URI_Trojan(),
    Clash_All(),
-    Surge_SSH(),
    Surge_SS(),
    Surge_VMess(),
    Surge_Trojan(),
--- a/backend/src/core/proxy-utils/parsers/peggy/surge.js
+++ b/backend/src/core/proxy-utils/parsers/peggy/surge.js
@@ -37,11 +37,11 @@ const grammars = String.raw`
    }
 }

-start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v5/wireguard/hysteria2/ssh) {
+start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v5/wireguard/hysteria2) {
    return proxy;
 }

-shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/test_url/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "ss";
    // handle obfs
    if (obfs.type == "http" || obfs.type === "tls") {
@@ -52,7 +52,7 @@ shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/
    }
    handleShadowTLS();
 }
-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/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/ip_version/underlying_proxy/test_url/no_error_alert/tls/sni/tls_fingerprint/tls_verification/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "vmess";
    proxy.cipher = proxy.cipher || "none";
    if (proxy.aead) {
@@ -63,25 +63,21 @@ vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/
    handleWebsocket();
    handleShadowTLS();
 }
-trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/test_url/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "trojan";
    handleWebsocket();
    handleShadowTLS();
 }
-https = tag equals "https" address (username password)? (usernamek passwordk)? (sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+https = tag equals "https" address (username password)? (usernamek passwordk)? (sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/test_url/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "http";
    proxy.tls = true;
    handleShadowTLS();
 }
-http = tag equals "http" address (username password)? (usernamek passwordk)? (ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+http = tag equals "http" address (username password)? (usernamek passwordk)? (ip_version/underlying_proxy/test_url/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "http";
    handleShadowTLS();
 }
-ssh = tag equals "ssh" address (username password)? (usernamek passwordk)? (server_fingerprint/idle_timeout/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
-    proxy.type = "ssh";
-    handleShadowTLS();
-}
-snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/udp_relay/reuse/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/test_url/no_error_alert/fast_open/udp_relay/reuse/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "snell";
    // handle obfs
    if (obfs.type == "http" || obfs.type === "tls") {
@@ -91,28 +87,28 @@ snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_
    }
    handleShadowTLS();
 }
-tuic = tag equals "tuic" address (alpn/token/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+tuic = tag equals "tuic" address (alpn/token/ip_version/underlying_proxy/test_url/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "tuic";
    handleShadowTLS();
 }
-tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/underlying_proxy/test_url/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "tuic";
    proxy.version = 5;
    handleShadowTLS();
 }
-wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/underlying_proxy/test_url/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    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/others)* {
+hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/test_url/sni/tls_verification/passwordk/tls_fingerprint/download_bandwidth/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "hysteria2";
    handleShadowTLS();
 }
-socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/test_url/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "socks5";
    handleShadowTLS();
 }
-socks5_tls = tag equals "socks5-tls" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/sni/tls_fingerprint/tls_verification/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+socks5_tls = tag equals "socks5-tls" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/test_url/sni/tls_fingerprint/tls_verification/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "socks5";
    proxy.tls = true;
    handleShadowTLS();
@@ -222,14 +218,6 @@ no_error_alert = comma "no-error-alert" equals match:[^,]+ { proxy["no-error-ale
 underlying_proxy = comma "underlying-proxy" equals match:[^,]+ { proxy["underlying-proxy"] = match.join(""); }
 download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
 test_url = comma "test-url" equals match:[^,]+ { proxy["test-url"] = match.join(""); }
-test_udp = comma "test-udp" equals match:[^,]+ { proxy["test-udp"] = match.join(""); }
-test_timeout = comma "test-timeout" equals match:$[0-9]+ { proxy["test-timeout"] = parseInt(match.trim()); }
-tos = comma "tos" equals match:$[0-9]+ { proxy.tos = parseInt(match.trim()); }
-interface = comma "interface" equals match:[^,]+ { proxy.interface = match.join(""); }
-allow_other_interface = comma "allow-other-interface" equals flag:bool { proxy["allow-other-interface"] = flag; }
-hybrid = comma "hybrid" equals flag:bool { proxy.hybrid = flag; }
-idle_timeout = comma "idle-timeout" equals match:$[0-9]+ { proxy["idle-timeout"] = parseInt(match.trim()); }
-server_fingerprint = comma "server-fingerprint" equals match:[^,]+ { proxy["server-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 block_quic = comma "block-quic" equals match:[^,]+ { proxy["block-quic"] = match.join(""); }
 shadow_tls_version = comma "shadow-tls-version" equals match:$[0-9]+ { proxy["shadow-tls-version"] = parseInt(match.trim()); }
 shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-sni"] = match.join(""); }
--- a/backend/src/core/proxy-utils/parsers/peggy/surge.peg
+++ b/backend/src/core/proxy-utils/parsers/peggy/surge.peg
@@ -35,11 +35,11 @@
    }
 }

-start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v5/wireguard/hysteria2/ssh) {
+start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v5/wireguard/hysteria2) {
    return proxy;
 }

-shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/test_url/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "ss";
    // handle obfs
    if (obfs.type == "http" || obfs.type === "tls") {
@@ -50,7 +50,7 @@ shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/
    }
    handleShadowTLS();
 }
-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/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/ip_version/underlying_proxy/test_url/no_error_alert/tls/sni/tls_fingerprint/tls_verification/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "vmess";
    proxy.cipher = proxy.cipher || "none";
    if (proxy.aead) {
@@ -61,25 +61,21 @@ vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/
    handleWebsocket();
    handleShadowTLS();
 }
-trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/test_url/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "trojan";
    handleWebsocket();
    handleShadowTLS();
 }
-https = tag equals "https" address (username password)? (usernamek passwordk)? (sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+https = tag equals "https" address (username password)? (usernamek passwordk)? (sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/test_url/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "http";
    proxy.tls = true;
    handleShadowTLS();
 }
-http = tag equals "http" address (username password)? (usernamek passwordk)? (ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+http = tag equals "http" address (username password)? (usernamek passwordk)? (ip_version/underlying_proxy/test_url/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "http";
    handleShadowTLS();
 }
-ssh = tag equals "ssh" address (username password)? (usernamek passwordk)? (server_fingerprint/idle_timeout/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
-    proxy.type = "ssh";
-    handleShadowTLS();
-}
-snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/udp_relay/reuse/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/test_url/no_error_alert/fast_open/udp_relay/reuse/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "snell";
    // handle obfs
    if (obfs.type == "http" || obfs.type === "tls") {
@@ -89,28 +85,28 @@ snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_
    }
    handleShadowTLS();
 }
-tuic = tag equals "tuic" address (alpn/token/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+tuic = tag equals "tuic" address (alpn/token/ip_version/underlying_proxy/test_url/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "tuic";
    handleShadowTLS();
 }
-tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/underlying_proxy/test_url/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "tuic";
    proxy.version = 5;
    handleShadowTLS();
 }
-wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/underlying_proxy/test_url/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    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/others)* {
+hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/test_url/sni/tls_verification/passwordk/tls_fingerprint/download_bandwidth/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "hysteria2";
    handleShadowTLS();
 }
-socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/test_url/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "socks5";
    handleShadowTLS();
 }
-socks5_tls = tag equals "socks5-tls" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/sni/tls_fingerprint/tls_verification/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+socks5_tls = tag equals "socks5-tls" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/test_url/sni/tls_fingerprint/tls_verification/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
    proxy.type = "socks5";
    proxy.tls = true;
    handleShadowTLS();
@@ -220,14 +216,6 @@ no_error_alert = comma "no-error-alert" equals match:[^,]+ { proxy["no-error-ale
 underlying_proxy = comma "underlying-proxy" equals match:[^,]+ { proxy["underlying-proxy"] = match.join(""); }
 download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
 test_url = comma "test-url" equals match:[^,]+ { proxy["test-url"] = match.join(""); }
-test_udp = comma "test-udp" equals match:[^,]+ { proxy["test-udp"] = match.join(""); }
-test_timeout = comma "test-timeout" equals match:$[0-9]+ { proxy["test-timeout"] = parseInt(match.trim()); }
-tos = comma "tos" equals match:$[0-9]+ { proxy.tos = parseInt(match.trim()); }
-interface = comma "interface" equals match:[^,]+ { proxy.interface = match.join(""); }
-allow_other_interface = comma "allow-other-interface" equals flag:bool { proxy["allow-other-interface"] = flag; }
-hybrid = comma "hybrid" equals flag:bool { proxy.hybrid = flag; }
-idle_timeout = comma "idle-timeout" equals match:$[0-9]+ { proxy["idle-timeout"] = parseInt(match.trim()); }
-server_fingerprint = comma "server-fingerprint" equals match:[^,]+ { proxy["server-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 block_quic = comma "block-quic" equals match:[^,]+ { proxy["block-quic"] = match.join(""); }
 shadow_tls_version = comma "shadow-tls-version" equals match:$[0-9]+ { proxy["shadow-tls-version"] = parseInt(match.trim()); }
 shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-sni"] = match.join(""); }
--- a/backend/src/core/proxy-utils/processors/index.js
+++ b/backend/src/core/proxy-utils/processors/index.js
@@ -121,7 +121,7 @@ function QuickSettingOperator(args) {
 }

 // add or remove flag for proxies
-function FlagOperator({ mode, tw }) {
+function FlagOperator({ mode }) {
    return {
        name: 'Flag Operator',
        func: (proxies) => {
@@ -135,13 +135,7 @@ function FlagOperator({ mode, tw }) {
                    // remove old flag
                    proxy.name = removeFlag(proxy.name);
                    proxy.name = newFlag + ' ' + proxy.name;
-                    if (tw == 'ws') {
-                        proxy.name = proxy.name.replace(/🇹🇼/g, '🇼🇸');
-                    } else if (tw == 'tw') {
-                        // 不变
-                    } else {
-                        proxy.name = proxy.name.replace(/🇹🇼/g, '🇨🇳');
-                    }
+                    proxy.name = proxy.name.replace(/🇹🇼/g, '🇨🇳');
                }
                return proxy;
            });
--- a/backend/src/core/proxy-utils/producers/sing-box.js
+++ b/backend/src/core/proxy-utils/producers/sing-box.js
@@ -178,8 +178,8 @@ const grpcParser = (proxy, parsedProxy) => {
    const transport = { type: 'grpc' };
    if (proxy['grpc-opts']) {
        const serviceName = proxy['grpc-opts']['grpc-service-name'];
-        if (serviceName != null && serviceName !== '')
-            transport.service_name = `${serviceName}`;
+        if (serviceName && serviceName !== '')
+            transport.service_name = serviceName;
    }
    parsedProxy.transport = transport;
 };
@@ -217,31 +217,6 @@ const tlsParser = (proxy, parsedProxy) => {
    if (!parsedProxy.tls.enabled) delete parsedProxy.tls;
 };

-const sshParser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'ssh',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-    };
-    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy.username) parsedProxy.user = proxy.username;
-    if (proxy.password) parsedProxy.password = proxy.password;
-    if (proxy['server-fingerprint']) {
-        parsedProxy.host_key = [proxy['server-fingerprint']];
-        // https://manual.nssurge.com/policy/ssh.html
-        // Surge only supports curve25519-sha256 as the kex algorithm and aes128-gcm as the encryption algorithm. It means that the SSH server must use OpenSSH v7.3 or above. (It should not be a problem since OpenSSH 7.3 was released on 2016-08-01.)
-        // TODO: ?
-        parsedProxy.host_key_algorithms = [
-            proxy['server-fingerprint'].split(' ')[0],
-        ];
-    }
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    tfoParser(proxy, parsedProxy);
-    return parsedProxy;
-};
-
 const httpParser = (proxy = {}) => {
    const parsedProxy = {
        tag: proxy.name,
@@ -613,10 +588,8 @@ const wireguardParser = (proxy = {}) => {
    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
    if (typeof proxy.reserved === 'string') {
        parsedProxy.reserved.push(proxy.reserved);
-    } else if (Array.isArray(proxy.reserved)) {
-        for (const r of proxy.reserved) parsedProxy.reserved.push(r);
    } else {
-        delete parsedProxy.reserved;
+        for (const r of proxy.reserved) parsedProxy.reserved.push(r);
    }
    if (proxy.peers && proxy.peers.length > 0) {
        parsedProxy.peers = [];
@@ -630,10 +603,8 @@ const wireguardParser = (proxy = {}) => {
            };
            if (typeof p.reserved === 'string') {
                peer.reserved.push(p.reserved);
-            } else if (Array.isArray(p.reserved)) {
-                for (const r of p.reserved) peer.reserved.push(r);
            } else {
-                delete peer.reserved;
+                for (const r of p.reserved) peer.reserved.push(r);
            }
            if (p['pre-shared-key']) peer.pre_shared_key = p['pre-shared-key'];
            parsedProxy.peers.push(peer);
@@ -653,9 +624,6 @@ export default function singbox_Producer() {
            .map((proxy) => {
                try {
                    switch (proxy.type) {
-                        case 'ssh':
-                            list.push(sshParser(proxy));
-                            break;
                        case 'http':
                            list.push(httpParser(proxy));
                            break;
--- a/backend/src/core/proxy-utils/producers/stash.js
+++ b/backend/src/core/proxy-utils/producers/stash.js
@@ -250,10 +250,6 @@ export default function Stash_Producer() {
                    proxy['benchmark-url'] = proxy['test-url'];
                    delete proxy['test-url'];
                }
-                if (proxy['test-timeout']) {
-                    proxy['benchmark-timeout'] = proxy['test-timeout'];
-                    delete proxy['test-timeout'];
-                }

                delete proxy.subName;
                delete proxy.collectionName;
--- a/backend/src/core/proxy-utils/producers/surge.js
+++ b/backend/src/core/proxy-utils/producers/surge.js
@@ -14,6 +14,7 @@ const ipVersions = {

 export default function Surge_Producer() {
    const produce = (proxy, type, opts = {}) => {
+        console.log(opts);
        switch (proxy.type) {
            case 'ss':
                return shadowsocks(proxy);
@@ -33,8 +34,6 @@ export default function Surge_Producer() {
                return wireguard_surge(proxy);
            case 'hysteria2':
                return hysteria2(proxy);
-            case 'ssh':
-                return ssh(proxy);
        }

        if (opts['include-unsupported-proxy'] && proxy.type === 'wireguard') {
@@ -121,18 +120,6 @@ function shadowsocks(proxy) {

    // test-url
    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
-    result.appendIfPresent(
-        `,test-timeout=${proxy['test-timeout']}`,
-        'test-timeout',
-    );
-    result.appendIfPresent(`,test-udp=${proxy['test-udp']}`, 'test-udp');
-    result.appendIfPresent(`,hybrid=${proxy['hybrid']}`, 'hybrid');
-    result.appendIfPresent(`,tos=${proxy['tos']}`, 'tos');
-    result.appendIfPresent(
-        `,allow-other-interface=${proxy['allow-other-interface']}`,
-        'allow-other-interface',
-    );
-    result.appendIfPresent(`,interface=${proxy['interface']}`, 'interface');

    // shadow-tls
    if (isPresent(proxy, 'shadow-tls-password')) {
@@ -218,18 +205,6 @@ function trojan(proxy) {

    // test-url
    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
-    result.appendIfPresent(
-        `,test-timeout=${proxy['test-timeout']}`,
-        'test-timeout',
-    );
-    result.appendIfPresent(`,test-udp=${proxy['test-udp']}`, 'test-udp');
-    result.appendIfPresent(`,hybrid=${proxy['hybrid']}`, 'hybrid');
-    result.appendIfPresent(`,tos=${proxy['tos']}`, 'tos');
-    result.appendIfPresent(
-        `,allow-other-interface=${proxy['allow-other-interface']}`,
-        'allow-other-interface',
-    );
-    result.appendIfPresent(`,interface=${proxy['interface']}`, 'interface');

    // shadow-tls
    if (isPresent(proxy, 'shadow-tls-password')) {
@@ -304,18 +279,6 @@ function vmess(proxy) {

    // test-url
    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
-    result.appendIfPresent(
-        `,test-timeout=${proxy['test-timeout']}`,
-        'test-timeout',
-    );
-    result.appendIfPresent(`,test-udp=${proxy['test-udp']}`, 'test-udp');
-    result.appendIfPresent(`,hybrid=${proxy['hybrid']}`, 'hybrid');
-    result.appendIfPresent(`,tos=${proxy['tos']}`, 'tos');
-    result.appendIfPresent(
-        `,allow-other-interface=${proxy['allow-other-interface']}`,
-        'allow-other-interface',
-    );
-    result.appendIfPresent(`,interface=${proxy['interface']}`, 'interface');

    // shadow-tls
    if (isPresent(proxy, 'shadow-tls-password')) {
@@ -343,61 +306,6 @@ function vmess(proxy) {
    return result.toString();
 }

-function ssh(proxy) {
-    const result = new Result(proxy);
-    result.append(`${proxy.name}=ssh,${proxy.server},${proxy.port}`);
-    result.appendIfPresent(`,${proxy.username}`, 'username');
-    result.appendIfPresent(`,${proxy.password}`, 'password');
-
-    result.appendIfPresent(
-        `,idle-timeout=${proxy['idle-timeout']}`,
-        'idle-timeout',
-    );
-    result.appendIfPresent(
-        `,server-fingerprint="${proxy['server-fingerprint']}"`,
-        'server-fingerprint',
-    );
-
-    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
-    result.appendIfPresent(`,ip-version=${ip_version}`, 'ip-version');
-
-    result.appendIfPresent(
-        `,no-error-alert=${proxy['no-error-alert']}`,
-        'no-error-alert',
-    );
-
-    // tfo
-    result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
-
-    // udp
-    result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
-
-    // test-url
-    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
-    result.appendIfPresent(
-        `,test-timeout=${proxy['test-timeout']}`,
-        'test-timeout',
-    );
-    result.appendIfPresent(`,test-udp=${proxy['test-udp']}`, 'test-udp');
-    result.appendIfPresent(`,hybrid=${proxy['hybrid']}`, 'hybrid');
-    result.appendIfPresent(`,tos=${proxy['tos']}`, 'tos');
-    result.appendIfPresent(
-        `,allow-other-interface=${proxy['allow-other-interface']}`,
-        'allow-other-interface',
-    );
-    result.appendIfPresent(`,interface=${proxy['interface']}`, 'interface');
-
-    // block-quic
-    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
-
-    // underlying-proxy
-    result.appendIfPresent(
-        `,underlying-proxy=${proxy['underlying-proxy']}`,
-        'underlying-proxy',
-    );
-
-    return result.toString();
-}
 function http(proxy) {
    const result = new Result(proxy);
    const type = proxy.tls ? 'https' : 'http';
@@ -434,18 +342,6 @@ function http(proxy) {

    // test-url
    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
-    result.appendIfPresent(
-        `,test-timeout=${proxy['test-timeout']}`,
-        'test-timeout',
-    );
-    result.appendIfPresent(`,test-udp=${proxy['test-udp']}`, 'test-udp');
-    result.appendIfPresent(`,hybrid=${proxy['hybrid']}`, 'hybrid');
-    result.appendIfPresent(`,tos=${proxy['tos']}`, 'tos');
-    result.appendIfPresent(
-        `,allow-other-interface=${proxy['allow-other-interface']}`,
-        'allow-other-interface',
-    );
-    result.appendIfPresent(`,interface=${proxy['interface']}`, 'interface');

    // shadow-tls
    if (isPresent(proxy, 'shadow-tls-password')) {
@@ -511,18 +407,6 @@ function socks5(proxy) {

    // test-url
    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
-    result.appendIfPresent(
-        `,test-timeout=${proxy['test-timeout']}`,
-        'test-timeout',
-    );
-    result.appendIfPresent(`,test-udp=${proxy['test-udp']}`, 'test-udp');
-    result.appendIfPresent(`,hybrid=${proxy['hybrid']}`, 'hybrid');
-    result.appendIfPresent(`,tos=${proxy['tos']}`, 'tos');
-    result.appendIfPresent(
-        `,allow-other-interface=${proxy['allow-other-interface']}`,
-        'allow-other-interface',
-    );
-    result.appendIfPresent(`,interface=${proxy['interface']}`, 'interface');

    // shadow-tls
    if (isPresent(proxy, 'shadow-tls-password')) {
@@ -586,18 +470,6 @@ function snell(proxy) {

    // test-url
    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
-    result.appendIfPresent(
-        `,test-timeout=${proxy['test-timeout']}`,
-        'test-timeout',
-    );
-    result.appendIfPresent(`,test-udp=${proxy['test-udp']}`, 'test-udp');
-    result.appendIfPresent(`,hybrid=${proxy['hybrid']}`, 'hybrid');
-    result.appendIfPresent(`,tos=${proxy['tos']}`, 'tos');
-    result.appendIfPresent(
-        `,allow-other-interface=${proxy['allow-other-interface']}`,
-        'allow-other-interface',
-    );
-    result.appendIfPresent(`,interface=${proxy['interface']}`, 'interface');

    // shadow-tls
    if (isPresent(proxy, 'shadow-tls-password')) {
@@ -676,18 +548,6 @@ function tuic(proxy) {

    // test-url
    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
-    result.appendIfPresent(
-        `,test-timeout=${proxy['test-timeout']}`,
-        'test-timeout',
-    );
-    result.appendIfPresent(`,test-udp=${proxy['test-udp']}`, 'test-udp');
-    result.appendIfPresent(`,hybrid=${proxy['hybrid']}`, 'hybrid');
-    result.appendIfPresent(`,tos=${proxy['tos']}`, 'tos');
-    result.appendIfPresent(
-        `,allow-other-interface=${proxy['allow-other-interface']}`,
-        'allow-other-interface',
-    );
-    result.appendIfPresent(`,interface=${proxy['interface']}`, 'interface');

    // shadow-tls
    if (isPresent(proxy, 'shadow-tls-password')) {
@@ -750,18 +610,6 @@ ${proxy.name}=wireguard`);

    // test-url
    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
-    result.appendIfPresent(
-        `,test-timeout=${proxy['test-timeout']}`,
-        'test-timeout',
-    );
-    result.appendIfPresent(`,test-udp=${proxy['test-udp']}`, 'test-udp');
-    result.appendIfPresent(`,hybrid=${proxy['hybrid']}`, 'hybrid');
-    result.appendIfPresent(`,tos=${proxy['tos']}`, 'tos');
-    result.appendIfPresent(
-        `,allow-other-interface=${proxy['allow-other-interface']}`,
-        'allow-other-interface',
-    );
-    result.appendIfPresent(`,interface=${proxy['interface']}`, 'interface');

    // shadow-tls
    if (isPresent(proxy, 'shadow-tls-password')) {
@@ -849,18 +697,6 @@ function wireguard_surge(proxy) {

    // test-url
    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
-    result.appendIfPresent(
-        `,test-timeout=${proxy['test-timeout']}`,
-        'test-timeout',
-    );
-    result.appendIfPresent(`,test-udp=${proxy['test-udp']}`, 'test-udp');
-    result.appendIfPresent(`,hybrid=${proxy['hybrid']}`, 'hybrid');
-    result.appendIfPresent(`,tos=${proxy['tos']}`, 'tos');
-    result.appendIfPresent(
-        `,allow-other-interface=${proxy['allow-other-interface']}`,
-        'allow-other-interface',
-    );
-    result.appendIfPresent(`,interface=${proxy['interface']}`, 'interface');

    // shadow-tls
    if (isPresent(proxy, 'shadow-tls-password')) {
@@ -925,18 +761,6 @@ function hysteria2(proxy) {

    // test-url
    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
-    result.appendIfPresent(
-        `,test-timeout=${proxy['test-timeout']}`,
-        'test-timeout',
-    );
-    result.appendIfPresent(`,test-udp=${proxy['test-udp']}`, 'test-udp');
-    result.appendIfPresent(`,hybrid=${proxy['hybrid']}`, 'hybrid');
-    result.appendIfPresent(`,tos=${proxy['tos']}`, 'tos');
-    result.appendIfPresent(
-        `,allow-other-interface=${proxy['allow-other-interface']}`,
-        'allow-other-interface',
-    );
-    result.appendIfPresent(`,interface=${proxy['interface']}`, 'interface');

    // shadow-tls
    if (isPresent(proxy, 'shadow-tls-password')) {
--- a/backend/src/products/cron-sync-artifacts.js
+++ b/backend/src/products/cron-sync-artifacts.js
@@ -1,14 +1,8 @@
 import { version } from '../../package.json';
-import {
-    SETTINGS_KEY,
-    ARTIFACTS_KEY,
-    SUBS_KEY,
-    COLLECTIONS_KEY,
-} from '@/constants';
+import { SETTINGS_KEY, ARTIFACTS_KEY } from '@/constants';
 import $ from '@/core/app';
 import { produceArtifact } from '@/restful/sync';
 import { syncToGist } from '@/restful/artifacts';
-import { findByName } from '@/utils/database';

 !(async function () {
    const settings = $.read(SETTINGS_KEY);
@@ -36,83 +30,23 @@ async function doSync() {
    const files = {};

    try {
-        const invalid = [];
-        const allSubs = $.read(SUBS_KEY);
-        const allCols = $.read(COLLECTIONS_KEY);
-        const subNames = [];
-        allArtifacts.map((artifact) => {
-            if (artifact.sync && artifact.source) {
-                if (artifact.type === 'subscription') {
-                    const subName = artifact.source;
-                    const sub = findByName(allSubs, subName);
-                    if (sub && sub.url && !subNames.includes(subName)) {
-                        subNames.push(subName);
-                    }
-                } else if (artifact.type === 'collection') {
-                    const collection = findByName(allCols, artifact.source);
-                    if (collection && Array.isArray(collection.subscriptions)) {
-                        collection.subscriptions.map((subName) => {
-                            const sub = findByName(allSubs, subName);
-                            if (sub && sub.url && !subNames.includes(subName)) {
-                                subNames.push(subName);
-                            }
-                        });
-                    }
-                }
-            }
-        });
-
-        if (subNames.length > 0) {
-            await Promise.all(
-                subNames.map(async (subName) => {
-                    try {
-                        await produceArtifact({
-                            type: 'subscription',
-                            name: subName,
-                        });
-                    } catch (e) {
-                        // $.error(`${e.message ?? e}`);
-                    }
-                }),
-            );
-        }
        await Promise.all(
            allArtifacts.map(async (artifact) => {
-                try {
-                    if (artifact.sync && artifact.source) {
-                        $.info(`正在同步云配置：${artifact.name}...`);
-                        const output = await produceArtifact({
-                            type: artifact.type,
-                            name: artifact.source,
-                            platform: artifact.platform,
-                            produceOpts: {
-                                'include-unsupported-proxy':
-                                    artifact.includeUnsupportedProxy,
-                            },
-                        });
+                if (artifact.sync) {
+                    $.info(`正在同步云配置：${artifact.name}...`);
+                    const output = await produceArtifact({
+                        type: artifact.type,
+                        name: artifact.source,
+                        platform: artifact.platform,
+                    });

-                        // if (!output || output.length === 0)
-                        //     throw new Error('该配置的结果为空 不进行上传');
-
-                        files[encodeURIComponent(artifact.name)] = {
-                            content: output,
-                        };
-                    }
-                } catch (e) {
-                    $.error(
-                        `同步配置 ${artifact.name} 发生错误: ${e.message ?? e}`,
-                    );
-                    invalid.push(artifact.name);
+                    files[encodeURIComponent(artifact.name)] = {
+                        content: output,
+                    };
                }
            }),
        );

-        if (invalid.length > 0) {
-            throw new Error(
-                `同步配置 ${invalid.join(', ')} 发生错误 详情请查看日志`,
-            );
-        }
-
        const resp = await syncToGist(files);
        const body = JSON.parse(resp.body);

@@ -137,8 +71,8 @@ async function doSync() {

        $.write(allArtifacts, ARTIFACTS_KEY);
        $.notify('🌍 Sub-Store', '全部订阅同步成功！');
-    } catch (e) {
-        $.notify('🌍 Sub-Store', '同步订阅失败', `原因：${e.message ?? e}`);
-        $.error(`无法同步订阅配置到 Gist，原因：${e}`);
+    } catch (err) {
+        $.notify('🌍 Sub-Store', '同步订阅失败', `原因：${err}`);
+        $.error(`无法同步订阅配置到 Gist，原因：${err}`);
    }
 }
--- a/backend/src/restful/sync.js
+++ b/backend/src/restful/sync.js
@@ -448,46 +448,6 @@ async function syncArtifacts() {

    try {
        const invalid = [];
-        const allSubs = $.read(SUBS_KEY);
-        const allCols = $.read(COLLECTIONS_KEY);
-        const subNames = [];
-        allArtifacts.map((artifact) => {
-            if (artifact.sync && artifact.source) {
-                if (artifact.type === 'subscription') {
-                    const subName = artifact.source;
-                    const sub = findByName(allSubs, subName);
-                    if (sub && sub.url && !subNames.includes(subName)) {
-                        subNames.push(subName);
-                    }
-                } else if (artifact.type === 'collection') {
-                    const collection = findByName(allCols, artifact.source);
-                    if (collection && Array.isArray(collection.subscriptions)) {
-                        collection.subscriptions.map((subName) => {
-                            const sub = findByName(allSubs, subName);
-                            if (sub && sub.url && !subNames.includes(subName)) {
-                                subNames.push(subName);
-                            }
-                        });
-                    }
-                }
-            }
-        });
-
-        if (subNames.length > 0) {
-            await Promise.all(
-                subNames.map(async (subName) => {
-                    try {
-                        await produceArtifact({
-                            type: 'subscription',
-                            name: subName,
-                        });
-                    } catch (e) {
-                        // $.error(`${e.message ?? e}`);
-                    }
-                }),
-            );
-        }
-
        await Promise.all(
            allArtifacts.map(async (artifact) => {
                try {
--- a/backend/src/utils/download.js
+++ b/backend/src/utils/download.js
@@ -1,4 +1,5 @@
-import { SETTINGS_KEY } from '@/constants';
+import { FILES_KEY, MODULES_KEY, SETTINGS_KEY } from '@/constants';
+import { findByName } from '@/utils/database';
 import { HTTP, ENV } from '@/vendor/open-api';
 import { hex_md5 } from '@/vendor/md5';
 import resourceCache from '@/utils/resource-cache';
@@ -35,22 +36,22 @@ export default async function download(rawUrl, ua, timeout) {
        }
    }

-    // 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}`);
-    //     }
+    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}`);
+        }

-    //     return item.content;
-    // }
+        return item.content;
+    }

    const { isNode } = ENV();
    const { defaultUserAgent, defaultTimeout } = $.read(SETTINGS_KEY);
@@ -73,7 +74,6 @@ export default async function download(rawUrl, ua, timeout) {
    // try to find in app cache
    const cached = resourceCache.get(id);
    if (!$arguments?.noCache && cached) {
-        $.info(`使用缓存: ${url}`);
        result = cached;
    } else {
        $.info(
--- a/backend/src/utils/geo.js
+++ b/backend/src/utils/geo.js
@@ -213,16 +213,11 @@ export function getFlag(name) {
        '🇹🇼': [
            'Taiwan',
            '台湾',
-            '臺灣',
-            '台灣',
-            '中華民國',
-            '中华民国',
            '台北',
            '台中',
            '新北',
            '彰化',
            '台',
-            '臺',
            'Taipei',
        ],
        '🇺🇦': ['Ukraine', '乌克兰', '烏克蘭'],
@@ -376,7 +371,7 @@ export function getFlag(name) {
        '🇹🇭': ['TH', 'THA'],
        '🇹🇳': ['TN', 'TUN'],
        '🇹🇷': ['TR', 'TUR'],
-        '🇹🇼': ['TW', 'TWN', 'CHT', 'HINET', 'ROC'],
+        '🇹🇼': ['TW', 'TWN', 'CHT', 'HINET'],
        '🇺🇦': ['UA', 'UKR'],
        '🇺🇸': ['US', 'USA', 'LAX', 'SFO'],
        '🇺🇾': ['UY', 'URY'],
--- a/config/README.md
+++ b/config/README.md
@@ -17,7 +17,7 @@ Telegram 频道: [`https://t.me/cool_scripts` ](https://t.me/cool_scripts)

 1. 官方默认版模块(目前不带 ability 参数, 不保证以后不会改动): [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule)

-2. 固定带 ability 参数版本,可能会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 请使用此带 ability 参数版本: [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule)
+2. 固定带 ability 参数版本,可能会爆内存, 如果需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 请使用此带 ability 参数版本: [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule)

 3. 固定不带 ability 参数版本： [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Noability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Noability.sgmodule)

--- a/config/Surge-Noability.sgmodule
+++ b/config/Surge-Noability.sgmodule
@@ -1,12 +1,12 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用带 ability 参数. 定时任务默认为每天 0 点
+#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 可以用带 ability 参数. 定时任务默认为每天 0 点
 #!category=订阅管理

 [MITM]
 hostname = %APPEND% sub.store

 [Script]
-# 主程序 已经去掉 Sub-Store Core 的参数 [,ability=http-client-policy] 不会爆内存，这个参数在 Surge 非常占用内存； 如果不需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 则可以使用此脚本
+# 主程序 已经去掉 Sub-Store Core 的参数 [,ability=http-client-policy] 不会爆内存，这个参数在 Surge 非常占用内存； 如果不需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 则可以使用此脚本
 Sub-Store Core=type=http-request,pattern=^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))),script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js,requires-body=true,timeout=120
 Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true

--- a/config/Surge-ability.sgmodule
+++ b/config/Surge-ability.sgmodule
@@ -1,5 +1,5 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  带 ability 参数版本, 可能会爆内存, 如果不需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用不带 ability 参数版本. 定时任务默认为每天 0 点
+#!desc=高级订阅管理工具 @Peng-YM  带 ability 参数版本, 可能会爆内存, 如果不需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 可以用不带 ability 参数版本. 定时任务默认为每天 0 点
 #!category=订阅管理

 [MITM]
--- a/config/Surge.sgmodule
+++ b/config/Surge.sgmodule
@@ -1,5 +1,5 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用带 ability 参数. 定时任务默认为每天 0 点
+#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 可以用带 ability 参数. 定时任务默认为每天 0 点
 #!category=订阅管理

 [MITM]
--- a/scripts/demo.js
+++ b/scripts/demo.js
@@ -35,49 +35,6 @@ function operator(proxies = [], targetPlatform, context) {
  //     yaml, // yaml 解析和生成
  // }

-  // 1. Surge 输出 WireGuard 完整配置
-
-  // let proxies = await produceArtifact({
-  //   type: 'subscription',
-  //   name: 'sub',
-  //   platform: 'Surge',
-  //   produceOpts: {
-  //     'include-unsupported-proxy': true,
-  //   }
-  // })
-  // $content = proxies
-  
-  // 2. sing-box
-
-  // 但是一般不需要这样用, 可参考 1. https://t.me/zhetengsha/1111 和 2. https://t.me/zhetengsha/1070
-
-  // let singboxProxies = await produceArtifact({
-  //     type: 'subscription', // type: 'subscription' 或 'collection'
-  //     name: 'sub', // subscription name
-  //     platform: 'sing-box', // target platform
-  //     produceType: 'internal' // 'internal' produces an Array, otherwise produces a String( JSON.parse('JSON String') )
-  // })
-
-  // // JSON
-  // $content = JSON.stringify({}, null, 2)
-
-  // 3. clash.meta
-
-  // 但是一般不需要这样用, 可参考 1. https://t.me/zhetengsha/1111 和 2. https://t.me/zhetengsha/1070
-
-  // let clashMetaProxies = await produceArtifact({
-  //     type: 'subscription',
-  //     name: 'sub',
-  //     platform: 'ClashMeta',
-  //     produceType: 'internal' // 'internal' produces an Array, otherwise produces a String( ProxyUtils.yaml.safeLoad('YAML String').proxies )
-  // }))
-
-  // // YAML
-  // $content = ProxyUtils.yaml.safeDump({})
-
-
-  // { $content, $files } will be passed to the next operator 
-  // $content is the final content of the file
  // flowUtils 为机场订阅流量信息处理工具
  // 可参考 https://t.me/zhetengsha/948
  // https://github.com/sub-store-org/Sub-Store/blob/31b6dd0507a9286d6ab834ec94ad3050f6bdc86b/backend/src/utils/download.js#L104
--- a/1
+++ b/1