feat: 找不到资源时不通知, 仅保留日志

feat: Trojan URI 支持省略端口号
feat: Stash 使用 includeUnsupportedProxy 参数开启 Shadowsocks 2022
2025-08-10 00:52:40 +00:00 · 2024-11-28 15:44:55 +08:00 · 2024-11-28 13:15:22 +08:00 · 2024-11-27 15:20:20 +08:00 · 2024-11-26 15:01:04 +08:00 · 2024-11-24 12:31:18 +08:00
20 changed files with 498 additions and 137 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -76,8 +76,8 @@ jobs:
          git commit -m "release: ${{ steps.tag.outputs.release_tag }}"
          git remote add origin "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}"
          git push -f -u origin release
-      - name: Sync to GitLab
-        env:
-          GITLAB_PIPELINE_TOKEN: ${{ secrets.GITLAB_PIPELINE_TOKEN }}
-        run: |
-          curl -X POST --fail -F token=$GITLAB_PIPELINE_TOKEN -F ref=master https://gitlab.com/api/v4/projects/48891296/trigger/pipeline
+      # - name: Sync to GitLab
+      #   env:
+      #     GITLAB_PIPELINE_TOKEN: ${{ secrets.GITLAB_PIPELINE_TOKEN }}
+      #   run: |
+      #     curl -X POST --fail -F token=$GITLAB_PIPELINE_TOKEN -F ref=master https://gitlab.com/api/v4/projects/48891296/trigger/pipeline
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 </div>

 <p align="center" color="#6a737d">
-Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.
+Advanced Subscription Manager for QX, Loon, Surge, Stash, Egern and Shadowrocket.
 </p>

 [![Build](https://github.com/sub-store-org/Sub-Store/actions/workflows/main.yml/badge.svg)](https://github.com/sub-store-org/Sub-Store/actions/workflows/main.yml) ![GitHub](https://img.shields.io/github/license/sub-store-org/Sub-Store) ![GitHub issues](https://img.shields.io/github/issues/sub-store-org/Sub-Store) ![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/Peng-Ym/Sub-Store) ![Lines of code](https://img.shields.io/tokei/lines/github/sub-store-org/Sub-Store) ![Size](https://img.shields.io/github/languages/code-size/sub-store-org/Sub-Store)
@@ -49,6 +49,7 @@ Core functionalities:
 - [x] Surge
 - [x] SurgeMac(Use mihomo to support protocols that are not supported by Surge itself)
 - [x] Loon
+- [x] Egern
 - [x] Shadowrocket
 - [x] QX
 - [x] sing-box
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sub-store",
-  "version": "2.14.415",
+  "version": "2.14.430",
  "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
  "main": "src/main.js",
  "scripts": {
--- a/backend/src/core/proxy-utils/parsers/index.js
+++ b/backend/src/core/proxy-utils/parsers/index.js
@@ -340,6 +340,10 @@ function URI_VMess() {
            } else if (params.net === 'h2' || proxy.network === 'h2') {
                proxy.network = 'h2';
            }
+            // 暂不支持 tcp + host + path
+            // else if (params.net === 'tcp' || proxy.network === 'tcp') {
+            //     proxy.network = 'tcp';
+            // }
            if (proxy.network) {
                let transportHost = params.host ?? params.obfsParam;
                try {
@@ -838,6 +842,11 @@ function URI_Trojan() {
    };

    const parse = (line) => {
+        const matched = /^(trojan:\/\/.*?@.*?)(:(\d+))?\/?(\?.*?)?$/.exec(line);
+        const port = matched?.[2];
+        if (!port) {
+            line = line.replace(matched[1], `${matched[1]}:443`);
+        }
        let [newLine, name] = line.split(/#(.+)/, 2);
        const parser = getTrojanURIParser();
        const proxy = parser.parse(newLine);
--- a/backend/src/core/proxy-utils/parsers/peggy/surge.js
+++ b/backend/src/core/proxy-utils/parsers/peggy/surge.js
@@ -193,7 +193,7 @@ snell_psk = comma "psk" equals match:[^,]+ { proxy.psk = match.join(""); }
 snell_version = comma "version" equals match:$[0-9]+ { proxy.version = parseInt(match.trim()); }

 usernamek = comma "username" equals match:[^,]+ { proxy.username = match.join(""); }
-passwordk = comma "password" equals match:[^,]+ { proxy.password = match.join(""); }
+passwordk = comma "password" equals match:[^,]+ { proxy.password = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
 vmess_uuid = comma "username" equals match:[^,]+ { proxy.uuid = match.join(""); }
 vmess_aead = comma "vmess-aead" equals flag:bool { proxy.aead = flag; }

--- a/backend/src/core/proxy-utils/parsers/peggy/surge.peg
+++ b/backend/src/core/proxy-utils/parsers/peggy/surge.peg
@@ -191,7 +191,7 @@ snell_psk = comma "psk" equals match:[^,]+ { proxy.psk = match.join(""); }
 snell_version = comma "version" equals match:$[0-9]+ { proxy.version = parseInt(match.trim()); }

 usernamek = comma "username" equals match:[^,]+ { proxy.username = match.join(""); }
-passwordk = comma "password" equals match:[^,]+ { proxy.password = match.join(""); }
+passwordk = comma "password" equals match:[^,]+ { proxy.password = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
 vmess_uuid = comma "username" equals match:[^,]+ { proxy.uuid = match.join(""); }
 vmess_aead = comma "vmess-aead" equals flag:bool { proxy.aead = flag; }

--- a/backend/src/core/proxy-utils/processors/index.js
+++ b/backend/src/core/proxy-utils/processors/index.js
@@ -561,7 +561,7 @@ function ResolveDomainOperator({
        throw new Error(`域名解析服务提供方 ${provider} 不支持 ${_type}`);
    }
    const { defaultTimeout } = $.read(SETTINGS_KEY);
-    const requestTimeout = timeout || defaultTimeout;
+    const requestTimeout = timeout || defaultTimeout || 8000;
    let type = ['IPv6', 'IP4P'].includes(_type) ? 'IPv6' : 'IPv4';

    const resolver = DOMAIN_RESOLVERS[provider];
--- a/backend/src/core/proxy-utils/producers/egern.js
+++ b/backend/src/core/proxy-utils/producers/egern.js
@@ -0,0 +1,298 @@
+export default function Egern_Producer() {
+    const type = 'ALL';
+    const produce = (proxies, type, opts = {}) => {
+        // https://egernapp.com/zh-CN/docs/configuration/proxies
+        const list = proxies
+            .filter((proxy) => {
+                if (opts['include-unsupported-proxy']) return true;
+                if (
+                    ![
+                        'http',
+                        'socks5',
+                        'ss',
+                        'trojan',
+                        'hysteria2',
+                        'vless',
+                        'vmess',
+                    ].includes(proxy.type) ||
+                    (proxy.type === 'ss' &&
+                        ((proxy.plugin === 'obfs' &&
+                            !['http', 'tls'].includes(
+                                proxy['plugin-opts']?.mode,
+                            )) ||
+                            ![
+                                'chacha20-ietf-poly1305',
+                                'chacha20-poly1305',
+                                'aes-256-gcm',
+                                'aes-128-gcm',
+                                'none',
+                                'tbale',
+                                'rc4',
+                                'rc4-md5',
+                                'aes-128-cfb',
+                                'aes-192-cfb',
+                                'aes-256-cfb',
+                                'aes-128-ctr',
+                                'aes-192-ctr',
+                                'aes-256-ctr',
+                                'bf-cfb',
+                                'camellia-128-cfb',
+                                'camellia-192-cfb',
+                                'camellia-256-cfb',
+                                'cast5-cfb',
+                                'des-cfb',
+                                'idea-cfb',
+                                'rc2-cfb',
+                                'seed-cfb',
+                                'salsa20',
+                                'chacha20',
+                                'chacha20-ietf',
+                            ].includes(proxy.cipher))) ||
+                    (proxy.type === 'vmess' &&
+                        (![
+                            'auto',
+                            'aes-128-gcm',
+                            'chacha20-poly1305',
+                            'none',
+                            'zero',
+                        ].includes(proxy.cipher) ||
+                            (!['http', 'ws', 'tcp'].includes(proxy.network) &&
+                                proxy.network))) ||
+                    (proxy.type === 'trojan' &&
+                        !['http', 'ws', 'tcp'].includes(proxy.network) &&
+                        proxy.network) ||
+                    (proxy.type === 'vless' &&
+                        (typeof proxy.flow !== 'undefined' ||
+                            proxy['reality-opts'] ||
+                            (!['http', 'ws', 'tcp'].includes(proxy.network) &&
+                                proxy.network)))
+                ) {
+                    return false;
+                }
+                return true;
+            })
+            .map((proxy) => {
+                if (proxy.type === 'http') {
+                    proxy = {
+                        type: 'http',
+                        name: proxy.name,
+                        server: proxy.server,
+                        port: proxy.port,
+                        username: proxy.username,
+                        password: proxy.password,
+                        tfo: proxy.tfo || proxy['fast-open'],
+                        next_hop: proxy.next_hop,
+                    };
+                } else if (proxy.type === 'socks5') {
+                    proxy = {
+                        type: 'socks5',
+                        name: proxy.name,
+                        server: proxy.server,
+                        port: proxy.port,
+                        username: proxy.username,
+                        password: proxy.password,
+                        tfo: proxy.tfo || proxy['fast-open'],
+                        udp_relay:
+                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
+                        next_hop: proxy.next_hop,
+                    };
+                } else if (proxy.type === 'ss') {
+                    proxy = {
+                        type: 'shadowsocks',
+                        name: proxy.name,
+                        method:
+                            proxy.cipher === 'chacha20-ietf-poly1305'
+                                ? 'chacha20-poly1305'
+                                : proxy.cipher,
+                        server: proxy.server,
+                        port: proxy.port,
+                        password: proxy.password,
+                        tfo: proxy.tfo || proxy['fast-open'],
+                        udp_relay:
+                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
+                        next_hop: proxy.next_hop,
+                    };
+                    if (proxy.plugin === 'obfs') {
+                        proxy.obfs = proxy['plugin-opts'].mode;
+                        proxy.obfs_host = proxy['plugin-opts'].host;
+                        proxy.obfs_uri = proxy['plugin-opts'].path;
+                    }
+                } else if (proxy.type === 'hysteria2') {
+                    proxy = {
+                        type: 'hysteria2',
+                        name: proxy.name,
+                        server: proxy.server,
+                        port: proxy.port,
+                        auth: proxy.password,
+                        tfo: proxy.tfo || proxy['fast-open'],
+                        udp_relay:
+                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
+                        next_hop: proxy.next_hop,
+                        sni: proxy.sni,
+                        skip_tls_verify: proxy['skip-cert-verify'],
+                    };
+                    if (proxy['obfs-password'] && proxy.obfs == 'salamander') {
+                        proxy.obfs = 'salamander';
+                        proxy.obfs_password = proxy['obfs-password'];
+                    }
+                } else if (proxy.type === 'trojan') {
+                    if (proxy.network === 'ws') {
+                        proxy.websocket = {
+                            path: proxy['ws-opts']?.path,
+                            host: proxy['ws-opts']?.headers?.Host,
+                        };
+                    }
+                    proxy = {
+                        type: 'trojan',
+                        name: proxy.name,
+                        server: proxy.server,
+                        port: proxy.port,
+                        password: proxy.password,
+                        tfo: proxy.tfo || proxy['fast-open'],
+                        udp_relay:
+                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
+                        next_hop: proxy.next_hop,
+                        sni: proxy.sni,
+                        skip_tls_verify: proxy['skip-cert-verify'],
+                        websocket: proxy.websocket,
+                    };
+                } else if (proxy.type === 'vmess') {
+                    if (proxy.network === 'ws') {
+                        proxy.transport = {
+                            [proxy.tls ? 'wss' : 'ws']: {
+                                path: proxy['ws-opts']?.path,
+                                headers: {
+                                    Host: proxy['ws-opts']?.headers?.Host,
+                                },
+                                sni: proxy.tls ? proxy.sni : undefined,
+                                skip_tls_verify: proxy.tls
+                                    ? proxy['skip-cert-verify']
+                                    : undefined,
+                            },
+                        };
+                    } else if (proxy.network === 'http') {
+                        proxy.transport = {
+                            http: {
+                                method: proxy['http-opts']?.method,
+                                path: proxy['http-opts']?.path,
+                                headers: {
+                                    Host: Array.isArray(
+                                        proxy['http-opts']?.headers?.Host,
+                                    )
+                                        ? proxy['http-opts']?.headers?.Host[0]
+                                        : proxy['http-opts']?.headers?.Host,
+                                },
+                                skip_tls_verify: proxy['skip-cert-verify'],
+                            },
+                        };
+                    } else if (proxy.network === 'tcp' || !proxy.network) {
+                        proxy.transport = {
+                            [proxy.tls ? 'tls' : 'tcp']: {
+                                sni: proxy.tls ? proxy.sni : undefined,
+                                skip_tls_verify: proxy.tls
+                                    ? proxy['skip-cert-verify']
+                                    : undefined,
+                            },
+                        };
+                    }
+                    proxy = {
+                        type: 'vmess',
+                        name: proxy.name,
+                        server: proxy.server,
+                        port: proxy.port,
+                        user_id: proxy.uuid,
+                        security: proxy.cipher,
+                        tfo: proxy.tfo || proxy['fast-open'],
+                        legacy: proxy.legacy,
+                        udp_relay:
+                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
+                        next_hop: proxy.next_hop,
+                        transport: proxy.transport,
+                        // sni: proxy.sni,
+                        // skip_tls_verify: proxy['skip-cert-verify'],
+                    };
+                } else if (proxy.type === 'vless') {
+                    if (proxy.network === 'ws') {
+                        proxy.transport = {
+                            [proxy.tls ? 'wss' : 'ws']: {
+                                path: proxy['ws-opts']?.path,
+                                headers: {
+                                    Host: proxy['ws-opts']?.headers?.Host,
+                                },
+                                sni: proxy.tls ? proxy.sni : undefined,
+                                skip_tls_verify: proxy.tls
+                                    ? proxy['skip-cert-verify']
+                                    : undefined,
+                            },
+                        };
+                    } else if (proxy.network === 'http') {
+                        proxy.transport = {
+                            http: {
+                                method: proxy['http-opts']?.method,
+                                path: proxy['http-opts']?.path,
+                                headers: {
+                                    Host: Array.isArray(
+                                        proxy['http-opts']?.headers?.Host,
+                                    )
+                                        ? proxy['http-opts']?.headers?.Host[0]
+                                        : proxy['http-opts']?.headers?.Host,
+                                },
+                                skip_tls_verify: proxy['skip-cert-verify'],
+                            },
+                        };
+                    } else if (proxy.network === 'tcp' || !proxy.network) {
+                        proxy.transport = {
+                            [proxy.tls ? 'tls' : 'tcp']: {
+                                sni: proxy.tls ? proxy.sni : undefined,
+                                skip_tls_verify: proxy.tls
+                                    ? proxy['skip-cert-verify']
+                                    : undefined,
+                            },
+                        };
+                    }
+                    proxy = {
+                        type: 'vless',
+                        name: proxy.name,
+                        server: proxy.server,
+                        port: proxy.port,
+                        user_id: proxy.uuid,
+                        security: proxy.cipher,
+                        tfo: proxy.tfo || proxy['fast-open'],
+                        legacy: proxy.legacy,
+                        udp_relay:
+                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
+                        next_hop: proxy.next_hop,
+                        transport: proxy.transport,
+                        // sni: proxy.sni,
+                        // skip_tls_verify: proxy['skip-cert-verify'],
+                    };
+                }
+
+                delete proxy.subName;
+                delete proxy.collectionName;
+                delete proxy.id;
+                delete proxy.resolved;
+                delete proxy['no-resolve'];
+                if (type !== 'internal') {
+                    for (const key in proxy) {
+                        if (proxy[key] == null || /^_/i.test(key)) {
+                            delete proxy[key];
+                        }
+                    }
+                }
+                return {
+                    [proxy.type]: {
+                        ...proxy,
+                        type: undefined,
+                    },
+                };
+            });
+        return type === 'internal'
+            ? list
+            : 'proxies:\n' +
+                  list
+                      .map((proxy) => '  - ' + JSON.stringify(proxy) + '\n')
+                      .join('');
+    };
+    return { type, produce };
+}
--- a/backend/src/core/proxy-utils/producers/index.js
+++ b/backend/src/core/proxy-utils/producers/index.js
@@ -10,6 +10,7 @@ import QX_Producer from './qx';
 import Shadowrocket_Producer from './shadowrocket';
 import Surfboard_Producer from './surfboard';
 import singbox_Producer from './sing-box';
+import Egern_Producer from './egern';

 function JSON_Producer() {
    const type = 'ALL';
@@ -34,4 +35,5 @@ export default {
    ShadowRocket: Shadowrocket_Producer(),
    Surfboard: Surfboard_Producer(),
    'sing-box': singbox_Producer(),
+    Egern: Egern_Producer(),
 };
--- a/backend/src/core/proxy-utils/producers/stash.js
+++ b/backend/src/core/proxy-utils/producers/stash.js
@@ -6,7 +6,6 @@ export default function Stash_Producer() {
        // https://stash.wiki/proxy-protocols/proxy-types#shadowsocks
        const list = proxies
            .filter((proxy) => {
-                if (opts['include-unsupported-proxy']) return true;
                if (
                    ![
                        'ss',
@@ -40,6 +39,12 @@ export default function Stash_Producer() {
                            'xchacha20',
                            'chacha20-ietf-poly1305',
                            'xchacha20-ietf-poly1305',
+                            ...(opts['include-unsupported-proxy']
+                                ? [
+                                      '2022-blake3-aes-128-gcm',
+                                      '2022-blake3-aes-256-gcm',
+                                  ]
+                                : []),
                        ].includes(proxy.cipher)) ||
                    (proxy.type === 'snell' && String(proxy.version) === '4') ||
                    (proxy.type === 'vless' && proxy['reality-opts'])
--- a/backend/src/core/proxy-utils/producers/surge.js
+++ b/backend/src/core/proxy-utils/producers/surge.js
@@ -93,7 +93,7 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
        throw new Error(`cipher ${proxy.cipher} is not supported`);
    }
    result.append(`,encrypt-method=${proxy.cipher}`);
-    result.appendIfPresent(`,password=${proxy.password}`, 'password');
+    result.appendIfPresent(`,password="${proxy.password}"`, 'password');

    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
    result.appendIfPresent(`,ip-version=${ip_version}`, 'ip-version');
@@ -193,7 +193,7 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
 function trojan(proxy) {
    const result = new Result(proxy);
    result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
-    result.appendIfPresent(`,password=${proxy.password}`, 'password');
+    result.appendIfPresent(`,password="${proxy.password}"`, 'password');

    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
    result.appendIfPresent(`,ip-version=${ip_version}`, 'ip-version');
@@ -366,7 +366,7 @@ function ssh(proxy) {
    result.append(`${proxy.name}=ssh,${proxy.server},${proxy.port}`);
    result.appendIfPresent(`,${proxy.username}`, 'username');
    // 所有的类似的字段都有双引号的问题 暂不处理
-    result.appendIfPresent(`,${proxy.password}`, 'password');
+    result.appendIfPresent(`,"${proxy.password}"`, 'password');

    // https://manual.nssurge.com/policy/ssh.html
    // 需配合 Keystore
@@ -431,7 +431,7 @@ function http(proxy) {
    const type = proxy.tls ? 'https' : 'http';
    result.append(`${proxy.name}=${type},${proxy.server},${proxy.port}`);
    result.appendIfPresent(`,${proxy.username}`, 'username');
-    result.appendIfPresent(`,${proxy.password}`, 'password');
+    result.appendIfPresent(`,"${proxy.password}"`, 'password');

    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
    result.appendIfPresent(`,ip-version=${ip_version}`, 'ip-version');
@@ -509,7 +509,7 @@ function socks5(proxy) {
    const type = proxy.tls ? 'socks5-tls' : 'socks5';
    result.append(`${proxy.name}=${type},${proxy.server},${proxy.port}`);
    result.appendIfPresent(`,${proxy.username}`, 'username');
-    result.appendIfPresent(`,${proxy.password}`, 'password');
+    result.appendIfPresent(`,"${proxy.password}"`, 'password');

    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
    result.appendIfPresent(`,ip-version=${ip_version}`, 'ip-version');
@@ -675,7 +675,7 @@ function tuic(proxy) {
    result.append(`${proxy.name}=${type},${proxy.server},${proxy.port}`);

    result.appendIfPresent(`,uuid=${proxy.uuid}`, 'uuid');
-    result.appendIfPresent(`,password=${proxy.password}`, 'password');
+    result.appendIfPresent(`,password="${proxy.password}"`, 'password');
    result.appendIfPresent(`,token=${proxy.token}`, 'token');

    result.appendIfPresent(
@@ -950,7 +950,7 @@ function hysteria2(proxy) {
    const result = new Result(proxy);
    result.append(`${proxy.name}=hysteria2,${proxy.server},${proxy.port}`);

-    result.appendIfPresent(`,password=${proxy.password}`, 'password');
+    result.appendIfPresent(`,password="${proxy.password}"`, 'password');

    if (isPresent(proxy, 'ports')) {
        result.append(`,port-hopping="${proxy.ports.replace(/,/g, ';')}"`);
--- a/backend/src/restful/download.js
+++ b/backend/src/restful/download.js
@@ -158,7 +158,7 @@ async function downloadSubscription(req, res) {
                proxy,
                noCache,
            });
-
+            let flowInfo;
            if (
                sub.source !== 'local' ||
                ['localFirst', 'remoteFirst'].includes(sub.mergeSources)
@@ -193,7 +193,7 @@ async function downloadSubscription(req, res) {
                    }
                    if (!$arguments.noFlow) {
                        // forward flow headers
-                        const flowInfo = await getFlowHeaders(
+                        flowInfo = await getFlowHeaders(
                            $arguments?.insecure ? `${url}#insecure` : url,
                            $arguments.flowUserAgent,
                            undefined,
@@ -213,7 +213,10 @@ async function downloadSubscription(req, res) {
                }
            }
            if (sub.subUserinfo) {
-                res.set('subscription-userinfo', sub.subUserinfo);
+                res.set(
+                    'subscription-userinfo',
+                    [sub.subUserinfo, flowInfo].filter((i) => i).join('; '),
+                );
            }

            if (platform === 'JSON') {
@@ -252,7 +255,7 @@ async function downloadSubscription(req, res) {
            );
        }
    } else {
-        $.notify(`🌍 Sub-Store 下载订阅失败`, `❌ 未找到订阅：${name}！`);
+        $.error(`🌍 Sub-Store 下载订阅失败`, `❌ 未找到订阅：${name}！`);
        failed(
            res,
            new ResourceNotFoundError(
@@ -358,6 +361,7 @@ async function downloadCollection(req, res) {
            const subnames = collection.subscriptions;
            if (subnames.length > 0) {
                const sub = findByName(allSubs, subnames[0]);
+                let flowInfo;
                if (
                    sub.source !== 'local' ||
                    ['localFirst', 'remoteFirst'].includes(sub.mergeSources)
@@ -391,7 +395,7 @@ async function downloadCollection(req, res) {
                            }
                        }
                        if (!$arguments.noFlow) {
-                            const flowInfo = await getFlowHeaders(
+                            flowInfo = await getFlowHeaders(
                                $arguments?.insecure ? `${url}#insecure` : url,
                                $arguments.flowUserAgent,
                                undefined,
@@ -411,7 +415,10 @@ async function downloadCollection(req, res) {
                    }
                }
                if (sub.subUserinfo) {
-                    res.set('subscription-userinfo', sub.subUserinfo);
+                    res.set(
+                        'subscription-userinfo',
+                        [sub.subUserinfo, flowInfo].filter((i) => i).join('; '),
+                    );
                }
            }

@@ -450,7 +457,7 @@ async function downloadCollection(req, res) {
            );
        }
    } else {
-        $.notify(
+        $.error(
            `🌍 Sub-Store 下载组合订阅失败`,
            `❌ 未找到组合订阅：${name}！`,
        );
--- a/backend/src/restful/file.js
+++ b/backend/src/restful/file.js
@@ -179,7 +179,7 @@ async function getFile(req, res) {
            );
        }
    } else {
-        $.notify(`🌍 Sub-Store 下载文件失败`, `❌ 未找到文件：${name}！`);
+        $.error(`🌍 Sub-Store 下载文件失败`, `❌ 未找到文件：${name}！`);
        failed(
            res,
            new ResourceNotFoundError(
--- a/backend/src/restful/subscriptions.js
+++ b/backend/src/restful/subscriptions.js
@@ -125,58 +125,53 @@ async function getFlowInfo(req, res) {
            );
            return;
        }
-        if (sub.subUserinfo) {
-            try {
-                success(res, {
-                    ...parseFlowHeaders(sub.subUserinfo),
-                    remainingDays: getRmainingDays({
-                        resetDay: $arguments.resetDay,
-                        startDate: $arguments.startDate,
-                        cycleDays: $arguments.cycleDays,
-                    }),
-                });
-            } catch (e) {
-                $.error(
-                    `Failed to parse flow info for local subscription ${name}: ${
-                        e.message ?? e
-                    }`,
-                );
-                failed(
-                    res,
-                    new RequestInvalidError(
-                        'NO_FLOW_INFO',
-                        'N/A',
-                        `Failed to parse flow info`,
-                    ),
-                );
-            }
-        } else {
-            const flowHeaders = await getFlowHeaders(
-                $arguments?.insecure ? `${url}#insecure` : url,
-                $arguments.flowUserAgent,
-                undefined,
-                sub.proxy,
-                $arguments.flowUrl,
+        const flowHeaders = await getFlowHeaders(
+            $arguments?.insecure ? `${url}#insecure` : url,
+            $arguments.flowUserAgent,
+            undefined,
+            sub.proxy,
+            $arguments.flowUrl,
+        );
+        if (!flowHeaders && !sub.subUserinfo) {
+            failed(
+                res,
+                new InternalServerError(
+                    'NO_FLOW_INFO',
+                    'No flow info',
+                    `Failed to fetch flow headers`,
+                ),
            );
-            if (!flowHeaders) {
-                failed(
-                    res,
-                    new InternalServerError(
-                        'NO_FLOW_INFO',
-                        'No flow info',
-                        `Failed to fetch flow headers`,
-                    ),
-                );
-                return;
-            }
-            success(res, {
-                ...parseFlowHeaders(flowHeaders),
-                remainingDays: getRmainingDays({
-                    resetDay: $arguments.resetDay,
-                    startDate: $arguments.startDate,
-                    cycleDays: $arguments.cycleDays,
-                }),
+            return;
+        }
+        try {
+            const remainingDays = getRmainingDays({
+                resetDay: $arguments.resetDay,
+                startDate: $arguments.startDate,
+                cycleDays: $arguments.cycleDays,
            });
+            const result = {
+                ...parseFlowHeaders(
+                    [sub.subUserinfo, flowHeaders].filter((i) => i).join('; '),
+                ),
+            };
+            if (remainingDays != null) {
+                result.remainingDays = remainingDays;
+            }
+            success(res, result);
+        } catch (e) {
+            $.error(
+                `Failed to parse flow info for local subscription ${name}: ${
+                    e.message ?? e
+                }`,
+            );
+            failed(
+                res,
+                new RequestInvalidError(
+                    'NO_FLOW_INFO',
+                    'N/A',
+                    `Failed to parse flow info`,
+                ),
+            );
        }
    } catch (err) {
        failed(
--- a/backend/src/utils/download.js
+++ b/backend/src/utils/download.js
@@ -44,14 +44,19 @@ export default async function download(
        }
    }
    const { isNode, isStash, isLoon, isShadowRocket, isQX } = ENV();
-    const { defaultProxy, defaultUserAgent, defaultTimeout, cacheThreshold } =
-        $.read(SETTINGS_KEY);
+    const {
+        defaultProxy,
+        defaultUserAgent,
+        defaultTimeout,
+        cacheThreshold: defaultCacheThreshold,
+    } = $.read(SETTINGS_KEY);
+    const cacheThreshold = defaultCacheThreshold || 1024;
    let proxy = customProxy || defaultProxy;
    if ($.env.isNode) {
        proxy = proxy || eval('process.env.SUB_STORE_BACKEND_DEFAULT_PROXY');
    }
    const userAgent = ua || defaultUserAgent || 'clash.meta';
-    const requestTimeout = timeout || defaultTimeout;
+    const requestTimeout = timeout || defaultTimeout || 8000;
    const id = hex_md5(userAgent + url);

    if ($arguments?.cacheKey === true) {
@@ -151,7 +156,7 @@ export default async function download(
    // try to find in app cache
    const cached = resourceCache.get(id);
    if (!noCache && !$arguments?.noCache && cached) {
-        $.info(`使用缓存: ${url}`);
+        $.info(`使用缓存: ${url}, ${userAgent}`);
        result = cached;
        if (customCacheKey) {
            $.info(`URL ${url}\n写入自定义缓存 ${$arguments?.cacheKey}`);
@@ -179,7 +184,7 @@ export default async function download(
            if (headers) {
                const flowInfo = getFlowField(headers);
                if (flowInfo) {
-                    headersResourceCache.set(url, flowInfo);
+                    headersResourceCache.set(id, flowInfo);
                }
            }
            if (body.replace(/\s/g, '').length === 0)
--- a/backend/src/utils/flow.js
+++ b/backend/src/utils/flow.js
@@ -1,14 +1,24 @@
 import { SETTINGS_KEY } from '@/constants';
 import { HTTP, ENV } from '@/vendor/open-api';
+import { hex_md5 } from '@/vendor/md5';
 import { getPolicyDescriptor } from '@/utils';
 import $ from '@/core/app';
 import headersResourceCache from '@/utils/headers-resource-cache';

 export function getFlowField(headers) {
-    const subkey = Object.keys(headers).filter((k) =>
-        /SUBSCRIPTION-USERINFO/i.test(k),
-    )[0];
-    return headers[subkey];
+    const keys = Object.keys(headers);
+    let sub = '';
+    let webPage = '';
+    for (let k of keys) {
+        const lower = k.toLowerCase();
+        if (lower === 'subscription-userinfo') {
+            sub = headers[k];
+        } else if (lower === 'profile-web-page-url') {
+            webPage = headers[k];
+        }
+    }
+
+    return `${sub || ''}${webPage ? `;app_url=${webPage}` : ''}`;
 }
 export async function getFlowHeaders(
    rawUrl,
@@ -41,29 +51,26 @@ export async function getFlowHeaders(
        return;
    }
    const { isStash, isLoon, isShadowRocket, isQX } = ENV();
-    const cached = headersResourceCache.get(url);
+    const insecure = $arguments?.insecure
+        ? $.env.isNode
+            ? { strictSSL: false }
+            : { insecure: true }
+        : undefined;
+    const { defaultProxy, defaultFlowUserAgent, defaultTimeout } =
+        $.read(SETTINGS_KEY);
+    let proxy = customProxy || defaultProxy;
+    if ($.env.isNode) {
+        proxy = proxy || eval('process.env.SUB_STORE_BACKEND_DEFAULT_PROXY');
+    }
+    const userAgent = ua || defaultFlowUserAgent || 'clash';
+    const requestTimeout = timeout || defaultTimeout || 8000;
+    const id = hex_md5(userAgent + url);
+    const cached = headersResourceCache.get(id);
    let flowInfo;
    if (!$arguments?.noCache && cached) {
-        // $.info(`使用缓存的流量信息: ${url}`);
+        $.info(`使用缓存的流量信息: ${url}, ${userAgent}`);
        flowInfo = cached;
    } else {
-        const insecure = $arguments?.insecure
-            ? $.env.isNode
-                ? { strictSSL: false }
-                : { insecure: true }
-            : undefined;
-        const { defaultProxy, defaultFlowUserAgent, defaultTimeout } =
-            $.read(SETTINGS_KEY);
-        let proxy = customProxy || defaultProxy;
-        if ($.env.isNode) {
-            proxy =
-                proxy || eval('process.env.SUB_STORE_BACKEND_DEFAULT_PROXY');
-        }
-        const userAgent =
-            ua ||
-            defaultFlowUserAgent ||
-            'Quantumult%20X/1.0.30 (iPhone14,2; iOS 15.6)';
-        const requestTimeout = timeout || defaultTimeout;
        const http = HTTP();
        if (flowUrl) {
            $.info(
@@ -159,7 +166,7 @@ export async function getFlowHeaders(
            }
        }
        if (flowInfo) {
-            headersResourceCache.set(url, flowInfo);
+            headersResourceCache.set(id, flowInfo);
        }
    }

@@ -190,8 +197,29 @@ export function parseFlowHeaders(flowHeaders) {
        ? Number(expireMatch[1] + expireMatch[2])
        : undefined;

-    return { expires, total, usage: { upload, download } };
+    const remainingDaysMatch = flowHeaders.match(/reset_day=([0-9]+)/);
+    const remainingDays = remainingDaysMatch
+        ? Number(remainingDaysMatch[1])
+        : undefined;
+
+    const appUrlMatch = flowHeaders.match(/app_url=(.*?)\s*?(;|$)/);
+    const appUrl = appUrlMatch ? decodeURIComponent(appUrlMatch[1]) : undefined;
+
+    const planNameMatch = flowHeaders.match(/plan_name=(.*?)\s*?(;|$)/);
+    const planName = planNameMatch
+        ? decodeURIComponent(planNameMatch[1])
+        : undefined;
+
+    return {
+        expires,
+        total,
+        usage: { upload, download },
+        remainingDays,
+        appUrl,
+        planName,
+    };
 }
+
 export function flowTransfer(flow, unit = 'B') {
    const unitList = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
    let unitIndex = unitList.indexOf(unit);
--- a/backend/src/utils/gist.js
+++ b/backend/src/utils/gist.js
@@ -41,7 +41,7 @@ export default class Gist {
                ...(isLoon && proxy ? { node: proxy } : {}),
                ...(isQX && proxy ? { opts: { policy: proxy } } : {}),
                ...(proxy ? getPolicyDescriptor(proxy) : {}),
-                timeout,
+                timeout: timeout || 8000,

                events: {
                    onResponse: (resp) => {
@@ -81,7 +81,7 @@ export default class Gist {
                ...(isLoon && proxy ? { node: proxy } : {}),
                ...(isQX && proxy ? { opts: { policy: proxy } } : {}),
                ...(proxy ? getPolicyDescriptor(proxy) : {}),
-                timeout,
+                timeout: timeout || 8000,

                events: {
                    onResponse: (resp) => {
--- a/backend/src/utils/user-agent.js
+++ b/backend/src/utils/user-agent.js
@@ -2,18 +2,24 @@ export function getUserAgentFromHeaders(headers) {
    const keys = Object.keys(headers);
    let UA = '';
    let ua = '';
+    let accept = '';
    for (let k of keys) {
-        if (/USER-AGENT/i.test(k)) {
+        const lower = k.toLowerCase();
+        if (lower === 'user-agent') {
            UA = headers[k];
            ua = UA.toLowerCase();
-            break;
+        } else if (lower === 'accept') {
+            accept = headers[k];
        }
    }
-    return { UA, ua };
+    return { UA, ua, accept };
 }
-export function getPlatformFromUserAgent({ ua, UA }) {
+
+export function getPlatformFromUserAgent({ ua, UA, accept }) {
    if (UA.indexOf('Quantumult%20X') !== -1) {
        return 'QX';
+    } else if (ua.indexOf('egern') !== -1) {
+        return 'Egern';
    } else if (UA.indexOf('Surfboard') !== -1) {
        return 'Surfboard';
    } else if (UA.indexOf('Surge Mac') !== -1) {
@@ -39,11 +45,14 @@ export function getPlatformFromUserAgent({ ua, UA }) {
        return 'V2Ray';
    } else if (ua.indexOf('sing-box') !== -1) {
        return 'sing-box';
-    } else {
+    } else if (accept.indexOf('application/json') === 0) {
        return 'JSON';
+    } else {
+        return 'V2Ray';
    }
 }
+
 export function getPlatformFromHeaders(headers) {
-    const { UA, ua } = getUserAgentFromHeaders(headers);
-    return getPlatformFromUserAgent({ ua, UA });
+    const { UA, ua, accept } = getUserAgentFromHeaders(headers);
+    return getPlatformFromUserAgent({ ua, UA, accept });
 }
--- a/backend/src/vendor/express.js
+++ b/backend/src/vendor/express.js
@@ -9,6 +9,7 @@ export default function express({ substore: $, port, host }) {
        'Access-Control-Allow-Methods': 'POST,GET,OPTIONS,PATCH,PUT,DELETE',
        'Access-Control-Allow-Headers':
            'Origin, X-Requested-With, Content-Type, Accept',
+        'X-Powered-By': 'Sub-Store',
    };

    // node support
--- a/config/Egern.yaml
+++ b/config/Egern.yaml
@@ -1,10 +1,10 @@
 name: Sub-Store
-description: "支持 Surge 正式版的参数设置功能. 测落地功能 ability: http-client-policy, 同步配置的定时 cronexp: 55 23 * * *"
+description: '支持 Surge 正式版的参数设置功能. 测落地功能 ability: http-client-policy, 同步配置的定时 cronexp: 55 23 * * *'
 compat_arguments:
  ability: http-client-policy
  cronexp: 55 23 * * *
  sync: '"Sub-Store Sync"'
-  timeout: "120"
+  timeout: '120'
  engine: auto
  produce: '"# Sub-Store Produce"'
  produce_cronexp: 50 */6 * * *
@@ -12,26 +12,27 @@ compat_arguments:
  produce_col: '"col1,col2"'
 compat_arguments_desc: '\n1️⃣ ability\n\n默认已开启测落地能力\n需要配合脚本操作\n如 https://raw.githubusercontent.com/Keywos/rule/main/cname.js\n填写任意其他值关闭\n\n2️⃣ cronexp\n\n同步配置定时任务\n默认为每天 23 点 55 分\n\n定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 ''同步'' 或 ''同步配置''\n\n3️⃣ sync\n\n自定义定时任务名\n便于在脚本编辑器中选择\n若设为 # 可取消定时任务\n\n4️⃣ timeout\n\n脚本超时, 单位为秒\n\n5️⃣ engine\n\n默认为自动使用 webview 引擎, 可设为指定 jsc, 但 jsc 容易爆内存\n\n6️⃣ produce\n\n自定义处理订阅的定时任务名\n一般用于定时处理耗时较长的订阅, 以更新缓存\n这样 Surge 中拉取的时候就能用到缓存, 不至于总是超时\n若设为 # 可取消此定时任务\n默认不开启\n\n7️⃣ produce_cronexp\n\n配置处理订阅的定时任务\n\n默认为每 6 小时\n\n9️⃣ produce_sub\n\n自定义需定时处理的单条订阅名\n多个用 , 连接\n\n🔟 produce_col\n\n自定义需定时处理的组合订阅名\n多个用 , 连接\n\n⚠️ 注意: 是 名称(name) 不是 显示名称(displayName)\n如果名称需要编码, 请编码后再用 , 连接\n顺序: 并发执行单条订阅, 然后并发执行组合订阅'
 scriptings:
-  - http_request:
-      name: Sub-Store Core
-      match: ^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info)))
-      script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-1.min.js
-      body_required: true
-  - http_request:
-      name: Sub-Store Simple
-      match: ^https?:\/\/sub\.store
-      script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-0.min.js
-      body_required: true
-  - schedule:
-      name: "{{{sync}}}"
-      cron: "{{{cronexp}}}"
-      script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js
-  - schedule:
-      name: "{{{produce}}}"
-      cron: "{{{produce_cronexp}}}"
-      script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js
-      arguments:
-        _compat.$argument: '"sub={{{produce_sub}}}&col={{{produce_col}}}"'
+- http_request:
+    name: Sub-Store Core
+    match: ^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info)))
+    script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-1.min.js
+    body_required: true
+- http_request:
+    name: Sub-Store Simple
+    match: ^https?:\/\/sub\.store
+    script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-0.min.js
+    body_required: true
+- schedule:
+    name: '{{{sync}}}'
+    cron: '{{{cronexp}}}'
+    script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js
+- schedule:
+    name: '{{{produce}}}'
+    cron: '{{{produce_cronexp}}}'
+    script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js
+    arguments:
+      _compat.$argument: '"sub={{{produce_sub}}}&col={{{produce_col}}}"'
 mitm:
  hostnames:
+    includes:
    - sub.store
Author	SHA1	Message	Date
xream	815552d470	feat: 找不到资源时不通知, 仅保留日志	2024-11-28 15:44:55 +08:00
xream	9d90369594	feat: Trojan URI 支持省略端口号	2024-11-28 13:15:22 +08:00
xream	6aece471aa	feat: Stash 使用 includeUnsupportedProxy 参数开启 Shadowsocks 2022	2024-11-27 15:20:20 +08:00
xream	99396773f6	ci: 去除 GitLab Sync	2024-11-26 15:01:04 +08:00
xream	e229408a2d	feat: 默认缓存阈值 1024KB	2024-11-24 12:31:18 +08:00
xream	514414587b	feat: 默认超时 8000ms	2024-11-24 12:13:52 +08:00
egerndaddy	d4c419745e	Update Egern.yaml	2024-11-22 23:59:59 +08:00
xream	fe3da254f4	feat: 支持 Egern 输出	2024-11-21 13:16:04 +08:00
xream	7d8132d7cd	feat: 默认输出格式改为 V2Ray; accept 为 application/json 时, 输出 JSON; 响应增加 X-Powered-By Sub-Store	2024-11-19 23:06:45 +08:00
xream	bc1247efaf	feat: 手动设置的订阅流量信息会附加到订阅自己的流量信息之前	2024-11-17 23:40:03 +08:00
xream	dea937df66	feat: 默认查询流量信息的 `User-Agent` 从 `Quantumult%20X/1.0.30 (iPhone14,2; iOS 15.6)` 改为 `clash`; 流量信息缓存逻辑调整	2024-11-17 02:10:38 +08:00
xream	cfb5a8e082	feat: 支持解析订阅中的 `profile-web-page-url` 字段	2024-11-17 01:02:28 +08:00
xream	4790bf47d1	feat: Surge 密码解析支持首尾成对的单引号双引号, 输出时增加双引号	2024-11-16 21:50:52 +08:00
xream	56fd495fb6	feat: 支持更多的 subscription-userinfo	2024-11-12 22:20:46 +08:00
xream	f4639d9a34	feat: 支持更多的 subscription-userinfo	2024-11-12 22:06:22 +08:00