feat: 同步配置前, 预处理订阅, 防止同时请求过多

README.md

@@ -84,15 +84,25 @@ Install `pnpm`
 Go to `backend` directories, install node dependencies:
 
 ```
-pnpm install
+pnpm i
 ```
 
 1. In `backend`, run the backend server on http://localhost:3000
 
+babel(old school)
+
 ```
 pnpm start
 ```
 
+or
+
+esbuild(experimental)
+
+```
+pnpm run --parallel "/^dev:.*/"
+```
+
 ## LICENSE
 
 This project is under the GPL V3 LICENSE.

backend/bundle-esbuild.js

@@ -0,0 +1,77 @@
+#!/usr/bin/env node
+const fs = require('fs');
+const path = require('path');
+const { build } = require('esbuild');
+
+!(async () => {
+    const version = JSON.parse(
+        fs.readFileSync(path.join(__dirname, 'package.json'), 'utf-8'),
+    ).version.trim();
+
+    const artifacts = [
+        { src: 'src/main.js', dest: 'sub-store.min.js' },
+        {
+            src: 'src/products/resource-parser.loon.js',
+            dest: 'dist/sub-store-parser.loon.min.js',
+        },
+        {
+            src: 'src/products/cron-sync-artifacts.js',
+            dest: 'dist/cron-sync-artifacts.min.js',
+        },
+        { src: 'src/products/sub-store-0.js', dest: 'dist/sub-store-0.min.js' },
+        { src: 'src/products/sub-store-1.js', dest: 'dist/sub-store-1.min.js' },
+    ];
+
+    for await (const artifact of artifacts) {
+        await build({
+            entryPoints: [artifact.src],
+            bundle: true,
+            minify: true,
+            sourcemap: false,
+            platform: 'browser',
+            format: 'iife',
+            outfile: artifact.dest,
+        });
+    }
+
+    let content = fs.readFileSync(path.join(__dirname, 'sub-store.min.js'), {
+        encoding: 'utf8',
+    });
+    content = content.replace(
+        /eval\(('|")(require\(('|").*?('|")\))('|")\)/g,
+        '$2',
+    );
+    fs.writeFileSync(
+        path.join(__dirname, 'dist/sub-store.no-bundle.js'),
+        content,
+        {
+            encoding: 'utf8',
+        },
+    );
+
+    await build({
+        entryPoints: ['dist/sub-store.no-bundle.js'],
+        bundle: true,
+        minify: true,
+        sourcemap: false,
+        platform: 'node',
+        format: 'cjs',
+        outfile: 'dist/sub-store.bundle.js',
+    });
+    fs.writeFileSync(
+        path.join(__dirname, 'dist/sub-store.bundle.js'),
+        `// SUB_STORE_BACKEND_VERSION: ${version}
+${fs.readFileSync(path.join(__dirname, 'dist/sub-store.bundle.js'), {
+    encoding: 'utf8',
+})}`,
+        {
+            encoding: 'utf8',
+        },
+    );
+})()
+    .catch((e) => {
+        console.log(e);
+    })
+    .finally(() => {
+        console.log('done');
+    });

backend/bundle.js

@@ -3,23 +3,49 @@ const fs = require('fs');
 const path = require('path');
 const { build } = require('esbuild');
 
-let content = fs.readFileSync(path.join(__dirname, 'sub-store.min.js'), {
-    encoding: 'utf8',
-});
-content = content.replace(
-    /eval\(('|")(require\(('|").*?('|")\))('|")\)/g,
-    '$2',
-);
-fs.writeFileSync(path.join(__dirname, 'dist/sub-store.no-bundle.js'), content, {
-    encoding: 'utf8',
-});
+!(async () => {
+    const version = JSON.parse(
+        fs.readFileSync(path.join(__dirname, 'package.json'), 'utf-8'),
+    ).version.trim();
 
-build({
-    entryPoints: ['dist/sub-store.no-bundle.js'],
-    bundle: true,
-    minify: true,
-    sourcemap: true,
-    platform: 'node',
-    format: 'cjs',
-    outfile: 'dist/sub-store.bundle.js',
-});
+    let content = fs.readFileSync(path.join(__dirname, 'sub-store.min.js'), {
+        encoding: 'utf8',
+    });
+    content = content.replace(
+        /eval\(('|")(require\(('|").*?('|")\))('|")\)/g,
+        '$2',
+    );
+    fs.writeFileSync(
+        path.join(__dirname, 'dist/sub-store.no-bundle.js'),
+        content,
+        {
+            encoding: 'utf8',
+        },
+    );
+
+    await build({
+        entryPoints: ['dist/sub-store.no-bundle.js'],
+        bundle: true,
+        minify: true,
+        sourcemap: true,
+        platform: 'node',
+        format: 'cjs',
+        outfile: 'dist/sub-store.bundle.js',
+    });
+    fs.writeFileSync(
+        path.join(__dirname, 'dist/sub-store.bundle.js'),
+        `// SUB_STORE_BACKEND_VERSION: ${version}
+${fs.readFileSync(path.join(__dirname, 'dist/sub-store.bundle.js'), {
+    encoding: 'utf8',
+})}`,
+        {
+            encoding: 'utf8',
+        },
+    );
+})()
+    .catch((e) => {
+        console.log(e);
+    })
+    .finally(() => {
+        console.log('done');
+    });

backend/dev-esbuild.js

