feat: url 支持 credentials; 修改导出文件名格式

README.md

@@ -41,9 +41,6 @@ Core functionalities:
 - [x] Surfboard (SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard(Surfboard to Surfboard))
 - [x] Clash.Meta (Direct, SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC, SSH, mieru, AnyTLS)
 - [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC, Juicity, SSH)
-
-Deprecated:
-
 - [x] Clash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard)
 
 ### Supported Target Platforms
@@ -51,6 +48,7 @@ Deprecated:
 - [x] Plain JSON
 - [x] Stash
 - [x] Clash.Meta(mihomo)
+- [x] Clash
 - [x] Surfboard
 - [x] Surge
 - [x] SurgeMac(Use mihomo to support protocols that are not supported by Surge itself)
@@ -62,10 +60,6 @@ Deprecated:
 - [x] V2Ray
 - [x] V2Ray URI
 
-Deprecated:
-
-- [x] Clash
-
 ## 2. Subscription Formatting
 
 ### Filtering

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.19.13",
+  "version": "2.18.1",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
   "main": "src/main.js",
   "scripts": {
@@ -27,12 +27,10 @@
     "automerge": "1.0.1-preview.7",
     "body-parser": "^1.19.0",
     "buffer": "^6.0.3",
-    "dotenv": "^16.4.7",
     "connect-history-api-fallback": "^2.0.0",
     "cron": "^3.1.6",
     "dns-packet": "^5.6.1",
     "express": "^4.17.1",
-    "mime-types": "^2.1.35",
     "http-proxy-middleware": "^3.0.3",
     "ip-address": "^9.0.5",
     "js-base64": "^3.7.2",

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

@@ -114,7 +114,12 @@ async function processFn(
         if (item.type.indexOf('Script') !== -1) {
             const { mode, content } = item.args;
             if (mode === 'link') {
+                let noCache;
                 let url = content || '';
+                if (url.endsWith('#noCache')) {
+                    url = url.replace(/#noCache$/, '');
+                    noCache = true;
+                }
                 // extract link arguments
                 const rawArgs = url.split('#');
                 if (rawArgs.length > 1) {
@@ -133,14 +138,7 @@ async function processFn(
                         }
                     }
                 }
-                url = `${url.split('#')[0]}${
-                    rawArgs[2]
-                        ? `#${rawArgs[2]}`
-                        : $arguments?.noCache != null ||
-                          $arguments?.insecure != null
-                        ? `#${rawArgs[1]}`
-                        : ''
-                }`;
+                url = `${url.split('#')[0]}${noCache ? '#noCache' : ''}`;
                 const downloadUrlMatch = url.match(
                     /^\/api\/(file|module)\/(.+)/,
                 );
@@ -615,7 +613,7 @@ function lastParse(proxy) {
         proxy['tls-fingerprint'] = rs.generateFingerprint(caStr);
     }
     if (
-        ['ss'].includes(proxy.type) &&
+        ['shadowsocks'].includes(proxy.type) &&
         isPresent(proxy, 'shadow-tls-password')
     ) {
         proxy.plugin = 'shadow-tls';

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

@@ -342,7 +342,7 @@ function URI_VMess() {
     };
     const parse = (line) => {
         line = line.split('vmess://')[1];
-        let content = Base64.decode(line.replace(/\?.*?$/, ''));
+        let content = Base64.decode(line);
         if (/=\s*vmess/.test(content)) {
             // Quantumult VMess URI format
             const partitions = content.split(',').map((p) => p.trim());
@@ -634,9 +634,6 @@ function URI_VLESS() {
         }
         if (!proxy.network && isShadowrocket && params.obfs) {
             proxy.network = params.obfs;
-            if (['none'].includes(proxy.network)) {
-                proxy.network = 'tcp';
-            }
         }
         if (['websocket'].includes(proxy.network)) {
             proxy.network = 'ws';

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

@@ -60,7 +60,7 @@ vmess = tag equals "vmess"i address method uuid (transport/transport_host/transp
     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/ip_mode/flow/public_key/short_id/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();
 }
@@ -180,10 +180,6 @@ tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-
 tls_cert_sha256 = comma "tls-cert-sha256" equals match:[^,]+ { proxy["tls-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals match:[^,]+ { proxy["tls-pubkey-sha256"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 
-flow = comma "flow" equals match:[^,]+ { proxy["flow"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-public_key = comma "public-key" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["public-key"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-short_id = comma "short-id" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["short-id"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-
 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(""); }

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

@@ -58,7 +58,7 @@ vmess = tag equals "vmess"i address method uuid (transport/transport_host/transp
     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/ip_mode/flow/public_key/short_id/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();
 }
@@ -178,10 +178,6 @@ tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-
 tls_cert_sha256 = comma "tls-cert-sha256" equals match:[^,]+ { proxy["tls-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals match:[^,]+ { proxy["tls-pubkey-sha256"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 
-flow = comma "flow" equals match:[^,]+ { proxy["flow"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-public_key = comma "public-key" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["public-key"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-short_id = comma "short-id" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["short-id"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-
 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(""); }

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

@@ -145,14 +145,14 @@ port = digits:[0-9]+ {
     }
 }
 
-username = comma "username" equals username:[^,]+ { proxy.username = username.join("").trim(); }
-password = comma "password" equals password:[^,]+ { proxy.password = password.join("").trim(); }
-uuid = comma "password" equals uuid:[^,]+ { proxy.uuid = uuid.join("").trim(); }
+username = comma "username" equals username:[^=,]+ { proxy.username = username.join("").trim(); }
+password = comma "password" equals password:[^=,]+ { proxy.password = password.join("").trim(); }
+uuid = comma "password" equals uuid:[^=,]+ { proxy.uuid = uuid.join("").trim(); }
 
 method = comma "method" equals cipher:cipher { 
     proxy.cipher = cipher;
 };
-cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"none"/"rc2-cfb"/"rc4-md5-6"/"rc4-md5"/"salsa20"/"xchacha20-ietf-poly1305"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
+cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"none"/"rc2-cfb"/"rc4-md5-6"/"rc4-md5"/"salsa20"/"xchacha20-ietf-poly1305");
 aead = comma "aead" equals flag:bool { proxy.aead = flag; }
 
 udp_relay = comma "udp-relay" equals flag:bool { proxy.udp = flag; }

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

@@ -143,14 +143,14 @@ port = digits:[0-9]+ {
     }
 }
 
-username = comma "username" equals username:[^,]+ { proxy.username = username.join("").trim(); }
-password = comma "password" equals password:[^,]+ { proxy.password = password.join("").trim(); }
-uuid = comma "password" equals uuid:[^,]+ { proxy.uuid = uuid.join("").trim(); }
+username = comma "username" equals username:[^=,]+ { proxy.username = username.join("").trim(); }
+password = comma "password" equals password:[^=,]+ { proxy.password = password.join("").trim(); }
+uuid = comma "password" equals uuid:[^=,]+ { proxy.uuid = uuid.join("").trim(); }
 
 method = comma "method" equals cipher:cipher { 
     proxy.cipher = cipher;
 };
-cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"none"/"rc2-cfb"/"rc4-md5-6"/"rc4-md5"/"salsa20"/"xchacha20-ietf-poly1305"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
+cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"none"/"rc2-cfb"/"rc4-md5-6"/"rc4-md5"/"salsa20"/"xchacha20-ietf-poly1305");
 aead = comma "aead" equals flag:bool { proxy.aead = flag; }
 
 udp_relay = comma "udp-relay" equals flag:bool { proxy.udp = flag; }

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

@@ -75,8 +75,6 @@ function Clash() {
                 // 是否被引号包裹
                 if (/^(['"]).*\1$/.test(afterTrim)) {
                     return `short-id: ${afterTrim}`;
-                } else if (['null'].includes(afterTrim)) {
-                    return `short-id: ${afterTrim}`;
                 } else {
                     return `short-id: "${afterTrim}"`;
                 }

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

@@ -284,15 +284,7 @@ function SortOperator(order = 'asc') {
 }
 
 // sort by regex
-function RegexSortOperator(input) {
-    const order = input.order || 'asc';
-    let expressions = input.expressions;
-    if (Array.isArray(input)) {
-        expressions = input;
-    }
-    if (!Array.isArray(expressions)) {
-        expressions = [];
-    }
+function RegexSortOperator(expressions) {
     return {
         name: 'Regex Sort Operator',
         func: (proxies) => {
@@ -303,13 +295,8 @@ function RegexSortOperator(input) {
                 if (oA && !oB) return -1;
                 if (oB && !oA) return 1;
                 if (oA && oB) return oA < oB ? -1 : 1;
-                if (order === 'original') {
-                    return 0;
-                } else if (order === 'desc') {
-                    return a.name < b.name ? 1 : -1;
-                } else {
-                    return a.name < b.name ? -1 : 1;
-                }
+                if ((!oA && !oB) || (oA && oB && oA === oB))
+                    return a.name < b.name ? -1 : 1; // fallback to normal sort
             });
         },
     };

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

@@ -23,7 +23,7 @@ export default function Loon_Producer() {
             case 'vmess':
                 return vmess(proxy);
             case 'vless':
-                return vless(proxy, opts['include-unsupported-proxy']);
+                return vless(proxy);
             case 'http':
                 return http(proxy);
             case 'socks5':
@@ -347,28 +347,10 @@ function vmess(proxy) {
     return result.toString();
 }
 
-function vless(proxy, includeUnsupportedProxy) {
-    if (
-        !includeUnsupportedProxy &&
-        (typeof proxy.flow !== 'undefined' || proxy['reality-opts'])
-    ) {
+function vless(proxy) {
+    if (typeof proxy.flow !== 'undefined' || proxy['reality-opts']) {
         throw new Error(`VLESS XTLS/REALITY is not supported`);
     }
-    let isReality = false;
-    if (includeUnsupportedProxy) {
-        if (
-            proxy['reality-opts'] &&
-            ['xtls-rprx-vision'].includes(proxy.flow)
-        ) {
-            isReality = true;
-        } else if (proxy['reality-opts']) {
-            throw new Error(
-                `VLESS REALITY with flow(${proxy.flow}) is not supported`,
-            );
-        } else if (proxy.flow) {
-            throw new Error(`VLESS XTLS is not supported`);
-        }
-    }
     const result = new Result(proxy);
     result.append(
         `${proxy.name}=vless,${proxy.server},${proxy.port},"${proxy.uuid}"`,
@@ -417,21 +399,7 @@ function vless(proxy, includeUnsupportedProxy) {
     );
 
     // sni
-    if (isReality) {
-        result.appendIfPresent(`,flow=${proxy.flow}`, 'flow');
-        result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
-        result.appendIfPresent(
-            `,public-key="${proxy['reality-opts']['public-key']}"`,
-            'reality-opts.public-key',
-        );
-        result.appendIfPresent(
-            `,short-id=${proxy['reality-opts']['short-id']}`,
-            'reality-opts.short-id',
-        );
-    } else {
-        result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
-    }
-
+    result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
     result.appendIfPresent(
         `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
         'tls-fingerprint',

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

@@ -7,7 +7,7 @@ export default function QX_Producer() {
     const produce = (proxy, type, opts = {}) => {
         switch (proxy.type) {
             case 'ss':
-                return shadowsocks(proxy, opts['include-unsupported-proxy']);
+                return shadowsocks(proxy);
             case 'ssr':
                 return shadowsocksr(proxy);
             case 'trojan':
@@ -28,7 +28,7 @@ export default function QX_Producer() {
     return { produce };
 }
 
-function shadowsocks(proxy, includeUnsupportedProxy) {
+function shadowsocks(proxy) {
     const result = new Result(proxy);
     const append = result.append.bind(result);
     const appendIfPresent = result.appendIfPresent.bind(result);
@@ -58,9 +58,6 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
             'aes-256-gcm',
             'chacha20-ietf-poly1305',
             'xchacha20-ietf-poly1305',
-            ...(includeUnsupportedProxy
-                ? ['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/sing-box.js

@@ -575,7 +575,7 @@ const hysteriaParser = (proxy = {}) => {
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
 };
-const hysteria2Parser = (proxy = {}) => {
+const hysteria2Parser = (proxy = {}, includeUnsupportedProxy) => {
     const parsedProxy = {
         tag: proxy.name,
         type: 'hysteria2',

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

@@ -23,11 +23,7 @@ export default function URI_Producer() {
         ) {
             delete proxy.tls;
         }
-        if (
-            !['vmess'].includes(proxy.type) &&
-            proxy.server &&
-            isIPv6(proxy.server)
-        ) {
+        if (proxy.server && isIPv6(proxy.server)) {
             proxy.server = `[${proxy.server}]`;
         }
         switch (proxy.type) {

backend/src/main.js

@@ -11,7 +11,6 @@
  * @documentation: https://www.notion.so/Sub-Store-6259586994d34c11a4ced5c406264b46
  */
 import { version } from '../package.json';
-import $ from '@/core/app';
 console.log(
     `
 ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
@@ -19,6 +18,7 @@ console.log(
 ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
 `,
 );
+
 import migrate from '@/utils/migration';
 import serve from '@/restful';
 

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

@@ -89,10 +89,8 @@ async function doSync() {
         const allSubs = $.read(SUBS_KEY);
         const allCols = $.read(COLLECTIONS_KEY);
         const subNames = [];
-        let enabledCount = 0;
         allArtifacts.map((artifact) => {
             if (artifact.sync && artifact.source) {
-                enabledCount++;
                 if (artifact.type === 'subscription') {
                     const subName = artifact.source;
                     const sub = findByName(allSubs, subName);
@@ -113,13 +111,6 @@ async function doSync() {
             }
         });
 
-        if (enabledCount === 0) {
-            $.info(
-                `需同步的配置: ${enabledCount}, 总数: ${allArtifacts.length}`,
-            );
-            return;
-        }
-
         if (subNames.length > 0) {
             await Promise.all(
                 subNames.map(async (subName) => {

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

@@ -14,12 +14,10 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
         `
     ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
          Sub-Store -- v${version}
-         Loon -- ${$loon}
     ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
     `,
     );
 
-    const build = $loon.match(/\((\d+)\)$/)?.[1];
     let arg;
     if (typeof $argument != 'undefined') {
         arg = Object.fromEntries(
@@ -28,28 +26,23 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
     } else {
         arg = {};
     }
-    console.log(`arg: ${JSON.stringify(arg)}`);
 
     const RESOURCE_TYPE = {
         PROXY: 1,
         RULE: 2,
     };
-    if (!arg.resourceUrlOnly) {
-        result = resource;
-    }
+
+    result = resource;
 
     if (resourceType === RESOURCE_TYPE.PROXY) {
-        if (!arg.resourceUrlOnly) {
-            try {
-                let proxies = ProxyUtils.parse(resource);
-                result = ProxyUtils.produce(proxies, 'Loon', undefined, {
-                    'include-unsupported-proxy':
-                        arg?.includeUnsupportedProxy || build >= 838,
-                });
-            } catch (e) {
-                console.log('解析器: 使用 resource 出现错误');
-                console.log(e.message ?? e);
-            }
+        try {
+            let proxies = ProxyUtils.parse(resource);
+            result = ProxyUtils.produce(proxies, 'Loon', undefined, {
+                'include-unsupported-proxy': arg?.includeUnsupportedProxy,
+            });
+        } catch (e) {
+            console.log('解析器: 使用 resource 出现错误');
+            console.log(e.message ?? e);
         }
         if ((!result || /^\s*$/.test(result)) && resourceUrl) {
             console.log(`解析器: 尝试从 ${resourceUrl} 获取订阅`);
@@ -66,21 +59,18 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
                 );
                 let proxies = ProxyUtils.parse(raw);
                 result = ProxyUtils.produce(proxies, 'Loon', undefined, {
-                    'include-unsupported-proxy':
-                        arg?.includeUnsupportedProxy || build >= 838,
+                    'include-unsupported-proxy': arg?.includeUnsupportedProxy,
                 });
             } catch (e) {
                 console.log(e.message ?? e);
             }
         }
     } else if (resourceType === RESOURCE_TYPE.RULE) {
-        if (!arg.resourceUrlOnly) {
-            try {
-                const rules = RuleUtils.parse(resource);
-                result = RuleUtils.produce(rules, 'Loon');
-            } catch (e) {
-                console.log(e.message ?? e);
-            }
+        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} 获取规则`);

backend/src/restful/collections.js

@@ -1,9 +1,8 @@
 import { deleteByName, findByName, updateByName } from '@/utils/database';
-import { COLLECTIONS_KEY, ARTIFACTS_KEY, FILES_KEY } from '@/constants';
+import { COLLECTIONS_KEY, ARTIFACTS_KEY } from '@/constants';
 import { failed, success } from '@/restful/response';
 import $ from '@/core/app';
 import { RequestInvalidError, ResourceNotFoundError } from '@/restful/errors';
-import { formatDateTime } from '@/utils';
 
 export default function register($app) {
     if (!$.read(COLLECTIONS_KEY)) $.write({}, COLLECTIONS_KEY);
@@ -61,9 +60,20 @@ function getCollection(req, res) {
                 .set(
                     'content-disposition',
                     `attachment; filename="${encodeURIComponent(
-                        `sub-store_collection_${name}_${formatDateTime(
-                            new Date(),
-                        )}.json`,
+                        `sub-store_collection_${name}_${new Date()
+                            .toLocaleString('zh-CN', {
+                                year: 'numeric',
+                                month: '2-digit',
+                                day: '2-digit',
+                                hour: '2-digit',
+                                minute: '2-digit',
+                                second: '2-digit',
+                                hour12: false,
+                            })
+                            .replace(
+                                /^(\d+?)\/(\d+?)\/(\d+?)\s*?(\d+?):(\d+?):(\d+?)$/,
+                                '$1-$2-$3_$4-$5-$6',
+                            )}.json`,
                     )}"`,
                 )
                 .send(JSON.stringify(collection));
@@ -106,18 +116,7 @@ function updateCollection(req, res) {
                     artifact.source = newCol.name;
                 }
             }
-            // update all files referring this collection
-            const allFiles = $.read(FILES_KEY) || [];
-            for (const file of allFiles) {
-                if (
-                    file.sourceType === 'collection' &&
-                    file.sourceName === oldCol.name
-                ) {
-                    file.sourceName = newCol.name;
-                }
-            }
             $.write(allArtifacts, ARTIFACTS_KEY);
-            $.write(allFiles, FILES_KEY);
         }
 
         updateByName(allCols, name, newCol);

backend/src/restful/file.js

@@ -1,6 +1,6 @@
 import { deleteByName, findByName, updateByName } from '@/utils/database';
 import { getFlowHeaders, normalizeFlowHeader } from '@/utils/flow';
-import { FILES_KEY, ARTIFACTS_KEY } from '@/constants';
+import { FILES_KEY } from '@/constants';
 import { failed, success } from '@/restful/response';
 import $ from '@/core/app';
 import {
@@ -9,7 +9,6 @@ import {
     InternalServerError,
 } from '@/restful/errors';
 import { produceArtifact } from '@/restful/sync';
-import { formatDateTime } from '@/utils';
 
 export default function register($app) {
     if (!$.read(FILES_KEY)) $.write([], FILES_KEY);
@@ -211,9 +210,20 @@ function getWholeFile(req, res) {
                 .set(
                     'content-disposition',
                     `attachment; filename="${encodeURIComponent(
-                        `sub-store_file_${name}_${formatDateTime(
-                            new Date(),
-                        )}.json`,
+                        `sub-store_file_${name}_${new Date()
+                            .toLocaleString('zh-CN', {
+                                year: 'numeric',
+                                month: '2-digit',
+                                day: '2-digit',
+                                hour: '2-digit',
+                                minute: '2-digit',
+                                second: '2-digit',
+                                hour12: false,
+                            })
+                            .replace(
+                                /^(\d+?)\/(\d+?)\/(\d+?)\s*?(\d+?):(\d+?):(\d+?)$/,
+                                '$1-$2-$3_$4-$5-$6',
+                            )}.json`,
                     )}"`,
                 )
                 .send(JSON.stringify(file));
@@ -245,20 +255,6 @@ function updateFile(req, res) {
         };
         $.info(`正在更新文件：${name}...`);
 
-        if (name !== newFile.name) {
-            // update all artifacts referring this collection
-            const allArtifacts = $.read(ARTIFACTS_KEY) || [];
-            for (const artifact of allArtifacts) {
-                if (
-                    artifact.type === 'file' &&
-                    artifact.source === oldFile.name
-                ) {
-                    artifact.source = newFile.name;
-                }
-            }
-            $.write(allArtifacts, ARTIFACTS_KEY);
-        }
-
         updateByName(allFiles, name, newFile);
         $.write(allFiles, FILES_KEY);
         success(res, newFile);

backend/src/restful/index.js

@@ -29,72 +29,6 @@ export default function serve() {
         host = eval('process.env.SUB_STORE_BACKEND_API_HOST') || '::';
     }
     const $app = express({ substore: $, port, host });
-    if ($.env.isNode) {
-        const be_merge = eval('process.env.SUB_STORE_BACKEND_MERGE');
-        const be_prefix = eval('process.env.SUB_STORE_BACKEND_PREFIX');
-        const fe_be_path = eval('process.env.SUB_STORE_FRONTEND_BACKEND_PATH');
-        const fe_path = eval('process.env.SUB_STORE_FRONTEND_PATH');
-        if (be_prefix || be_merge) {
-            if(!fe_be_path.startsWith('/')){
-                throw new Error(
-                    'SUB_STORE_FRONTEND_BACKEND_PATH should start with /',
-                );
-            }
-            if (be_merge) {
-                $.info(`[BACKEND] MERGE mode is [ON].`);
-                $.info(`[BACKEND && FRONTEND] ${host}:${port}`);
-            }
-            $.info(`[BACKEND PREFIX] ${host}:${port}${fe_be_path}`);
-            $app.use((req, res, next) => {
-                if (req.path.startsWith(fe_be_path)) {
-                    req.url = req.url.replace(fe_be_path, '') || '/';
-                    if(be_merge && req.url.startsWith('/api/')){
-                        req.query['share'] = 'true';
-                    }
-                    next();
-                    return;
-                }
-                const pathname = decodeURIComponent(req._parsedUrl.pathname) || '/';
-                if(be_merge && req.path.startsWith('/share/') && req.query.token){
-                    if (req.method.toLowerCase() !== 'get'){
-                        res.status(405).send('Method not allowed');
-                        return;
-                    }
-                    const tokens = $.read(TOKENS_KEY) || [];
-                    const token = tokens.find(
-                        (t) =>
-                            t.token === req.query.token &&
-                            `/share/${t.type}/${t.name}` === pathname &&
-                            (t.exp == null || t.exp > Date.now()),
-                    );
-                    if (token){
-                        next();
-                        return;
-                    }
-                }
-                if (be_merge && fe_path && req.path.indexOf('/',1) == -1) {
-                    if (req.path.indexOf('.') == -1){
-                        req.url = "/index.html"
-                    }
-                    const express_ = eval(`require("express")`);
-                    const mime_ = eval(`require("mime-types")`);
-                    const path_ = eval(`require("path")`);
-                    const staticFileMiddleware = express_.static(fe_path, {
-                        setHeaders: (res, path) => {
-                            const type = mime_.contentType(path_.extname(path));
-                            if (type) {
-                                res.set('Content-Type', type);
-                            }
-                        }
-                    });
-                    staticFileMiddleware(req, res, next);
-                    return;
-                }
-                res.status(403).end('Forbbiden');
-                return;
-            });
-        }
-    }
     // register routes
     registerCollectionRoutes($app);
     registerSubscriptionRoutes($app);
@@ -241,8 +175,7 @@ export default function serve() {
         const fe_abs_path = path.resolve(
             fe_path || path.join(__dirname, 'frontend'),
         );
-        const be_merge = eval('process.env.SUB_STORE_BACKEND_MERGE');
-        if (fe_path && !be_merge) {
+        if (fe_path) {
             try {
                 fs.accessSync(path.join(fe_abs_path, 'index.html'));
             } catch (e) {
@@ -267,9 +200,6 @@ export default function serve() {
             let be_download_rewrite = '';
             let be_api_rewrite = '';
             let be_share_rewrite = `${be_share}:type/:name`;
-            let prefix = eval('process.env.SUB_STORE_BACKEND_PREFIX')
-                ? fe_be_path
-                : '';
             if (fe_be_path) {
                 if (!fe_be_path.startsWith('/')) {
                     throw new Error(
@@ -286,7 +216,7 @@ export default function serve() {
                 app.use(
                     be_share_rewrite,
                     createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}${prefix}`,
+                        target: `http://127.0.0.1:${port}`,
                         changeOrigin: true,
                         pathRewrite: async (path, req) => {
                             if (req.method.toLowerCase() !== 'get')
@@ -307,7 +237,7 @@ export default function serve() {
                 app.use(
                     be_api_rewrite,
                     createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}${prefix}${be_api}`,
+                        target: `http://127.0.0.1:${port}${be_api}`,
                         pathRewrite: async (path) => {
                             return path.includes('?')
                                 ? `${path}&share=true`
@@ -318,7 +248,7 @@ export default function serve() {
                 app.use(
                     be_download_rewrite,
                     createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}${prefix}${be_download}`,
+                        target: `http://127.0.0.1:${port}${be_download}`,
                         changeOrigin: true,
                     }),
                 );
@@ -339,10 +269,10 @@ export default function serve() {
                 $.info(`[FRONTEND] ${fe_address}:${fe_port}`);
                 if (fe_be_path) {
                     $.info(
-                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_api_rewrite} -> ${host}:${port}${prefix}${be_api}`,
+                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_api_rewrite} -> http://127.0.0.1:${port}${be_api}`,
                     );
                     $.info(
-                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_download_rewrite} -> ${host}:${port}${prefix}${be_download}`,
+                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_download_rewrite} -> http://127.0.0.1:${port}${be_download}`,
                     );
                     $.info(
                         `[SHARE BACKEND] ${fe_address}:${fe_port}${be_share_rewrite}`,

backend/src/restful/miscs.js

@@ -14,7 +14,6 @@ import { InternalServerError, RequestInvalidError } from '@/restful/errors';
 import Gist from '@/utils/gist';
 import migrate from '@/utils/migration';
 import env from '@/utils/env';
-import { formatDateTime } from '@/utils';
 
 export default function register($app) {
     // utils
@@ -29,7 +28,20 @@ export default function register($app) {
                 .set(
                     'content-disposition',
                     `attachment; filename="${encodeURIComponent(
-                        `sub-store_data_${formatDateTime(new Date())}.json`,
+                        `sub-store_data_${new Date()
+                            .toLocaleString('zh-CN', {
+                                year: 'numeric',
+                                month: '2-digit',
+                                day: '2-digit',
+                                hour: '2-digit',
+                                minute: '2-digit',
+                                second: '2-digit',
+                                hour12: false,
+                            })
+                            .replace(
+                                /^(\d+?)\/(\d+?)\/(\d+?)\s*?(\d+?):(\d+?):(\d+?)$/,
+                                '$1-$2-$3_$4-$5-$6',
+                            )}.json`,
                     )}"`,
                 )
                 .send(

backend/src/restful/settings.js

@@ -134,15 +134,11 @@ export async function updateArtifactStore() {
                 settings.artifactStore = url;
                 settings.artifactStoreStatus = 'VALID';
             } else {
-                $.error(`找不到 Sub-Store Gist (${ARTIFACT_REPOSITORY_KEY})`);
+                $.error(`找不到 Sub-Store Gist`);
                 settings.artifactStoreStatus = 'NOT FOUND';
             }
         } catch (err) {
-            $.error(
-                `查找 Sub-Store Gist (${ARTIFACT_REPOSITORY_KEY}) 时发生错误: ${
-                    err.message ?? err
-                }`,
-            );
+            $.error(`查找 Sub-Store Gist 时发生错误: ${err.message ?? err}`);
             settings.artifactStoreStatus = 'ERROR';
         }
         $.write(settings, SETTINGS_KEY);

backend/src/restful/subscriptions.js

@@ -5,12 +5,7 @@ import {
     RequestInvalidError,
 } from './errors';
 import { deleteByName, findByName, updateByName } from '@/utils/database';
-import {
-    SUBS_KEY,
-    COLLECTIONS_KEY,
-    ARTIFACTS_KEY,
-    FILES_KEY,
-} from '@/constants';
+import { SUBS_KEY, COLLECTIONS_KEY, ARTIFACTS_KEY } from '@/constants';
 import {
     getFlowHeaders,
     parseFlowHeaders,
@@ -18,7 +13,6 @@ import {
 } from '@/utils/flow';
 import { success, failed } from './response';
 import $ from '@/core/app';
-import { formatDateTime } from '@/utils';
 
 if (!$.read(SUBS_KEY)) $.write({}, SUBS_KEY);
 
@@ -271,9 +265,20 @@ function getSubscription(req, res) {
                 .set(
                     'content-disposition',
                     `attachment; filename="${encodeURIComponent(
-                        `sub-store_subscription_${name}_${formatDateTime(
-                            new Date(),
-                        )}.json`,
+                        `sub-store_subscription_${name}_${new Date()
+                            .toLocaleString('zh-CN', {
+                                year: 'numeric',
+                                month: '2-digit',
+                                day: '2-digit',
+                                hour: '2-digit',
+                                minute: '2-digit',
+                                second: '2-digit',
+                                hour12: false,
+                            })
+                            .replace(
+                                /^(\d+?)\/(\d+?)\/(\d+?)\s*?(\d+?):(\d+?):(\d+?)$/,
+                                '$1-$2-$3_$4-$5-$6',
+                            )}.json`,
                     )}"`,
                 )
                 .send(JSON.stringify(sub));
@@ -325,20 +330,9 @@ function updateSubscription(req, res) {
                     artifact.source = sub.name;
                 }
             }
-            // update all files referring this subscription
-            const allFiles = $.read(FILES_KEY) || [];
-            for (const file of allFiles) {
-                if (
-                    file.sourceType === 'subscription' &&
-                    file.sourceName == name
-                ) {
-                    file.sourceName = sub.name;
-                }
-            }
 
             $.write(allCols, COLLECTIONS_KEY);
             $.write(allArtifacts, ARTIFACTS_KEY);
-            $.write(allFiles, FILES_KEY);
         }
         updateByName(allSubs, name, newSub);
         $.write(allSubs, SUBS_KEY);

backend/src/restful/sync.js

@@ -556,10 +556,8 @@ async function syncArtifacts() {
         const allSubs = $.read(SUBS_KEY);
         const allCols = $.read(COLLECTIONS_KEY);
         const subNames = [];
-        let enabledCount = 0;
         allArtifacts.map((artifact) => {
             if (artifact.sync && artifact.source) {
-                enabledCount++;
                 if (artifact.type === 'subscription') {
                     const subName = artifact.source;
                     const sub = findByName(allSubs, subName);
@@ -580,13 +578,6 @@ async function syncArtifacts() {
             }
         });
 
-        if (enabledCount === 0) {
-            $.info(
-                `需同步的配置: ${enabledCount}, 总数: ${allArtifacts.length}`,
-            );
-            return;
-        }
-
         if (subNames.length > 0) {
             await Promise.all(
                 subNames.map(async (subName) => {

backend/src/utils/gist.js

@@ -280,7 +280,7 @@ export default class Gist {
                 return Promise.reject(err);
             }
         } else {
-            return Promise.reject(`找不到 Sub-Store Gist (${this.key})`);
+            return Promise.reject('找不到 Sub-Store Gist');
         }
     }
 }

backend/src/utils/index.js

@@ -126,32 +126,7 @@ function isValidUUID(uuid) {
     );
 }
 
-function formatDateTime(date, format = 'YYYY-MM-DD_HH-mm-ss') {
-    const d = date instanceof Date ? date : new Date(date);
-
-    if (isNaN(d.getTime())) {
-        return '';
-    }
-
-    const pad = (num) => String(num).padStart(2, '0');
-
-    const replacements = {
-        YYYY: d.getFullYear(),
-        MM: pad(d.getMonth() + 1),
-        DD: pad(d.getDate()),
-        HH: pad(d.getHours()),
-        mm: pad(d.getMinutes()),
-        ss: pad(d.getSeconds()),
-    };
-
-    return format.replace(
-        /YYYY|MM|DD|HH|mm|ss/g,
-        (match) => replacements[match],
-    );
-}
-
 export {
-    formatDateTime,
     isValidUUID,
     ipAddress,
     isIPv4,

backend/src/utils/migration.js

@@ -4,8 +4,6 @@ import {
     SCHEMA_VERSION_KEY,
     ARTIFACTS_KEY,
     RULES_KEY,
-    FILES_KEY,
-    TOKENS_KEY,
 } from '@/constants';
 import $ from '@/core/app';
 
@@ -57,17 +55,7 @@ function doMigrationV2() {
     const newRules = Object.values(rules);
     $.write(newRules, RULES_KEY);
 
-    // 5. migrate files
-    const files = $.read(FILES_KEY) || {};
-    const newFiles = Object.values(files);
-    $.write(newFiles, FILES_KEY);
-
-    // 6. migrate tokens
-    const tokens = $.read(TOKENS_KEY) || {};
-    const newTokens = Object.values(tokens);
-    $.write(newTokens, TOKENS_KEY);
-
-    // 7. delete builtin rules
+    // 5. delete builtin rules
     delete $.cache.builtin;
     $.info('Migration complete!');
 

backend/src/utils/user-agent.js

@@ -47,7 +47,7 @@ export function getPlatformFromUserAgent({ ua, UA, accept }) {
         return 'Clash';
     } else if (ua.indexOf('v2ray') !== -1) {
         return 'V2Ray';
-    } else if (ua.indexOf('sing-box') !== -1 || ua.indexOf('singbox') !== -1) {
+    } else if (ua.indexOf('sing-box') !== -1) {
         return 'sing-box';
     } else if (accept.indexOf('application/json') === 0) {
         return 'JSON';
@@ -66,12 +66,10 @@ export function shouldIncludeUnsupportedProxy(platform, ua) {
             UA: ua,
             ua: ua.toLowerCase(),
         });
-        if (!['Stash', 'Egern', 'Loon'].includes(target)) {
+        if (!['Stash', 'Egern'].includes(target)) {
             return false;
         }
-        const coerceVersion = coerce(ua);
-        $.log(JSON.stringify(coerceVersion, null, 2));
-        const { version } = coerceVersion;
+        const version = coerce(ua).version;
         if (
             platform === 'Stash' &&
             target === 'Stash' &&
@@ -86,14 +84,6 @@ export function shouldIncludeUnsupportedProxy(platform, ua) {
         ) {
             return true;
         }
-        // Loon 的 UA 不规范, version 取出来是 build
-        if (
-            platform === 'Loon' &&
-            target === 'Loon' &&
-            gte(version, '838.0.0')
-        ) {
-            return true;
-        }
     } catch (e) {
         $.error(`获取版本号失败: ${e}`);
     }

backend/src/vendor/open-api.js

@@ -18,10 +18,6 @@ export class OpenAPI {
         this.http = HTTP();
         this.env = ENV();
 
-        if (isNode) {
-            const dotenv = eval(`require("dotenv")`);
-            dotenv.config();
-        }
         this.node = (() => {
             if (isNode) {
                 const fs = eval("require('fs')");
@@ -364,12 +360,7 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                 }
                 if (isNode) {
                     const undici = eval("require('undici')");
-                    const {
-                        ProxyAgent,
-                        EnvHttpProxyAgent,
-                        request,
-                        interceptors,
-                    } = undici;
+                    const { ProxyAgent, EnvHttpProxyAgent, request } = undici;
                     const agentOpts = {
                         connect: {
                             rejectUnauthorized:
@@ -383,31 +374,29 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                     };
                     try {
                         const url = new URL(opts.url);
-                        if (url.username || url.password) {
+                        const auth =
+                            url.username || url.password
+                                ? Buffer.from(
+                                      `${url.username || ''}:${
+                                          url.password || ''
+                                      }`,
+                                  ).toString('base64')
+                                : undefined;
+                        if (auth) {
                             opts.headers = {
                                 ...(opts.headers || {}),
-                                Authorization: `Basic ${Buffer.from(
-                                    `${url.username || ''}:${
-                                        url.password || ''
-                                    }`,
-                                ).toString('base64')}`,
+                                Authorization: `Basic ${auth}`,
                             };
                         }
                         const response = await request(opts.url, {
                             ...opts,
                             method: method.toUpperCase(),
-                            dispatcher: (opts.proxy
+                            dispatcher: opts.proxy
                                 ? new ProxyAgent({
                                       ...agentOpts,
                                       uri: opts.proxy,
                                   })
-                                : new EnvHttpProxyAgent(agentOpts)
-                            ).compose(
-                                interceptors.redirect({
-                                    maxRedirections: 3,
-                                    throwOnMaxRedirects: true,
-                                }),
-                            ),
+                                : new EnvHttpProxyAgent(agentOpts),
                         });
                         resolve({
                             statusCode: response.statusCode,