feat: 支持 VLESS XHTTP extra

.github/workflows/main.yml

@@ -27,18 +27,18 @@ jobs:
         run: |
           npm install -g pnpm
           cd backend && pnpm i --no-frozen-lockfile
-      - name: Test
-        run: |
-          cd backend
-          pnpm test
-      - name: Build
-        run: |
-          cd backend
-          pnpm run build
+      # - name: Test
+      #   run: |
+      #     cd backend
+      #     pnpm test
+      # - name: Build
+      #   run: |
+      #     cd backend
+      #     pnpm run build
       - name: Bundle
         run: |
           cd backend
-          pnpm run bundle
+          pnpm bundle:esbuild
       - id: tag
         name: Generate release tag
         run: |

README.md

@@ -28,7 +28,7 @@ Core functionalities:
 
 > ⚠️ Do not use `Shadowrocket` to export URI and then import it as input. It is not a standard URI.
 
-- [x] Normal Proxy(`socks5`, `socks5+tls`, `http`, `https`(it's ok))
+- [x] Proxy URI Scheme(`socks5`, `socks5+tls`, `http`, `https`(it's ok))
 
   example: `socks5+tls://user:pass@ip:port#name`
 

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.16.7",
+  "version": "2.16.19",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
@@ -12,6 +12,7 @@
     "dev:run": "nodemon -w sub-store.min.js sub-store.min.js",
     "build": "gulp",
     "bundle": "node bundle.js",
+    "bundle:esbuild": "node bundle-esbuild.js",
     "changelog": "conventional-changelog -p cli -i CHANGELOG.md -s"
   },
   "author": "Peng-YM",
@@ -33,6 +34,7 @@
     "ms": "^2.1.3",
     "nanoid": "^3.3.3",
     "request": "^2.88.2",
+    "semver": "^7.6.3",
     "static-js-yaml": "^1.0.0"
   },
   "devDependencies": {

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

@@ -343,6 +343,14 @@ function lastParse(proxy) {
     if (typeof proxy.password === 'number') {
         proxy.password = numberToString(proxy.password);
     }
+    if (
+        ['ss'].includes(proxy.type) &&
+        proxy.cipher === 'none' &&
+        !proxy.password
+    ) {
+        // https://github.com/MetaCubeX/mihomo/issues/1677
+        proxy.password = '';
+    }
     if (proxy.interface) {
         proxy['interface-name'] = proxy.interface;
         delete proxy.interface;

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

@@ -596,6 +596,9 @@ function URI_VLESS() {
                 // mKCP 的伪装头部类型。当前可选值有 none / srtp / utp / wechat-video / dtls / wireguard。省略时默认值为 none，即不使用伪装头部，但不可以为空字符串。
                 proxy.headerType = params.headerType || 'none';
             }
+            if (params.extra) {
+                proxy.extra = params.extra;
+            }
         }
 
         return proxy;

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

@@ -39,12 +39,12 @@ start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/socks5/hysteria2
     return proxy;
 }
 
-shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/others)*{
+shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/others)*{
     proxy.type = "ssr";
     // handle ssr obfs
     proxy.obfs = obfs.type;
 }
-shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/others)* {
     proxy.type = "ss";
     // handle ss obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -54,31 +54,31 @@ shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs
         $set(proxy, "plugin-opts.path", obfs.path);
     }
 }
-vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/others)* {
+vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     proxy.alterId = proxy.alterId || 0;
     handleTransport();
 }
-vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/others)* {
+vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "vless";
     handleTransport();
 }
-trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/others)* {
+trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/others)* {
+hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/others)* {
     proxy.type = "hysteria2";
 }
-https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/others)* {
+https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-http = tag equals "http"i address (username password)? (fast_open/udp_relay/others)* {
+http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "http";
 }
-socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/others)* {
+socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "socks5";
 }
 
@@ -182,6 +182,7 @@ tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals match:[^,]+ { proxy["tls-pu
 
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
+ip_mode = comma "ip-mode" equals match:[^,]+ { proxy["ip-version"] = match.join(""); }
 
 ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
 download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }

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

@@ -37,12 +37,12 @@ start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/socks5/hysteria2
     return proxy;
 }
 
-shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/others)*{
+shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/others)*{
     proxy.type = "ssr";
     // handle ssr obfs
     proxy.obfs = obfs.type;
 }
-shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/others)* {
     proxy.type = "ss";
     // handle ss obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -52,31 +52,31 @@ shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs
         $set(proxy, "plugin-opts.path", obfs.path);
     }
 }
-vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/others)* {
+vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     proxy.alterId = proxy.alterId || 0;
     handleTransport();
 }
-vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/others)* {
+vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "vless";
     handleTransport();
 }
-trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/others)* {
+trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/others)* {
+hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/others)* {
     proxy.type = "hysteria2";
 }
-https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/others)* {
+https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-http = tag equals "http"i address (username password)? (fast_open/udp_relay/others)* {
+http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "http";
 }
-socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/others)* {
+socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/others)* {
     proxy.type = "socks5";
 }
 
@@ -180,6 +180,7 @@ tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals match:[^,]+ { proxy["tls-pu
 
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
+ip_mode = comma "ip-mode" equals match:[^,]+ { proxy["ip-version"] = match.join(""); }
 
 ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
 download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }

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

@@ -37,7 +37,7 @@ function Base64Encoded() {
     };
     const parse = function (raw) {
         const decoded = Base64.decode(raw);
-        if (!/^\w+:\/\/\w+/m.test(decoded)) {
+        if (!/^\w+(:\/\/|\s*?=\s*?)\w+/m.test(decoded)) {
             $.error(
                 `Base64 Pre-processor error: decoded line does not start with protocol`,
             );

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

@@ -4,7 +4,7 @@ export default function Egern_Producer() {
         // https://egernapp.com/zh-CN/docs/configuration/proxies
         const list = proxies
             .filter((proxy) => {
-                if (opts['include-unsupported-proxy']) return true;
+                // if (opts['include-unsupported-proxy']) return true;
                 if (
                     ![
                         'http',
@@ -47,6 +47,12 @@ export default function Egern_Producer() {
                                 'salsa20',
                                 'chacha20',
                                 'chacha20-ietf',
+                                ...(opts['include-unsupported-proxy']
+                                    ? [
+                                          '2022-blake3-aes-128-gcm',
+                                          '2022-blake3-aes-256-gcm',
+                                      ]
+                                    : []),
                             ].includes(proxy.cipher))) ||
                     (proxy.type === 'vmess' &&
                         (![

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

@@ -3,13 +3,21 @@ const targetPlatform = 'Loon';
 import { isPresent, Result } from './utils';
 import { isIPv4, isIPv6 } from '@/utils';
 
+const ipVersions = {
+    dual: 'dual',
+    ipv4: 'v4-only',
+    ipv6: 'v6-only',
+    'ipv4-prefer': 'prefer-v4',
+    'ipv6-prefer': 'prefer-v6',
+};
+
 export default function Loon_Producer() {
     const produce = (proxy, type, opts = {}) => {
         switch (proxy.type) {
             case 'ss':
                 return shadowsocks(proxy, opts['include-unsupported-proxy']);
             case 'ssr':
-                return shadowsocksr(proxy);
+                return shadowsocksr(proxy, opts['include-unsupported-proxy']);
             case 'trojan':
                 return trojan(proxy);
             case 'vmess':
@@ -139,11 +147,13 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
             `shadow-tls is not supported(请使用 includeUnsupportedProxy 参数)`,
         );
     }
+    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
+    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
 
     return result.toString();
 }
 
-function shadowsocksr(proxy) {
+function shadowsocksr(proxy, includeUnsupportedProxy) {
     const result = new Result(proxy);
     result.append(
         `${proxy.name}=shadowsocksr,${proxy.server},${proxy.port},${proxy.cipher},"${proxy.password}"`,
@@ -160,6 +170,49 @@ function shadowsocksr(proxy) {
     result.appendIfPresent(`,obfs=${proxy.obfs}`, 'obfs');
     result.appendIfPresent(`,obfs-param=${proxy['obfs-param']}`, 'obfs-param');
 
+    let isShadowTLS;
+
+    // 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',
+        );
+        // udp-port
+        result.appendIfPresent(`,udp-port=${proxy['udp-port']}`, 'udp-port');
+        isShadowTLS = true;
+    } else if (['shadow-tls'].includes(proxy.plugin) && proxy['plugin-opts']) {
+        const password = proxy['plugin-opts'].password;
+        const host = proxy['plugin-opts'].host;
+        const version = proxy['plugin-opts'].version;
+        if (password) {
+            result.append(`,shadow-tls-password=${password}`);
+            if (host) {
+                result.append(`,shadow-tls-sni=${host}`);
+            }
+            if (version) {
+                if (version < 2) {
+                    throw new Error(
+                        `shadow-tls version ${version} is not supported`,
+                    );
+                }
+                result.append(`,shadow-tls-version=${version}`);
+            }
+            // udp-port
+            result.appendIfPresent(
+                `,udp-port=${proxy['udp-port']}`,
+                'udp-port',
+            );
+            isShadowTLS = true;
+        }
+    }
+
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
@@ -168,6 +221,14 @@ function shadowsocksr(proxy) {
         result.append(`,udp=true`);
     }
 
+    if (!includeUnsupportedProxy && isShadowTLS) {
+        throw new Error(
+            `shadow-tls is not supported(请使用 includeUnsupportedProxy 参数)`,
+        );
+    }
+    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
+    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
+
     return result.toString();
 }
 
@@ -220,6 +281,8 @@ function trojan(proxy) {
     if (proxy.udp) {
         result.append(`,udp=true`);
     }
+    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
+    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
 
     return result.toString();
 }
@@ -296,13 +359,16 @@ function vmess(proxy) {
     // udp
     if (proxy.udp) {
         result.append(`,udp=true`);
+        const ip_version =
+            ipVersions[proxy['ip-version']] || proxy['ip-version'];
+        result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
     }
     return result.toString();
 }
 
 function vless(proxy) {
-    if (proxy['reality-opts']) {
-        throw new Error(`VLESS REALITY is unsupported`);
+    if (typeof proxy.flow !== 'undefined' || proxy['reality-opts']) {
+        throw new Error(`VLESS XTLS/REALITY is not supported`);
     }
     const result = new Result(proxy);
     result.append(
@@ -368,6 +434,9 @@ function vless(proxy) {
     // udp
     if (proxy.udp) {
         result.append(`,udp=true`);
+        const ip_version =
+            ipVersions[proxy['ip-version']] || proxy['ip-version'];
+        result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
     }
     return result.toString();
 }
@@ -390,6 +459,8 @@ function http(proxy) {
 
     // tfo
     result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
+    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
+    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
 
     return result.toString();
 }
@@ -418,6 +489,8 @@ function socks5(proxy) {
     if (proxy.udp) {
         result.append(`,udp=true`);
     }
+    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
+    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
 
     return result.toString();
 }
@@ -483,6 +556,8 @@ function wireguard(proxy) {
             presharedKey ?? ''
         }}]`,
     );
+    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
+    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
 
     return result.toString();
 }
@@ -530,6 +605,8 @@ function hysteria2(proxy) {
     );
 
     result.appendIfPresent(`,ecn=${proxy.ecn}`, 'ecn');
+    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
+    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
 
     return result.toString();
 }

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

@@ -53,7 +53,7 @@ export default function Surge_Producer() {
     return { produce };
 }
 
-function shadowsocks(proxy, includeUnsupportedProxy) {
+function shadowsocks(proxy) {
     const result = new Result(proxy);
     result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
     if (!proxy.cipher) {
@@ -87,9 +87,8 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
             'chacha20',
             'chacha20-ietf',
             'none',
-            ...(includeUnsupportedProxy
-                ? ['2022-blake3-aes-128-gcm', '2022-blake3-aes-256-gcm']
-                : []),
+            '2022-blake3-aes-128-gcm',
+            '2022-blake3-aes-256-gcm',
         ].includes(proxy.cipher)
     ) {
         throw new Error(`cipher ${proxy.cipher} is not supported`);

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

@@ -188,6 +188,10 @@ export default function URI_Producer() {
                 if (proxy.flow) {
                     flow = `&flow=${encodeURIComponent(proxy.flow)}`;
                 }
+                let extra = '';
+                if (proxy.extra) {
+                    extra = `&extra=${encodeURIComponent(proxy.extra)}`;
+                }
                 let vlessType = proxy.network;
                 if (
                     proxy.network === 'ws' &&
@@ -254,7 +258,7 @@ export default function URI_Producer() {
                     proxy.port
                 }?security=${encodeURIComponent(
                     security,
-                )}${vlessTransport}${alpn}${allowInsecure}${sni}${fp}${flow}${sid}${pbk}#${encodeURIComponent(
+                )}${vlessTransport}${alpn}${allowInsecure}${sni}${fp}${flow}${sid}${pbk}${extra}#${encodeURIComponent(
                     proxy.name,
                 )}`;
                 break;

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

@@ -174,6 +174,14 @@ async function doSync() {
 
         const resp = await syncToGist(files);
         const body = JSON.parse(resp.body);
+        delete body.history;
+        delete body.forks;
+        delete body.owner;
+        Object.values(body.files).forEach((file) => {
+            delete file.content;
+        });
+        $.info('上传配置响应:');
+        $.info(JSON.stringify(body, null, 2));
 
         for (const artifact of allArtifacts) {
             if (artifact.sync) {

backend/src/restful/download.js

@@ -1,4 +1,7 @@
-import { getPlatformFromHeaders } from '@/utils/user-agent';
+import {
+    getPlatformFromHeaders,
+    shouldIncludeUnsupportedProxy,
+} from '@/utils/user-agent';
 import { ProxyUtils } from '@/core/proxy-utils';
 import { COLLECTIONS_KEY, SUBS_KEY } from '@/constants';
 import { findByName } from '@/utils/database';
@@ -161,7 +164,19 @@ async function downloadSubscription(req, res) {
     }
     if (includeUnsupportedProxy) {
         includeUnsupportedProxy = decodeURIComponent(includeUnsupportedProxy);
-        $.info(`包含不支持的节点: ${includeUnsupportedProxy}`);
+        $.info(
+            `包含官方/商店版/未续费订阅不支持的协议: ${includeUnsupportedProxy}`,
+        );
+    }
+
+    if (
+        !includeUnsupportedProxy &&
+        shouldIncludeUnsupportedProxy(platform, reqUA)
+    ) {
+        includeUnsupportedProxy = true;
+        $.info(
+            `当前客户端可包含官方/商店版/未续费订阅不支持的协议: ${includeUnsupportedProxy}`,
+        );
     }
 
     if (useMihomoExternal) {
@@ -342,11 +357,9 @@ async function downloadCollection(req, res) {
 
     const allCols = $.read(COLLECTIONS_KEY);
     const collection = findByName(allCols, name);
-
+    const reqUA = req.headers['user-agent'] || req.headers['User-Agent'];
     $.info(
-        `正在下载组合订阅：${name}\n请求 User-Agent: ${
-            req.headers['user-agent'] || req.headers['User-Agent']
-        }\n请求 target: ${req.query.target}\n实际输出: ${platform}`,
+        `正在下载组合订阅：${name}\n请求 User-Agent: ${reqUA}\n请求 target: ${req.query.target}\n实际输出: ${platform}`,
     );
 
     let {
@@ -393,7 +406,18 @@ async function downloadCollection(req, res) {
 
     if (includeUnsupportedProxy) {
         includeUnsupportedProxy = decodeURIComponent(includeUnsupportedProxy);
-        $.info(`包含不支持的节点: ${includeUnsupportedProxy}`);
+        $.info(
+            `包含官方/商店版/未续费订阅不支持的协议: ${includeUnsupportedProxy}`,
+        );
+    }
+    if (
+        !includeUnsupportedProxy &&
+        shouldIncludeUnsupportedProxy(platform, reqUA)
+    ) {
+        includeUnsupportedProxy = true;
+        $.info(
+            `当前客户端可包含官方/商店版/未续费订阅不支持的协议: ${includeUnsupportedProxy}`,
+        );
     }
     if (useMihomoExternal) {
         $.info(`手动指定了 target 为 SurgeMac, 将使用 Mihomo External`);
@@ -417,6 +441,7 @@ async function downloadCollection(req, res) {
                 $options,
                 proxy,
                 noCache,
+                ua: reqUA,
             });
             let subUserInfoOfSub;
             // forward flow header from the first subscription in this collection
@@ -522,13 +547,12 @@ async function downloadCollection(req, res) {
             } else {
                 subUserInfoOfCol = collection.subUserinfo;
             }
-            res.set(
-                'subscription-userinfo',
-                [subUserInfoOfCol, subUserInfoOfSub]
-                    .filter((i) => i)
-                    .join('; '),
-            );
-
+            const subUserInfo = [subUserInfoOfCol, subUserInfoOfSub]
+                .filter((i) => i)
+                .join('; ');
+            if (subUserInfo) {
+                res.set('subscription-userinfo', subUserInfo);
+            }
             if (platform === 'JSON') {
                 if (resultFormat === 'nezha') {
                     output = nezhaTransform(output);

backend/src/restful/sync.js

@@ -216,6 +216,14 @@ async function produceArtifact({
         await Promise.all(
             subnames.map(async (name) => {
                 const sub = findByName(allSubs, name);
+                const passThroughUA = sub.passThroughUA;
+                let reqUA = sub.ua;
+                if (passThroughUA) {
+                    $.info(
+                        `订阅开启了透传 User-Agent, 使用请求的 User-Agent: ${ua}`,
+                    );
+                    reqUA = ua;
+                }
                 try {
                     $.info(`正在处理子订阅：${sub.name}...`);
                     let raw;
@@ -237,7 +245,7 @@ async function produceArtifact({
                                     try {
                                         return await download(
                                             url,
-                                            sub.ua,
+                                            reqUA,
                                             undefined,
                                             proxy ||
                                                 sub.proxy ||
@@ -625,6 +633,15 @@ async function syncArtifacts() {
         const resp = await syncToGist(files);
         const body = JSON.parse(resp.body);
 
+        delete body.history;
+        delete body.forks;
+        delete body.owner;
+        Object.values(body.files).forEach((file) => {
+            delete file.content;
+        });
+        $.info('上传配置响应:');
+        $.info(JSON.stringify(body, null, 2));
+
         for (const artifact of allArtifacts) {
             if (artifact.sync) {
                 artifact.updated = new Date().getTime();
@@ -743,6 +760,16 @@ async function syncArtifact(req, res) {
         });
         artifact.updated = new Date().getTime();
         const body = JSON.parse(resp.body);
+
+        delete body.history;
+        delete body.forks;
+        delete body.owner;
+        Object.values(body.files).forEach((file) => {
+            delete file.content;
+        });
+        $.info('上传配置响应:');
+        $.info(JSON.stringify(body, null, 2));
+
         let files = body.files;
         let isGitLab;
         if (Array.isArray(files)) {

backend/src/utils/user-agent.js

@@ -1,3 +1,7 @@
+import gte from 'semver/functions/gte';
+import coerce from 'semver/functions/coerce';
+import $ from '@/core/app';
+
 export function getUserAgentFromHeaders(headers) {
     const keys = Object.keys(headers);
     let UA = '';
@@ -56,3 +60,17 @@ export function getPlatformFromHeaders(headers) {
     const { UA, ua, accept } = getUserAgentFromHeaders(headers);
     return getPlatformFromUserAgent({ ua, UA, accept });
 }
+export function shouldIncludeUnsupportedProxy(platform, ua) {
+    try {
+        const version = coerce(ua).version;
+        if (platform === 'Stash' && gte(version, '2.8.0')) {
+            return true;
+        }
+        if (platform === 'Egern' && gte(version, '1.29.0')) {
+            return true;
+        }
+    } catch (e) {
+        $.error(`获取版本号失败: ${e}`);
+    }
+    return false;
+}