@@ -0,0 +1,24 @@
+#!/usr/bin/env node
+const { build } = require('esbuild');
+
+!(async () => {
+    const artifacts = [{ src: 'src/main.js', dest: 'sub-store.min.js' }];
+
+    for await (const artifact of artifacts) {
+        await build({
+            entryPoints: [artifact.src],
+            bundle: true,
+            minify: false,
+            sourcemap: false,
+            platform: 'node',
+            format: 'cjs',
+            outfile: artifact.dest,
+        });
+    }
+})()
+    .catch((e) => {
+        console.log(e);
+    })
+    .finally(() => {
+        console.log('done');
+    });

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.201",
+  "version": "2.14.218",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
@@ -8,6 +8,8 @@
     "test": "gulp peggy && npx cross-env BABEL_ENV=test mocha src/test/**/*.spec.js --require @babel/register --recursive",
     "serve": "node sub-store.min.js",
     "start": "nodemon -w src -w package.json --exec babel-node src/main.js",
+    "dev:esbuild": "nodemon -w src -w package.json dev-esbuild.js",
+    "dev:run": "nodemon -w sub-store.min.js sub-store.min.js",
     "build": "gulp",
     "bundle": "node bundle.js"
   },

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

@@ -63,7 +63,7 @@ function parse(raw) {
     return proxies;
 }
 
