feat: 文件支持脚本操作

fix: Handles node-info IPv6 address URIs

.github/workflows/main.yml

@@ -44,19 +44,15 @@ jobs:
         run: |
           cd backend
           SUBSTORE_RELEASE=`node --eval="process.stdout.write(require('./package.json').version)"`
-          echo "::set-output name=release_tag::$SUBSTORE_RELEASE"
+          echo "release_tag=$SUBSTORE_RELEASE" >> $GITHUB_OUTPUT
-      - name: Prepare release
-        run: |
-          cd backend
-          pnpm i -D conventional-changelog-cli
-          pnpm run changelog
       - name: Release
         uses: softprops/action-gh-release@v1
+        if: ${{ success() }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          body_path: ./backend/CHANGELOG.md
           tag_name: ${{ steps.tag.outputs.release_tag }}
+          generate_release_notes: true
           files: |
             ./backend/sub-store.min.js
             ./backend/dist/sub-store-0.min.js

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 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) 
@@ -31,23 +31,25 @@ Core functionalities:
 - [x] SSD URI
 - [x] V2RayN URI
 - [x] Hysteria2 URI
-- [x] QX (SS, SSR, VMess, Trojan, HTTP)
+- [x] QX (SS, SSR, VMess, Trojan, HTTP, SOCKS5)
-- [x] Loon (SS, SSR, VMess, Trojan, HTTP, WireGuard, VLESS)
+- [x] Loon (SS, SSR, VMess, Trojan, HTTP, SOCKS5, WireGuard, VLESS, Hysteria2)
-- [x] Surge (SS, VMess, Trojan, HTTP, TUIC, Snell, Hysteria2, SSR(external, only for macOS), WireGuard(Surge to Surge))
+- [x] Surge (SS, VMess, Trojan, HTTP, SOCKS5, TUIC, Snell, Hysteria2, SSR(external, only for macOS), WireGuard(Surge to Surge))
-- [x] ShadowRocket (SS, SSR, VMess, Trojan, HTTP, Snell, VLESS, Hysteria2)
+- [x] Surfboard (SS, VMess, Trojan, HTTP, SOCKS5, WireGuard(Surfboard to Surfboard))
-- [x] Clash.Meta (SS, SSR, VMess, Trojan, HTTP, Snell, VLESS, WireGuard, Hysteria, Hysteria2)
+- [x] Shadowrocket (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria2, TUIC)
-- [x] Stash (SS, SSR, VMess, Trojan, HTTP, Snell, VLESS, WireGuard, Hysteria)
+- [x] Clash.Meta (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria2, TUIC)
-- [x] Clash (SS, SSR, VMess, Trojan, HTTP, Snell, VLESS, WireGuard)
+- [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC)
+- [x] Clash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard)
 
 ### Supported Target Platforms
 
 - [x] QX
 - [x] Loon
 - [x] Surge
+- [x] Surfboard
 - [x] Stash
 - [x] Clash.Meta
 - [x] Clash
-- [x] ShadowRocket
+- [x] Shadowrocket
 - [x] V2Ray
 - [x] V2Ray URI
 - [x] Plain JSON
@@ -76,24 +78,20 @@ Core functionalities:
 
 ### Development
 
-Go to `backend` and `web` directories, install node dependencies:
+Install `pnpm`
+
+Go to `backend` directories, install node dependencies:
 
 ```
-npm install
+pnpm install
 ```
 
 1. In `backend`, run the backend server on http://localhost:3000
 
 ```
-npm run serve
+pnpm start
 ```
 
-2. In`web`, start the vue-cli server
-   
-   ```
-   npm start
-   ```
-
 ## LICENSE
 
 This project is under the GPL V3 LICENSE.

backend/bundle.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 const fs = require('fs');
-
 const path = require('path');