-async function process(proxies, operators = [], targetPlatform, source) {
+async function processFn(proxies, operators = [], targetPlatform, source) {
     for (const item of operators) {
         // process script
         let script;
@@ -188,7 +188,7 @@ function produce(proxies, targetPlatform, type, opts = {}) {
 
 export const ProxyUtils = {
     parse,
-    process,
+    process: processFn,
     produce,
     isIPv4,
     isIPv6,

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

@@ -545,6 +545,123 @@ function URI_Hysteria2() {
     };
     return { name, test, parse };
 }
+function URI_Hysteria() {
+    const name = 'URI Hysteria Parser';
+    const test = (line) => {
+        return /^(hysteria|hy):\/\//.test(line);
+    };
+    const parse = (line) => {
+        line = line.split(/(hysteria|hy):\/\//)[2];
+        // eslint-disable-next-line no-unused-vars
+        let [__, server, ___, port, ____, addons = '', name] =
+            /^(.*?)(:(\d+))?\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
+        port = parseInt(`${port}`, 10);
+        if (isNaN(port)) {
+            port = 443;
+        }
+        if (name != null) {
+            name = decodeURIComponent(name);
+        }
+        name = name ?? `Hysteria ${server}:${port}`;
+
+        const proxy = {
+            type: 'hysteria',
+            name,
+            server,
+            port,
+        };
+        const params = {};
+        for (const addon of addons.split('&')) {
+            let [key, value] = addon.split('=');
+            key = key.replace(/_/, '-');
+            value = decodeURIComponent(value);
+            if (['alpn'].includes(key)) {
+                proxy[key] = value ? value.split(',') : undefined;
+            } else if (['insecure'].includes(key)) {
+                proxy['skip-cert-verify'] = /(TRUE)|1/i.test(value);
+            } else if (['auth'].includes(key)) {
+                proxy['auth-str'] = value;
+            } else if (['mport'].includes(key)) {
+                proxy['ports'] = value;
+            } else if (['obfsParam'].includes(key)) {
+                proxy['obfs'] = value;
+            } else if (['upmbps'].includes(key)) {
+                proxy['up'] = value;
+            } else if (['downmbps'].includes(key)) {
+                proxy['down'] = value;
+            } else if (['obfs'].includes(key)) {
+                // obfs: Obfuscation mode (optional, empty or "xplus")
+                proxy['_obfs'] = value || '';
+            } else if (['fast-open', 'peer'].includes(key)) {
+                params[key] = value;
+            } else {
+                proxy[key] = value;
+            }
+        }
+
+        if (!proxy.sni && params.peer) {
+            proxy.sni = params.peer;
+        }
+        if (!proxy['fast-open'] && params.fastopen) {
+            proxy['fast-open'] = true;
+        }
+        if (!proxy.protocol) {
+            // protocol: protocol to use ("udp", "wechat-video", "faketcp") (optional, default: "udp")
+            proxy.protocol = 'udp';
+        }
+
+        return proxy;
+    };
+    return { name, test, parse };
+}
+function URI_TUIC() {
+    const name = 'URI TUIC Parser';
+    const test = (line) => {
+        return /^tuic:\/\//.test(line);
+    };
+    const parse = (line) => {
+        line = line.split(/tuic:\/\//)[1];
+        // eslint-disable-next-line no-unused-vars
+        let [__, uuid, password, server, ___, port, ____, addons = '', name] =
+            /^(.*?):(.*?)@(.*?)(:(\d+))?\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
+        port = parseInt(`${port}`, 10);
+        if (isNaN(port)) {
+            port = 443;
+        }
+        password = decodeURIComponent(password);
+        if (name != null) {
+            name = decodeURIComponent(name);
+        }
+        name = name ?? `TUIC ${server}:${port}`;
+
+        const proxy = {
+            type: 'tuic',
+            name,
+            server,
+            port,
+            password,
+            uuid,
+        };
+
+        for (const addon of addons.split('&')) {
+            let [key, value] = addon.split('=');
+            key = key.replace(/_/, '-');
+            value = decodeURIComponent(value);
+            if (['alpn'].includes(key)) {
+                proxy[key] = value ? value.split(',') : undefined;
+            } else if (['allow-insecure'].includes(key)) {
+                proxy['skip-cert-verify'] = /(TRUE)|1/i.test(value);
+            } else if (['disable-sni', 'reduce-rtt'].includes(key)) {
+                proxy[key] = /(TRUE)|1/i.test(value);
+            } else {
+                proxy[key] = value;
+            }
+        }
+
+        return proxy;
+    };
+    return { name, test, parse };
+}
 
 // Trojan URI format
 function URI_Trojan() {
@@ -1051,6 +1168,8 @@ export default [
     URI_SSR(),
     URI_VMess(),
     URI_VLESS(),
+    URI_TUIC(),
+    URI_Hysteria(),
     URI_Hysteria2(),
     URI_Trojan(),
     Clash_All(),

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

@@ -68,7 +68,7 @@ trojan = tag equals "trojan"i address password (transport/transport_host/transpo
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/udp_relay/download_bandwidth/ecn/others)* {
+hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/udp_relay/fast_open/download_bandwidth/ecn/others)* {
     proxy.type = "hysteria2";
 }
 https = tag equals "https"i address (username password)? (tls_host/tls_verification/fast_open/udp_relay/others)* {

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

@@ -66,7 +66,7 @@ trojan = tag equals "trojan"i address password (transport/transport_host/transpo
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/udp_relay/download_bandwidth/ecn/others)* {
+hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/udp_relay/fast_open/download_bandwidth/ecn/others)* {
     proxy.type = "hysteria2";
 }
 https = tag equals "https"i address (username password)? (tls_host/tls_verification/fast_open/udp_relay/others)* {

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

@@ -41,7 +41,7 @@ start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v
     return proxy;
 }
 
-shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/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/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,21 +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/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/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/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();
 }
-snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/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") {
@@ -87,11 +87,11 @@ 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/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/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();
@@ -104,11 +104,11 @@ hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying
     proxy.type = "hysteria2";
     handleShadowTLS();
 }
-socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/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/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();

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

@@ -39,7 +39,7 @@ start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v
     return proxy;
 }
 
-shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/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/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,21 +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/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/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/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();
 }
-snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/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") {
@@ -85,11 +85,11 @@ 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/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/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();
@@ -102,11 +102,11 @@ hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying
     proxy.type = "hysteria2";
     handleShadowTLS();
 }
-socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/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/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();

backend/src/core/proxy-utils/parsers/peggy/trojan-uri.js

@@ -30,7 +30,7 @@ start = (trojan) {
   return proxy
 }
 
-trojan = "trojan://" password:password "@" server:server ":" port:port params? name:name?{
+trojan = "trojan://" password:password "@" server:server ":" port:port "/"? params? name:name?{
   proxy.type = "trojan";
   proxy.password = password;
   proxy.server = server;
@@ -79,7 +79,7 @@ port = digits:[0-9]+ {
   }
 }
 
-params = "/"? "?" head:param tail:("&"@param)* {
+params = "?" head:param tail:("&"@param)* {
   proxy["skip-cert-verify"] = toBool(params["allowInsecure"]);
   proxy.sni = params["sni"] || params["peer"];
 

backend/src/core/proxy-utils/parsers/peggy/trojan-uri.peg

@@ -28,7 +28,7 @@ start = (trojan) {
   return proxy
 }
 
-trojan = "trojan://" password:password "@" server:server ":" port:port params? name:name?{
+trojan = "trojan://" password:password "@" server:server ":" port:port "/"? params? name:name?{
   proxy.type = "trojan";
   proxy.password = password;
   proxy.server = server;
@@ -77,7 +77,7 @@ port = digits:[0-9]+ {
   }
 }
 
-params = "/"? "?" head:param tail:("&"@param)* {
+params = "?" head:param tail:("&"@param)* {
   proxy["skip-cert-verify"] = toBool(params["allowInsecure"]);
   proxy.sni = params["sni"] || params["peer"];
 

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

@@ -87,12 +87,15 @@ function QuickSettingOperator(args) {
             if (get(args.useless)) {
                 const filter = UselessFilter();
                 const selected = filter.func(proxies);
-                proxies.filter((_, i) => selected[i]);
+                proxies = proxies.filter(
+                    (p, i) => selected[i] && p.port > 0 && p.port <= 65535,
+                );
             }
 
             return proxies.map((proxy) => {
                 proxy.udp = get(args.udp, proxy.udp);
                 proxy.tfo = get(args.tfo, proxy.tfo);
+                proxy['fast-open'] = get(args.tfo, proxy['fast-open']);
                 proxy['skip-cert-verify'] = get(
                     args.scert,
                     proxy['skip-cert-verify'],
@@ -510,7 +513,7 @@ function ResolveDomainOperator({ provider, type, filter }) {
 
             return proxies.filter((p) => {
                 if (filter === 'removeFailed') {
-                    return p['no-resolve'] || p.resolved;
+                    return isIP(p.server) || p['no-resolve'] || p.resolved;
                 } else if (filter === 'IPOnly') {
                     return isIP(p.server);
                 } else if (filter === 'IPv4Only') {

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

@@ -83,7 +83,9 @@ function shadowsocks(proxy) {
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
     // udp
-    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
+    if (proxy.udp) {
+        result.append(`,udp=true`);
+    }
 
     return result.toString();
 }
@@ -109,7 +111,9 @@ function shadowsocksr(proxy) {
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
     // udp
-    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
+    if (proxy.udp) {
+        result.append(`,udp=true`);
+    }
 
     return result.toString();
 }
@@ -152,7 +156,9 @@ function trojan(proxy) {
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
     // udp
-    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
+    if (proxy.udp) {
+        result.append(`,udp=true`);
+    }
 
     return result.toString();
 }
@@ -219,7 +225,9 @@ function vmess(proxy) {
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
     // udp
-    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
+    if (proxy.udp) {
+        result.append(`,udp=true`);
+    }
     return result.toString();
 }
 
@@ -281,7 +289,9 @@ function vless(proxy) {
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
     // udp
-    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
+    if (proxy.udp) {
+        result.append(`,udp=true`);
+    }
     return result.toString();
 }
 
@@ -304,8 +314,6 @@ function http(proxy) {
     // tfo
     result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
 
-    // udp
-    result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
     return result.toString();
 }
 
@@ -336,7 +344,11 @@ function wireguard(proxy) {
     if (proxy.dns) {
         if (Array.isArray(proxy.dns)) {
             proxy.dnsv6 = proxy.dns.find((i) => isIPv6(i));
-            proxy.dns = proxy.dns.find((i) => isIPv4(i));
+            let dns = proxy.dns.find((i) => isIPv4(i));
+            if (!dns) {
+                dns = proxy.dns.find((i) => !isIPv4(i) && !isIPv6(i));
+            }
+            proxy.dns = dns;
         }
     }
     result.appendIfPresent(`,dns=${proxy.dns}`, 'dns');
@@ -386,8 +398,13 @@ function hysteria2(proxy) {
         'skip-cert-verify',
     );
 
+    // tfo
+    result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
+
     // udp
-    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
+    if (proxy.udp) {
+        result.append(`,udp=true`);
+    }
 
     // download-bandwidth
     result.appendIfPresent(

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

@@ -225,7 +225,7 @@ const httpParser = (proxy = {}) => {
         server_port: parseInt(`${proxy.port}`, 10),
         tls: { enabled: false, server_name: proxy.server, insecure: false },
     };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
+    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy.username) parsedProxy.username = proxy.username;
     if (proxy.password) parsedProxy.password = proxy.password;
@@ -252,7 +252,7 @@ const socks5Parser = (proxy = {}) => {
         password: proxy.password,
         version: '5',
     };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
+    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy.username) parsedProxy.username = proxy.username;
     if (proxy.password) parsedProxy.password = proxy.password;
@@ -287,7 +287,7 @@ const shadowTLSParser = (proxy = {}) => {
             },
         },
     };
-    if (stPart.server_port < 1 || stPart.server_port > 65535)
+    if (stPart.server_port < 0 || stPart.server_port > 65535)
         throw '端口值非法';
     if (proxy['fast-open'] === true) stPart.udp_fragment = true;
     tfoParser(proxy, stPart);
@@ -303,7 +303,7 @@ const ssParser = (proxy = {}) => {
         method: proxy.cipher,
         password: proxy.password,
     };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
+    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy.uot) parsedProxy.udp_over_tcp = true;
     if (proxy['udp-over-tcp']) parsedProxy.udp_over_tcp = true;
@@ -379,7 +379,7 @@ const ssrParser = (proxy = {}) => {
         obfs: proxy.obfs,
         protocol: proxy.protocol,
     };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
+    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy['obfs-param']) parsedProxy.obfs_param = proxy['obfs-param'];
     if (proxy['protocol-param'] && proxy['protocol-param'] !== '')
@@ -412,7 +412,7 @@ const vmessParser = (proxy = {}) => {
         ].indexOf(parsedProxy.security) === -1
     )
         parsedProxy.security = 'auto';
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
+    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;
@@ -436,7 +436,7 @@ const vlessParser = (proxy = {}) => {
         uuid: proxy.uuid,
         tls: { enabled: false, server_name: proxy.server, insecure: false },
     };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
+    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     if (proxy.flow === 'xtls-rprx-vision') parsedProxy.flow = proxy.flow;
@@ -457,7 +457,7 @@ const trojanParser = (proxy = {}) => {
         password: proxy.password,
         tls: { enabled: true, server_name: proxy.server, insecure: false },
     };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
+    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     if (proxy.network === 'grpc') grpcParser(proxy, parsedProxy);
@@ -477,7 +477,7 @@ const hysteriaParser = (proxy = {}) => {
         disable_mtu_discovery: false,
         tls: { enabled: true, server_name: proxy.server, insecure: false },
     };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
+    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy.auth_str) parsedProxy.auth_str = `${proxy.auth_str}`;
     if (proxy['auth-str']) parsedProxy.auth_str = `${proxy['auth-str']}`;
@@ -524,7 +524,7 @@ const hysteria2Parser = (proxy = {}) => {
         obfs: {},
         tls: { enabled: true, server_name: proxy.server, insecure: false },
     };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
+    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy.up) parsedProxy.up_mbps = parseInt(`${proxy.up}`, 10);
     if (proxy.down) parsedProxy.down_mbps = parseInt(`${proxy.down}`, 10);
@@ -547,7 +547,7 @@ const tuic5Parser = (proxy = {}) => {
         password: proxy.password,
         tls: { enabled: true, server_name: proxy.server, insecure: false },
     };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
+    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     if (
@@ -583,7 +583,7 @@ const wireguardParser = (proxy = {}) => {
         pre_shared_key: proxy['pre-shared-key'],
         reserved: [],
     };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
+    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     if (typeof proxy.reserved === 'string') {
@@ -637,6 +637,35 @@ export default function singbox_Producer() {
                             }
                             break;
                         case 'ss':
+                            // if (!proxy.cipher) {
+                            //     proxy.cipher = 'none';
+                            // }
+                            // if (
+                            //     ![
+                            //         '2022-blake3-aes-128-gcm',
+                            //         '2022-blake3-aes-256-gcm',
+                            //         '2022-blake3-chacha20-poly1305',
+                            //         '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',
+                            //         'chacha20-ietf',
+                            //         'chacha20-ietf-poly1305',
+                            //         'none',
+                            //         'rc4-md5',
+                            //         'xchacha20',
+                            //         'xchacha20-ietf-poly1305',
+                            //     ].includes(proxy.cipher)
+                            // ) {
+                            //     throw new Error(
+                            //         `cipher ${proxy.cipher} is not supported`,
+                            //     );
+                            // }
                             if (proxy.plugin === 'shadow-tls') {
                                 const { ssPart, stPart } =
                                     shadowTLSParser(proxy);

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

@@ -1,5 +1,5 @@
 import { Result, isPresent } from './utils';
-import { isNotBlank } from '@/utils';
+import { isNotBlank, getIfNotBlank } from '@/utils';
 import $ from '@/core/app';
 
 const targetPlatform = 'Surge';
@@ -13,7 +13,7 @@ const ipVersions = {
 };
 
 export default function Surge_Producer() {
-    const produce = (proxy) => {
+    const produce = (proxy, type, opts = {}) => {
         switch (proxy.type) {
             case 'ss':
                 return shadowsocks(proxy);
@@ -30,10 +30,14 @@ export default function Surge_Producer() {
             case 'tuic':
                 return tuic(proxy);
             case 'wireguard-surge':
-                return wireguard(proxy);
+                return wireguard_surge(proxy);
             case 'hysteria2':
                 return hysteria2(proxy);
         }
+
+        if (opts['include-unsupported-proxy'] && proxy.type === 'wireguard') {
+            return wireguard(proxy);
+        }
         throw new Error(
             `Platform ${targetPlatform} does not support proxy type: ${proxy.type}`,
         );
@@ -82,10 +86,8 @@ function shadowsocks(proxy) {
     result.append(`,encrypt-method=${proxy.cipher}`);
     result.appendIfPresent(`,password=${proxy.password}`, 'password');
 
-    result.appendIfPresent(
-        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
-        'ip-version',
-    );
+    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']}`,
@@ -167,10 +169,8 @@ function trojan(proxy) {
     result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
     result.appendIfPresent(`,password=${proxy.password}`, 'password');
 
-    result.appendIfPresent(
-        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
-        'ip-version',
-    );
+    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']}`,
@@ -236,10 +236,8 @@ function vmess(proxy) {
     result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
     result.appendIfPresent(`,username=${proxy.uuid}`, 'uuid');
 
-    result.appendIfPresent(
-        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
-        'ip-version',
-    );
+    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']}`,
@@ -314,10 +312,8 @@ function http(proxy) {
     result.appendIfPresent(`,${proxy.username}`, 'username');
     result.appendIfPresent(`,${proxy.password}`, 'password');
 
-    result.appendIfPresent(
-        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
-        'ip-version',
-    );
+    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']}`,
@@ -379,10 +375,8 @@ function socks5(proxy) {
     result.appendIfPresent(`,${proxy.username}`, 'username');
     result.appendIfPresent(`,${proxy.password}`, 'password');
 
-    result.appendIfPresent(
-        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
-        'ip-version',
-    );
+    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']}`,
@@ -445,10 +439,8 @@ function snell(proxy) {
     result.appendIfPresent(`,version=${proxy.version}`, 'version');
     result.appendIfPresent(`,psk=${proxy.psk}`, 'psk');
 
-    result.appendIfPresent(
-        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
-        'ip-version',
-    );
+    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']}`,
@@ -525,10 +517,8 @@ function tuic(proxy) {
         'alpn',
     );
 
-    result.appendIfPresent(
-        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
-        'ip-version',
-    );
+    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']}`,
@@ -587,6 +577,107 @@ function tuic(proxy) {
 }
 
 function wireguard(proxy) {
+    if (Array.isArray(proxy.peers) && proxy.peers.length > 0) {
+        proxy.server = proxy.peers[0].server;
+        proxy.port = proxy.peers[0].port;
+        proxy.ip = proxy.peers[0].ip;
+        proxy.ipv6 = proxy.peers[0].ipv6;
+        proxy['public-key'] = proxy.peers[0]['public-key'];
+        proxy['preshared-key'] = proxy.peers[0]['pre-shared-key'];
+        // https://github.com/MetaCubeX/mihomo/blob/0404e35be8736b695eae018a08debb175c1f96e6/docs/config.yaml#L717
+        proxy['allowed-ips'] = proxy.peers[0]['allowed-ips'];
+        proxy.reserved = proxy.peers[0].reserved;
+    }
+    const result = new Result(proxy);
+
+    result.append(`# WireGuard Proxy ${proxy.name}
+${proxy.name}=wireguard`);
+
+    proxy['section-name'] = getIfNotBlank(proxy['section-name'], proxy.name);
+
+    result.appendIfPresent(
+        `,section-name=${proxy['section-name']}`,
+        'section-name',
+    );
+    result.appendIfPresent(
+        `,no-error-alert=${proxy['no-error-alert']}`,
+        'no-error-alert',
+    );
+
+    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
+    result.appendIfPresent(`,ip-version=${ip_version}`, 'ip-version');
+
+    // test-url
+    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
+
+    // shadow-tls
+    if (isPresent(proxy, 'shadow-tls-password')) {
+        result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
+
+        result.appendIfPresent(
+            `,shadow-tls-version=${proxy['shadow-tls-version']}`,
+            'shadow-tls-version',
+        );
+        result.appendIfPresent(
+            `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
+            'shadow-tls-sni',
+        );
+    }
+
+    // block-quic
+    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
+
+    // underlying-proxy
+    result.appendIfPresent(
+        `,underlying-proxy=${proxy['underlying-proxy']}`,
+        'underlying-proxy',
+    );
+
+    result.append(`
+# WireGuard Section ${proxy.name}
+[WireGuard ${proxy['section-name']}]
+private-key = ${proxy['private-key']}`);
+
+    result.appendIfPresent(`\nself-ip = ${proxy.ip}`, 'ip');
+    result.appendIfPresent(`\nself-ip-v6 = ${proxy.ipv6}`, 'ipv6');
+    if (proxy.dns) {
+        if (Array.isArray(proxy.dns)) {
+            proxy.dns = proxy.dns.join(', ');
+        }
+        result.append(`\ndns-server = ${proxy.dns}`);
+    }
+    result.appendIfPresent(`\nmtu = ${proxy.mtu}`, 'mtu');
+
+    if (ip_version === 'prefer-v6') {
+        result.append(`\nprefer-ipv6 = true`);
+    }
+    const allowedIps = Array.isArray(proxy['allowed-ips'])
+        ? proxy['allowed-ips'].join(',')
+        : proxy['allowed-ips'];
+    let reserved = Array.isArray(proxy.reserved)
+        ? proxy.reserved.join('/')
+        : proxy.reserved;
+    let presharedKey = proxy['preshared-key'] ?? proxy['pre-shared-key'];
+    if (presharedKey) {
+        presharedKey = `,preshared-key="${presharedKey}"`;
+    }
+    const peer = {
+        'public-key': proxy['public-key'],
+        'allowed-ips': allowedIps,
+        endpoint: `${proxy.server}:${proxy.port}`,
+        keepalive: proxy['persistent-keepalive'] || proxy.keepalive,
+        'client-id': reserved,
+        'preshared-key': presharedKey,
+    };
+    result.append(
+        `\npeer = (${Object.keys(peer)
+            .filter((k) => peer[k] != null)
+            .map((k) => `${k} = ${peer[k]}`)
+            .join(', ')})`,
+    );
+    return result.toString();
+}
+function wireguard_surge(proxy) {
     const result = new Result(proxy);
 
     result.append(`${proxy.name}=wireguard`);
@@ -600,10 +691,8 @@ function wireguard(proxy) {
         'no-error-alert',
     );
 
-    result.appendIfPresent(
-        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
-        'ip-version',
-    );
+    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
+    result.appendIfPresent(`,ip-version=${ip_version}`, 'ip-version');
 
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
@@ -643,10 +732,8 @@ function hysteria2(proxy) {
 
     result.appendIfPresent(`,password=${proxy.password}`, 'password');
 
-    result.appendIfPresent(
-        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
-        'ip-version',
-    );
+    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']}`,

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

@@ -6,6 +6,11 @@ export default function URI_Producer() {
     const type = 'SINGLE';
     const produce = (proxy) => {
         let result = '';
+        delete proxy.subName;
+        delete proxy.collectionName;
+        if (['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(proxy.type)) {
+            delete proxy.tls;
+        }
         if (proxy.server && isIPv6(proxy.server)) {
             proxy.server = `[${proxy.server}]`;
         }
@@ -197,9 +202,9 @@ export default function URI_Producer() {
 
                 result = `vless://${proxy.uuid}@${proxy.server}:${
                     proxy.port
-                }?${vlessTransport}&security=${encodeURIComponent(
+                }?security=${encodeURIComponent(
                     security,
-                )}${alpn}${allowInsecure}${sni}${fp}${flow}${sid}${pbk}#${encodeURIComponent(
+                )}${vlessTransport}${alpn}${allowInsecure}${sni}${fp}${flow}${sid}${pbk}#${encodeURIComponent(
                     proxy.name,
                 )}`;
                 break;
@@ -285,6 +290,119 @@ export default function URI_Producer() {
                     '&',
                 )}#${encodeURIComponent(proxy.name)}`;
                 break;
+            case 'hysteria':
+                let hysteriaParams = [];
+                Object.keys(proxy).forEach((key) => {
+                    if (!['name', 'type', 'server', 'port'].includes(key)) {
+                        const i = key.replace(/-/, '_');
+                        if (['alpn'].includes(key)) {
+                            if (proxy[key]) {
+                                hysteriaParams.push(
+                                    `${i}=${encodeURIComponent(
+                                        Array.isArray(proxy[key])
+                                            ? proxy[key][0]
+                                            : proxy[key],
+                                    )}`,
+                                );
+                            }
+                        } else if (['skip-cert-verify'].includes(key)) {
+                            if (proxy[key]) {
+                                hysteriaParams.push(`insecure=1`);
+                            }
+                        } else if (['tfo', 'fast-open'].includes(key)) {
+                            if (
+                                proxy[key] &&
+                                !hysteriaParams.includes('fastopen=1')
+                            ) {
+                                hysteriaParams.push(`fastopen=1`);
+                            }
+                        } else if (['ports'].includes(key)) {
+                            hysteriaParams.push(`mport=${proxy[key]}`);
+                        } else if (['auth-str'].includes(key)) {
+                            hysteriaParams.push(`auth=${proxy[key]}`);
+                        } else if (['up'].includes(key)) {
+                            hysteriaParams.push(`upmbps=${proxy[key]}`);
+                        } else if (['down'].includes(key)) {
+                            hysteriaParams.push(`downmbps=${proxy[key]}`);
+                        } else if (['_obfs'].includes(key)) {
+                            hysteriaParams.push(`obfs=${proxy[key]}`);
+                        } else if (['obfs'].includes(key)) {
+                            hysteriaParams.push(`obfsParam=${proxy[key]}`);
+                        } else if (['sni'].includes(key)) {
+                            hysteriaParams.push(`peer=${proxy[key]}`);
+                        } else if (proxy[key]) {
+                            hysteriaParams.push(
+                                `${i}=${encodeURIComponent(proxy[key])}`,
+                            );
+                        }
+                    }
+                });
+
+                result = `hysteria://${proxy.server}:${
+                    proxy.port
+                }?${hysteriaParams.join('&')}#${encodeURIComponent(
+                    proxy.name,
+                )}`;
+                break;
+
+            case 'tuic':
+                if (!proxy.token || proxy.token.length === 0) {
+                    let tuicParams = [];
+                    Object.keys(proxy).forEach((key) => {
+                        if (
+                            ![
+                                'name',
+                                'type',
+                                'uuid',
+                                'password',
+                                'server',
+                                'port',
+                            ].includes(key)
+                        ) {
+                            const i = key.replace(/-/, '_');
+                            if (['alpn'].includes(key)) {
+                                if (proxy[key]) {
+                                    tuicParams.push(
+                                        `${i}=${encodeURIComponent(
+                                            Array.isArray(proxy[key])
+                                                ? proxy[key][0]
+                                                : proxy[key],
+                                        )}`,
+                                    );
+                                }
+                            } else if (['skip-cert-verify'].includes(key)) {
+                                if (proxy[key]) {
+                                    tuicParams.push(`allow_insecure=1`);
+                                }
+                            } else if (['tfo', 'fast-open'].includes(key)) {
+                                if (
+                                    proxy[key] &&
+                                    !tuicParams.includes('fast_open=1')
+                                ) {
+                                    tuicParams.push(`fast_open=1`);
+                                }
+                            } else if (
+                                ['disable-sni', 'reduce-rtt'].includes(key) &&
+                                proxy[key]
+                            ) {
+                                tuicParams.push(`${i}=1`);
+                            } else if (proxy[key]) {
+                                tuicParams.push(
+                                    `${i}=${encodeURIComponent(proxy[key])}`,
+                                );
+                            }
+                        }
+                    });
+
+                    result = `tuic://${encodeURIComponent(
+                        proxy.uuid,
+                    )}:${encodeURIComponent(proxy.password)}@${proxy.server}:${
+                        proxy.port
+                    }?${tuicParams.join('&')}#${encodeURIComponent(
+                        proxy.name,
+                    )}`;
+                    break;
+                }
         }
         return result;
     };

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

@@ -1,8 +1,14 @@
 import { version } from '../../package.json';
-import { SETTINGS_KEY, ARTIFACTS_KEY } from '@/constants';
+import {
+    SETTINGS_KEY,
+    ARTIFACTS_KEY,
+    SUBS_KEY,
+    COLLECTIONS_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);
@@ -30,23 +36,83 @@ 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) => {
-                if (artifact.sync) {
-                    $.info(`正在同步云配置：${artifact.name}...`);
-                    const output = await produceArtifact({
-                        type: artifact.type,
-                        name: artifact.source,
-                        platform: artifact.platform,
-                    });
+                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,
+                            },
+                        });
 
-                    files[encodeURIComponent(artifact.name)] = {
-                        content: output,
-                    };
+                        // 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);
                 }
             }),
         );
 
+        if (invalid.length > 0) {
+            throw new Error(
+                `同步配置 ${invalid.join(', ')} 发生错误 详情请查看日志`,
+            );
+        }
+
         const resp = await syncToGist(files);
         const body = JSON.parse(resp.body);
 
@@ -71,8 +137,8 @@ async function doSync() {
 
         $.write(allArtifacts, ARTIFACTS_KEY);
         $.notify('🌍 Sub-Store', '全部订阅同步成功！');
-    } catch (err) {
-        $.notify('🌍 Sub-Store', '同步订阅失败', `原因：${err}`);
-        $.error(`无法同步订阅配置到 Gist，原因：${err}`);
+    } catch (e) {
+        $.notify('🌍 Sub-Store', '同步订阅失败', `原因：${e.message ?? e}`);
+        $.error(`无法同步订阅配置到 Gist，原因：${e}`);
     }
 }

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

@@ -2,28 +2,79 @@
 import { ProxyUtils } from '@/core/proxy-utils';
 import { RuleUtils } from '@/core/rule-utils';
 import { version } from '../../package.json';
+import download from '@/utils/download';
 
-console.log(
-    `
-┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
-     Sub-Store -- v${version}
-┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
-`,
-);
+let result = '';
+let resource = typeof $resource !== 'undefined' ? $resource : '';
+let resourceType = typeof $resourceType !== 'undefined' ? $resourceType : '';
+let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
 
-const RESOURCE_TYPE = {
-    PROXY: 1,
-    RULE: 2,
-};
+!(async () => {
+    console.log(
+        `
+    ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
+         Sub-Store -- v${version}
+    ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
+    `,
+    );
 
-let result = $resource;
+    let arg;
+    if (typeof $argument != 'undefined') {
+        arg = Object.fromEntries(
+            $argument.split('&').map((item) => item.split('=')),
+        );
+    } else {
+        arg = {};
+    }
 
-if ($resourceType === RESOURCE_TYPE.PROXY) {
-    const proxies = ProxyUtils.parse($resource);
-    result = ProxyUtils.produce(proxies, 'Loon');
-} else if ($resourceType === RESOURCE_TYPE.RULE) {
-    const rules = RuleUtils.parse($resource);
-    result = RuleUtils.produce(rules, 'Loon');
-}
+    const RESOURCE_TYPE = {
+        PROXY: 1,
+        RULE: 2,
+    };
 
-$done(result);
+    result = resource;
+
+    if (resourceType === RESOURCE_TYPE.PROXY) {
+        try {
+            let proxies = ProxyUtils.parse(resource);
+            result = ProxyUtils.produce(proxies, 'Loon');
+        } catch (e) {
+            console.log('解析器: 使用 resource 出现错误');
+            console.log(e.message ?? e);
+        }
+        if ((!result || /^\s*$/.test(result)) && resourceUrl) {
+            console.log(`解析器: 尝试从 ${resourceUrl} 获取订阅`);
+            try {
+                let raw = await download(resourceUrl, arg?.ua, arg?.timeout);
+                let proxies = ProxyUtils.parse(raw);
+                result = ProxyUtils.produce(proxies, 'Loon');
+            } catch (e) {
+                console.log(e.message ?? e);
+            }
+        }
+    } else if (resourceType === RESOURCE_TYPE.RULE) {
+        try {
+            const rules = RuleUtils.parse(resource);
+            result = RuleUtils.produce(rules, 'Loon');
+        } catch (e) {
+            console.log(e.message ?? e);
+        }
+        if ((!result || /^\s*$/.test(result)) && resourceUrl) {
+            console.log(`解析器: 尝试从 ${resourceUrl} 获取规则`);
+            try {
+                let raw = await download(resourceUrl, arg?.ua, arg?.timeout);
+                let rules = RuleUtils.parse(raw);
+                result = RuleUtils.produce(rules, 'Loon');
+            } catch (e) {
+                console.log(e.message ?? e);
+            }
+        }
+    }
+})()
+    .catch(async (e) => {
+        console.log('解析器: 出现错误');
+        console.log(e.message ?? e);
+    })
+    .finally(() => {
+        $done(result || '');
+    });

backend/src/restful/sync.js

@@ -448,6 +448,46 @@ 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 {

backend/src/utils/download.js

@@ -74,6 +74,7 @@ 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(

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

@@ -10,7 +10,17 @@ class ResourceCache {
         if (!$.read(HEADERS_RESOURCE_CACHE_KEY)) {
             $.write('{}', HEADERS_RESOURCE_CACHE_KEY);
         }
-        this.resourceCache = JSON.parse($.read(HEADERS_RESOURCE_CACHE_KEY));
+        try {
+            this.resourceCache = JSON.parse($.read(HEADERS_RESOURCE_CACHE_KEY));
+        } catch (e) {
+            $.error(
+                `解析持久化缓存中的 ${HEADERS_RESOURCE_CACHE_KEY} 失败, 重置为 {}, 错误: ${
+                    e?.message ?? e
+                }`,
+            );
+            this.resourceCache = {};
+            $.write('{}', HEADERS_RESOURCE_CACHE_KEY);
+        }
         this._cleanup();
     }
 

backend/src/utils/resource-cache.js

@@ -7,7 +7,17 @@ class ResourceCache {
         if (!$.read(RESOURCE_CACHE_KEY)) {
             $.write('{}', RESOURCE_CACHE_KEY);
         }
-        this.resourceCache = JSON.parse($.read(RESOURCE_CACHE_KEY));
+        try {
+            this.resourceCache = JSON.parse($.read(RESOURCE_CACHE_KEY));
+        } catch (e) {
+            $.error(
+                `解析持久化缓存中的 ${RESOURCE_CACHE_KEY} 失败, 重置为 {}, 错误: ${
+                    e?.message ?? e
+                }`,
+            );
+            this.resourceCache = {};
+            $.write('{}', RESOURCE_CACHE_KEY);
+        }
         this._cleanup();
     }
 

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

@@ -10,7 +10,17 @@ class ResourceCache {
         if (!$.read(SCRIPT_RESOURCE_CACHE_KEY)) {
             $.write('{}', SCRIPT_RESOURCE_CACHE_KEY);
         }
-        this.resourceCache = JSON.parse($.read(SCRIPT_RESOURCE_CACHE_KEY));
+        try {
+            this.resourceCache = JSON.parse($.read(SCRIPT_RESOURCE_CACHE_KEY));
+        } catch (e) {
+            $.error(
+                `解析持久化缓存中的 ${SCRIPT_RESOURCE_CACHE_KEY} 失败, 重置为 {}, 错误: ${
+                    e?.message ?? e
+                }`,
+            );
+            this.resourceCache = {};
+            $.write('{}', SCRIPT_RESOURCE_CACHE_KEY);
+        }
         this._cleanup();
     }
 

config/Stash.stoverride

@@ -1,5 +1,6 @@
 name: Sub-Store
 desc: 高级订阅管理工具 @Peng-YM. 定时任务默认为每天 0 点
+icon: https://raw.githubusercontent.com/cc63/ICON/main/Sub-Store.png
 
 http:
   mitm:

scripts/demo.js

@@ -35,6 +35,49 @@ 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