+const { build } = require('esbuild');
 
 let content = fs.readFileSync(path.join(__dirname, 'sub-store.min.js'), {
     encoding: 'utf8',
@@ -14,10 +14,12 @@ fs.writeFileSync(path.join(__dirname, 'dist/sub-store.no-bundle.js'), content, {
     encoding: 'utf8',
 });
 
-const { build } = require('estrella');
 build({
-    entry: 'dist/sub-store.no-bundle.js',
+    entryPoints: ['dist/sub-store.no-bundle.js'],
-    outfile: 'dist/sub-store.bundle.js',
     bundle: true,
+    minify: true,
+    sourcemap: true,
     platform: 'node',
+    format: 'cjs',
+    outfile: 'dist/sub-store.bundle.js',
 });

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.79",
+  "version": "2.14.146",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
@@ -9,15 +9,16 @@
     "serve": "node sub-store.min.js",
     "start": "nodemon -w src -w package.json --exec babel-node src/main.js",
     "build": "gulp",
-    "bundle": "node bundle.js",
+    "bundle": "node bundle.js"
-    "changelog": "conventional-changelog -p cli -i CHANGELOG.md -s"
   },
   "author": "Peng-YM",
   "license": "GPL-3.0",
   "dependencies": {
     "automerge": "1.0.1-preview.7",
     "body-parser": "^1.19.0",
+    "connect-history-api-fallback": "^2.0.0",
     "express": "^4.17.1",
+    "http-proxy-middleware": "^2.0.6",
     "js-base64": "^3.7.2",
     "lodash": "^4.17.21",
     "request": "^2.88.2",
@@ -38,6 +39,7 @@
     "browser-pack-flat": "^3.4.2",
     "browserify": "^17.0.0",
     "chai": "^4.3.6",
+    "esbuild": "^0.19.8",
     "eslint": "^8.16.0",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",

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

@@ -1,5 +1,5 @@
 import download from '@/utils/download';
-import { isIPv4, isIPv6 } from '@/utils';
+import { isIPv4, isIPv6, isValidPortNumber } from '@/utils';
 import PROXY_PROCESSORS, { ApplyProcessor } from './processors';
 import PROXY_PREPROCESSORS from './preprocessors';
 import PROXY_PRODUCERS from './producers';
@@ -71,7 +71,12 @@ async function process(proxies, operators = [], targetPlatform, source) {
         if (item.type.indexOf('Script') !== -1) {
             const { mode, content } = item.args;
             if (mode === 'link') {
-                const url = content;
+                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) {
@@ -93,7 +98,9 @@ async function process(proxies, operators = [], targetPlatform, source) {
 
                 // if this is a remote script, download it
                 try {
-                    script = await download(url.split('#')[0]);
+                    script = await download(
+                        `${url.split('#')[0]}${noCache ? '#noCache' : ''}`,
+                    );
                     // $.info(`Script loaded: >>>\n ${script}`);
                 } catch (err) {
                     $.error(
@@ -132,7 +139,7 @@ async function process(proxies, operators = [], targetPlatform, source) {
     return proxies;
 }
 
-function produce(proxies, targetPlatform) {
+function produce(proxies, targetPlatform, type) {
     const producer = PROXY_PRODUCERS[targetPlatform];
     if (!producer) {
         throw new Error(`Target platform: ${targetPlatform} is not supported!`);
@@ -150,7 +157,7 @@ function produce(proxies, targetPlatform) {
         return proxies
             .map((proxy) => {
                 try {
-                    let line = producer.produce(proxy);
+                    let line = producer.produce(proxy, type);
                     if (
                         line.length > 0 &&
                         line.includes('__SubStoreLocalPort__')
@@ -175,7 +182,7 @@ function produce(proxies, targetPlatform) {
             .filter((line) => line.length > 0)
             .join('\n');
     } else if (producer.type === 'ALL') {
-        return producer.produce(proxies);
+        return producer.produce(proxies, type);
     }
 }
 
@@ -183,6 +190,9 @@ export const ProxyUtils = {
     parse,
     process,
     produce,
+    isIPv4,
+    isIPv6,
+    isIP,
 };
 
 function tryParse(parser, line) {
@@ -204,6 +214,15 @@ function safeMatch(parser, line) {
 }
 
 function lastParse(proxy) {
+    if (isValidPortNumber(proxy.port)) {
+        proxy.port = parseInt(proxy.port, 10);
+    }
+    if (proxy.server) {
+        proxy.server = proxy.server
+            .trim()
+            .replace(/^\[/, '')
+            .replace(/\]$/, '');
+    }
     if (proxy.type === 'trojan') {
         if (proxy.network === 'tcp') {
             delete proxy.network;
@@ -212,6 +231,14 @@ function lastParse(proxy) {
     if (['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(proxy.type)) {
         proxy.tls = true;
     }
+    if (proxy.network) {
+        let transportHost = proxy[`${proxy.network}-opts`]?.headers?.Host;
+        let transporthost = proxy[`${proxy.network}-opts`]?.headers?.host;
+        if (transporthost && !transportHost) {
+            proxy[`${proxy.network}-opts`].headers.Host = transporthost;
+            delete proxy[`${proxy.network}-opts`].headers.host;
+        }
+    }
     if (proxy.tls && !proxy.sni) {
         if (proxy.network) {
             let transportHost = proxy[`${proxy.network}-opts`]?.headers?.Host;
@@ -252,6 +279,9 @@ function lastParse(proxy) {
             proxy[`${proxy.network}-opts`].path = [transportPath];
         }
     }
+    if (['hysteria', 'hysteria2'].includes(proxy.type) && !proxy.ports) {
+        delete proxy.ports;
+    }
     return proxy;
 }
 

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

@@ -33,7 +33,9 @@ function URI_SS() {
         const serverAndPort = serverAndPortArray[1];
         const portIdx = serverAndPort.lastIndexOf(':');
         proxy.server = serverAndPort.substring(0, portIdx);
-        proxy.port = serverAndPort.substring(portIdx + 1);
+        proxy.port = `${serverAndPort.substring(portIdx + 1)}`.match(
+            /\d+/,
+        )?.[0];
 
         const userInfo = userInfoStr.split(':');
         proxy.cipher = userInfo[0];
@@ -330,11 +332,14 @@ function URI_VLESS() {
     const parse = (line) => {
         line = line.split('vless://')[1];
         // eslint-disable-next-line no-unused-vars
-        let [__, uuid, server, port, addons, name] =
+        let [__, uuid, server, port, ___, addons = '', name] =
-            /^(.*?)@(.*?):(\d+)\/?\?(.*?)(?:#(.*?))$/.exec(line);
+            /^(.*?)@(.*?):(\d+)\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
         port = parseInt(`${port}`, 10);
         uuid = decodeURIComponent(uuid);
-        name = decodeURIComponent(name) ?? `VLESS ${server}:${port}`;
+        if (name != null) {
+            name = decodeURIComponent(name);
+        }
+        name = name ?? `VLESS ${server}:${port}`;
         const proxy = {
             type: 'vless',
             name,
@@ -407,19 +412,22 @@ function URI_VLESS() {
 function URI_Hysteria2() {
     const name = 'URI Hysteria2 Parser';
     const test = (line) => {
-        return /^hysteria2:\/\//.test(line);
+        return /^(hysteria2|hy2):\/\//.test(line);
     };
     const parse = (line) => {
-        line = line.split('hysteria2://')[1];
+        line = line.split(/(hysteria2|hy2):\/\//)[2];
         // eslint-disable-next-line no-unused-vars
-        let [__, password, server, ___, port, addons, name] =
+        let [__, password, server, ___, port, ____, addons = '', name] =
-            /^(.*?)@(.*?)(:(\d+))?\/?\?(.*?)(?:#(.*?))$/.exec(line);
+            /^(.*?)@(.*?)(:(\d+))?\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
         port = parseInt(`${port}`, 10);
         if (isNaN(port)) {
             port = 443;
         }
         password = decodeURIComponent(password);
-        name = decodeURIComponent(name) ?? `Hysteria2 ${server}:${port}`;
+        if (name != null) {
+            name = decodeURIComponent(name);
+        }
+        name = name ?? `Hysteria2 ${server}:${port}`;
 
         const proxy = {
             type: 'hysteria2',
@@ -463,8 +471,16 @@ function URI_Trojan() {
     };
 
     const parse = (line) => {
+        let [newLine, name] = line.split(/#(.+)/, 2);
         const parser = getTrojanURIParser();
-        const proxy = parser.parse(line);
+        const proxy = parser.parse(newLine);
+        if (isNotBlank(name)) {
+            try {
+                proxy.name = decodeURIComponent(name);
+            } catch (e) {
+                console.log(e);
+            }
+        }
         return proxy;
     };
     return { name, test, parse };
@@ -487,7 +503,7 @@ function Clash_All() {
                 'ss',
                 'ssr',
                 'vmess',
-                'socks',
+                'socks5',
                 'http',
                 'snell',
                 'trojan',
@@ -519,6 +535,10 @@ function Clash_All() {
             }
         }
 
+        if (proxy['benchmark-url']) {
+            proxy['test-url'] = proxy['benchmark-url'];
+        }
+
         return proxy;
     };
     return { name, test, parse };
@@ -642,6 +662,15 @@ function Loon_Trojan() {
     const parse = (line) => getLoonParser().parse(line);
     return { name, test, parse };
 }
+function Loon_Hysteria2() {
+    const name = 'Loon Hysteria2 Parser';
+    const test = (line) => {
+        return /^.*=\s*Hysteria2/i.test(line.split(',')[0]);
+    };
+
+    const parse = (line) => getLoonParser().parse(line);
+    return { name, test, parse };
+}
 
 function Loon_Http() {
     const name = 'Loon HTTP Parser';
@@ -719,6 +748,7 @@ function Loon_WireGuard() {
         let publicKey = peers.match(
             /(,|^)\s*?public-key\s*?=\s*?"?(.+?)"?\s*?(,|$)/i,
         )?.[2];
+        // https://github.com/MetaCubeX/mihomo/blob/0404e35be8736b695eae018a08debb175c1f96e6/docs/config.yaml#L717
         const proxy = {
             type: 'wireguard',
             name,
@@ -745,7 +775,7 @@ function Loon_WireGuard() {
                     ipv6,
                     'public-key': publicKey,
                     'pre-shared-key': preSharedKey,
-                    allowed_ips: allowedIps,
+                    'allowed-ips': allowedIps,
                     reserved,
                 },
             ],
@@ -864,6 +894,7 @@ export default [
     Loon_SSR(),
     Loon_VMess(),
     Loon_Vless(),
+    Loon_Hysteria2(),
     Loon_Trojan(),
     Loon_Http(),
     Loon_WireGuard(),

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

@@ -35,7 +35,7 @@ const grammars = String.raw`
     }
 }
 
-start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http) {
+start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/hysteria2) {
     return proxy;
 }
 
@@ -44,7 +44,7 @@ shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/
     // handle ssr obfs
     proxy.obfs = obfs.type;
 }
-shadowsocks = tag equals "shadowsocks"i address method password (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
     proxy.type = "ss";
     // handle ss obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -68,6 +68,9 @@ trojan = tag equals "trojan"i address password (transport/transport_host/transpo
     proxy.type = "trojan";
     handleTransport();
 }
+hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/udp_relay/download_bandwidth/ecn/others)* {
+    proxy.type = "hysteria2";
+}
 https = tag equals "https"i address (username password)? (tls_host/tls_verification/fast_open/udp_relay/others)* {
     proxy.type = "http";
     proxy.tls = true;
@@ -142,6 +145,9 @@ username = & {
 password = comma '"' match:[^"]* '"' { proxy.password = match.join(""); }
 uuid = comma '"' match:[^"]+ '"' { proxy.uuid = match.join(""); }
 
+obfs_typev = comma type:("http"/"tls") { obfs.type = type; }
+obfs_hostv = comma match:[^,]+ { obfs.host = match.join(""); }
+
 obfs_ss = comma "obfs-name" equals type:("http"/"tls") { obfs.type = type; }
 
 obfs_ssr = comma "obfs" equals type:("plain"/"http_simple"/"http_post"/"random_head"/"tls1.2_ticket_auth"/"tls1.2_ticket_fastauth") { obfs.type = type; }
@@ -167,6 +173,9 @@ tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
 
+ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
+download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
+
 tag = match:[^=,]* { proxy.name = match.join("").trim(); }
 comma = _ "," _
 equals = _ "=" _

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

@@ -33,7 +33,7 @@
     }
 }
 
-start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http) {
+start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/hysteria2) {
     return proxy;
 }
 
@@ -42,7 +42,7 @@ shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/
     // handle ssr obfs
     proxy.obfs = obfs.type;
 }
-shadowsocks = tag equals "shadowsocks"i address method password (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
     proxy.type = "ss";
     // handle ss obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -66,6 +66,9 @@ trojan = tag equals "trojan"i address password (transport/transport_host/transpo
     proxy.type = "trojan";
     handleTransport();
 }
+hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/udp_relay/download_bandwidth/ecn/others)* {
+    proxy.type = "hysteria2";
+}
 https = tag equals "https"i address (username password)? (tls_host/tls_verification/fast_open/udp_relay/others)* {
     proxy.type = "http";
     proxy.tls = true;
@@ -140,6 +143,9 @@ username = & {
 password = comma '"' match:[^"]* '"' { proxy.password = match.join(""); }
 uuid = comma '"' match:[^"]+ '"' { proxy.uuid = match.join(""); }
 
+obfs_typev = comma type:("http"/"tls") { obfs.type = type; }
+obfs_hostv = comma match:[^,]+ { obfs.host = match.join(""); }
+
 obfs_ss = comma "obfs-name" equals type:("http"/"tls") { obfs.type = type; }
 
 obfs_ssr = comma "obfs" equals type:("plain"/"http_simple"/"http_post"/"random_head"/"tls1.2_ticket_auth"/"tls1.2_ticket_fastauth") { obfs.type = type; }
@@ -165,6 +171,9 @@ tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
 
+ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
+download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
+
 tag = match:[^=,]* { proxy.name = match.join("").trim(); }
 comma = _ "," _
 equals = _ "=" _

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

@@ -43,13 +43,13 @@ start = (trojan/shadowsocks/vmess/http/socks5) {
 }
 
 trojan = "trojan" equals address
-    (password/over_tls/tls_host/tls_fingerprint/tls_verification/obfs/obfs_host/obfs_uri/tag/udp_relay/udp_over_tcp/fast_open/others)* {
+    (password/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/obfs/obfs_host/obfs_uri/tag/udp_relay/udp_over_tcp/fast_open/server_check_url/others)* {
     proxy.type = "trojan";
     handleObfs();
 }
 
 shadowsocks = "shadowsocks" equals address
-    (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp/fast_open/tag/others)* {
+    (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp/fast_open/tag/server_check_url/others)* {
     if (proxy.protocol) {
         proxy.type = "ssr";
         // handle ssr obfs
@@ -80,7 +80,7 @@ shadowsocks = "shadowsocks" equals address
 }
 
 vmess = "vmess" equals address
-    (uuid/method/over_tls/tls_host/tls_fingerprint/tls_verification/tag/obfs/obfs_host/obfs_uri/udp_relay/udp_over_tcp/fast_open/aead/others)* {
+    (uuid/method/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/tag/obfs/obfs_host/obfs_uri/udp_relay/udp_over_tcp/fast_open/aead/server_check_url/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     if (proxy.aead) {
@@ -92,12 +92,12 @@ vmess = "vmess" equals address
 }
 
 http = "http" equals address 
-    (username/password/over_tls/tls_host/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/others)*{
+    (username/password/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/server_check_url/others)*{
     proxy.type = "http";
 }
 
 socks5 = "socks5" equals address
-    (username/password/password/over_tls/tls_host/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/others)* {
+    (username/password/password/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/server_check_url/others)* {
     proxy.type = "socks5";
 }
     
@@ -155,6 +155,14 @@ tls_verification = comma "tls-verification" equals flag:bool {
     proxy["skip-cert-verify"] = !flag;
 }
 tls_fingerprint = comma "tls-cert-sha256" equals tls_fingerprint:$[^,]+ { proxy["tls-fingerprint"] = tls_fingerprint.trim(); }
+tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals param:$[^=,]+ { proxy["tls-pubkey-sha256"] = param; }
+tls_alpn = comma "tls-alpn" equals param:$[^=,]+ { proxy["tls-alpn"] = param; }
+tls_no_session_ticket = comma "tls-no-session-ticket" equals flag:bool { 
+    proxy["tls-no-session-ticket"] = flag;
+}
+tls_no_session_reuse = comma "tls-no-session-reuse" equals flag:bool { 
+    proxy["tls-no-session-reuse"] = flag;
+}
 
 obfs_ss = comma "obfs" equals type:("http"/"tls"/"wss"/"ws"/"over-tls") { obfs.type = type; return type; }
 obfs_ssr = comma "obfs" equals type:("plain"/"http_simple"/"http_post"/"random_head"/"tls1.2_ticket_auth"/"tls1.2_ticket_fastauth") { obfs.type = type; return type; }
@@ -166,6 +174,8 @@ obfs_uri = comma "obfs-uri" equals uri:uri { obfs.path = uri; }
 ssr_protocol = comma "ssr-protocol" equals protocol:("origin"/"auth_sha1_v4"/"auth_aes128_md5"/"auth_aes128_sha1"/"auth_chain_a"/"auth_chain_b") { proxy.protocol = protocol; return protocol; }
 ssr_protocol_param = comma "ssr-protocol-param" equals param:$[^=,]+ { proxy["protocol-param"] = param; }
 
+server_check_url = comma "server_check_url" equals param:$[^=,]+ { proxy["test-url"] = param; }
+
 uri = $[^,]+
 
 tag = comma "tag" equals tag:[^=,]+ { proxy.name = tag.join(""); }

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

@@ -41,13 +41,13 @@ start = (trojan/shadowsocks/vmess/http/socks5) {
 }
 
 trojan = "trojan" equals address
-    (password/over_tls/tls_host/tls_fingerprint/tls_verification/obfs/obfs_host/obfs_uri/tag/udp_relay/udp_over_tcp/fast_open/others)* {
+    (password/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/obfs/obfs_host/obfs_uri/tag/udp_relay/udp_over_tcp/fast_open/server_check_url/others)* {
     proxy.type = "trojan";
     handleObfs();
 }
 
 shadowsocks = "shadowsocks" equals address
-    (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp/fast_open/tag/others)* {
+    (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp/fast_open/tag/server_check_url/others)* {
     if (proxy.protocol) {
         proxy.type = "ssr";
         // handle ssr obfs
@@ -78,7 +78,7 @@ shadowsocks = "shadowsocks" equals address
 }
 
 vmess = "vmess" equals address
-    (uuid/method/over_tls/tls_host/tls_fingerprint/tls_verification/tag/obfs/obfs_host/obfs_uri/udp_relay/udp_over_tcp/fast_open/aead/others)* {
+    (uuid/method/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/tag/obfs/obfs_host/obfs_uri/udp_relay/udp_over_tcp/fast_open/aead/server_check_url/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     if (proxy.aead) {
@@ -90,12 +90,12 @@ vmess = "vmess" equals address
 }
 
 http = "http" equals address 
-    (username/password/over_tls/tls_host/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/others)*{
+    (username/password/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/server_check_url/others)*{
     proxy.type = "http";
 }
 
 socks5 = "socks5" equals address
-    (username/password/password/over_tls/tls_host/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/others)* {
+    (username/password/password/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/server_check_url/others)* {
     proxy.type = "socks5";
 }
     
@@ -153,6 +153,14 @@ tls_verification = comma "tls-verification" equals flag:bool {
     proxy["skip-cert-verify"] = !flag;
 }
 tls_fingerprint = comma "tls-cert-sha256" equals tls_fingerprint:$[^,]+ { proxy["tls-fingerprint"] = tls_fingerprint.trim(); }
+tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals param:$[^=,]+ { proxy["tls-pubkey-sha256"] = param; }
+tls_alpn = comma "tls-alpn" equals param:$[^=,]+ { proxy["tls-alpn"] = param; }
+tls_no_session_ticket = comma "tls-no-session-ticket" equals flag:bool { 
+    proxy["tls-no-session-ticket"] = flag;
+}
+tls_no_session_reuse = comma "tls-no-session-reuse" equals flag:bool { 
+    proxy["tls-no-session-reuse"] = flag;
+}
 
 obfs_ss = comma "obfs" equals type:("http"/"tls"/"wss"/"ws"/"over-tls") { obfs.type = type; return type; }
 obfs_ssr = comma "obfs" equals type:("plain"/"http_simple"/"http_post"/"random_head"/"tls1.2_ticket_auth"/"tls1.2_ticket_fastauth") { obfs.type = type; return type; }
@@ -164,6 +172,8 @@ obfs_uri = comma "obfs-uri" equals uri:uri { obfs.path = uri; }
 ssr_protocol = comma "ssr-protocol" equals protocol:("origin"/"auth_sha1_v4"/"auth_aes128_md5"/"auth_aes128_sha1"/"auth_chain_a"/"auth_chain_b") { proxy.protocol = protocol; return protocol; }
 ssr_protocol_param = comma "ssr-protocol-param" equals param:$[^=,]+ { proxy["protocol-param"] = param; }
 
+server_check_url = comma "server_check_url" equals param:$[^=,]+ { proxy["test-url"] = param; }
+
 uri = $[^,]+
 
 tag = comma "tag" equals tag:[^=,]+ { proxy.name = tag.join(""); }

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

@@ -36,7 +36,7 @@ start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v
     return proxy;
 }
 
-shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/ip_version/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "ss";
     // handle obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -46,7 +46,7 @@ shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/
         $set(proxy, "plugin-opts.path", obfs.path);
     }
 }
-vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/tls/sni/tls_fingerprint/tls_verification/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/ip_version/no_error_alert/tls/sni/tls_fingerprint/tls_verification/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     if (proxy.aead) {
@@ -56,18 +56,18 @@ vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/
     }
     handleWebsocket();
 }
-trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/ip_version/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "trojan";
     handleWebsocket();
 }
-https = tag equals "https" address (username password)? (sni/tls_fingerprint/tls_verification/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+https = tag equals "https" address (username password)? (usernamek passwordk)? (sni/tls_fingerprint/tls_verification/ip_version/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-http = tag equals "http" address (username password)? (fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+http = tag equals "http" address (username password)? (usernamek passwordk)? (ip_version/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "http";
 }
-snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/fast_open/udp_relay/reuse/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/no_error_alert/fast_open/udp_relay/reuse/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "snell";
     // handle obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -76,10 +76,10 @@ snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_
         $set(proxy, "obfs-opts.path", obfs.path);
     }
 }
-tuic = tag equals "tuic" address (alpn/token/ip_version/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+tuic = tag equals "tuic" address (alpn/token/ip_version/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "tuic";
 }
-tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "tuic";
     proxy.version = 5;
 }
@@ -89,10 +89,10 @@ wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/under
 hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/test_url/sni/tls_verification/passwordk/tls_fingerprint/download_bandwidth/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "hysteria2";
 }
-socks5 = tag equals "socks5" address (username password)? (fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "socks5";
 }
-socks5_tls = tag equals "socks5-tls" address (username password)? (sni/tls_fingerprint/tls_verification/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+socks5_tls = tag equals "socks5-tls" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/sni/tls_fingerprint/tls_verification/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "socks5";
     proxy.tls = true;
 }
@@ -163,6 +163,7 @@ tls_fingerprint = comma "server-cert-fingerprint-sha256" equals tls_fingerprint:
 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(""); }
 vmess_uuid = comma "username" equals match:[^,]+ { proxy.uuid = match.join(""); }
 vmess_aead = comma "vmess-aead" equals flag:bool { proxy.aead = flag; }

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

@@ -34,7 +34,7 @@ start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v
     return proxy;
 }
 
-shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/ip_version/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "ss";
     // handle obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -44,7 +44,7 @@ shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/
         $set(proxy, "plugin-opts.path", obfs.path);
     }
 }
-vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/tls/sni/tls_fingerprint/tls_verification/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/ip_version/no_error_alert/tls/sni/tls_fingerprint/tls_verification/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     if (proxy.aead) {
@@ -54,18 +54,18 @@ vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/
     }
     handleWebsocket();
 }
-trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/ip_version/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "trojan";
     handleWebsocket();
 }
-https = tag equals "https" address (username password)? (sni/tls_fingerprint/tls_verification/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+https = tag equals "https" address (username password)? (usernamek passwordk)? (sni/tls_fingerprint/tls_verification/ip_version/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-http = tag equals "http" address (username password)? (fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+http = tag equals "http" address (username password)? (usernamek passwordk)? (ip_version/no_error_alert/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "http";
 }
-snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/fast_open/udp_relay/reuse/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/no_error_alert/fast_open/udp_relay/reuse/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "snell";
     // handle obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -74,10 +74,10 @@ snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_
         $set(proxy, "obfs-opts.path", obfs.path);
     }
 }
-tuic = tag equals "tuic" address (alpn/token/ip_version/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+tuic = tag equals "tuic" address (alpn/token/ip_version/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "tuic";
 }
-tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "tuic";
     proxy.version = 5;
 }
@@ -87,10 +87,10 @@ wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/under
 hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/test_url/sni/tls_verification/passwordk/tls_fingerprint/download_bandwidth/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "hysteria2";
 }
-socks5 = tag equals "socks5" address (username password)? (fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "socks5";
 }
-socks5_tls = tag equals "socks5-tls" address (username password)? (sni/tls_fingerprint/tls_verification/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+socks5_tls = tag equals "socks5-tls" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/sni/tls_fingerprint/tls_verification/fast_open/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "socks5";
     proxy.tls = true;
 }
@@ -161,6 +161,7 @@ tls_fingerprint = comma "server-cert-fingerprint-sha256" equals tls_fingerprint:
 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(""); }
 vmess_uuid = comma "username" equals match:[^,]+ { proxy.uuid = match.join(""); }
 vmess_aead = comma "vmess-aead" equals flag:bool { proxy.aead = flag; }

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

@@ -90,11 +90,18 @@ params = "/"? "?" head:param tail:("&"@param)* {
   
   if (params["type"]) {
     proxy.network = params["type"]
-    if (params["path"]) {
+    if (['grpc'].includes(proxy.network)) {
-      $set(proxy, proxy.network+"-opts.path", decodeURIComponent(params["path"]));  
+        proxy[proxy.network + '-opts'] = {
-    }
+            'grpc-service-name': params["serviceName"],
-    if (params["host"]) {
+            '_grpc-type': params["mode"],
-      $set(proxy, proxy.network+"-opts.headers.Host", decodeURIComponent(params["host"])); 
+        };
+    } else {
+      if (params["path"]) {
+        $set(proxy, proxy.network+"-opts.path", decodeURIComponent(params["path"]));  
+      }
+      if (params["host"]) {
+        $set(proxy, proxy.network+"-opts.headers.Host", decodeURIComponent(params["host"])); 
+      }
     }
   }
 

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

@@ -88,11 +88,18 @@ params = "/"? "?" head:param tail:("&"@param)* {
   
   if (params["type"]) {
     proxy.network = params["type"]
-    if (params["path"]) {
+    if (['grpc'].includes(proxy.network)) {
-      $set(proxy, proxy.network+"-opts.path", decodeURIComponent(params["path"]));  
+        proxy[proxy.network + '-opts'] = {
-    }
+            'grpc-service-name': params["serviceName"],
-    if (params["host"]) {
+            '_grpc-type': params["mode"],
-      $set(proxy, proxy.network+"-opts.headers.Host", decodeURIComponent(params["host"])); 
+        };
+    } else {
+      if (params["path"]) {
+        $set(proxy, proxy.network+"-opts.path", decodeURIComponent(params["path"]));  
+      }
+      if (params["host"]) {
+        $set(proxy, proxy.network+"-opts.headers.Host", decodeURIComponent(params["host"])); 
+      }
     }
   }
 

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

@@ -25,7 +25,10 @@ function Base64Encoded() {
     ];
 
     const test = function (raw) {
-        return keys.some((k) => raw.indexOf(k) !== -1);
+        return (
+            !/^\w+:\/\/\w+/im.test(raw) &&
+            keys.some((k) => raw.indexOf(k) !== -1)
+        );
     };
     const parse = function (raw) {
         raw = Base64.decode(raw);
@@ -37,7 +40,9 @@ function Base64Encoded() {
 function Clash() {
     const name = 'Clash Pre-processor';
     const test = function (raw) {
-        return /proxies/.test(raw);
+        if (!/proxies/.test(raw)) return false;
+        const content = safeLoad(raw);
+        return content.proxies && Array.isArray(content.proxies);
     };
     const parse = function (raw) {
         // Clash YAML format
@@ -105,4 +110,4 @@ function FullConfig() {
     return { name, test, parse };
 }
 
-export default [HTML(), Base64Encoded(), Clash(), SSD(), FullConfig()];
+export default [HTML(), Clash(), Base64Encoded(), SSD(), FullConfig()];

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

@@ -8,6 +8,7 @@ import $ from '@/core/app';
 import { hex_md5 } from '@/vendor/md5';
 import { ProxyUtils } from '@/core/proxy-utils';
 import env from '@/utils/env';
+import { getFlowHeaders, parseFlowHeaders, flowTransfer } from '@/utils/flow';
 
 /**
  The rule "(name CONTAINS "🇨🇳") AND (port IN [80, 443])" can be expressed as follows:
@@ -310,6 +311,32 @@ function ScriptOperator(script, targetPlatform, $arguments, source) {
             })();
             return output;
         },
+        nodeFunc: async (proxies) => {
+            let output = proxies;
+            await (async function () {
+                const operator = createDynamicFunction(
+                    'operator',
+                    `async function operator(input = []) {
+                        let proxies
+                        if (Array.isArray(input)) {
+                            proxies = input
+                            return proxies.map(($server = {}) => {
+                                ${script}
+                                return $server
+                            })
+                        } else {
+                            let $content = input
+                            ${script}
+                            return $content
+                        }
+                        
+                      }`,
+                    $arguments,
+                );
+                output = operator(proxies, targetPlatform, { source, ...env });
+            })();
+            return output;
+        },
     };
 }
 
@@ -433,7 +460,9 @@ function ResolveDomainOperator({ provider }) {
             const limit = 15; // more than 20 concurrency may result in surge TCP connection shortage.
             const totalDomain = [
                 ...new Set(
-                    proxies.filter((p) => !isIP(p.server)).map((c) => c.server),
+                    proxies
+                        .filter((p) => !isIP(p.server) && !p['no-resolve'])
+                        .map((c) => c.server),
                 ),
             ];
             const totalBatch = Math.ceil(totalDomain.length / limit);
@@ -457,8 +486,15 @@ function ResolveDomainOperator({ provider }) {
                 }
                 await Promise.all(currentBatch);
             }
-            proxies.forEach((proxy) => {
+            proxies.forEach((p) => {
-                proxy.server = results[proxy.server] || proxy.server;
+                if (!p['no-resolve']) {
+                    if (results[p.server]) {
+                        p.server = results[p.server];
+                        p.resolved = true;
+                    } else {
+                        p.resolved = false;
+                    }
+                }
             });
 
             return proxies;
@@ -578,6 +614,22 @@ function ScriptFilter(script, targetPlatform, $arguments, source) {
             })();
             return output;
         },
+        nodeFunc: async (proxies) => {
+            let output = FULL(proxies.length, true);
+            await (async function () {
+                const filter = createDynamicFunction(
+                    'filter',
+                    `async function filter(proxies = []) {
+                        return proxies.filter(($server = {}) => {
+                          ${script}
+                        })
+                      }`,
+                    $arguments,
+                );
+                output = filter(proxies, targetPlatform, { source, ...env });
+            })();
+            return output;
+        },
     };
 }
 
@@ -608,7 +660,29 @@ async function ApplyFilter(filter, objs) {
     } catch (err) {
         // print log and skip this filter
         $.error(`Cannot apply filter ${filter.name}\n Reason: ${err}`);
-        throw new Error(`脚本过滤失败 ${err.message ?? err}`);
+        let funcErr = '';
+        let funcErrMsg = `${err.message ?? err}`;
+        if (funcErrMsg.includes('$server is not defined')) {
+            funcErr = '';
+        } else {
+            funcErr = `执行 function filter 失败 ${funcErrMsg}; `;
+        }
+        try {
+            selected = await filter.nodeFunc(objs);
+        } catch (err) {
+            $.error(
+                `Cannot apply filter ${filter.name}(node script)! Reason: ${err}`,
+            );
+            let nodeErr = '';
+            let nodeErrMsg = `${err.message ?? err}`;
+            if (funcErr && nodeErrMsg === funcErrMsg) {
+                nodeErr = '';
+                funcErr = `执行失败 ${funcErrMsg}`;
+            } else {
+                nodeErr = `执行节点快捷过滤脚本 失败 ${nodeErr}`;
+            }
+            throw new Error(`脚本过滤 ${funcErr}${nodeErr}`);
+        }
     }
     return objs.filter((_, i) => selected[i]);
 }
@@ -619,9 +693,36 @@ async function ApplyOperator(operator, objs) {
         const output_ = await operator.func(output);
         if (output_) output = output_;
     } catch (err) {
-        // print log and skip this operator
+        $.error(
-        $.error(`Cannot apply operator ${operator.name}! Reason: ${err}`);
+            `Cannot apply operator ${operator.name}(function operator)! Reason: ${err}`,
-        throw new Error(`脚本操作失败 ${err.message ?? err}`);
+        );
+        let funcErr = '';
+        let funcErrMsg = `${err.message ?? err}`;
+        if (
+            funcErrMsg.includes('$server is not defined') ||
+            funcErrMsg.includes('$content is not defined')
+        ) {
+            funcErr = '';
+        } else {
+            funcErr = `执行 function operator 失败 ${funcErrMsg}; `;
+        }
+        try {
+            const output_ = await operator.nodeFunc(output);
+            if (output_) output = output_;
+        } catch (err) {
+            $.error(
+                `Cannot apply operator ${operator.name}(node script)! Reason: ${err}`,
+            );
+            let nodeErr = '';
+            let nodeErrMsg = `${err.message ?? err}`;
+            if (funcErr && nodeErrMsg === funcErrMsg) {
+                nodeErr = '';
+                funcErr = `执行失败 ${funcErrMsg}`;
+            } else {
+                nodeErr = `执行节点快捷脚本 失败 ${nodeErr}`;
+            }
+            throw new Error(`脚本操作 ${funcErr}${nodeErr}`);
+        }
     }
     return output;
 }
@@ -668,6 +769,7 @@ function removeFlag(str) {
 }
 
 function createDynamicFunction(name, script, $arguments) {
+    const flowUtils = { getFlowHeaders, parseFlowHeaders, flowTransfer };
     if ($.env.isLoon) {
         return new Function(
             '$arguments',
@@ -678,6 +780,7 @@ function createDynamicFunction(name, script, $arguments) {
             '$notification',
             'ProxyUtils',
             'scriptResourceCache',
+            'flowUtils',
             `${script}\n return ${name}`,
         )(
             $arguments,
@@ -691,6 +794,7 @@ function createDynamicFunction(name, script, $arguments) {
             $notification,
             ProxyUtils,
             scriptResourceCache,
+            flowUtils,
         );
     } else {
         return new Function(
@@ -699,7 +803,9 @@ function createDynamicFunction(name, script, $arguments) {
             'lodash',
             'ProxyUtils',
             'scriptResourceCache',
+            'flowUtils',
+
             `${script}\n return ${name}`,
-        )($arguments, $, lodash, ProxyUtils, scriptResourceCache);
+        )($arguments, $, lodash, ProxyUtils, scriptResourceCache, flowUtils);
     }
 }

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

@@ -7,6 +7,7 @@ export default function Clash_Producer() {
         // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/docs/config.yaml#L532
         // github.com/Dreamacro/clash/pull/2891/files
         // filter unsupported proxies
+        // https://clash.wiki/configuration/outbound.html#shadowsocks
         proxies = proxies.filter((proxy) => {
             if (
                 ![
@@ -14,12 +15,29 @@ export default function Clash_Producer() {
                     'ssr',
                     'vmess',
                     'vless',
-                    'socks',
+                    'socks5',
                     'http',
                     'snell',
                     'trojan',
                     'wireguard',
                 ].includes(proxy.type) ||
+                (proxy.type === 'ss' &&
+                    ![
+                        'aes-128-gcm',
+                        'aes-192-gcm',
+                        'aes-256-gcm',
+                        'aes-128-cfb',
+                        'aes-192-cfb',
+                        'aes-256-cfb',
+                        'aes-128-ctr',
+                        'aes-192-ctr',
+                        'aes-256-ctr',
+                        'rc4-md5',
+                        'chacha20-ietf',
+                        'xchacha20',
+                        'chacha20-ietf-poly1305',
+                        'xchacha20-ietf-poly1305',
+                    ].includes(proxy.cipher)) ||
                 (proxy.type === 'snell' && String(proxy.version) === '4') ||
                 (proxy.type === 'vless' &&
                     (typeof proxy.flow !== 'undefined' ||

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

@@ -2,136 +2,143 @@ import { isPresent } from '@/core/proxy-utils/producers/utils';
 
 export default function ClashMeta_Producer() {
     const type = 'ALL';
-    const produce = (proxies) => {
+    const produce = (proxies, type) => {
-        return (
+        const list = proxies
-            'proxies:\n' +
+            .filter((proxy) => {
-            proxies
+                if (proxy.type === 'snell' && String(proxy.version) === '4') {
-                .filter((proxy) => {
+                    return false;
+                }
+                return true;
+            })
+            .map((proxy) => {
+                if (proxy.type === 'vmess') {
+                    // handle vmess aead
+                    if (isPresent(proxy, 'aead')) {
+                        if (proxy.aead) {
+                            proxy.alterId = 0;
+                        }
+                        delete proxy.aead;
+                    }
+                    if (isPresent(proxy, 'sni')) {
+                        proxy.servername = proxy.sni;
+                        delete proxy.sni;
+                    }
+                    // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/docs/config.yaml#L400
+                    // https://stash.wiki/proxy-protocols/proxy-types#vmess
                     if (
-                        proxy.type === 'snell' &&
+                        isPresent(proxy, 'cipher') &&
-                        String(proxy.version) === '4'
+                        ![
+                            'auto',
+                            'aes-128-gcm',
+                            'chacha20-poly1305',
+                            'none',
+                        ].includes(proxy.cipher)
                     ) {
-                        return false;
+                        proxy.cipher = 'auto';
                     }
-                    return true;
+                } else if (proxy.type === 'tuic') {
-                })
+                    if (isPresent(proxy, 'alpn')) {
-                .map((proxy) => {
+                        proxy.alpn = Array.isArray(proxy.alpn)
-                    if (proxy.type === 'vmess') {
+                            ? proxy.alpn
-                        // handle vmess aead
+                            : [proxy.alpn];
-                        if (isPresent(proxy, 'aead')) {
+                    } else {
-                            if (proxy.aead) {
+                        proxy.alpn = ['h3'];
-                                proxy.alterId = 0;
-                            }
-                            delete proxy.aead;
-                        }
-                        if (isPresent(proxy, 'sni')) {
-                            proxy.servername = proxy.sni;
-                            delete proxy.sni;
-                        }
-                        // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/docs/config.yaml#L400
-                        // https://stash.wiki/proxy-protocols/proxy-types#vmess
-                        if (
-                            isPresent(proxy, 'cipher') &&
-                            ![
-                                'auto',
-                                'aes-128-gcm',
-                                'chacha20-poly1305',
-                                'none',
-                            ].includes(proxy.cipher)
-                        ) {
-                            proxy.cipher = 'auto';
-                        }
-                    } else if (proxy.type === 'tuic') {
-                        if (isPresent(proxy, 'alpn')) {
-                            proxy.alpn = Array.isArray(proxy.alpn)
-                                ? proxy.alpn
-                                : [proxy.alpn];
-                        } else {
-                            proxy.alpn = ['h3'];
-                        }
-                        if (
-                            isPresent(proxy, 'tfo') &&
-                            !isPresent(proxy, 'fast-open')
-                        ) {
-                            proxy['fast-open'] = proxy.tfo;
-                        }
-                        // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/adapter/outbound/tuic.go#L197
-                        if (
-                            (!proxy.token || proxy.token.length === 0) &&
-                            !isPresent(proxy, 'version')
-                        ) {
-                            proxy.version = 5;
-                        }
-                    } else if (proxy.type === 'hysteria') {
-                        if (isPresent(proxy, 'alpn')) {
-                            proxy.alpn = Array.isArray(proxy.alpn)
-                                ? proxy.alpn
-                                : [proxy.alpn];
-                        }
-                        if (
-                            isPresent(proxy, 'tfo') &&
-                            !isPresent(proxy, 'fast-open')
-                        ) {
-                            proxy['fast-open'] = proxy.tfo;
-                        }
-                    } else if (proxy.type === 'wireguard') {
-                        proxy.keepalive =
-                            proxy.keepalive ?? proxy['persistent-keepalive'];
-                        proxy['persistent-keepalive'] = proxy.keepalive;
-                        proxy['preshared-key'] =
-                            proxy['preshared-key'] ?? proxy['pre-shared-key'];
-                        proxy['pre-shared-key'] = proxy['preshared-key'];
-                    } else if (proxy.type === 'vless') {
-                        if (isPresent(proxy, 'sni')) {
-                            proxy.servername = proxy.sni;
-                            delete proxy.sni;
-                        }
                     }
+                    if (
+                        isPresent(proxy, 'tfo') &&
+                        !isPresent(proxy, 'fast-open')
+                    ) {
+                        proxy['fast-open'] = proxy.tfo;
+                    }
+                    // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/adapter/outbound/tuic.go#L197
+                    if (
+                        (!proxy.token || proxy.token.length === 0) &&
+                        !isPresent(proxy, 'version')
+                    ) {
+                        proxy.version = 5;
+                    }
+                } else if (proxy.type === 'hysteria') {
+                    // auth_str 将会在未来某个时候删除 但是有的机场不规范
+                    if (
+                        isPresent(proxy, 'auth_str') &&
+                        !isPresent(proxy, 'auth-str')
+                    ) {
+                        proxy['auth-str'] = proxy['auth_str'];
+                    }
+                    if (isPresent(proxy, 'alpn')) {
+                        proxy.alpn = Array.isArray(proxy.alpn)
+                            ? proxy.alpn
+                            : [proxy.alpn];
+                    }
+                    if (
+                        isPresent(proxy, 'tfo') &&
+                        !isPresent(proxy, 'fast-open')
+                    ) {
+                        proxy['fast-open'] = proxy.tfo;
+                    }
+                } else if (proxy.type === 'wireguard') {
+                    proxy.keepalive =
+                        proxy.keepalive ?? proxy['persistent-keepalive'];
+                    proxy['persistent-keepalive'] = proxy.keepalive;
+                    proxy['preshared-key'] =
+                        proxy['preshared-key'] ?? proxy['pre-shared-key'];
+                    proxy['pre-shared-key'] = proxy['preshared-key'];
+                } else if (proxy.type === 'vless') {
+                    if (isPresent(proxy, 'sni')) {
+                        proxy.servername = proxy.sni;
+                        delete proxy.sni;
+                    }
+                }
 
+                if (
+                    ['vmess', 'vless'].includes(proxy.type) &&
+                    proxy.network === 'http'
+                ) {
+                    let httpPath = proxy['http-opts']?.path;
                     if (
-                        ['vmess', 'vless'].includes(proxy.type) &&
+                        isPresent(proxy, 'http-opts.path') &&
-                        proxy.network === 'http'
+                        !Array.isArray(httpPath)
                     ) {
-                        let httpPath = proxy['http-opts']?.path;
+                        proxy['http-opts'].path = [httpPath];
-                        if (
-                            isPresent(proxy, 'http-opts.path') &&
-                            !Array.isArray(httpPath)
-                        ) {
-                            proxy['http-opts'].path = [httpPath];
-                        }
-                        let httpHost = proxy['http-opts']?.headers?.Host;
-                        if (
-                            isPresent(proxy, 'http-opts.headers.Host') &&
-                            !Array.isArray(httpHost)
-                        ) {
-                            proxy['http-opts'].headers.Host = [httpHost];
-                        }
                     }
+                    let httpHost = proxy['http-opts']?.headers?.Host;
+                    if (
+                        isPresent(proxy, 'http-opts.headers.Host') &&
+                        !Array.isArray(httpHost)
+                    ) {
+                        proxy['http-opts'].headers.Host = [httpHost];
+                    }
+                }
 
-                    if (
+                if (
-                        ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
+                    ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
-                            proxy.type,
+                        proxy.type,
-                        )
+                    )
-                    ) {
+                ) {
-                        delete proxy.tls;
+                    delete proxy.tls;
-                    }
+                }
 
-                    if (proxy['tls-fingerprint']) {
+                if (proxy['tls-fingerprint']) {
-                        proxy.fingerprint = proxy['tls-fingerprint'];
+                    proxy.fingerprint = proxy['tls-fingerprint'];
-                    }
+                }
-                    delete proxy['tls-fingerprint'];
+                delete proxy['tls-fingerprint'];
-                    delete proxy.subName;
+                delete proxy.subName;
-                    delete proxy.collectionName;
+                delete proxy.collectionName;
-                    if (
+                if (
-                        ['grpc'].includes(proxy.network) &&
+                    ['grpc'].includes(proxy.network) &&
-                        proxy[`${proxy.network}-opts`]
+                    proxy[`${proxy.network}-opts`]
-                    ) {
+                ) {
-                        delete proxy[`${proxy.network}-opts`]['_grpc-type'];
+                    delete proxy[`${proxy.network}-opts`]['_grpc-type'];
-                    }
+                }
-                    return '  - ' + JSON.stringify(proxy) + '\n';
+                return proxy;
-                })
+            });
-                .join('')
+
-        );
+        return type === 'internal'
+            ? list
+            : 'proxies:\n' +
+                  list
+                      .map((proxy) => '  - ' + JSON.stringify(proxy) + '\n')
+                      .join('');
     };
     return { type, produce };
 }

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

@@ -8,6 +8,7 @@ import URI_Producer from './uri';
 import V2Ray_Producer from './v2ray';
 import QX_Producer from './qx';
 import ShadowRocket_Producer from './shadowrocket';
+import Surfboard_Producer from './surfboard';
 
 function JSON_Producer() {
     const type = 'ALL';
@@ -27,4 +28,5 @@ export default {
     JSON: JSON_Producer(),
     Stash: Stash_Producer(),
     ShadowRocket: ShadowRocket_Producer(),
+    Surfboard: Surfboard_Producer(),
 };

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

@@ -20,6 +20,8 @@ export default function Loon_Producer() {
                 return http(proxy);
             case 'wireguard':
                 return wireguard(proxy);
+            case 'hysteria2':
+                return hysteria2(proxy);
         }
         throw new Error(
             `Platform ${targetPlatform} does not support proxy type: ${proxy.type}`,
@@ -97,7 +99,7 @@ function trojan(proxy) {
         if (proxy.network === 'ws') {
             result.append(`,transport=ws`);
             result.appendIfPresent(
-                `,path=${proxy['ws-opts'].path}`,
+                `,path=${proxy['ws-opts']?.path}`,
                 'ws-opts.path',
             );
             result.appendIfPresent(
@@ -283,7 +285,8 @@ function wireguard(proxy) {
         proxy.ipv6 = proxy.peers[0].ipv6;
         proxy['public-key'] = proxy.peers[0]['public-key'];
         proxy['preshared-key'] = proxy.peers[0]['pre-shared-key'];
-        proxy['allowed-ips'] = proxy.peers[0]['allowed_ips'];
+        // https://github.com/MetaCubeX/mihomo/blob/0404e35be8736b695eae018a08debb175c1f96e6/docs/config.yaml#L717
+        proxy['allowed-ips'] = proxy.peers[0]['allowed-ips'];
         proxy.reserved = proxy.peers[0].reserved;
     }
     const result = new Result(proxy);
@@ -334,3 +337,33 @@ function wireguard(proxy) {
 
     return result.toString();
 }
+
+function hysteria2(proxy) {
+    if (proxy.obfs || proxy['obfs-password']) {
+        throw new Error(`obfs is unsupported`);
+    }
+    const result = new Result(proxy);
+    result.append(`${proxy.name}=Hysteria2,${proxy.server},${proxy.port}`);
+
+    result.appendIfPresent(`,"${proxy.password}"`, 'password');
+
+    // sni
+    result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
+    result.appendIfPresent(
+        `,skip-cert-verify=${proxy['skip-cert-verify']}`,
+        'skip-cert-verify',
+    );
+
+    // udp
+    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
+
+    // download-bandwidth
+    result.appendIfPresent(
+        `,download-bandwidth=${`${proxy['down']}`.match(/\d+/)?.[0] || 0}`,
+        'down',
+    );
+
+    result.appendIfPresent(`,ecn=${proxy.ecn}`, 'ecn');
+
+    return result.toString();
+}

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

@@ -63,6 +63,19 @@ function shadowsocks(proxy) {
     }
 
     if (needTls(proxy)) {
+        appendIfPresent(
+            `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
+            'tls-pubkey-sha256',
+        );
+        appendIfPresent(`,tls-alpn=${proxy['tls-alpn']}`, 'tls-alpn');
+        appendIfPresent(
+            `,tls-no-session-ticket=${proxy['tls-no-session-ticket']}`,
+            'tls-no-session-ticket',
+        );
+        appendIfPresent(
+            `,tls-no-session-reuse=${proxy['tls-no-session-reuse']}`,
+            'tls-no-session-reuse',
+        );
         // tls fingerprint
         appendIfPresent(
             `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
@@ -83,6 +96,12 @@ function shadowsocks(proxy) {
     // udp
     appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
 
+    // server_check_url
+    result.appendIfPresent(
+        `,server_check_url=${proxy['test-url']}`,
+        'test-url',
+    );
+
     // tag
     append(`,tag=${proxy.name}`);
 
@@ -115,6 +134,12 @@ function shadowsocksr(proxy) {
     // udp
     appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
 
+    // server_check_url
+    result.appendIfPresent(
+        `,server_check_url=${proxy['test-url']}`,
+        'test-url',
+    );
+
     // tag
     append(`,tag=${proxy.name}`);
 
@@ -153,6 +178,19 @@ function trojan(proxy) {
     }
 
     if (needTls(proxy)) {
+        appendIfPresent(
+            `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
+            'tls-pubkey-sha256',
+        );
+        appendIfPresent(`,tls-alpn=${proxy['tls-alpn']}`, 'tls-alpn');
+        appendIfPresent(
+            `,tls-no-session-ticket=${proxy['tls-no-session-ticket']}`,
+            'tls-no-session-ticket',
+        );
+        appendIfPresent(
+            `,tls-no-session-reuse=${proxy['tls-no-session-reuse']}`,
+            'tls-no-session-reuse',
+        );
         // tls fingerprint
         appendIfPresent(
             `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
@@ -173,6 +211,12 @@ function trojan(proxy) {
     // udp
     appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
 
+    // server_check_url
+    result.appendIfPresent(
+        `,server_check_url=${proxy['test-url']}`,
+        'test-url',
+    );
+
     // tag
     append(`,tag=${proxy.name}`);
 
@@ -230,6 +274,19 @@ function vmess(proxy) {
     }
 
     if (needTls(proxy)) {
+        appendIfPresent(
+            `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
+            'tls-pubkey-sha256',
+        );
+        appendIfPresent(`,tls-alpn=${proxy['tls-alpn']}`, 'tls-alpn');
+        appendIfPresent(
+            `,tls-no-session-ticket=${proxy['tls-no-session-ticket']}`,
+            'tls-no-session-ticket',
+        );
+        appendIfPresent(
+            `,tls-no-session-reuse=${proxy['tls-no-session-reuse']}`,
+            'tls-no-session-reuse',
+        );
         // tls fingerprint
         appendIfPresent(
             `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
@@ -257,6 +314,12 @@ function vmess(proxy) {
     // udp
     appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
 
+    // server_check_url
+    result.appendIfPresent(
+        `,server_check_url=${proxy['test-url']}`,
+        'test-url',
+    );
+
     // tag
     append(`,tag=${proxy.name}`);
 
@@ -279,6 +342,19 @@ function http(proxy) {
     appendIfPresent(`,over-tls=${proxy.tls}`, 'tls');
 
     if (needTls(proxy)) {
+        appendIfPresent(
+            `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
+            'tls-pubkey-sha256',
+        );
+        appendIfPresent(`,tls-alpn=${proxy['tls-alpn']}`, 'tls-alpn');
+        appendIfPresent(
+            `,tls-no-session-ticket=${proxy['tls-no-session-ticket']}`,
+            'tls-no-session-ticket',
+        );
+        appendIfPresent(
+            `,tls-no-session-reuse=${proxy['tls-no-session-reuse']}`,
+            'tls-no-session-reuse',
+        );
         // tls fingerprint
         appendIfPresent(
             `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
@@ -299,6 +375,12 @@ function http(proxy) {
     // udp
     appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
 
+    // server_check_url
+    result.appendIfPresent(
+        `,server_check_url=${proxy['test-url']}`,
+        'test-url',
+    );
+
     // tag
     append(`,tag=${proxy.name}`);
 
@@ -321,6 +403,19 @@ function socks5(proxy) {
     appendIfPresent(`,over-tls=${proxy.tls}`, 'tls');
 
     if (needTls(proxy)) {
+        appendIfPresent(
+            `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
+            'tls-pubkey-sha256',
+        );
+        appendIfPresent(`,tls-alpn=${proxy['tls-alpn']}`, 'tls-alpn');
+        appendIfPresent(
+            `,tls-no-session-ticket=${proxy['tls-no-session-ticket']}`,
+            'tls-no-session-ticket',
+        );
+        appendIfPresent(
+            `,tls-no-session-reuse=${proxy['tls-no-session-reuse']}`,
+            'tls-no-session-reuse',
+        );
         // tls fingerprint
         appendIfPresent(
             `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
@@ -341,6 +436,12 @@ function socks5(proxy) {
     // udp
     appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
 
+    // server_check_url
+    result.appendIfPresent(
+        `,server_check_url=${proxy['test-url']}`,
+        'test-url',
+    );
+
     // tag
     append(`,tag=${proxy.name}`);
 

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

@@ -63,6 +63,32 @@ export default function ShadowRocket_Producer() {
                             proxy.version = 5;
                         }
                     } else if (proxy.type === 'hysteria') {
+                        // auth_str 将会在未来某个时候删除 但是有的机场不规范
+                        if (
+                            isPresent(proxy, 'auth_str') &&
+                            !isPresent(proxy, 'auth-str')
+                        ) {
+                            proxy['auth-str'] = proxy['auth_str'];
+                        }
+                        if (isPresent(proxy, 'alpn')) {
+                            proxy.alpn = Array.isArray(proxy.alpn)
+                                ? proxy.alpn
+                                : [proxy.alpn];
+                        }
+                        if (
+                            isPresent(proxy, 'tfo') &&
+                            !isPresent(proxy, 'fast-open')
+                        ) {
+                            proxy['fast-open'] = proxy.tfo;
+                        }
+                    } else if (proxy.type === 'hysteria2') {
+                        if (
+                            proxy['obfs-password'] &&
+                            proxy.obfs == 'salamander'
+                        ) {
+                            proxy.obfs = proxy['obfs-password'];
+                            delete proxy['obfs-password'];
+                        }
                         if (isPresent(proxy, 'alpn')) {
                             proxy.alpn = Array.isArray(proxy.alpn)
                                 ? proxy.alpn

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

@@ -3,6 +3,7 @@ import { isPresent } from '@/core/proxy-utils/producers/utils';
 export default function Stash_Producer() {
     const type = 'ALL';
     const produce = (proxies) => {
+        // https://stash.wiki/proxy-protocols/proxy-types#shadowsocks
         return (
             'proxies:\n' +
             proxies
@@ -12,7 +13,7 @@ export default function Stash_Producer() {
                             'ss',
                             'ssr',
                             'vmess',
-                            'socks',
+                            'socks5',
                             'http',
                             'snell',
                             'trojan',
@@ -22,6 +23,23 @@ export default function Stash_Producer() {
                             'hysteria',
                             'hysteria2',
                         ].includes(proxy.type) ||
+                        (proxy.type === 'ss' &&
+                            ![
+                                'aes-128-gcm',
+                                'aes-192-gcm',
+                                'aes-256-gcm',
+                                'aes-128-cfb',
+                                'aes-192-cfb',
+                                'aes-256-cfb',
+                                'aes-128-ctr',
+                                'aes-192-ctr',
+                                'aes-256-ctr',
+                                'rc4-md5',
+                                'chacha20-ietf',
+                                'xchacha20',
+                                'chacha20-ietf-poly1305',
+                                'xchacha20-ietf-poly1305',
+                            ].includes(proxy.cipher)) ||
                         (proxy.type === 'snell' &&
                             String(proxy.version) === '4') ||
                         (proxy.type === 'vless' && proxy['reality-opts'])
@@ -79,6 +97,13 @@ export default function Stash_Producer() {
                             proxy.version = 5;
                         }
                     } else if (proxy.type === 'hysteria') {
+                        // auth_str 将会在未来某个时候删除 但是有的机场不规范
+                        if (
+                            isPresent(proxy, 'auth_str') &&
+                            !isPresent(proxy, 'auth-str')
+                        ) {
+                            proxy['auth-str'] = proxy['auth_str'];
+                        }
                         if (isPresent(proxy, 'alpn')) {
                             proxy.alpn = Array.isArray(proxy.alpn)
                                 ? proxy.alpn
@@ -105,6 +130,14 @@ export default function Stash_Producer() {
                             proxy['up-speed'] = proxy.up;
                             delete proxy.up;
                         }
+                        if (isPresent(proxy, 'down-speed')) {
+                            proxy['down-speed'] =
+                                `${proxy['down-speed']}`.match(/\d+/)?.[0] || 0;
+                        }
+                        if (isPresent(proxy, 'up-speed')) {
+                            proxy['up-speed'] =
+                                `${proxy['up-speed']}`.match(/\d+/)?.[0] || 0;
+                        }
                     } else if (proxy.type === 'hysteria2') {
                         if (
                             isPresent(proxy, 'password') &&
@@ -134,6 +167,14 @@ export default function Stash_Producer() {
                             proxy['up-speed'] = proxy.up;
                             delete proxy.up;
                         }
+                        if (isPresent(proxy, 'down-speed')) {
+                            proxy['down-speed'] =
+                                `${proxy['down-speed']}`.match(/\d+/)?.[0] || 0;
+                        }
+                        if (isPresent(proxy, 'up-speed')) {
+                            proxy['up-speed'] =
+                                `${proxy['up-speed']}`.match(/\d+/)?.[0] || 0;
+                        }
                     } else if (proxy.type === 'wireguard') {
                         proxy.keepalive =
                             proxy.keepalive ?? proxy['persistent-keepalive'];
@@ -178,6 +219,12 @@ export default function Stash_Producer() {
                         proxy.fingerprint = proxy['tls-fingerprint'];
                     }
                     delete proxy['tls-fingerprint'];
+
+                    if (proxy['test-url']) {
+                        proxy['benchmark-url'] = proxy['test-url'];
+                        delete proxy['test-url'];
+                    }
+
                     delete proxy.subName;
                     delete proxy.collectionName;
                     if (

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

@@ -0,0 +1,199 @@
+import { Result, isPresent } from './utils';
+import { isNotBlank } from '@/utils';
+// import $ from '@/core/app';
+
+const targetPlatform = 'Surfboard';
+
+export default function Surfboard_Producer() {
+    const produce = (proxy) => {
+        switch (proxy.type) {
+            case 'ss':
+                return shadowsocks(proxy);
+            case 'trojan':
+                return trojan(proxy);
+            case 'vmess':
+                return vmess(proxy);
+            case 'http':
+                return http(proxy);
+            case 'socks5':
+                return socks5(proxy);
+            case 'wireguard-surge':
+                return wireguard(proxy);
+        }
+        throw new Error(
+            `Platform ${targetPlatform} does not support proxy type: ${proxy.type}`,
+        );
+    };
+    return { produce };
+}
+
+function shadowsocks(proxy) {
+    const result = new Result(proxy);
+    result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
+    result.append(`,encrypt-method=${proxy.cipher}`);
+    result.appendIfPresent(`,password=${proxy.password}`, 'password');
+
+    // obfs
+    if (isPresent(proxy, 'plugin')) {
+        if (proxy.plugin === 'obfs') {
+            result.append(`,obfs=${proxy['plugin-opts'].mode}`);
+            result.appendIfPresent(
+                `,obfs-host=${proxy['plugin-opts'].host}`,
+                'plugin-opts.host',
+            );
+            result.appendIfPresent(
+                `,obfs-uri=${proxy['plugin-opts'].path}`,
+                'plugin-opts.path',
+            );
+        } else {
+            throw new Error(`plugin ${proxy.plugin} is not supported`);
+        }
+    }
+
+    // udp
+    result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
+
+    return result.toString();
+}
+
+function trojan(proxy) {
+    const result = new Result(proxy);
+    result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
+    result.appendIfPresent(`,password=${proxy.password}`, 'password');
+
+    // transport
+    handleTransport(result, proxy);
+
+    // tls
+    result.appendIfPresent(`,tls=${proxy.tls}`, 'tls');
+
+    // tls verification
+    result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
+    result.appendIfPresent(
+        `,skip-cert-verify=${proxy['skip-cert-verify']}`,
+        'skip-cert-verify',
+    );
+
+    // tfo
+    result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
+
+    // udp
+    result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
+
+    return result.toString();
+}
+
+function vmess(proxy) {
+    const result = new Result(proxy);
+    result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
+    result.appendIfPresent(`,username=${proxy.uuid}`, 'uuid');
+
+    // transport
+    handleTransport(result, proxy);
+
+    // AEAD
+    if (isPresent(proxy, 'aead')) {
+        result.append(`,vmess-aead=${proxy.aead}`);
+    } else {
+        result.append(`,vmess-aead=${proxy.alterId === 0}`);
+    }
+
+    // tls
+    result.appendIfPresent(`,tls=${proxy.tls}`, 'tls');
+
+    // tls verification
+    result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
+    result.appendIfPresent(
+        `,skip-cert-verify=${proxy['skip-cert-verify']}`,
+        'skip-cert-verify',
+    );
+
+    // udp
+    result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
+
+    return result.toString();
+}
+
+function http(proxy) {
+    const result = new Result(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');
+
+    // tls verification
+    result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
+    result.appendIfPresent(
+        `,skip-cert-verify=${proxy['skip-cert-verify']}`,
+        'skip-cert-verify',
+    );
+
+    // udp
+    result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
+
+    return result.toString();
+}
+
+function socks5(proxy) {
+    const result = new Result(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');
+
+    // tls verification
+    result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
+    result.appendIfPresent(
+        `,skip-cert-verify=${proxy['skip-cert-verify']}`,
+        'skip-cert-verify',
+    );
+
+    // udp
+    result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
+
+    return result.toString();
+}
+
+function wireguard(proxy) {
+    const result = new Result(proxy);
+
+    result.append(`${proxy.name}=wireguard`);
+
+    result.appendIfPresent(
+        `,section-name=${proxy['section-name']}`,
+        'section-name',
+    );
+
+    return result.toString();
+}
+
+function handleTransport(result, proxy) {
+    if (isPresent(proxy, 'network')) {
+        if (proxy.network === 'ws') {
+            result.append(`,ws=true`);
+            if (isPresent(proxy, 'ws-opts')) {
+                result.appendIfPresent(
+                    `,ws-path=${proxy['ws-opts'].path}`,
+                    'ws-opts.path',
+                );
+                if (isPresent(proxy, 'ws-opts.headers')) {
+                    const headers = proxy['ws-opts'].headers;
+                    const value = Object.keys(headers)
+                        .map((k) => {
+                            let v = headers[k];
+                            if (['Host'].includes(k)) {
+                                v = `"${v}"`;
+                            }
+                            return `${k}:${v}`;
+                        })
+                        .join('|');
+                    if (isNotBlank(value)) {
+                        result.append(`,ws-headers=${value}`);
+                    }
+                }
+            }
+        } else {
+            throw new Error(`network ${proxy.network} is unsupported`);
+        }
+    }
+}

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

@@ -47,6 +47,16 @@ function shadowsocks(proxy) {
     result.append(`,encrypt-method=${proxy.cipher}`);
     result.appendIfPresent(`,password=${proxy.password}`, 'password');
 
+    result.appendIfPresent(
+        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
+        'ip-version',
+    );
+
+    result.appendIfPresent(
+        `,no-error-alert=${proxy['no-error-alert']}`,
+        'no-error-alert',
+    );
+
     // obfs
     if (isPresent(proxy, 'plugin')) {
         if (proxy.plugin === 'obfs') {
@@ -104,6 +114,16 @@ function trojan(proxy) {
     result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
     result.appendIfPresent(`,password=${proxy.password}`, 'password');
 
+    result.appendIfPresent(
+        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
+        'ip-version',
+    );
+
+    result.appendIfPresent(
+        `,no-error-alert=${proxy['no-error-alert']}`,
+        'no-error-alert',
+    );
+
     // transport
     handleTransport(result, proxy);
 
@@ -163,6 +183,16 @@ function vmess(proxy) {
     result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
     result.appendIfPresent(`,username=${proxy.uuid}`, 'uuid');
 
+    result.appendIfPresent(
+        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
+        'ip-version',
+    );
+
+    result.appendIfPresent(
+        `,no-error-alert=${proxy['no-error-alert']}`,
+        'no-error-alert',
+    );
+
     // transport
     handleTransport(result, proxy);
 
@@ -231,6 +261,16 @@ function http(proxy) {
     result.appendIfPresent(`,${proxy.username}`, 'username');
     result.appendIfPresent(`,${proxy.password}`, 'password');
 
+    result.appendIfPresent(
+        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
+        'ip-version',
+    );
+
+    result.appendIfPresent(
+        `,no-error-alert=${proxy['no-error-alert']}`,
+        'no-error-alert',
+    );
+
     // tls fingerprint
     result.appendIfPresent(
         `,server-cert-fingerprint-sha256=${proxy['tls-fingerprint']}`,
@@ -286,6 +326,16 @@ function socks5(proxy) {
     result.appendIfPresent(`,${proxy.username}`, 'username');
     result.appendIfPresent(`,${proxy.password}`, 'password');
 
+    result.appendIfPresent(
+        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
+        'ip-version',
+    );
+
+    result.appendIfPresent(
+        `,no-error-alert=${proxy['no-error-alert']}`,
+        'no-error-alert',
+    );
+
     // tls fingerprint
     result.appendIfPresent(
         `,server-cert-fingerprint-sha256=${proxy['tls-fingerprint']}`,
@@ -342,6 +392,16 @@ function snell(proxy) {
     result.appendIfPresent(`,version=${proxy.version}`, 'version');
     result.appendIfPresent(`,psk=${proxy.psk}`, 'psk');
 
+    result.appendIfPresent(
+        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
+        'ip-version',
+    );
+
+    result.appendIfPresent(
+        `,no-error-alert=${proxy['no-error-alert']}`,
+        'no-error-alert',
+    );
+
     // obfs
     result.appendIfPresent(
         `,obfs=${proxy['obfs-opts']?.mode}`,
@@ -414,6 +474,11 @@ function tuic(proxy) {
         'ip-version',
     );
 
+    result.appendIfPresent(
+        `,no-error-alert=${proxy['no-error-alert']}`,
+        'no-error-alert',
+    );
+
     // tls verification
     result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
     result.appendIfPresent(

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

@@ -1,7 +1,7 @@
 import { Result } from './utils';
 import Surge_Producer from './surge';
 
-const targetPlatform = 'SurgeMac';
+// const targetPlatform = 'SurgeMac';
 
 const surge_Producer = Surge_Producer();
 
@@ -10,24 +10,9 @@ export default function SurgeMac_Producer() {
         switch (proxy.type) {
             case 'ssr':
                 return shadowsocksr(proxy);
-            case 'ss':
+            default:
-                return surge_Producer.produce(proxy);
-            case 'trojan':
-                return surge_Producer.produce(proxy);
-            case 'vmess':
-                return surge_Producer.produce(proxy);
-            case 'http':
-                return surge_Producer.produce(proxy);
-            case 'socks5':
-                return surge_Producer.produce(proxy);
-            case 'snell':
-                return surge_Producer.produce(proxy);
-            case 'tuic':
                 return surge_Producer.produce(proxy);
         }
-        throw new Error(
-            `Platform ${targetPlatform} does not support proxy type: ${proxy.type}`,
-        );
     };
     return { produce };
 }

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

@@ -1,10 +1,14 @@
 /* eslint-disable no-case-declarations */
 import { Base64 } from 'js-base64';
+import { isIPv6 } from '@/utils';
 
 export default function URI_Producer() {
     const type = 'SINGLE';
     const produce = (proxy) => {
         let result = '';
+        if (proxy.server && isIPv6(proxy.server)) {
+            proxy.server = `[${proxy.server}]`;
+        }
         switch (proxy.type) {
             case 'ss':
                 const userinfo = `${proxy.cipher}:${proxy.password}`;
@@ -197,6 +201,21 @@ export default function URI_Producer() {
                 let trojanTransport = '';
                 if (proxy.network) {
                     trojanTransport = `&type=${proxy.network}`;
+                    if (['grpc'].includes(proxy.network)) {
+                        let trojanTransportServiceName =
+                            proxy[`${proxy.network}-opts`]?.[
+                                `${proxy.network}-service-name`
+                            ];
+                        if (trojanTransportServiceName) {
+                            trojanTransport += `&serviceName=${encodeURIComponent(
+                                trojanTransportServiceName,
+                            )}`;
+                        }
+                        trojanTransport += `&mode=${encodeURIComponent(
+                            proxy[`${proxy.network}-opts`]?.['_grpc-type'] ||
+                                'gun',
+                        )}`;
+                    }
                     let trojanTransportPath =
                         proxy[`${proxy.network}-opts`]?.path;
                     let trojanTransportHost =
@@ -222,6 +241,44 @@ export default function URI_Producer() {
                     proxy['skip-cert-verify'] ? '&allowInsecure=1' : ''
                 }${trojanTransport}#${encodeURIComponent(proxy.name)}`;
                 break;
+            case 'hysteria2':
+                let hysteria2params = [];
+                if (proxy['skip-cert-verify']) {
+                    hysteria2params.push(`insecure=1`);
+                }
+                if (proxy.obfs) {
+                    hysteria2params.push(
+                        `obfs=${encodeURIComponent(proxy.obfs)}`,
+                    );
+                    if (proxy['obfs-password']) {
+                        hysteria2params.push(
+                            `obfs-password=${encodeURIComponent(
+                                proxy['obfs-password'],
+                            )}`,
+                        );
+                    }
+                }
+                if (proxy.sni) {
+                    hysteria2params.push(
+                        `sni=${encodeURIComponent(proxy.sni)}`,
+                    );
+                }
+                if (proxy['tls-fingerprint']) {
+                    hysteria2params.push(
+                        `pinSHA256=${encodeURIComponent(
+                            proxy['tls-fingerprint'],
+                        )}`,
+                    );
+                }
+                if (proxy.tfo) {
+                    hysteria2params.push(`fastopen=1`);
+                }
+                result = `hysteria2://${encodeURIComponent(proxy.password)}@${
+                    proxy.server
+                }:${proxy.port}?${hysteria2params.join(
+                    '&',
+                )}#${encodeURIComponent(proxy.name)}`;
+                break;
         }
         return result;
     };

backend/src/restful/download.js

@@ -20,6 +20,27 @@ async function downloadSubscription(req, res) {
         req.query.target || getPlatformFromHeaders(req.headers) || 'JSON';
 
     $.info(`正在下载订阅：${name}`);
+    let { url, ua, content, mergeSources, ignoreFailedRemoteSub } = req.query;
+    if (url) {
+        url = decodeURIComponent(url);
+        $.info(`指定远程订阅 URL: ${url}`);
+    }
+    if (ua) {
+        ua = decodeURIComponent(ua);
+        $.info(`指定远程订阅 User-Agent: ${ua}`);
+    }
+    if (content) {
+        content = decodeURIComponent(content);
+        $.info(`指定本地订阅: ${content}`);
+    }
+    if (mergeSources) {
+        mergeSources = decodeURIComponent(mergeSources);
+        $.info(`指定合并来源: ${mergeSources}`);
+    }
+    if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
+        ignoreFailedRemoteSub = decodeURIComponent(ignoreFailedRemoteSub);
+        $.info(`指定忽略失败的远程订阅: ${ignoreFailedRemoteSub}`);
+    }
 
     const allSubs = $.read(SUBS_KEY);
     const sub = findByName(allSubs, name);
@@ -29,12 +50,17 @@ async function downloadSubscription(req, res) {
                 type: 'subscription',
                 name,
                 platform,
+                url,
+                ua,
+                content,
+                mergeSources,
+                ignoreFailedRemoteSub,
             });
 
-            if (sub.source !== 'local') {
+            if (sub.source !== 'local' || url) {
                 try {
                     // forward flow headers
-                    const flowInfo = await getFlowHeaders(sub.url);
+                    const flowInfo = await getFlowHeaders(url || sub.url);
                     if (flowInfo) {
                         res.set('subscription-userinfo', flowInfo);
                     }
@@ -95,12 +121,20 @@ async function downloadCollection(req, res) {
 
     $.info(`正在下载组合订阅：${name}`);
 
+    let { ignoreFailedRemoteSub } = req.query;
+
+    if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
+        ignoreFailedRemoteSub = decodeURIComponent(ignoreFailedRemoteSub);
+        $.info(`指定忽略失败的远程订阅: ${ignoreFailedRemoteSub}`);
+    }
+
     if (collection) {
         try {
             const output = await produceArtifact({
                 type: 'collection',
                 name,
                 platform,
+                ignoreFailedRemoteSub,
             });
 
             // forward flow header from the first subscription in this collection

backend/src/restful/file.js

@@ -3,6 +3,7 @@ import { FILES_KEY } from '@/constants';
 import { failed, success } from '@/restful/response';
 import $ from '@/core/app';
 import { RequestInvalidError, ResourceNotFoundError } from '@/restful/errors';
+import { ProxyUtils } from '@/core/proxy-utils';
 
 export default function register($app) {
     if (!$.read(FILES_KEY)) $.write([], FILES_KEY);
@@ -12,7 +13,10 @@ export default function register($app) {
         .patch(updateFile)
         .delete(deleteFile);
 
+    $app.route('/api/wholeFile/:name').get(getWholeFile);
+
     $app.route('/api/files').get(getAllFiles).post(createFile).put(replaceFile);
+    $app.route('/api/wholeFiles').get(getAllWholeFiles);
 }
 
 // file API
@@ -37,13 +41,35 @@ function createFile(req, res) {
     success(res, file, 201);
 }
 
-function getFile(req, res) {
+async function getFile(req, res) {
     let { name } = req.params;
     name = decodeURIComponent(name);
     const allFiles = $.read(FILES_KEY);
     const file = findByName(allFiles, name);
     if (file) {
-        res.status(200).json(file.content);
+        let content = file.content ?? '';
+        content = await ProxyUtils.process(content, file.process || []);
+        res.set('Content-Type', 'text/plain; charset=utf-8').send(
+            content ?? '',
+        );
+    } else {
+        failed(
+            res,
+            new ResourceNotFoundError(
+                `FILE_NOT_FOUND`,
+                `File ${name} does not exist`,
+                404,
+            ),
+        );
+    }
+}
+function getWholeFile(req, res) {
+    let { name } = req.params;
+    name = decodeURIComponent(name);
+    const allFiles = $.read(FILES_KEY);
+    const file = findByName(allFiles, name);
+    if (file) {
+        success(res, file);
     } else {
         failed(
             res,
@@ -102,6 +128,11 @@ function getAllFiles(req, res) {
     );
 }
 
+function getAllWholeFiles(req, res) {
+    const allFiles = $.read(FILES_KEY);
+    success(res, allFiles);
+}
+
 function replaceFile(req, res) {
     const allFiles = req.body;
     $.write(allFiles, FILES_KEY);

backend/src/restful/index.js

@@ -1,5 +1,7 @@
 import express from '@/vendor/express';
 import $ from '@/core/app';
+import migrate from '@/utils/migration';
+import download from '@/utils/download';
 
 import registerSubscriptionRoutes from './subscriptions';
 import registerCollectionRoutes from './collections';
@@ -15,8 +17,13 @@ import registerMiscRoutes from './miscs';
 import registerNodeInfoRoutes from './node-info';
 
 export default function serve() {
-    const $app = express({ substore: $ });
+    let port;
-
+    let host;
+    if ($.env.isNode) {
+        port = eval('process.env.SUB_STORE_BACKEND_API_PORT') || 3000;
+        host = eval('process.env.SUB_STORE_BACKEND_API_HOST') || '::';
+    }
+    const $app = express({ substore: $, port, host });
     // register routes
     registerCollectionRoutes($app);
     registerSubscriptionRoutes($app);
@@ -32,4 +39,120 @@ export default function serve() {
     registerMiscRoutes($app);
 
     $app.start();
+
+    if ($.env.isNode) {
+        const path = eval(`require("path")`);
+        const fs = eval(`require("fs")`);
+        const data_url = eval('process.env.SUB_STORE_DATA_URL');
+        const fe_be_path = eval('process.env.SUB_STORE_FRONTEND_BACKEND_PATH');
+        const fe_port = eval('process.env.SUB_STORE_FRONTEND_PORT') || 3001;
+        const fe_host =
+            eval('process.env.SUB_STORE_FRONTEND_HOST') || host || '::';
+        const fe_path = eval('process.env.SUB_STORE_FRONTEND_PATH');
+        const fe_abs_path = path.resolve(
+            fe_path || path.join(__dirname, 'frontend'),
+        );
+        if (fe_path) {
+            try {
+                fs.accessSync(path.join(fe_abs_path, 'index.html'));
+            } catch (e) {
+                throw new Error(
+                    `[FRONTEND] index.html file not found in ${fe_abs_path}`,
+                );
+            }
+
+            const express_ = eval(`require("express")`);
+            const history = eval(`require("connect-history-api-fallback")`);
+            const { createProxyMiddleware } = eval(
+                `require("http-proxy-middleware")`,
+            );
+
+            const app = express_();
+
+            const staticFileMiddleware = express_.static(fe_path);
+
+            let be_api_rewrite = '';
+            let be_download_rewrite = '';
+            let be_api = '/api/';
+            let be_download = '/download/';
+            if (fe_be_path) {
+                if (!fe_be_path.startsWith('/')) {
+                    throw new Error(
+                        'SUB_STORE_FRONTEND_BACKEND_PATH should start with /',
+                    );
+                }
+                be_api_rewrite = `${
+                    fe_be_path === '/' ? '' : fe_be_path
+                }${be_api}`;
+                be_download_rewrite = `${
+                    fe_be_path === '/' ? '' : fe_be_path
+                }${be_download}`;
+                app.use(
+                    be_api_rewrite,
+                    createProxyMiddleware({
+                        target: `http://127.0.0.1:${port}`,
+                        changeOrigin: true,
+                        pathRewrite: (path) => {
+                            return path.startsWith(be_api_rewrite)
+                                ? path.replace(be_api_rewrite, be_api)
+                                : path;
+                        },
+                    }),
+                );
+                app.use(
+                    be_download_rewrite,
+                    createProxyMiddleware({
+                        target: `http://127.0.0.1:${port}`,
+                        changeOrigin: true,
+                        pathRewrite: (path) => {
+                            return path.startsWith(be_download_rewrite)
+                                ? path.replace(be_download_rewrite, be_download)
+                                : path;
+                        },
+                    }),
+                );
+            }
+
+            app.use(staticFileMiddleware);
+            app.use(
+                history({
+                    disableDotRule: true,
+                    verbose: false,
+                }),
+            );
+            app.use(staticFileMiddleware);
+
+            const listener = app.listen(fe_port, fe_host, () => {
+                const { address: fe_address, port: fe_port } =
+                    listener.address();
+                $.info(`[FRONTEND] ${fe_address}:${fe_port}`);
+                if (fe_be_path) {
+                    $.info(
+                        `[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} -> http://127.0.0.1:${port}${be_download}`,
+                    );
+                }
+            });
+        }
+        if (data_url) {
+            $.info(`[BACKEND] downloading data from ${data_url}`);
+            download(data_url)
+                .then((content) => {
+                    $.write(content, '#sub-store');
+
+                    $.cache = JSON.parse(content);
+                    $.persistCache();
+
+                    migrate();
+                    $.info(`[BACKEND] restored data from ${data_url}`);
+                })
+                .catch((e) => {
+                    $.error(`[BACKEND] restore data failed`);
+                    console.error(e);
+                    throw e;
+                });
+        }
+    }
 }

backend/src/restful/miscs.js

@@ -22,12 +22,26 @@ export default function register($app) {
     // Storage management
     $app.route('/api/storage')
         .get((req, res) => {
-            res.json($.read('#sub-store'));
+            res.set('content-type', 'application/json')
+                .set(
+                    'content-disposition',
+                    'attachment; filename="sub-store.json"',
+                )
+                .send(
+                    $.env.isNode
+                        ? JSON.stringify($.cache)
+                        : $.read('#sub-store'),
+                );
         })
         .post((req, res) => {
-            const data = req.body;
+            const { content } = req.body;
-            $.write(JSON.stringify(data), '#sub-store');
+            $.write(content, '#sub-store');
-            res.end();
+            if ($.env.isNode) {
+                $.cache = JSON.parse(content);
+                $.persistCache();
+            }
+            migrate();
+            success(res);
         });
 
     // Redirect sub.store to vercel webpage

backend/src/restful/module.js

@@ -47,7 +47,9 @@ function getModule(req, res) {
     const allModules = $.read(MODULES_KEY);
     const module = findByName(allModules, name);
     if (module) {
-        res.status(200).json(module.content);
+        res.set('Content-Type', 'text/plain; charset=utf-8').send(
+            module.content,
+        );
     } else {
         failed(
             res,

backend/src/restful/node-info.js

@@ -22,7 +22,10 @@ async function getNodeInfo(req, res) {
         const info = await $http
             .get({
                 url: `http://ip-api.com/json/${encodeURIComponent(
-                    proxy.server,
+                    proxy.server
+                        .trim()
+                        .replace(/^\[/, '')
+                        .replace(/\]$/, '')
                 )}?lang=${lang}`,
                 headers: {
                     'User-Agent':

backend/src/restful/preview.js

@@ -1,4 +1,4 @@
-import { InternalServerError, NetworkError } from './errors';
+import { InternalServerError } from './errors';
 import { ProxyUtils } from '@/core/proxy-utils';
 import { findByName } from '@/utils/database';
 import { success, failed } from './response';
@@ -9,6 +9,28 @@ import $ from '@/core/app';
 export default function register($app) {
     $app.post('/api/preview/sub', compareSub);
     $app.post('/api/preview/collection', compareCollection);
+    $app.post('/api/preview/file', previewFile);
+}
+
+async function previewFile(req, res) {
+    try {
+        let { content = '', process = [] } = req.body;
+
+        const processed = await ProxyUtils.process(content, process || []);
+
+        // produce
+        success(res, { original: content, processed });
+    } catch (err) {
+        $.error(err.message ?? err);
+        failed(
+            res,
+            new InternalServerError(
+                `INTERNAL_SERVER_ERROR`,
+                `Failed to preview file`,
+                `Reason: ${err.message ?? err}`,
+            ),
+        );
+    }
 }
 
 async function compareSub(req, res) {
@@ -16,25 +38,48 @@ async function compareSub(req, res) {
         const sub = req.body;
         const target = req.query.target || 'JSON';
         let content;
-        if (sub.source === 'local') {
+        if (
+            sub.source === 'local' &&
+            !['localFirst', 'remoteFirst'].includes(sub.mergeSources)
+        ) {
             content = sub.content;
         } else {
-            try {
+            const errors = {};
-                content = await download(sub.url, sub.ua);
+            content = await Promise.all(
-            } catch (err) {
+                sub.url
-                failed(
+                    .split(/[\r\n]+/)
-                    res,
+                    .map((i) => i.trim())
-                    new NetworkError(
+                    .filter((i) => i.length)
-                        'FAILED_TO_DOWNLOAD_RESOURCE',
+                    .map(async (url) => {
-                        '无法下载远程资源',
+                        try {
-                        `Reason: ${err}`,
+                            return await download(url, sub.ua);
-                    ),
+                        } catch (err) {
+                            errors[url] = err;
+                            $.error(
+                                `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
+                            );
+                            return '';
+                        }
+                    }),
+            );
+
+            if (!sub.ignoreFailedRemoteSub && Object.keys(errors).length > 0) {
+                throw new Error(
+                    `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
+                        ', ',
+                    )} 发生错误, 请查看日志`,
                 );
-                return;
+            }
+            if (sub.mergeSources === 'localFirst') {
+                content.unshift(sub.content);
+            } else if (sub.mergeSources === 'remoteFirst') {
+                content.push(sub.content);
             }
         }
         // parse proxies
-        const original = ProxyUtils.parse(content);
+        const original = (Array.isArray(content) ? content : [content])
+            .map((i) => ProxyUtils.parse(i))
+            .flat();
 
         // add id
         original.forEach((proxy, i) => {
@@ -71,19 +116,58 @@ async function compareCollection(req, res) {
         const collection = req.body;
         const subnames = collection.subscriptions;
         const results = {};
-
+        const errors = {};
         await Promise.all(
             subnames.map(async (name) => {
                 const sub = findByName(allSubs, name);
                 try {
                     let raw;
-                    if (sub.source === 'local') {
+                    if (
+                        sub.source === 'local' &&
+                        !['localFirst', 'remoteFirst'].includes(
+                            sub.mergeSources,
+                        )
+                    ) {
                         raw = sub.content;
                     } else {
-                        raw = await download(sub.url, sub.ua);
+                        const errors = {};
+                        raw = await Promise.all(
+                            sub.url
+                                .split(/[\r\n]+/)
+                                .map((i) => i.trim())
+                                .filter((i) => i.length)
+                                .map(async (url) => {
+                                    try {
+                                        return await download(url, sub.ua);
+                                    } catch (err) {
+                                        errors[url] = err;
+                                        $.error(
+                                            `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
+                                        );
+                                        return '';
+                                    }
+                                }),
+                        );
+                        if (
+                            !sub.ignoreFailedRemoteSub &&
+                            Object.keys(errors).length > 0
+                        ) {
+                            throw new Error(
+                                `订阅 ${sub.name} 的远程订阅 ${Object.keys(
+                                    errors,
+                                ).join(', ')} 发生错误, 请查看日志`,
+                            );
+                        }
+                        if (sub.mergeSources === 'localFirst') {
+                            raw.unshift(sub.content);
+                        } else if (sub.mergeSources === 'remoteFirst') {
+                            raw.push(sub.content);
+                        }
                     }
                     // parse proxies
-                    let currentProxies = ProxyUtils.parse(raw);
+                    let currentProxies = (Array.isArray(raw) ? raw : [raw])
+                        .map((i) => ProxyUtils.parse(i))
+                        .flat();
 
                     currentProxies.forEach((proxy) => {
                         proxy.subName = sub.name;
@@ -99,18 +183,28 @@ async function compareCollection(req, res) {
                     );
                     results[name] = currentProxies;
                 } catch (err) {
-                    failed(
+                    errors[name] = err;
-                        res,
+
-                        new InternalServerError(
+                    $.error(
-                            'PROCESS_FAILED',
+                        `❌ 处理组合订阅中的子订阅: ${
-                            `处理子订阅 ${name} 失败`,
+                            sub.name
-                            `Reason: ${err}`,
+                        }时出现错误：${err}！进度--${
-                        ),
+                            100 * (processed / subnames.length).toFixed(1)
+                        }%`,
                     );
                 }
             }),
         );
-
+        if (
+            !collection.ignoreFailedRemoteSub &&
+            Object.keys(errors).length > 0
+        ) {
+            throw new Error(
+                `组合订阅 ${collection.name} 中的子订阅 ${Object.keys(
+                    errors,
+                ).join(', ')} 发生错误, 请查看日志`,
+            );
+        }
         // merge proxies with the original order
         const original = Array.prototype.concat.apply(
             [],

backend/src/restful/settings.js

@@ -10,7 +10,12 @@ export default function register($app) {
 }
 
 async function getSettings(req, res) {
-    const settings = $.read(SETTINGS_KEY);
+    let settings = $.read(SETTINGS_KEY);
+    if (!settings) {
+        settings = {};
+        $.write(settings, SETTINGS_KEY);
+    }
+
     if (!settings.avatarUrl) await updateGitHubAvatar();
     if (!settings.artifactStore) await updateArtifactStore();
     success(res, settings);

backend/src/restful/sort.js

@@ -1,4 +1,9 @@
-import { ARTIFACTS_KEY, COLLECTIONS_KEY, SUBS_KEY } from '@/constants';
+import {
+    ARTIFACTS_KEY,
+    COLLECTIONS_KEY,
+    SUBS_KEY,
+    FILES_KEY,
+} from '@/constants';
 import $ from '@/core/app';
 import { success } from '@/restful/response';
 
@@ -6,6 +11,7 @@ export default function register($app) {
     $app.post('/api/sort/subs', sortSubs);
     $app.post('/api/sort/collections', sortCollections);
     $app.post('/api/sort/artifacts', sortArtifacts);
+    $app.post('/api/sort/files', sortFiles);
 }
 
 function sortSubs(req, res) {
@@ -33,3 +39,11 @@ function sortArtifacts(req, res) {
     $.write(allArtifacts, ARTIFACTS_KEY);
     success(res, allArtifacts);
 }
+
+function sortFiles(req, res) {
+    const orders = req.body;
+    const allFiles = $.read(FILES_KEY);
+    allFiles.sort((a, b) => orders.indexOf(a.name) - orders.indexOf(b.name));
+    $.write(allFiles, FILES_KEY);
+    success(res, allFiles);
+}

backend/src/restful/subscriptions.js

@@ -6,7 +6,7 @@ import {
 } from './errors';
 import { deleteByName, findByName, updateByName } from '@/utils/database';
 import { SUBS_KEY, COLLECTIONS_KEY, ARTIFACTS_KEY } from '@/constants';
-import { getFlowHeaders } from '@/utils/flow';
+import { getFlowHeaders, parseFlowHeaders } from '@/utils/flow';
 import { success, failed } from './response';
 import $ from '@/core/app';
 
@@ -68,20 +68,7 @@ async function getFlowInfo(req, res) {
             return;
         }
 
-        // unit is KB
+        success(res, parseFlowHeaders(flowHeaders));
-        const uploadMatch = flowHeaders.match(/upload=(-?)(\d+)/);
-        const upload = Number(uploadMatch[1] + uploadMatch[2]);
-
-        const downloadMatch = flowHeaders.match(/download=(-?)(\d+)/);
-        const download = Number(downloadMatch[1] + downloadMatch[2]);
-
-        const total = Number(flowHeaders.match(/total=(\d+)/)[1]);
-
-        // optional expire timestamp
-        const match = flowHeaders.match(/expire=(\d+)/);
-        const expires = match ? Number(match[1]) : undefined;
-
-        success(res, { expires, total, usage: { upload, download } });
     } catch (err) {
         failed(
             res,

backend/src/restful/sync.js

@@ -4,6 +4,7 @@ import {
     COLLECTIONS_KEY,
     RULES_KEY,
     SUBS_KEY,
+    FILES_KEY,
 } from '@/constants';
 import { failed, success } from '@/restful/response';
 import { InternalServerError, ResourceNotFoundError } from '@/restful/errors';
@@ -22,20 +23,105 @@ export default function register($app) {
     $app.get('/api/sync/artifact/:name', syncArtifact);
 }
 
-async function produceArtifact({ type, name, platform }) {
+async function produceArtifact({
+    type,
+    name,
+    platform,
+    url,
+    ua,
+    content,
+    mergeSources,
+    ignoreFailedRemoteSub,
+}) {
     platform = platform || 'JSON';
 
     if (type === 'subscription') {
         const allSubs = $.read(SUBS_KEY);
         const sub = findByName(allSubs, name);
         let raw;
-        if (sub.source === 'local') {
+        if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) {
+            raw = content;
+        } else if (url) {
+            const errors = {};
+            raw = await Promise.all(
+                url
+                    .split(/[\r\n]+/)
+                    .map((i) => i.trim())
+                    .filter((i) => i.length)
+                    .map(async (url) => {
+                        try {
+                            return await download(url, ua || sub.ua);
+                        } catch (err) {
+                            errors[url] = err;
+                            $.error(
+                                `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
+                            );
+                            return '';
+                        }
+                    }),
+            );
+            let subIgnoreFailedRemoteSub = sub.ignoreFailedRemoteSub;
+            if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
+                subIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
+            }
+            if (!subIgnoreFailedRemoteSub && Object.keys(errors).length > 0) {
+                throw new Error(
+                    `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
+                        ', ',
+                    )} 发生错误, 请查看日志`,
+                );
+            }
+            if (mergeSources === 'localFirst') {
+                raw.unshift(content);
+            } else if (mergeSources === 'remoteFirst') {
+                raw.push(content);
+            }
+        } else if (
+            sub.source === 'local' &&
+            !['localFirst', 'remoteFirst'].includes(sub.mergeSources)
+        ) {
             raw = sub.content;
         } else {
-            raw = await download(sub.url, sub.ua);
+            const errors = {};
+            raw = await Promise.all(
+                sub.url
+                    .split(/[\r\n]+/)
+                    .map((i) => i.trim())
+                    .filter((i) => i.length)
+                    .map(async (url) => {
+                        try {
+                            return await download(url, ua || sub.ua);
+                        } catch (err) {
+                            errors[url] = err;
+                            $.error(
+                                `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
+                            );
+                            return '';
+                        }
+                    }),
+            );
+            let subIgnoreFailedRemoteSub = sub.ignoreFailedRemoteSub;
+            if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
+                subIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
+            }
+            if (!subIgnoreFailedRemoteSub && Object.keys(errors).length > 0) {
+                throw new Error(
+                    `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
+                        ', ',
+                    )} 发生错误, 请查看日志`,
+                );
+            }
+            if (sub.mergeSources === 'localFirst') {
+                raw.unshift(sub.content);
+            } else if (sub.mergeSources === 'remoteFirst') {
+                raw.push(sub.content);
+            }
         }
         // parse proxies
-        let proxies = ProxyUtils.parse(raw);
+        let proxies = (Array.isArray(raw) ? raw : [raw])
+            .map((i) => ProxyUtils.parse(i))
+            .flat();
+
         proxies.forEach((proxy) => {
             proxy.subName = sub.name;
         });
@@ -83,13 +169,52 @@ async function produceArtifact({ type, name, platform }) {
                 try {
                     $.info(`正在处理子订阅：${sub.name}...`);
                     let raw;
-                    if (sub.source === 'local') {
+                    if (
+                        sub.source === 'local' &&
+                        !['localFirst', 'remoteFirst'].includes(
+                            sub.mergeSources,
+                        )
+                    ) {
                         raw = sub.content;
                     } else {
-                        raw = await download(sub.url, sub.ua);
+                        const errors = {};
+                        raw = await await Promise.all(
+                            sub.url
+                                .split(/[\r\n]+/)
+                                .map((i) => i.trim())
+                                .filter((i) => i.length)
+                                .map(async (url) => {
+                                    try {
+                                        return await download(url, sub.ua);
+                                    } catch (err) {
+                                        errors[url] = err;
+                                        $.error(
+                                            `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
+                                        );
+                                        return '';
+                                    }
+                                }),
+                        );
+                        if (
+                            !sub.ignoreFailedRemoteSub &&
+                            Object.keys(errors).length > 0
+                        ) {
+                            throw new Error(
+                                `订阅 ${sub.name} 的远程订阅 ${Object.keys(
+                                    errors,
+                                ).join(', ')} 发生错误, 请查看日志`,
+                            );
+                        }
+                        if (sub.mergeSources === 'localFirst') {
+                            raw.unshift(sub.content);
+                        } else if (sub.mergeSources === 'remoteFirst') {
+                            raw.push(sub.content);
+                        }
                     }
                     // parse proxies
-                    let currentProxies = ProxyUtils.parse(raw);
+                    let currentProxies = (Array.isArray(raw) ? raw : [raw])
+                        .map((i) => ProxyUtils.parse(i))
+                        .flat();
 
                     currentProxies.forEach((proxy) => {
                         proxy.subName = sub.name;
@@ -116,15 +241,21 @@ async function produceArtifact({ type, name, platform }) {
                     $.error(
                         `❌ 处理组合订阅中的子订阅: ${
                             sub.name
-                        }时出现错误：${err}，该订阅已被跳过！进度--${
+                        }时出现错误：${err}！进度--${
                             100 * (processed / subnames.length).toFixed(1)
                         }%`,
                     );
                 }
             }),
         );
-
+        let collectionIgnoreFailedRemoteSub = collection.ignoreFailedRemoteSub;
-        if (Object.keys(errors).length > 0) {
+        if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
+            collectionIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
+        }
+        if (
+            !collectionIgnoreFailedRemoteSub &&
+            Object.keys(errors).length > 0
+        ) {
             throw new Error(
                 `组合订阅 ${name} 中的子订阅 ${Object.keys(errors).join(
                     ', ',
@@ -197,6 +328,13 @@ async function produceArtifact({ type, name, platform }) {
         ]);
         // produce output
         return RuleUtils.produce(rules, platform);
+    } else if (type === 'file') {
+        const allFiles = $.read(FILES_KEY);
+        const file = findByName(allFiles, name);
+        if (!file) throw new Error(`找不到文件 ${name}`);
+        let content = file.content ?? '';
+        content = await ProxyUtils.process(content, file.process || []);
+        return content ?? '';
     }
 }
 
@@ -256,10 +394,12 @@ async function syncAllArtifacts(_, res) {
 async function syncArtifact(req, res) {
     let { name } = req.params;
     name = decodeURIComponent(name);
+    $.info(`开始同步远程配置 ${name}...`);
     const allArtifacts = $.read(ARTIFACTS_KEY);
     const artifact = findByName(allArtifacts, name);
 
     if (!artifact) {
+        $.error(`找不到远程配置 ${name}`);
         failed(
             res,
             new ResourceNotFoundError(
@@ -298,6 +438,7 @@ async function syncArtifact(req, res) {
         $.write(allArtifacts, ARTIFACTS_KEY);
         success(res, artifact);
     } catch (err) {
+        $.error(`远程配置 ${artifact.name} 发生错误: ${err}`);
         failed(
             res,
             new InternalServerError(

backend/src/utils/download.js

@@ -1,4 +1,4 @@
-import { FILES_KEY, MODULES_KEY } from '@/constants';
+import { FILES_KEY, MODULES_KEY, SETTINGS_KEY } from '@/constants';
 import { findByName } from '@/utils/database';
 import { HTTP, ENV } from '@/vendor/open-api';
 import { hex_md5 } from '@/vendor/md5';
@@ -7,7 +7,7 @@ import $ from '@/core/app';
 
 const tasks = new Map();
 
-export default async function download(url, ua) {
+export default async function download(url, ua, timeout) {
     let $arguments = {};
     const rawArgs = url.split('#');
     if (rawArgs.length > 1) {
@@ -45,16 +45,19 @@ export default async function download(url, ua) {
     }
 
     const { isNode } = ENV();
-    ua = ua || 'Quantumult%20X/1.0.29 (iPhone14,5; iOS 15.4.1)';
+    const { defaultUserAgent, defaultTimeout } = $.read(SETTINGS_KEY);
-    const id = hex_md5(ua + url);
+    const userAgent = ua || defaultUserAgent || 'clash.meta';
+    const requestTimeout = timeout || defaultTimeout;
+    const id = hex_md5(userAgent + url);
     if (!isNode && tasks.has(id)) {
         return tasks.get(id);
     }
 
     const http = HTTP({
         headers: {
-            'User-Agent': ua,
+            'User-Agent': userAgent,
         },
+        timeout: requestTimeout,
     });
 
     const result = new Promise((resolve, reject) => {
@@ -63,6 +66,9 @@ export default async function download(url, ua) {
         if (!$arguments?.noCache && cached) {
             resolve(cached);
         } else {
+            $.info(
+                `Downloading...\nUser-Agent: ${userAgent}\nTimeout: ${requestTimeout}\nURL: ${url}`,
+            );
             http.get(url)
                 .then((resp) => {
                     const body = resp.body;

backend/src/utils/flow.js

@@ -1,15 +1,52 @@
+import { SETTINGS_KEY } from '@/constants';
 import { HTTP } from '@/vendor/open-api';
+import $ from '@/core/app';
 
-export async function getFlowHeaders(url) {
+export async function getFlowHeaders(url, ua, timeout) {
+    const { defaultFlowUserAgent, defaultTimeout } = $.read(SETTINGS_KEY);
+    const userAgent =
+        ua ||
+        defaultFlowUserAgent ||
+        'Quantumult%20X/1.0.30 (iPhone14,2; iOS 15.6)';
+    const requestTimeout = timeout || defaultTimeout;
     const http = HTTP();
     const { headers } = await http.get({
-        url,
+        url: url
+            .split(/[\r\n]+/)
+            .map((i) => i.trim())
+            .filter((i) => i.length)[0],
         headers: {
-            'User-Agent': 'Quantumult%20X/1.0.30 (iPhone14,2; iOS 15.6)',
+            'User-Agent': userAgent,
         },
+        timeout: requestTimeout,
     });
     const subkey = Object.keys(headers).filter((k) =>
         /SUBSCRIPTION-USERINFO/i.test(k),
     )[0];
     return headers[subkey];
 }
+export function parseFlowHeaders(flowHeaders) {
+    if (!flowHeaders) return;
+    // unit is KB
+    const uploadMatch = flowHeaders.match(/upload=(-?)(\d+)/);
+    const upload = Number(uploadMatch[1] + uploadMatch[2]);
+
+    const downloadMatch = flowHeaders.match(/download=(-?)(\d+)/);
+    const download = Number(downloadMatch[1] + downloadMatch[2]);
+
+    const total = Number(flowHeaders.match(/total=(\d+)/)[1]);
+
+    // optional expire timestamp
+    const match = flowHeaders.match(/expire=(\d+)/);
+    const expires = match ? Number(match[1]) : undefined;
+
+    return { expires, total, usage: { upload, download } };
+}
+export function flowTransfer(flow, unit = 'B') {
+    const unitList = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB'];
+    let unitIndex = unitList.indexOf(unit);
+
+    return flow < 1024
+        ? { value: flow.toFixed(1), unit: unit }
+        : flowTransfer(flow / 1024, unitList[++unitIndex]);
+}

backend/src/utils/index.js

@@ -13,6 +13,12 @@ function isIPv6(ip) {
     return IPV6_REGEX.test(ip);
 }
 
+function isValidPortNumber(port) {
+    return /^((6553[0-5])|(655[0-2][0-9])|(65[0-4][0-9]{2})|(6[0-4][0-9]{3})|([1-5][0-9]{4})|([0-5]{0,5})|([0-9]{1,4}))$/.test(
+        port,
+    );
+}
+
 function isNotBlank(str) {
     return typeof str === 'string' && str.trim().length > 0;
 }
@@ -29,4 +35,12 @@ function getIfPresent(obj, defaultValue) {
     return isPresent(obj) ? obj : defaultValue;
 }
 
-export { isIPv4, isIPv6, isNotBlank, getIfNotBlank, isPresent, getIfPresent };
+export {
+    isIPv4,
+    isIPv6,
+    isValidPortNumber,
+    isNotBlank,
+    getIfNotBlank,
+    isPresent,
+    getIfPresent,
+};

backend/src/utils/platform.js

@@ -11,6 +11,8 @@ export function getPlatformFromHeaders(headers) {
     }
     if (UA.indexOf('Quantumult%20X') !== -1) {
         return 'QX';
+    } else if (UA.indexOf('Surfboard') !== -1) {
+        return 'Surfboard';
     } else if (UA.indexOf('Surge Mac') !== -1) {
         return 'SurgeMac';
     } else if (UA.indexOf('Surge') !== -1) {

backend/src/vendor/express.js

@@ -1,8 +1,7 @@
 /* eslint-disable no-undef */
 import { ENV } from './open-api';
 
-export default function express({ substore: $, port }) {
+export default function express({ substore: $, port, host }) {
-    port = port || 3000;
     const { isNode } = ENV();
     const DEFAULT_HEADERS = {
         'Content-Type': 'text/plain;charset=UTF-8',
@@ -29,8 +28,9 @@ export default function express({ substore: $, port }) {
 
         // adapter
         app.start = () => {
-            app.listen(port, () => {
+            const listener = app.listen(port, host, () => {
-                $.info(`Express started on port: ${port}`);
+                const { address, port } = listener.address();
+                $.info(`[BACKEND] ${address}:${port}`);
             });
         };
         return app;

backend/src/vendor/open-api.js

@@ -191,6 +191,32 @@ export class OpenAPI {
                 (openURL ? `\n点击跳转: ${openURL}` : '') +
                 (mediaURL ? `\n多媒体: ${mediaURL}` : '');
             console.log(`${title}\n${subtitle}\n${content_}\n\n`);
+
+            let push = eval('process.env.SUB_STORE_PUSH_SERVICE');
+            if (push) {
+                const url = push
+                    .replace(
+                        '[推送标题]',
+                        encodeURIComponent(title || 'Sub-Store'),
+                    )
+                    .replace(
+                        '[推送内容]',
+                        encodeURIComponent(
+                            [subtitle, content_].map((i) => i).join('\n'),
+                        ),
+                    );
+                const $http = HTTP();
+                $http
+                    .get({ url })
+                    .then((resp) => {
+                        console.log(
+                            `[Push Service] URL: ${url}\nRES: ${resp.statusCode} ${resp.body}`,
+                        );
+                    })
+                    .catch((e) => {
+                        console.log(`[Push Service] URL: ${url}\nERROR: ${e}`);
+                    });
+            }
         }
     }
 

config/QX-Task.json

@@ -0,0 +1,7 @@
+{
+    "name":"Sub-Store",
+    "description":"",
+    "task":[
+      "0 0 * * * https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js, tag=Sub-Store Sync, img-url=https://raw.githubusercontent.com/58xinian/icon/master/Sub-Store1.png"
+    ]
+}

config/README.md

@@ -22,6 +22,8 @@ Telegram 频道: [`https://t.me/cool_scripts` ](https://t.me/cool_scripts)
 ### 3. QX
 订阅 重写 [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/QX.snippet`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/QX.snippet) 即可。
 
+定时任务: [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/QX-Task.json`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/QX-Task.json)
+
 ### 4. Stash
 安装使用 覆写 [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Stash.stoverride`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Stash.stoverride) 即可。
 

package-lock.json

@@ -1,40 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "axios": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
-      "requires": {
-        "follow-redirects": "1.5.10"
-      }
-    },
-    "debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
-      "requires": {
-        "debug": "=3.1.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    }
-  }
-}