fix: 修复 Base64 内容的判断

feat: add sync task for qx

.github/workflows/main.yml

@@ -1,15 +1,15 @@
 name: build
-on: 
+on:
   push:
     branches:
       - master
     paths:
-      - 'backend/package.json'
+      - "backend/package.json"
   pull_request:
     branches:
       - master
     paths:
-      - 'backend/package.json'
+      - "backend/package.json"
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          ref: 'master'
+          ref: "master"
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
@@ -34,17 +34,28 @@ jobs:
         run: |
           cd backend
           pnpm run build
+      - name: Bundle
+        run: |
+          cd backend
+          pnpm i -D estrella
+          pnpm run bundle
       - id: tag
         name: Generate release tag
         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
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
+          body_path: ./backend/CHANGELOG.md
           tag_name: ${{ steps.tag.outputs.release_tag }}
           files: |
             ./backend/sub-store.min.js
@@ -52,3 +63,9 @@ jobs:
             ./backend/dist/sub-store-1.min.js
             ./backend/dist/sub-store-parser.loon.min.js
             ./backend/dist/cron-sync-artifacts.min.js
+            ./backend/dist/sub-store.bundle.js
+      - name: Sync to GitLab
+        env:
+          GITLAB_PIPELINE_TOKEN: ${{ secrets.GITLAB_PIPELINE_TOKEN }}
+        run: |
+          curl -X POST --fail -F token=$GITLAB_PIPELINE_TOKEN -F ref=master https://gitlab.com/api/v4/projects/48891296/trigger/pipeline

.gitignore

@@ -127,4 +127,11 @@ out
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
+*.sw?
+
+# Dist files
+backend/dist/*
+!backend/dist/.gitkeep
+backend/sub-store.min.js
+
+CHANGELOG.md

README.md

@@ -10,8 +10,8 @@
 Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.
 </p>
 
-[![Build](https://github.com/Peng-YM/Sub-Store/actions/workflows/main.yml/badge.svg)](https://github.com/Peng-YM/Sub-Store/actions/workflows/main.yml) ![GitHub](https://img.shields.io/github/license/Peng-YM/Sub-Store) ![GitHub issues](https://img.shields.io/github/issues/Peng-YM/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/Peng-YM/Sub-Store) ![Size](https://img.shields.io/github/languages/code-size/Peng-YM/Sub-Store) 
+[![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) 
-   
+
 [!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/PengYM)
    
 Core functionalities:
@@ -19,6 +19,8 @@ Core functionalities:
 1. Conversion among various formats.
 2. Subscription formatting.
 3. Collect multiple subscriptions in one URL.
+
+> The following descriptions of features may not be updated in real-time. Please refer to the actual available features for accurate information.
    
 ## 1. Subscription Conversion
 
@@ -28,18 +30,27 @@ Core functionalities:
 - [x] SSR URI
 - [x] SSD URI
 - [x] V2RayN URI
+- [x] Hysteria2 URI
 - [x] QX (SS, SSR, VMess, Trojan, HTTP)
-- [x] Loon (SS, SSR, VMess, Trojan, HTTP)
+- [x] Loon (SS, SSR, VMess, Trojan, HTTP, WireGuard, VLESS, Hysteria2)
-- [x] Surge (SS, VMess, Trojan, HTTP)
+- [x] Surge (SS, VMess, Trojan, HTTP, TUIC, Snell, Hysteria2, SSR(external, only for macOS), WireGuard(Surge to Surge))
-- [x] Stash & Clash (SS, SSR, VMess, Trojan, HTTP)
+- [x] ShadowRocket (SS, SSR, VMess, Trojan, HTTP, Snell, VLESS, Hysteria2)
+- [x] Clash.Meta (SS, SSR, VMess, Trojan, HTTP, Snell, VLESS, WireGuard, Hysteria, Hysteria2)
+- [x] Stash (SS, SSR, VMess, Trojan, HTTP, Snell, VLESS, WireGuard, Hysteria)
+- [x] Clash (SS, SSR, VMess, Trojan, HTTP, Snell, VLESS, WireGuard)
 
 ### Supported Target Platforms
 
 - [x] QX
 - [x] Loon
 - [x] Surge
-- [x] Stash & Clash
+- [x] Stash
+- [x] Clash.Meta
+- [x] Clash
 - [x] ShadowRocket
+- [x] V2Ray
+- [x] V2Ray URI
+- [x] Plain JSON
 
 ## 2. Subscription Formatting
 
@@ -61,33 +72,35 @@ Core functionalities:
 - [x] **Regex rename operator**: replace by regex in proxy names.
 - [x] **Regex delete operator**: delete by regex in proxy names.
 - [x] **Script operator**: modify proxy by script.
+- [x] **Resolve Domain Operator**: resolve the domain of nodes to an IP address.
 
 ### 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.
 
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FPeng-YM%2FSub-Store.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FPeng-YM%2FSub-Store?ref=badge_large)
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=sub-store-org/sub-store&type=Date)](https://star-history.com/#sub-store-org/sub-store&Date)
+
+
 ## Acknowledgements
 
 - Special thanks to @KOP-XIAO for his awesome resource-parser. Please give a [star](https://github.com/KOP-XIAO/QuantumultX) for his great work!

backend/banner

@@ -9,7 +9,7 @@
  * @updated: <%= updated %>
  * @version: <%= pkg.version %>
  * @author: Peng-YM
- * @github: https://github.com/Peng-YM/Sub-Store
+ * @github: https://github.com/sub-store-org/Sub-Store
  * @documentation: https://www.notion.so/Sub-Store-6259586994d34c11a4ced5c406264b46
  */
 

backend/bundle.js

@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+const fs = require('fs');
+
+const path = require('path');
+
+let content = fs.readFileSync(path.join(__dirname, 'sub-store.min.js'), {
+    encoding: 'utf8',
+});
+content = content.replace(
+    /eval\(('|")(require\(('|").*?('|")\))('|")\)/g,
+    '$2',
+);
+fs.writeFileSync(path.join(__dirname, 'dist/sub-store.no-bundle.js'), content, {
+    encoding: 'utf8',
+});
+
+const { build } = require('estrella');
+build({
+    entry: 'dist/sub-store.no-bundle.js',
+    outfile: 'dist/sub-store.bundle.js',
+    bundle: true,
+    platform: 'node',
+});

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.31",
+  "version": "2.14.109",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
@@ -8,7 +8,9 @@
     "test": "gulp peggy && npx cross-env BABEL_ENV=test mocha src/test/**/*.spec.js --require @babel/register --recursive",
     "serve": "node sub-store.min.js",
     "start": "nodemon -w src -w package.json --exec babel-node src/main.js",
-    "build": "gulp"
+    "build": "gulp",
+    "bundle": "node bundle.js",
+    "changelog": "conventional-changelog -p cli -i CHANGELOG.md -s"
   },
   "author": "Peng-YM",
   "license": "GPL-3.0",

backend/src/constants.js

@@ -2,6 +2,8 @@ export const SCHEMA_VERSION_KEY = 'schemaVersion';
 export const SETTINGS_KEY = 'settings';
 export const SUBS_KEY = 'subs';
 export const COLLECTIONS_KEY = 'collections';
+export const FILES_KEY = 'files';
+export const MODULES_KEY = 'modules';
 export const ARTIFACTS_KEY = 'artifacts';
 export const RULES_KEY = 'rules';
 export const GIST_BACKUP_KEY = 'Auto Generated Sub-Store Backup';

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

@@ -63,35 +63,50 @@ function parse(raw) {
     return proxies;
 }
 
-async function process(proxies, operators = [], targetPlatform) {
+async function process(proxies, operators = [], targetPlatform, source) {
     for (const item of operators) {
         // process script
         let script;
-        const $arguments = {};
+        let $arguments = {};
         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) {
-                    for (const pair of rawArgs[1].split('&')) {
+                    try {
-                        const key = pair.split('=')[0];
+                        // 支持 `#${encodeURIComponent(JSON.stringify({arg1: "1"}))}`
-                        const value = pair.split('=')[1] || true;
+                        $arguments = JSON.parse(decodeURIComponent(rawArgs[1]));
-                        $arguments[key] = value;
+                    } catch (e) {
+                        for (const pair of rawArgs[1].split('&')) {
+                            const key = pair.split('=')[0];
+                            const value = pair.split('=')[1];
+                            // 部分兼容之前的逻辑 const value = pair.split('=')[1] || true;
+                            $arguments[key] =
+                                value == null || value === ''
+                                    ? true
+                                    : decodeURIComponent(value);
+                        }
                     }
                 }
 
                 // 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(
                         `Error when downloading remote script: ${item.args.content}.\n Reason: ${err}`,
                     );
-                    // skip the script if download failed.
+                    throw new Error(`无法下载脚本: ${url}`);
-                    continue;
                 }
             } else {
                 script = content;
@@ -114,6 +129,7 @@ async function process(proxies, operators = [], targetPlatform) {
                 script,
                 targetPlatform,
                 $arguments,
+                source,
             );
         } else {
             processor = PROXY_PROCESSORS[item.type](item.args || {});
@@ -137,10 +153,21 @@ function produce(proxies, targetPlatform) {
 
     $.info(`Producing proxies for target: ${targetPlatform}`);
     if (typeof producer.type === 'undefined' || producer.type === 'SINGLE') {
+        let localPort = 10000;
         return proxies
             .map((proxy) => {
                 try {
-                    return producer.produce(proxy);
+                    let line = producer.produce(proxy);
+                    if (
+                        line.length > 0 &&
+                        line.includes('__SubStoreLocalPort__')
+                    ) {
+                        line = line.replace(
+                            /__SubStoreLocalPort__/g,
+                            localPort++,
+                        );
+                    }
+                    return line;
                 } catch (err) {
                     $.error(
                         `Cannot produce proxy: ${JSON.stringify(
@@ -163,6 +190,9 @@ export const ProxyUtils = {
     parse,
     process,
     produce,
+    isIPv4,
+    isIPv6,
+    isIP,
 };
 
 function tryParse(parser, line) {
@@ -189,9 +219,17 @@ function lastParse(proxy) {
             delete proxy.network;
         }
     }
-    if (['trojan', 'tuic', 'hysteria'].includes(proxy.type)) {
+    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;
@@ -206,6 +244,32 @@ function lastParse(proxy) {
             proxy.sni = proxy.server;
         }
     }
+    // 非 tls, 有 ws/http 传输层, 使用域名的节点, 将设置传输层 Host 防止之后域名解析后丢失域名(不覆盖现有的 Host)
+    if (
+        !proxy.tls &&
+        ['ws', 'http'].includes(proxy.network) &&
+        !proxy[`${proxy.network}-opts`]?.headers?.Host &&
+        !isIP(proxy.server)
+    ) {
+        proxy[`${proxy.network}-opts`] = proxy[`${proxy.network}-opts`] || {};
+        proxy[`${proxy.network}-opts`].headers =
+            proxy[`${proxy.network}-opts`].headers || {};
+        proxy[`${proxy.network}-opts`].headers.Host =
+            ['vmess', 'vless'].includes(proxy.type) && proxy.network === 'http'
+                ? [proxy.server]
+                : proxy.server;
+    }
+    // 统一将 VMess 和 VLESS 的 http 传输层的 path 和 Host 处理为数组
+    if (['vmess', 'vless'].includes(proxy.type) && proxy.network === 'http') {
+        let transportPath = proxy[`${proxy.network}-opts`]?.path;
+        let transportHost = proxy[`${proxy.network}-opts`]?.headers?.Host;
+        if (transportHost && !Array.isArray(transportHost)) {
+            proxy[`${proxy.network}-opts`].headers.Host = [transportHost];
+        }
+        if (transportPath && !Array.isArray(transportPath)) {
+            proxy[`${proxy.network}-opts`].path = [transportPath];
+        }
+    }
     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];
@@ -215,7 +217,6 @@ function URI_VMess() {
                 // V2rayN URI format
                 params = JSON.parse(content);
             } catch (e) {
-                // console.error(e);
                 // Shadowrocket URI format
                 // eslint-disable-next-line no-unused-vars
                 let [__, base64Line, qs] = /(^[^?]+?)\/?\?(.*)$/.exec(line);
@@ -241,7 +242,7 @@ function URI_VMess() {
                 params.add = server;
             }
             const proxy = {
-                name: params.ps ?? params.remark,
+                name: params.ps ?? params.remarks,
                 type: 'vmess',
                 server: params.add,
                 port: parseInt(getIfPresent(params.port), 10),
@@ -268,9 +269,19 @@ function URI_VMess() {
                 params.obfs === 'http'
             ) {
                 proxy.network = 'http';
+            } else if (['grpc'].includes(params.net)) {
+                proxy.network = 'grpc';
             }
             if (proxy.network) {
                 let transportHost = params.host ?? params.obfsParam;
+                try {
+                    const parsedObfs = JSON.parse(transportHost);
+                    const parsedHost = parsedObfs?.Host;
+                    if (parsedHost) {
+                        transportHost = parsedHost;
+                    }
+                    // eslint-disable-next-line no-empty
+                } catch (e) {}
                 let transportPath = params.path;
 
                 if (proxy.network === 'http') {
@@ -286,10 +297,17 @@ function URI_VMess() {
                     }
                 }
                 if (transportPath || transportHost) {
-                    proxy[`${proxy.network}-opts`] = {
+                    if (['grpc'].includes(proxy.network)) {
-                        path: getIfNotBlank(transportPath),
+                        proxy[`${proxy.network}-opts`] = {
-                        headers: { Host: getIfNotBlank(transportHost) },
+                            'grpc-service-name': getIfNotBlank(transportPath),
-                    };
+                            '_grpc-type': getIfNotBlank(params.type),
+                        };
+                    } else {
+                        proxy[`${proxy.network}-opts`] = {
+                            path: getIfNotBlank(transportPath),
+                            headers: { Host: getIfNotBlank(transportHost) },
+                        };
+                    }
                 } else {
                     delete proxy.network;
                 }
@@ -366,6 +384,10 @@ function URI_VLESS() {
             if (params.serviceName) {
                 opts[`${proxy.network}-service-name`] = params.serviceName;
             }
+            // https://github.com/XTLS/Xray-core/issues/91
+            if (['grpc'].includes(proxy.network)) {
+                opts['_grpc-type'] = params.mode || 'gun';
+            }
             if (Object.keys(opts).length > 0) {
                 proxy[`${proxy.network}-opts`] = opts;
             }
@@ -384,6 +406,56 @@ function URI_VLESS() {
     };
     return { name, test, parse };
 }
+function URI_Hysteria2() {
+    const name = 'URI Hysteria2 Parser';
+    const test = (line) => {
+        return /^hysteria2:\/\//.test(line);
+    };
+    const parse = (line) => {
+        line = line.split('hysteria2://')[1];
+        // eslint-disable-next-line no-unused-vars
+        let [__, password, server, ___, port, addons, name] =
+            /^(.*?)@(.*?)(:(\d+))?\/?\?(.*?)(?:#(.*?))$/.exec(line);
+        port = parseInt(`${port}`, 10);
+        if (isNaN(port)) {
+            port = 443;
+        }
+        password = decodeURIComponent(password);
+        name = decodeURIComponent(name) ?? `Hysteria2 ${server}:${port}`;
+
+        const proxy = {
+            type: 'hysteria2',
+            name,
+            server,
+            port,
+            password,
+        };
+
+        const params = {};
+        for (const addon of addons.split('&')) {
+            const [key, valueRaw] = addon.split('=');
+            let value = valueRaw;
+            value = decodeURIComponent(valueRaw);
+            params[key] = value;
+        }
+
+        proxy.sni = params.sni;
+        if (!proxy.sni && params.peer) {
+            proxy.sni = params.peer;
+        }
+        if (params.obfs && params.obfs !== 'none') {
+            proxy.obfs = params.obfs;
+        }
+
+        proxy['obfs-password'] = params['obfs-password'];
+        proxy['skip-cert-verify'] = /(TRUE)|1/i.test(params.insecure);
+        proxy.tfo = /(TRUE)|1/i.test(params.fastopen);
+        proxy['tls-fingerprint'] = params.pinSHA256;
+
+        return proxy;
+    };
+    return { name, test, parse };
+}
 
 // Trojan URI format
 function URI_Trojan() {
@@ -393,8 +465,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 };
@@ -417,13 +497,14 @@ function Clash_All() {
                 'ss',
                 'ssr',
                 'vmess',
-                'socks',
+                'socks5',
                 'http',
                 'snell',
                 'trojan',
                 'tuic',
                 'vless',
                 'hysteria',
+                'hysteria2',
                 'wireguard',
             ].includes(proxy.type)
         ) {
@@ -448,6 +529,10 @@ function Clash_All() {
             }
         }
 
+        if (proxy['benchmark-url']) {
+            proxy['test-url'] = proxy['benchmark-url'];
+        }
+
         return proxy;
     };
     return { name, test, parse };
@@ -571,6 +656,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';
@@ -740,7 +834,7 @@ function Surge_Socks5() {
 function Surge_Snell() {
     const name = 'Surge Snell Parser';
     const test = (line) => {
-        return /^.*=\s*snell?/.test(line.split(',')[0]);
+        return /^.*=\s*snell/.test(line.split(',')[0]);
     };
     const parse = (line) => getSurgeParser().parse(line);
     return { name, test, parse };
@@ -749,7 +843,24 @@ function Surge_Snell() {
 function Surge_Tuic() {
     const name = 'Surge Tuic Parser';
     const test = (line) => {
-        return /^.*=\s*tuic(-v5)??/.test(line.split(',')[0]);
+        return /^.*=\s*tuic(-v5)?/.test(line.split(',')[0]);
+    };
+    const parse = (line) => getSurgeParser().parse(line);
+    return { name, test, parse };
+}
+function Surge_WireGuard() {
+    const name = 'Surge WireGuard Parser';
+    const test = (line) => {
+        return /^.*=\s*wireguard/.test(line.split(',')[0]);
+    };
+    const parse = (line) => getSurgeParser().parse(line);
+    return { name, test, parse };
+}
+
+function Surge_Hysteria2() {
+    const name = 'Surge Hysteria2 Parser';
+    const test = (line) => {
+        return /^.*=\s*hysteria2/.test(line.split(',')[0]);
     };
     const parse = (line) => getSurgeParser().parse(line);
     return { name, test, parse };
@@ -760,6 +871,7 @@ export default [
     URI_SSR(),
     URI_VMess(),
     URI_VLESS(),
+    URI_Hysteria2(),
     URI_Trojan(),
     Clash_All(),
     Surge_SS(),
@@ -768,11 +880,14 @@ export default [
     Surge_Http(),
     Surge_Snell(),
     Surge_Tuic(),
+    Surge_WireGuard(),
+    Surge_Hysteria2(),
     Surge_Socks5(),
     Loon_SS(),
     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

@@ -32,11 +32,11 @@ const grammars = String.raw`
     }
 }
 
-start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v5) {
+start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v5/wireguard/hysteria2) {
     return proxy;
 }
 
-shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/fast_open/udp_relay/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/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/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/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/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/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,17 +76,23 @@ 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/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/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;
 }
-socks5 = tag equals "socks5" address (username password)? (fast_open/others)* {
+wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/underlying_proxy/test_url/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+    proxy.type = "wireguard-surge";
+}
+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)? (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/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;
 }
@@ -157,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; }
@@ -185,8 +192,19 @@ uri = $[^,]+
 
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
+reuse = comma "reuse" equals flag:bool { proxy.reuse = flag; }
+ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
 tfo = comma "tfo" equals flag:bool { proxy.tfo = flag; }
 ip_version = comma "ip-version" equals match:[^,]+ { proxy["ip-version"] = match.join(""); }
+section_name = comma "section-name" equals match:[^,]+ { proxy["section-name"] = match.join(""); }
+no_error_alert = comma "no-error-alert" equals match:[^,]+ { proxy["no-error-alert"] = match.join(""); }
+underlying_proxy = comma "underlying-proxy" equals match:[^,]+ { proxy["underlying-proxy"] = match.join(""); }
+download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
+test_url = comma "test-url" equals match:[^,]+ { proxy["test-url"] = match.join(""); }
+block_quic = comma "block-quic" equals match:[^,]+ { proxy["block-quic"] = match.join(""); }
+shadow_tls_version = comma "shadow-tls-version" equals match:$[0-9]+ { proxy["shadow-tls-version"] = parseInt(match.trim()); }
+shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-sni"] = match.join(""); }
+shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
 token = comma "token" equals match:[^,]+ { proxy.token = match.join(""); }
 alpn = comma "alpn" equals match:[^,]+ { proxy.alpn = match.join(""); }
 uuidk = comma "uuid" equals match:[^,]+ { proxy.uuid = match.join(""); }

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

@@ -30,11 +30,11 @@
     }
 }
 
-start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v5) {
+start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v5/wireguard/hysteria2) {
     return proxy;
 }
 
-shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/fast_open/udp_relay/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/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/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/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/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/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,17 +74,23 @@ 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/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/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;
 }
-socks5 = tag equals "socks5" address (username password)? (fast_open/others)* {
+wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/underlying_proxy/test_url/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+    proxy.type = "wireguard-surge";
+}
+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)? (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/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;
 }
@@ -155,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; }
@@ -183,8 +190,19 @@ uri = $[^,]+
 
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
+reuse = comma "reuse" equals flag:bool { proxy.reuse = flag; }
+ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
 tfo = comma "tfo" equals flag:bool { proxy.tfo = flag; }
 ip_version = comma "ip-version" equals match:[^,]+ { proxy["ip-version"] = match.join(""); }
+section_name = comma "section-name" equals match:[^,]+ { proxy["section-name"] = match.join(""); }
+no_error_alert = comma "no-error-alert" equals match:[^,]+ { proxy["no-error-alert"] = match.join(""); }
+underlying_proxy = comma "underlying-proxy" equals match:[^,]+ { proxy["underlying-proxy"] = match.join(""); }
+download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
+test_url = comma "test-url" equals match:[^,]+ { proxy["test-url"] = match.join(""); }
+block_quic = comma "block-quic" equals match:[^,]+ { proxy["block-quic"] = match.join(""); }
+shadow_tls_version = comma "shadow-tls-version" equals match:$[0-9]+ { proxy["shadow-tls-version"] = parseInt(match.trim()); }
+shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-sni"] = match.join(""); }
+shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
 token = comma "token" equals match:[^,]+ { proxy.token = match.join(""); }
 alpn = comma "alpn" equals match:[^,]+ { proxy.alpn = match.join(""); }
 uuidk = comma "uuid" equals match:[^,]+ { proxy.uuid = match.join(""); }

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

@@ -13,17 +13,22 @@ function Base64Encoded() {
     const name = 'Base64 Pre-processor';
 
     const keys = [
-        'dm1lc3M',
+        'dm1lc3M', // vmess
-        'c3NyOi8v',
+        'c3NyOi8v', // ssr://
-        'dHJvamFu',
+        'dHJvamFu', // trojan
-        'c3M6Ly',
+        'c3M6Ly', // ss:/
-        'c3NkOi8v',
+        'c3NkOi8v', // ssd://
-        'c2hhZG93',
+        'c2hhZG93', // shadow
-        'aHR0c',
+        'aHR0c', // htt
+        'dmxlc3M=', // vless
+        'aHlzdGVyaWEy', // hysteria2
     ];
 
     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);

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

@@ -7,6 +7,8 @@ import lodash from 'lodash';
 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:
@@ -294,7 +296,7 @@ function RegexDeleteOperator(regex) {
  1. This function name should be `operator`!
  2. Always declare variables before using them!
  */
-function ScriptOperator(script, targetPlatform, $arguments) {
+function ScriptOperator(script, targetPlatform, $arguments, source) {
     return {
         name: 'Script Operator',
         func: async (proxies) => {
@@ -305,7 +307,24 @@ function ScriptOperator(script, targetPlatform, $arguments) {
                     script,
                     $arguments,
                 );
-                output = operator(proxies, targetPlatform);
+                output = operator(proxies, targetPlatform, { source, ...env });
+            })();
+            return output;
+        },
+        nodeFunc: async (proxies) => {
+            let output = proxies;
+            await (async function () {
+                const operator = createDynamicFunction(
+                    'operator',
+                    `async function operator(proxies = []) {
+                        return proxies.map(($server = {}) => {
+                          ${script}
+                          return $server
+                        })
+                      }`,
+                    $arguments,
+                );
+                output = operator(proxies, targetPlatform, { source, ...env });
             })();
             return output;
         },
@@ -378,6 +397,46 @@ const DOMAIN_RESOLVERS = {
         resourceCache.set(id, result);
         return result;
     },
+    Ali: async function (domain) {
+        const id = hex_md5(`ALI:${domain}`);
+        const cached = resourceCache.get(id);
+        if (cached) return cached;
+        const resp = await $.http.get({
+            url: `http://223.6.6.6/resolve?name=${encodeURIComponent(
+                domain,
+            )}&type=A&short=1`,
+            headers: {
+                accept: 'application/dns-json',
+            },
+        });
+        const answers = JSON.parse(resp.body);
+        if (answers.length === 0) {
+            throw new Error('No answers');
+        }
+        const result = answers[answers.length - 1];
+        resourceCache.set(id, result);
+        return result;
+    },
+    Tencent: async function (domain) {
+        const id = hex_md5(`ALI:${domain}`);
+        const cached = resourceCache.get(id);
+        if (cached) return cached;
+        const resp = await $.http.get({
+            url: `http://119.28.28.28/d?type=A&dn=${encodeURIComponent(
+                domain,
+            )}`,
+            headers: {
+                accept: 'application/dns-json',
+            },
+        });
+        const answers = resp.body.split(';').map((i) => i.split(',')[0]);
+        if (answers.length === 0) {
+            throw new Error('No answers');
+        }
+        const result = answers[answers.length - 1];
+        resourceCache.set(id, result);
+        return result;
+    },
 };
 
 function ResolveDomainOperator({ provider }) {
@@ -392,7 +451,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);
@@ -416,8 +477,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;
@@ -522,7 +590,7 @@ function TypeFilter(types) {
  1. This function name should be `filter`!
  2. Always declare variables before using them!
  */
-function ScriptFilter(script, targetPlatform, $arguments) {
+function ScriptFilter(script, targetPlatform, $arguments, source) {
     return {
         name: 'Script Filter',
         func: async (proxies) => {
@@ -533,7 +601,7 @@ function ScriptFilter(script, targetPlatform, $arguments) {
                     script,
                     $arguments,
                 );
-                output = filter(proxies, targetPlatform);
+                output = filter(proxies, targetPlatform, { source, ...env });
             })();
             return output;
         },
@@ -566,7 +634,8 @@ async function ApplyFilter(filter, objs) {
         selected = await filter.func(objs);
     } catch (err) {
         // print log and skip this filter
-        $.log(`Cannot apply filter ${filter.name}\n Reason: ${err}`);
+        $.error(`Cannot apply filter ${filter.name}\n Reason: ${err}`);
+        throw new Error(`脚本过滤失败 ${err.message ?? err}`);
     }
     return objs.filter((_, i) => selected[i]);
 }
@@ -577,8 +646,33 @@ async function ApplyOperator(operator, objs) {
         const output_ = await operator.func(output);
         if (output_) output = output_;
     } catch (err) {
-        // print log and skip this operator
+        $.error(
-        $.log(`Cannot apply operator ${operator.name}! Reason: ${err}`);
+            `Cannot apply operator ${operator.name}(function operator)! Reason: ${err}`,
+        );
+        let funcErr = '';
+        let funcErrMsg = `${err.message ?? err}`;
+        if (funcErrMsg.includes('$server 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;
 }
@@ -625,6 +719,7 @@ function removeFlag(str) {
 }
 
 function createDynamicFunction(name, script, $arguments) {
+    const flowUtils = { getFlowHeaders, parseFlowHeaders, flowTransfer };
     if ($.env.isLoon) {
         return new Function(
             '$arguments',
@@ -635,6 +730,7 @@ function createDynamicFunction(name, script, $arguments) {
             '$notification',
             'ProxyUtils',
             'scriptResourceCache',
+            'flowUtils',
             `${script}\n return ${name}`,
         )(
             $arguments,
@@ -648,6 +744,7 @@ function createDynamicFunction(name, script, $arguments) {
             $notification,
             ProxyUtils,
             scriptResourceCache,
+            flowUtils,
         );
     } else {
         return new Function(
@@ -656,7 +753,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

@@ -3,6 +3,9 @@ import { isPresent } from '@/core/proxy-utils/producers/utils';
 export default function Clash_Producer() {
     const type = 'ALL';
     const produce = (proxies) => {
+        // VLESS XTLS is not supported by Clash
+        // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/docs/config.yaml#L532
+        // github.com/Dreamacro/clash/pull/2891/files
         // filter unsupported proxies
         proxies = proxies.filter((proxy) => {
             if (
@@ -10,17 +13,17 @@ export default function Clash_Producer() {
                     'ss',
                     'ssr',
                     'vmess',
-                    'socks',
+                    'vless',
+                    'socks5',
                     'http',
                     'snell',
                     'trojan',
                     'wireguard',
-                ].includes(proxy.type)
+                ].includes(proxy.type) ||
-            ) {
+                (proxy.type === 'snell' && String(proxy.version) === '4') ||
-                return false;
+                (proxy.type === 'vless' &&
-            } else if (
+                    (typeof proxy.flow !== 'undefined' ||
-                proxy.type === 'snell' &&
+                        proxy['reality-opts']))
-                String(proxy.version) === '4'
             ) {
                 return false;
             }
@@ -61,6 +64,11 @@ export default function Clash_Producer() {
                         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 (
@@ -82,10 +90,26 @@ export default function Clash_Producer() {
                             proxy['http-opts'].headers.Host = [httpHost];
                         }
                     }
-                    if (['trojan', 'tuic', 'hysteria'].includes(proxy.type)) {
+                    if (
+                        ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
+                            proxy.type,
+                        )
+                    ) {
                         delete proxy.tls;
                     }
+
+                    if (proxy['tls-fingerprint']) {
+                        proxy.fingerprint = proxy['tls-fingerprint'];
+                    }
                     delete proxy['tls-fingerprint'];
+                    delete proxy.subName;
+                    delete proxy.collectionName;
+                    if (
+                        ['grpc'].includes(proxy.network) &&
+                        proxy[`${proxy.network}-opts`]
+                    ) {
+                        delete proxy[`${proxy.network}-opts`]['_grpc-type'];
+                    }
                     return '  - ' + JSON.stringify(proxy) + '\n';
                 })
                 .join('')

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

@@ -0,0 +1,144 @@
+import { isPresent } from '@/core/proxy-utils/producers/utils';
+
+export default function ClashMeta_Producer() {
+    const type = 'ALL';
+    const produce = (proxies) => {
+        return (
+            'proxies:\n' +
+            proxies
+                .filter((proxy) => {
+                    if (
+                        proxy.type === 'snell' &&
+                        String(proxy.version) === '4'
+                    ) {
+                        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 (
+                            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') {
+                        // 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 (
+                            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];
+                        }
+                    }
+
+                    if (
+                        ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
+                            proxy.type,
+                        )
+                    ) {
+                        delete proxy.tls;
+                    }
+
+                    if (proxy['tls-fingerprint']) {
+                        proxy.fingerprint = proxy['tls-fingerprint'];
+                    }
+                    delete proxy['tls-fingerprint'];
+                    delete proxy.subName;
+                    delete proxy.collectionName;
+                    if (
+                        ['grpc'].includes(proxy.network) &&
+                        proxy[`${proxy.network}-opts`]
+                    ) {
+                        delete proxy[`${proxy.network}-opts`]['_grpc-type'];
+                    }
+                    return '  - ' + JSON.stringify(proxy) + '\n';
+                })
+                .join('')
+        );
+    };
+    return { type, produce };
+}

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

@@ -1,5 +1,7 @@
 import Surge_Producer from './surge';
+import SurgeMac_Producer from './surgemac';
 import Clash_Producer from './clash';
+import ClashMeta_Producer from './clashmeta';
 import Stash_Producer from './stash';
 import Loon_Producer from './loon';
 import URI_Producer from './uri';
@@ -16,8 +18,10 @@ function JSON_Producer() {
 export default {
     QX: QX_Producer(),
     Surge: Surge_Producer(),
+    SurgeMac: SurgeMac_Producer(),
     Loon: Loon_Producer(),
     Clash: Clash_Producer(),
+    ClashMeta: ClashMeta_Producer(),
     URI: URI_Producer(),
     V2Ray: V2Ray_Producer(),
     JSON: JSON_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}`,
@@ -101,7 +103,7 @@ function trojan(proxy) {
                 'ws-opts.path',
             );
             result.appendIfPresent(
-                `,host=${proxy['ws-opts'].headers.Host}`,
+                `,host=${proxy['ws-opts']?.headers?.Host}`,
                 'ws-opts.headers.Host',
             );
         } else {
@@ -138,11 +140,11 @@ function vmess(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(
-                `,host=${proxy['ws-opts'].headers.Host}`,
+                `,host=${proxy['ws-opts']?.headers?.Host}`,
                 'ws-opts.headers.Host',
             );
         } else if (proxy.network === 'http') {
@@ -205,11 +207,11 @@ function vless(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(
-                `,host=${proxy['ws-opts'].headers.Host}`,
+                `,host=${proxy['ws-opts']?.headers?.Host}`,
                 'ws-opts.headers.Host',
             );
         } else if (proxy.network === 'http') {
@@ -334,3 +336,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}`);
 
@@ -135,11 +160,11 @@ function trojan(proxy) {
             if (needTls(proxy)) append(`,obfs=wss`);
             else append(`,obfs=ws`);
             appendIfPresent(
-                `,obfs-uri=${proxy['ws-opts'].path}`,
+                `,obfs-uri=${proxy['ws-opts']?.path}`,
                 'ws-opts.path',
             );
             appendIfPresent(
-                `,obfs-host=${proxy['ws-opts'].headers.Host}`,
+                `,obfs-host=${proxy['ws-opts']?.headers?.Host}`,
                 'ws-opts.headers.Host',
             );
         } else {
@@ -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

@@ -1,6 +1,6 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
 
-export default function Stash_Producer() {
+export default function ShadowRocket_Producer() {
     const type = 'ALL';
     const produce = (proxies) => {
         return (
@@ -63,6 +63,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
@@ -81,6 +88,11 @@ export default function Stash_Producer() {
                         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 (
@@ -103,11 +115,26 @@ export default function Stash_Producer() {
                         }
                     }
 
-                    if (['trojan', 'tuic', 'hysteria'].includes(proxy.type)) {
+                    if (
+                        ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
+                            proxy.type,
+                        )
+                    ) {
                         delete proxy.tls;
                     }
 
+                    if (proxy['tls-fingerprint']) {
+                        proxy.fingerprint = proxy['tls-fingerprint'];
+                    }
                     delete proxy['tls-fingerprint'];
+                    delete proxy.subName;
+                    delete proxy.collectionName;
+                    if (
+                        ['grpc'].includes(proxy.network) &&
+                        proxy[`${proxy.network}-opts`]
+                    ) {
+                        delete proxy[`${proxy.network}-opts`]['_grpc-type'];
+                    }
                     return '  - ' + JSON.stringify(proxy) + '\n';
                 })
                 .join('')

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

@@ -12,13 +12,15 @@ export default function Stash_Producer() {
                             'ss',
                             'ssr',
                             'vmess',
-                            'socks',
+                            'socks5',
                             'http',
                             'snell',
                             'trojan',
                             'tuic',
                             'vless',
                             'wireguard',
+                            'hysteria',
+                            'hysteria2',
                         ].includes(proxy.type) ||
                         (proxy.type === 'snell' &&
                             String(proxy.version) === '4') ||
@@ -67,6 +69,7 @@ export default function Stash_Producer() {
                             !isPresent(proxy, 'fast-open')
                         ) {
                             proxy['fast-open'] = proxy.tfo;
+                            delete proxy.tfo;
                         }
                         // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/adapter/outbound/tuic.go#L197
                         if (
@@ -76,6 +79,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
@@ -86,6 +96,66 @@ export default function Stash_Producer() {
                             !isPresent(proxy, 'fast-open')
                         ) {
                             proxy['fast-open'] = proxy.tfo;
+                            delete proxy.tfo;
+                        }
+                        if (
+                            isPresent(proxy, 'down') &&
+                            !isPresent(proxy, 'down-speed')
+                        ) {
+                            proxy['down-speed'] = proxy.down;
+                            delete proxy.down;
+                        }
+                        if (
+                            isPresent(proxy, 'up') &&
+                            !isPresent(proxy, 'up-speed')
+                        ) {
+                            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') &&
+                            !isPresent(proxy, 'auth')
+                        ) {
+                            proxy.auth = proxy.password;
+                            delete proxy.password;
+                        }
+                        if (
+                            isPresent(proxy, 'tfo') &&
+                            !isPresent(proxy, 'fast-open')
+                        ) {
+                            proxy['fast-open'] = proxy.tfo;
+                            delete proxy.tfo;
+                        }
+                        if (
+                            isPresent(proxy, 'down') &&
+                            !isPresent(proxy, 'down-speed')
+                        ) {
+                            proxy['down-speed'] = proxy.down;
+                            delete proxy.down;
+                        }
+                        if (
+                            isPresent(proxy, 'up') &&
+                            !isPresent(proxy, 'up-speed')
+                        ) {
+                            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 =
@@ -94,6 +164,11 @@ export default function Stash_Producer() {
                         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 (
@@ -115,10 +190,31 @@ export default function Stash_Producer() {
                             proxy['http-opts'].headers.Host = [httpHost];
                         }
                     }
-                    if (['trojan', 'tuic', 'hysteria'].includes(proxy.type)) {
+                    if (
+                        ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
+                            proxy.type,
+                        )
+                    ) {
                         delete proxy.tls;
                     }
+                    if (proxy['tls-fingerprint']) {
+                        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 (
+                        ['grpc'].includes(proxy.network) &&
+                        proxy[`${proxy.network}-opts`]
+                    ) {
+                        delete proxy[`${proxy.network}-opts`]['_grpc-type'];
+                    }
                     return '  - ' + JSON.stringify(proxy) + '\n';
                 })
                 .join('')

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

@@ -29,6 +29,10 @@ export default function Surge_Producer() {
                 return snell(proxy);
             case 'tuic':
                 return tuic(proxy);
+            case 'wireguard-surge':
+                return wireguard(proxy);
+            case 'hysteria2':
+                return hysteria2(proxy);
         }
         throw new Error(
             `Platform ${targetPlatform} does not support proxy type: ${proxy.type}`,
@@ -43,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') {
@@ -69,6 +83,29 @@ function shadowsocks(proxy) {
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
 
+    // shadow-tls
+    if (isPresent(proxy, 'shadow-tls-password')) {
+        result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
+
+        result.appendIfPresent(
+            `,shadow-tls-version=${proxy['shadow-tls-version']}`,
+            'shadow-tls-version',
+        );
+        result.appendIfPresent(
+            `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
+            'shadow-tls-sni',
+        );
+    }
+
+    // block-quic
+    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
+
+    // underlying-proxy
+    result.appendIfPresent(
+        `,underlying-proxy=${proxy['underlying-proxy']}`,
+        'underlying-proxy',
+    );
+
     return result.toString();
 }
 
@@ -77,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);
 
@@ -105,6 +152,29 @@ function trojan(proxy) {
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
 
+    // shadow-tls
+    if (isPresent(proxy, 'shadow-tls-password')) {
+        result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
+
+        result.appendIfPresent(
+            `,shadow-tls-version=${proxy['shadow-tls-version']}`,
+            'shadow-tls-version',
+        );
+        result.appendIfPresent(
+            `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
+            'shadow-tls-sni',
+        );
+    }
+
+    // block-quic
+    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
+
+    // underlying-proxy
+    result.appendIfPresent(
+        `,underlying-proxy=${proxy['underlying-proxy']}`,
+        'underlying-proxy',
+    );
+
     return result.toString();
 }
 
@@ -113,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);
 
@@ -148,6 +228,29 @@ function vmess(proxy) {
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
 
+    // shadow-tls
+    if (isPresent(proxy, 'shadow-tls-password')) {
+        result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
+
+        result.appendIfPresent(
+            `,shadow-tls-version=${proxy['shadow-tls-version']}`,
+            'shadow-tls-version',
+        );
+        result.appendIfPresent(
+            `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
+            'shadow-tls-sni',
+        );
+    }
+
+    // block-quic
+    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
+
+    // underlying-proxy
+    result.appendIfPresent(
+        `,underlying-proxy=${proxy['underlying-proxy']}`,
+        'underlying-proxy',
+    );
+
     return result.toString();
 }
 
@@ -158,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']}`,
@@ -180,6 +293,29 @@ function http(proxy) {
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
 
+    // shadow-tls
+    if (isPresent(proxy, 'shadow-tls-password')) {
+        result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
+
+        result.appendIfPresent(
+            `,shadow-tls-version=${proxy['shadow-tls-version']}`,
+            'shadow-tls-version',
+        );
+        result.appendIfPresent(
+            `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
+            'shadow-tls-sni',
+        );
+    }
+
+    // block-quic
+    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
+
+    // underlying-proxy
+    result.appendIfPresent(
+        `,underlying-proxy=${proxy['underlying-proxy']}`,
+        'underlying-proxy',
+    );
+
     return result.toString();
 }
 
@@ -190,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']}`,
@@ -214,6 +360,29 @@ function socks5(proxy) {
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
 
+    // shadow-tls
+    if (isPresent(proxy, 'shadow-tls-password')) {
+        result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
+
+        result.appendIfPresent(
+            `,shadow-tls-version=${proxy['shadow-tls-version']}`,
+            'shadow-tls-version',
+        );
+        result.appendIfPresent(
+            `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
+            'shadow-tls-sni',
+        );
+    }
+
+    // block-quic
+    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
+
+    // underlying-proxy
+    result.appendIfPresent(
+        `,underlying-proxy=${proxy['underlying-proxy']}`,
+        'underlying-proxy',
+    );
+
     return result.toString();
 }
 
@@ -223,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}`,
@@ -243,6 +422,29 @@ function snell(proxy) {
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
 
+    // shadow-tls
+    if (isPresent(proxy, 'shadow-tls-password')) {
+        result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
+
+        result.appendIfPresent(
+            `,shadow-tls-version=${proxy['shadow-tls-version']}`,
+            'shadow-tls-version',
+        );
+        result.appendIfPresent(
+            `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
+            'shadow-tls-sni',
+        );
+    }
+
+    // block-quic
+    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
+
+    // underlying-proxy
+    result.appendIfPresent(
+        `,underlying-proxy=${proxy['underlying-proxy']}`,
+        'underlying-proxy',
+    );
+
     // reuse
     result.appendIfPresent(`,reuse=${proxy['reuse']}`, 'reuse');
 
@@ -272,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(
@@ -279,13 +486,169 @@ function tuic(proxy) {
         'skip-cert-verify',
     );
 
+    // tls fingerprint
+    result.appendIfPresent(
+        `,server-cert-fingerprint-sha256=${proxy['tls-fingerprint']}`,
+        'tls-fingerprint',
+    );
+
     // tfo
-    result.appendIfPresent(`,tfo=${proxy['fast-open']}`, 'fast-open');
+    if (isPresent(proxy, 'tfo')) {
-    result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
+        result.append(`,tfo=${proxy['tfo']}`);
+    } else if (isPresent(proxy, 'fast-open')) {
+        result.append(`,tfo=${proxy['fast-open']}`);
+    }
 
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
 
+    // shadow-tls
+    if (isPresent(proxy, 'shadow-tls-password')) {
+        result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
+
+        result.appendIfPresent(
+            `,shadow-tls-version=${proxy['shadow-tls-version']}`,
+            'shadow-tls-version',
+        );
+        result.appendIfPresent(
+            `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
+            'shadow-tls-sni',
+        );
+    }
+
+    // block-quic
+    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
+
+    // underlying-proxy
+    result.appendIfPresent(
+        `,underlying-proxy=${proxy['underlying-proxy']}`,
+        'underlying-proxy',
+    );
+
+    result.appendIfPresent(`,ecn=${proxy.ecn}`, 'ecn');
+
+    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',
+    );
+    result.appendIfPresent(
+        `,no-error-alert=${proxy['no-error-alert']}`,
+        'no-error-alert',
+    );
+
+    result.appendIfPresent(
+        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
+        'ip-version',
+    );
+
+    // test-url
+    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
+
+    // shadow-tls
+    if (isPresent(proxy, 'shadow-tls-password')) {
+        result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
+
+        result.appendIfPresent(
+            `,shadow-tls-version=${proxy['shadow-tls-version']}`,
+            'shadow-tls-version',
+        );
+        result.appendIfPresent(
+            `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
+            'shadow-tls-sni',
+        );
+    }
+
+    // block-quic
+    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
+
+    // underlying-proxy
+    result.appendIfPresent(
+        `,underlying-proxy=${proxy['underlying-proxy']}`,
+        'underlying-proxy',
+    );
+
+    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(`,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',
+    );
+
+    // tls verification
+    result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
+    result.appendIfPresent(
+        `,skip-cert-verify=${proxy['skip-cert-verify']}`,
+        'skip-cert-verify',
+    );
+    result.appendIfPresent(
+        `,server-cert-fingerprint-sha256=${proxy['tls-fingerprint']}`,
+        'tls-fingerprint',
+    );
+
+    // tfo
+    if (isPresent(proxy, 'tfo')) {
+        result.append(`,tfo=${proxy['tfo']}`);
+    } else if (isPresent(proxy, 'fast-open')) {
+        result.append(`,tfo=${proxy['fast-open']}`);
+    }
+
+    // test-url
+    result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
+
+    // shadow-tls
+    if (isPresent(proxy, 'shadow-tls-password')) {
+        result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
+
+        result.appendIfPresent(
+            `,shadow-tls-version=${proxy['shadow-tls-version']}`,
+            'shadow-tls-version',
+        );
+        result.appendIfPresent(
+            `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
+            'shadow-tls-sni',
+        );
+    }
+
+    // block-quic
+    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
+
+    // underlying-proxy
+    result.appendIfPresent(
+        `,underlying-proxy=${proxy['underlying-proxy']}`,
+        'underlying-proxy',
+    );
+
+    // 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/surgemac.js

@@ -0,0 +1,65 @@
+import { Result } from './utils';
+import Surge_Producer from './surge';
+
+const targetPlatform = 'SurgeMac';
+
+const surge_Producer = Surge_Producer();
+
+export default function SurgeMac_Producer() {
+    const produce = (proxy) => {
+        switch (proxy.type) {
+            case 'ssr':
+                return shadowsocksr(proxy);
+            case 'ss':
+                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 };
+}
+
+function shadowsocksr(proxy) {
+    const result = new Result(proxy);
+
+    proxy.local_port = '__SubStoreLocalPort__';
+    proxy.local_address = proxy.local_address ?? '127.0.0.1';
+
+    result.append(
+        `${proxy.name} = external, exec = "${
+            proxy.exec || '/usr/local/bin/ssr-local'
+        }", address = "${proxy.server}", local-port = ${proxy.local_port}`,
+    );
+
+    for (const [key, value] of Object.entries({
+        cipher: '-m',
+        obfs: '-o',
+        password: '-k',
+        port: '-p',
+        protocol: '-O',
+        'protocol-param': '-G',
+        server: '-s',
+        local_port: '-l',
+        local_address: '-b',
+    })) {
+        result.appendIfPresent(
+            `, args = "${value}", args = "${proxy[key]}"`,
+            key,
+        );
+    }
+
+    return result.toString();
+}

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

@@ -91,6 +91,16 @@ export default function URI_Producer() {
                             ? vmessTransportHost[0]
                             : vmessTransportHost;
                     }
+                    if (['grpc'].includes(proxy.network)) {
+                        result.path =
+                            proxy[`${proxy.network}-opts`]?.[
+                                'grpc-service-name'
+                            ];
+                        // https://github.com/XTLS/Xray-core/issues/91
+                        result.type =
+                            proxy[`${proxy.network}-opts`]?.['_grpc-type'] ||
+                            'gun';
+                    }
                 }
                 result = 'vmess://' + Base64.encode(JSON.stringify(result));
                 break;
@@ -141,6 +151,12 @@ export default function URI_Producer() {
                 let vlessTransport = `&type=${encodeURIComponent(
                     proxy.network,
                 )}`;
+                if (['grpc'].includes(proxy.network)) {
+                    // https://github.com/XTLS/Xray-core/issues/91
+                    vlessTransport += `&mode=${encodeURIComponent(
+                        proxy[`${proxy.network}-opts`]?.['_grpc-type'] || 'gun',
+                    )}`;
+                }
 
                 let vlessTransportServiceName =
                     proxy[`${proxy.network}-opts`]?.[

backend/src/core/rule-utils/parsers.js

@@ -47,7 +47,7 @@ function AllRuleParser() {
                 }
                 if (!matched) throw new Error('Invalid rule type: ' + rawType);
             } catch (e) {
-                console.error(`Failed to parse line: ${line}\n Reason: ${e}`);
+                console.log(`Failed to parse line: ${line}\n Reason: ${e}`);
             }
         }
         return result;

backend/src/main.js

@@ -7,7 +7,7 @@
  *  ╚══════╝ ╚═════╝ ╚═════╝       ╚══════╝   ╚═╝    ╚═════╝ ╚═╝  ╚═╝╚══════╝
  * Advanced Subscription Manager for QX, Loon, Surge and Clash.
  * @author: Peng-YM
- * @github: https://github.com/Peng-YM/Sub-Store
+ * @github: https://github.com/sub-store-org/Sub-Store
  * @documentation: https://www.notion.so/Sub-Store-6259586994d34c11a4ced5c406264b46
  */
 import { version } from '../package.json';

backend/src/products/sub-store-0.js

@@ -20,6 +20,8 @@ import registerArtifactRoutes from '@/restful/artifacts';
 import registerSettingRoutes from '@/restful/settings';
 import registerMiscRoutes from '@/restful/miscs';
 import registerSortRoutes from '@/restful/sort';
+import registerFileRoutes from '@/restful/file';
+import registerModuleRoutes from '@/restful/module';
 
 migrate();
 serve();
@@ -30,6 +32,8 @@ function serve() {
     // register routes
     registerCollectionRoutes($app);
     registerSubscriptionRoutes($app);
+    registerFileRoutes($app);
+    registerModuleRoutes($app);
     registerArtifactRoutes($app);
     registerSettingRoutes($app);
     registerSortRoutes($app);

backend/src/restful/collections.js

@@ -22,6 +22,16 @@ export default function register($app) {
 function createCollection(req, res) {
     const collection = req.body;
     $.info(`正在创建组合订阅：${collection.name}`);
+    if (/\//.test(collection.name)) {
+        failed(
+            res,
+            new RequestInvalidError(
+                'INVALID_NAME',
+                `Collection ${collection.name} is invalid`,
+            ),
+        );
+        return;
+    }
     const allCols = $.read(COLLECTIONS_KEY);
     if (findByName(allCols, collection.name)) {
         failed(
@@ -31,6 +41,7 @@ function createCollection(req, res) {
                 `Collection ${collection.name} already exists.`,
             ),
         );
+        return;
     }
     allCols.push(collection);
     $.write(allCols, COLLECTIONS_KEY);

backend/src/restful/download.js

@@ -20,6 +20,23 @@ async function downloadSubscription(req, res) {
         req.query.target || getPlatformFromHeaders(req.headers) || 'JSON';
 
     $.info(`正在下载订阅：${name}`);
+    let { url, ua, content, mergeSources } = 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}`);
+    }
 
     const allSubs = $.read(SUBS_KEY);
     const sub = findByName(allSubs, name);
@@ -29,12 +46,16 @@ async function downloadSubscription(req, res) {
                 type: 'subscription',
                 name,
                 platform,
+                url,
+                ua,
+                content,
+                mergeSources,
             });
 
-            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);
                     }

backend/src/restful/file.js

@@ -0,0 +1,109 @@
+import { deleteByName, findByName, updateByName } from '@/utils/database';
+import { FILES_KEY } from '@/constants';
+import { failed, success } from '@/restful/response';
+import $ from '@/core/app';
+import { RequestInvalidError, ResourceNotFoundError } from '@/restful/errors';
+
+export default function register($app) {
+    if (!$.read(FILES_KEY)) $.write([], FILES_KEY);
+
+    $app.route('/api/file/:name')
+        .get(getFile)
+        .patch(updateFile)
+        .delete(deleteFile);
+
+    $app.route('/api/files').get(getAllFiles).post(createFile).put(replaceFile);
+}
+
+// file API
+function createFile(req, res) {
+    const file = req.body;
+    file.name = `${file.name ?? Date.now()}`;
+    $.info(`正在创建文件：${file.name}`);
+    const allFiles = $.read(FILES_KEY);
+    if (findByName(allFiles, file.name)) {
+        return failed(
+            res,
+            new RequestInvalidError(
+                'DUPLICATE_KEY',
+                req.body.name
+                    ? `已存在 name 为 ${file.name} 的文件`
+                    : `无法同时创建相同的文件 可稍后重试`,
+            ),
+        );
+    }
+    allFiles.push(file);
+    $.write(allFiles, FILES_KEY);
+    success(res, file, 201);
+}
+
+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);
+    } else {
+        failed(
+            res,
+            new ResourceNotFoundError(
+                `FILE_NOT_FOUND`,
+                `File ${name} does not exist`,
+                404,
+            ),
+        );
+    }
+}
+
+function updateFile(req, res) {
+    let { name } = req.params;
+    name = decodeURIComponent(name);
+    let file = req.body;
+    const allFiles = $.read(FILES_KEY);
+    const oldFile = findByName(allFiles, name);
+    if (oldFile) {
+        const newFile = {
+            ...oldFile,
+            ...file,
+        };
+        $.info(`正在更新文件：${name}...`);
+
+        updateByName(allFiles, name, newFile);
+        $.write(allFiles, FILES_KEY);
+        success(res, newFile);
+    } else {
+        failed(
+            res,
+            new ResourceNotFoundError(
+                'RESOURCE_NOT_FOUND',
+                `File ${name} does not exist!`,
+            ),
+            404,
+        );
+    }
+}
+
+function deleteFile(req, res) {
+    let { name } = req.params;
+    name = decodeURIComponent(name);
+    $.info(`正在删除文件：${name}`);
+    let allFiles = $.read(FILES_KEY);
+    deleteByName(allFiles, name);
+    $.write(allFiles, FILES_KEY);
+    success(res);
+}
+
+function getAllFiles(req, res) {
+    const allFiles = $.read(FILES_KEY);
+    success(
+        res, // eslint-disable-next-line no-unused-vars
+        allFiles.map(({ content, ...rest }) => rest),
+    );
+}
+
+function replaceFile(req, res) {
+    const allFiles = req.body;
+    $.write(allFiles, FILES_KEY);
+    success(res);
+}

backend/src/restful/index.js

@@ -4,6 +4,8 @@ import $ from '@/core/app';
 import registerSubscriptionRoutes from './subscriptions';
 import registerCollectionRoutes from './collections';
 import registerArtifactRoutes from './artifacts';
+import registerFileRoutes from './file';
+import registerModuleRoutes from './module';
 import registerSyncRoutes from './sync';
 import registerDownloadRoutes from './download';
 import registerSettingRoutes from './settings';
@@ -13,8 +15,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');
+        host = eval('process.env.SUB_STORE_BACKEND_API_HOST');
+    }
+    const $app = express({ substore: $, port, host });
     // register routes
     registerCollectionRoutes($app);
     registerSubscriptionRoutes($app);
@@ -23,6 +30,8 @@ export default function serve() {
     registerSortingRoutes($app);
     registerSettingRoutes($app);
     registerArtifactRoutes($app);
+    registerFileRoutes($app);
+    registerModuleRoutes($app);
     registerSyncRoutes($app);
     registerNodeInfoRoutes($app);
     registerMiscRoutes($app);

backend/src/restful/miscs.js

@@ -1,7 +1,6 @@
 import $ from '@/core/app';
 import { ENV } from '@/vendor/open-api';
 import { failed, success } from '@/restful/response';
-import { version as substoreVersion } from '../../package.json';
 import { updateArtifactStore, updateGitHubAvatar } from '@/restful/settings';
 import resourceCache from '@/utils/resource-cache';
 import {
@@ -12,6 +11,7 @@ import {
 import { InternalServerError, RequestInvalidError } from '@/restful/errors';
 import Gist from '@/utils/gist';
 import migrate from '@/utils/migration';
+import env from '@/utils/env';
 
 export default function register($app) {
     // utils
@@ -49,19 +49,7 @@ export default function register($app) {
 }
 
 function getEnv(req, res) {
-    const { isNode, isQX, isLoon, isSurge, isStash, isShadowRocket } = ENV();
+    success(res, env);
-    let backend = 'Node';
-    if (isNode) backend = 'Node';
-    if (isQX) backend = 'QX';
-    if (isLoon) backend = 'Loon';
-    if (isSurge) backend = 'Surge';
-    if (isStash) backend = 'Stash';
-    if (isShadowRocket) backend = 'ShadowRocket';
-
-    success(res, {
-        backend,
-        version: substoreVersion,
-    });
 }
 
 async function refresh(_, res) {
@@ -118,6 +106,23 @@ async function gistBackup(req, res) {
                 case 'download':
                     $.info(`还原备份中...`);
                     content = await gist.download(GIST_BACKUP_FILE_NAME);
+                    try {
+                        if (
+                            Object.keys(JSON.parse(content).settings).length ===
+                            0
+                        ) {
+                            throw new Error(
+                                '备份文件应该至少包含 settings 字段',
+                            );
+                        }
+                    } catch (err) {
+                        $.error(
+                            `Gist 备份文件校验失败, 无法还原\nReason: ${
+                                err.message ?? err
+                            }`,
+                        );
+                        throw new Error('Gist 备份文件校验失败, 无法还原');
+                    }
                     // restore settings
                     $.write(content, '#sub-store');
                     if ($.env.isNode) {
@@ -125,8 +130,10 @@ async function gistBackup(req, res) {
                         $.cache = content;
                         $.persistCache();
                     }
-                    // perform migration after restoring from gist
+                    $.info(`perform migration after restoring from gist...`);
                     migrate();
+                    $.info(`migration completed`);
+                    $.info(`还原备份完成`);
                     break;
             }
             success(res);

backend/src/restful/module.js

@@ -0,0 +1,114 @@
+import { deleteByName, findByName, updateByName } from '@/utils/database';
+import { MODULES_KEY } from '@/constants';
+import { failed, success } from '@/restful/response';
+import $ from '@/core/app';
+import { RequestInvalidError, ResourceNotFoundError } from '@/restful/errors';
+import { hex_md5 } from '@/vendor/md5';
+
+export default function register($app) {
+    if (!$.read(MODULES_KEY)) $.write([], MODULES_KEY);
+
+    $app.route('/api/module/:name')
+        .get(getModule)
+        .patch(updateModule)
+        .delete(deleteModule);
+
+    $app.route('/api/modules')
+        .get(getAllModules)
+        .post(createModule)
+        .put(replaceModule);
+}
+
+// module API
+function createModule(req, res) {
+    const module = req.body;
+    module.name = `${module.name ?? hex_md5(JSON.stringify(module))}`;
+    $.info(`正在创建模块：${module.name}`);
+    const allModules = $.read(MODULES_KEY);
+    if (findByName(allModules, module.name)) {
+        return failed(
+            res,
+            new RequestInvalidError(
+                'DUPLICATE_KEY',
+                req.body.name
+                    ? `已存在 name 为 ${module.name} 的模块`
+                    : `已存在相同的模块 请勿重复添加`,
+            ),
+        );
+    }
+    allModules.push(module);
+    $.write(allModules, MODULES_KEY);
+    success(res, module, 201);
+}
+
+function getModule(req, res) {
+    let { name } = req.params;
+    name = decodeURIComponent(name);
+    const allModules = $.read(MODULES_KEY);
+    const module = findByName(allModules, name);
+    if (module) {
+        res.status(200).json(module.content);
+    } else {
+        failed(
+            res,
+            new ResourceNotFoundError(
+                `MODULE_NOT_FOUND`,
+                `Module ${name} does not exist`,
+                404,
+            ),
+        );
+    }
+}
+
+function updateModule(req, res) {
+    let { name } = req.params;
+    name = decodeURIComponent(name);
+    let module = req.body;
+    const allModules = $.read(MODULES_KEY);
+    const oldModule = findByName(allModules, name);
+    if (oldModule) {
+        const newModule = {
+            ...oldModule,
+            ...module,
+        };
+        $.info(`正在更新模块：${name}...`);
+
+        updateByName(allModules, name, newModule);
+        $.write(allModules, MODULES_KEY);
+        success(res, newModule);
+    } else {
+        failed(
+            res,
+            new ResourceNotFoundError(
+                'RESOURCE_NOT_FOUND',
+                `Module ${name} does not exist!`,
+            ),
+            404,
+        );
+    }
+}
+
+function deleteModule(req, res) {
+    let { name } = req.params;
+    name = decodeURIComponent(name);
+    $.info(`正在删除模块：${name}`);
+    let allModules = $.read(MODULES_KEY);
+    deleteByName(allModules, name);
+    $.write(allModules, MODULES_KEY);
+    success(res);
+}
+
+function getAllModules(req, res) {
+    const allModules = $.read(MODULES_KEY);
+    success(
+        res,
+        // eslint-disable-next-line no-unused-vars
+        allModules.map(({ content, ...rest }) => rest),
+    );
+}
+
+function replaceModule(req, res) {
+    const allModules = req.body;
+    $.write(allModules, MODULES_KEY);
+    success(res);
+}

backend/src/restful/preview.js

@@ -12,98 +12,167 @@ export default function register($app) {
 }
 
 async function compareSub(req, res) {
-    const sub = req.body;
+    try {
-    const target = req.query.target || 'JSON';
+        const sub = req.body;
-    let content;
+        const target = req.query.target || 'JSON';
-    if (sub.source === 'local') {
+        let content;
-        content = sub.content;
+        if (
-    } else {
+            sub.source === 'local' &&
-        try {
+            !['localFirst', 'remoteFirst'].includes(sub.mergeSources)
-            content = await download(sub.url, sub.ua);
+        ) {
-        } catch (err) {
+            content = sub.content;
-            failed(
+        } else {
-                res,
-                new NetworkError(
-                    'FAILED_TO_DOWNLOAD_RESOURCE',
-                    '无法下载远程资源',
-                    `Reason: ${err}`,
-                ),
-            );
-            return;
-        }
-    }
-    // parse proxies
-    const original = ProxyUtils.parse(content);
-
-    // add id
-    original.forEach((proxy, i) => {
-        proxy.id = i;
-    });
-
-    // apply processors
-    const processed = await ProxyUtils.process(
-        original,
-        sub.process || [],
-        target,
-    );
-
-    // produce
-    success(res, { original, processed });
-}
-
-async function compareCollection(req, res) {
-    const allSubs = $.read(SUBS_KEY);
-    const collection = req.body;
-    const subnames = collection.subscriptions;
-    const results = {};
-
-    await Promise.all(
-        subnames.map(async (name) => {
-            const sub = findByName(allSubs, name);
             try {
-                let raw;
+                content = await Promise.all(
-                if (sub.source === 'local') {
+                    sub.url
-                    raw = sub.content;
+                        .split(/[\r\n]+/)
-                } else {
+                        .map((i) => i.trim())
-                    raw = await download(sub.url, sub.ua);
+                        .filter((i) => i.length)
-                }
+                        .map((url) => download(url, sub.ua)),
-                // parse proxies
-                let currentProxies = ProxyUtils.parse(raw);
-                // apply processors
-                currentProxies = await ProxyUtils.process(
-                    currentProxies,
-                    sub.process || [],
-                    'JSON',
                 );
-                results[name] = currentProxies;
             } catch (err) {
                 failed(
                     res,
-                    new InternalServerError(
+                    new NetworkError(
-                        'PROCESS_FAILED',
+                        'FAILED_TO_DOWNLOAD_RESOURCE',
-                        `处理子订阅 ${name} 失败`,
+                        '无法下载远程资源',
                         `Reason: ${err}`,
                     ),
                 );
+                return;
             }
-        }),
+            if (sub.mergeSources === 'localFirst') {
-    );
+                content.unshift(sub.content);
+            } else if (sub.mergeSources === 'remoteFirst') {
+                content.push(sub.content);
+            }
+        }
+        // parse proxies
+        const original = (Array.isArray(content) ? content : [content])
+            .map((i) => ProxyUtils.parse(i))
+            .flat();
 
-    // merge proxies with the original order
+        // add id
-    const original = Array.prototype.concat.apply(
+        original.forEach((proxy, i) => {
-        [],
+            proxy.id = i;
-        subnames.map((name) => results[name] || []),
+            proxy.subName = sub.name;
-    );
+        });
 
-    original.forEach((proxy, i) => {
+        // apply processors
-        proxy.id = i;
+        const processed = await ProxyUtils.process(
-    });
+            original,
+            sub.process || [],
+            target,
+            { [sub.name]: sub },
+        );
 
-    const processed = await ProxyUtils.process(
+        // produce
-        original,
+        success(res, { original, processed });
-        collection.process || [],
+    } catch (err) {
-        'JSON',
+        $.error(err.message ?? err);
-    );
+        failed(
-
+            res,
-    success(res, { original, processed });
+            new InternalServerError(
+                `INTERNAL_SERVER_ERROR`,
+                `Failed to preview subscription`,
+                `Reason: ${err.message ?? err}`,
+            ),
+        );
+    }
+}
+
+async function compareCollection(req, res) {
+    try {
+        const allSubs = $.read(SUBS_KEY);
+        const collection = req.body;
+        const subnames = collection.subscriptions;
+        const results = {};
+
+        await Promise.all(
+            subnames.map(async (name) => {
+                const sub = findByName(allSubs, name);
+                try {
+                    let raw;
+                    if (
+                        sub.source === 'local' &&
+                        !['localFirst', 'remoteFirst'].includes(
+                            sub.mergeSources,
+                        )
+                    ) {
+                        raw = sub.content;
+                    } else {
+                        raw = await Promise.all(
+                            sub.url
+                                .split(/[\r\n]+/)
+                                .map((i) => i.trim())
+                                .filter((i) => i.length)
+                                .map((url) => download(url, sub.ua)),
+                        );
+                        if (sub.mergeSources === 'localFirst') {
+                            raw.unshift(sub.content);
+                        } else if (sub.mergeSources === 'remoteFirst') {
+                            raw.push(sub.content);
+                        }
+                    }
+                    // parse proxies
+                    let currentProxies = (Array.isArray(raw) ? raw : [raw])
+                        .map((i) => ProxyUtils.parse(i))
+                        .flat();
+
+                    currentProxies.forEach((proxy) => {
+                        proxy.subName = sub.name;
+                        proxy.collectionName = collection.name;
+                    });
+
+                    // apply processors
+                    currentProxies = await ProxyUtils.process(
+                        currentProxies,
+                        sub.process || [],
+                        'JSON',
+                        { [sub.name]: sub, _collection: collection },
+                    );
+                    results[name] = currentProxies;
+                } catch (err) {
+                    failed(
+                        res,
+                        new InternalServerError(
+                            'PROCESS_FAILED',
+                            `处理子订阅 ${name} 失败`,
+                            `Reason: ${err}`,
+                        ),
+                    );
+                }
+            }),
+        );
+
+        // merge proxies with the original order
+        const original = Array.prototype.concat.apply(
+            [],
+            subnames.map((name) => results[name] || []),
+        );
+
+        original.forEach((proxy, i) => {
+            proxy.id = i;
+            proxy.collectionName = collection.name;
+        });
+
+        const processed = await ProxyUtils.process(
+            original,
+            collection.process || [],
+            'JSON',
+            { _collection: collection },
+        );
+
+        success(res, { original, processed });
+    } catch (err) {
+        $.error(err.message ?? err);
+        failed(
+            res,
+            new InternalServerError(
+                `INTERNAL_SERVER_ERROR`,
+                `Failed to preview collection`,
+                `Reason: ${err.message ?? err}`,
+            ),
+        );
+    }
 }

backend/src/restful/settings.js

@@ -44,8 +44,12 @@ export async function updateGitHubAvatar() {
                 .then((resp) => JSON.parse(resp.body));
             settings.avatarUrl = data['avatar_url'];
             $.write(settings, SETTINGS_KEY);
-        } catch (e) {
+        } catch (err) {
-            $.error('Failed to fetch GitHub avatar for User: ' + username);
+            $.error(
+                `Failed to fetch GitHub avatar for User: ${username}. Reason: ${
+                    err.message ?? err
+                }`,
+            );
         }
     }
 }
@@ -67,7 +71,11 @@ export async function updateArtifactStore() {
                 $.write(settings, SETTINGS_KEY);
             }
         } catch (err) {
-            $.error('Failed to fetch artifact store for User: ' + githubUser);
+            $.error(
+                `Failed to fetch artifact store for User: ${githubUser}. Reason: ${
+                    err.message ?? err
+                }`,
+            );
         }
     }
 }

backend/src/restful/sort.js

@@ -11,7 +11,7 @@ export default function register($app) {
 function sortSubs(req, res) {
     const orders = req.body;
     const allSubs = $.read(SUBS_KEY);
-    allSubs.sort((a, b) => orders.indexOf(a) - orders.indexOf(b));
+    allSubs.sort((a, b) => orders.indexOf(a.name) - orders.indexOf(b.name));
     $.write(allSubs, SUBS_KEY);
     success(res, allSubs);
 }
@@ -19,7 +19,7 @@ function sortSubs(req, res) {
 function sortCollections(req, res) {
     const orders = req.body;
     const allCols = $.read(COLLECTIONS_KEY);
-    allCols.sort((a, b) => orders.indexOf(a) - orders.indexOf(b));
+    allCols.sort((a, b) => orders.indexOf(a.name) - orders.indexOf(b.name));
     $.write(allCols, COLLECTIONS_KEY);
     success(res, allCols);
 }
@@ -27,7 +27,9 @@ function sortCollections(req, res) {
 function sortArtifacts(req, res) {
     const orders = req.body;
     const allArtifacts = $.read(ARTIFACTS_KEY);
-    allArtifacts.sort((a, b) => orders.indexOf(a) - orders.indexOf(b));
+    allArtifacts.sort(
+        (a, b) => orders.indexOf(a.name) - orders.indexOf(b.name),
+    );
     $.write(allArtifacts, ARTIFACTS_KEY);
     success(res, allArtifacts);
 }

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,
@@ -96,6 +83,16 @@ async function getFlowInfo(req, res) {
 function createSubscription(req, res) {
     const sub = req.body;
     $.info(`正在创建订阅： ${sub.name}`);
+    if (/\//.test(sub.name)) {
+        failed(
+            res,
+            new RequestInvalidError(
+                'INVALID_NAME',
+                `Subscription ${sub.name} is invalid`,
+            ),
+        );
+        return;
+    }
     const allSubs = $.read(SUBS_KEY);
     if (findByName(allSubs, sub.name)) {
         failed(
@@ -105,6 +102,7 @@ function createSubscription(req, res) {
                 `Subscription ${sub.name} already exists.`,
             ),
         );
+        return;
     }
     allSubs.push(sub);
     $.write(allSubs, SUBS_KEY);

backend/src/restful/sync.js

@@ -22,25 +22,69 @@ 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,
+}) {
     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) {
+            raw = await Promise.all(
+                url
+                    .split(/[\r\n]+/)
+                    .map((i) => i.trim())
+                    .filter((i) => i.length)
+                    .map((url) => download(url, ua)),
+            );
+            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);
+            raw = await Promise.all(
+                sub.url
+                    .split(/[\r\n]+/)
+                    .map((i) => i.trim())
+                    .filter((i) => i.length)
+                    .map((url) => download(url, sub.ua)),
+            );
+            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;
+        });
         // apply processors
         proxies = await ProxyUtils.process(
             proxies,
             sub.process || [],
             platform,
+            { [sub.name]: sub },
         );
         if (proxies.length === 0) {
             throw new Error(`订阅 ${name} 中不含有效节点`);
@@ -51,7 +95,7 @@ async function produceArtifact({ type, name, platform }) {
             if (exist[proxy.name]) {
                 $.notify(
                     '🌍 Sub-Store',
-                    '⚠️ 订阅包含重复节点！',
+                    `⚠️ 订阅 ${name} 包含重复节点 ${proxy.name}！`,
                     '请仔细检测配置！',
                     {
                         'media-url':
@@ -79,18 +123,43 @@ 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);
+                        raw = await await Promise.all(
+                            sub.url
+                                .split(/[\r\n]+/)
+                                .map((i) => i.trim())
+                                .filter((i) => i.length)
+                                .map((url) => download(url, sub.ua)),
+                        );
+                        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;
+                        proxy.collectionName = collection.name;
+                    });
+
                     // apply processors
                     currentProxies = await ProxyUtils.process(
                         currentProxies,
                         sub.process || [],
                         platform,
+                        { [sub.name]: sub, _collection: collection },
                     );
                     results[name] = currentProxies;
                     processed++;
@@ -127,11 +196,16 @@ async function produceArtifact({ type, name, platform }) {
             subnames.map((name) => results[name] || []),
         );
 
+        proxies.forEach((proxy) => {
+            proxy.collectionName = collection.name;
+        });
+
         // apply own processors
         proxies = await ProxyUtils.process(
             proxies,
             collection.process || [],
             platform,
+            { _collection: collection },
         );
         if (proxies.length === 0) {
             throw new Error(`组合订阅 ${name} 中不含有效节点`);
@@ -142,7 +216,7 @@ async function produceArtifact({ type, name, platform }) {
             if (exist[proxy.name]) {
                 $.notify(
                     '🌍 Sub-Store',
-                    '⚠️ 订阅包含重复节点！',
+                    `⚠️ 组合订阅 ${name} 包含重复节点 ${proxy.name}！`,
                     '请仔细检测配置！',
                     {
                         'media-url':
@@ -255,20 +329,20 @@ async function syncArtifact(req, res) {
         return;
     }
 
-    const output = await produceArtifact({
-        type: artifact.type,
-        name: artifact.source,
-        platform: artifact.platform,
-    });
-
-    $.info(
-        `正在上传配置：${artifact.name}\n>>>${JSON.stringify(
-            artifact,
-            null,
-            2,
-        )}`,
-    );
     try {
+        const output = await produceArtifact({
+            type: artifact.type,
+            name: artifact.source,
+            platform: artifact.platform,
+        });
+
+        $.info(
+            `正在上传配置：${artifact.name}\n>>>${JSON.stringify(
+                artifact,
+                null,
+                2,
+            )}`,
+        );
         const resp = await syncToGist({
             [encodeURIComponent(artifact.name)]: {
                 content: output,

backend/src/utils/download.js

@@ -1,12 +1,52 @@
+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';
 import resourceCache from '@/utils/resource-cache';
+import $ from '@/core/app';
 
 const tasks = new Map();
 
 export default async function download(url, ua) {
+    let $arguments = {};
+    const rawArgs = url.split('#');
+    if (rawArgs.length > 1) {
+        try {
+            // 支持 `#${encodeURIComponent(JSON.stringify({arg1: "1"}))}`
+            $arguments = JSON.parse(decodeURIComponent(rawArgs[1]));
+        } catch (e) {
+            for (const pair of rawArgs[1].split('&')) {
+                const key = pair.split('=')[0];
+                const value = pair.split('=')[1];
+                // 部分兼容之前的逻辑 const value = pair.split('=')[1] || true;
+                $arguments[key] =
+                    value == null || value === ''
+                        ? true
+                        : decodeURIComponent(value);
+            }
+        }
+    }
+
+    const downloadUrlMatch = url.match(/^\/api\/(file|module)\/(.+)/);
+    if (downloadUrlMatch) {
+        let type = downloadUrlMatch?.[1];
+        let name = downloadUrlMatch?.[2];
+        if (name == null) {
+            throw new Error(`本地 ${type} URL 无效: ${url}`);
+        }
+        name = decodeURIComponent(name);
+        const key = type === 'module' ? MODULES_KEY : FILES_KEY;
+        const item = findByName($.read(key), name);
+        if (!item) {
+            throw new Error(`找不到本地 ${type}: ${name}`);
+        }
+
+        return item.content;
+    }
+
     const { isNode } = ENV();
-    ua = ua || 'Quantumult%20X/1.0.29 (iPhone14,5; iOS 15.4.1)';
+    const { defaultUserAgent } = $.read(SETTINGS_KEY);
+    ua = ua || defaultUserAgent || 'clash.meta';
     const id = hex_md5(ua + url);
     if (!isNode && tasks.has(id)) {
         return tasks.get(id);
@@ -21,9 +61,10 @@ export default async function download(url, ua) {
     const result = new Promise((resolve, reject) => {
         // try to find in app cache
         const cached = resourceCache.get(id);
-        if (cached) {
+        if (!$arguments?.noCache && cached) {
             resolve(cached);
         } else {
+            $.info(`Downloading...\nUser-Agent: ${ua}\nURL: ${url}`);
             http.get(url)
                 .then((resp) => {
                     const body = resp.body;

backend/src/utils/env.js

@@ -0,0 +1,16 @@
+import { version as substoreVersion } from '../../package.json';
+import { ENV } from '@/vendor/open-api';
+
+const { isNode, isQX, isLoon, isSurge, isStash, isShadowRocket } = ENV();
+let backend = 'Node';
+if (isNode) backend = 'Node';
+if (isQX) backend = 'QX';
+if (isLoon) backend = 'Loon';
+if (isSurge) backend = 'Surge';
+if (isStash) backend = 'Stash';
+if (isShadowRocket) backend = 'ShadowRocket';
+
+export default {
+    backend,
+    version: substoreVersion,
+};

backend/src/utils/flow.js

@@ -3,7 +3,10 @@ import { HTTP } from '@/vendor/open-api';
 export async function getFlowHeaders(url) {
     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)',
         },
@@ -13,3 +16,28 @@ export async function getFlowHeaders(url) {
     )[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/platform.js

@@ -1,14 +1,18 @@
 export function getPlatformFromHeaders(headers) {
     const keys = Object.keys(headers);
     let UA = '';
+    let ua = '';
     for (let k of keys) {
         if (/USER-AGENT/i.test(k)) {
             UA = headers[k];
+            ua = UA.toLowerCase();
             break;
         }
     }
     if (UA.indexOf('Quantumult%20X') !== -1) {
         return 'QX';
+    } else if (UA.indexOf('Surge Mac') !== -1) {
+        return 'SurgeMac';
     } else if (UA.indexOf('Surge') !== -1) {
         return 'Surge';
     } else if (UA.indexOf('Decar') !== -1 || UA.indexOf('Loon') !== -1) {
@@ -17,6 +21,15 @@ export function getPlatformFromHeaders(headers) {
         return 'ShadowRocket';
     } else if (UA.indexOf('Stash') !== -1) {
         return 'Stash';
+    } else if (
+        ua === 'meta' ||
+        (ua.indexOf('clash') !== -1 && ua.indexOf('meta') !== -1)
+    ) {
+        return 'ClashMeta';
+    } else if (ua.indexOf('clash') !== -1) {
+        return 'Clash';
+    } else if (ua.indexOf('v2ray') !== -1) {
+        return 'V2Ray';
     } else {
         return 'JSON';
     }

backend/src/utils/resource-cache.js

@@ -48,7 +48,7 @@ class ResourceCache {
     }
 
     set(id, value) {
-        this.resourceCache[id] = { time: new Date().getTime(), data: value }
+        this.resourceCache[id] = { time: new Date().getTime(), data: value };
         this._persist();
     }
 }

backend/src/vendor/express.js

@@ -1,8 +1,9 @@
 /* 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;
+    host = host || '::';
     const { isNode } = ENV();
     const DEFAULT_HEADERS = {
         'Content-Type': 'text/plain;charset=UTF-8',
@@ -17,7 +18,7 @@ export default function express({ substore: $, port }) {
         const express_ = eval(`require("express")`);
         const bodyParser = eval(`require("body-parser")`);
         const app = express_();
-        app.use(bodyParser.json({ verify: rawBodySaver }));
+        app.use(bodyParser.json({ verify: rawBodySaver, limit: '1mb' }));
         app.use(
             bodyParser.urlencoded({ verify: rawBodySaver, extended: true }),
         );
@@ -29,8 +30,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(`Express started on ${address}:${port}`);
             });
         };
         return app;

backend/src/vendor/open-api.js

@@ -49,27 +49,32 @@ export class OpenAPI {
 
         if (isNode) {
             // create a json for root cache
-            let fpath = 'root.json';
+            const basePath =
-            if (!this.node.fs.existsSync(fpath)) {
+                eval('process.env.SUB_STORE_DATA_BASE_PATH') || '.';
-                this.node.fs.writeFileSync(fpath, JSON.stringify({}), {
+            let rootPath = `${basePath}/root.json`;
+
+            this.log(`Root path: ${rootPath}`);
+            if (!this.node.fs.existsSync(rootPath)) {
+                this.node.fs.writeFileSync(rootPath, JSON.stringify({}), {
                     flag: 'wx',
                 });
                 this.root = {};
             } else {
-                this.root = JSON.parse(this.node.fs.readFileSync(`${fpath}`));
+                this.root = JSON.parse(
+                    this.node.fs.readFileSync(`${rootPath}`),
+                );
             }
 
             // create a json file with the given name if not exists
-            fpath = `${this.name}.json`;
+            let fpath = `${basePath}/${this.name}.json`;
+            this.log(`Data path: ${fpath}`);
             if (!this.node.fs.existsSync(fpath)) {
                 this.node.fs.writeFileSync(fpath, JSON.stringify({}), {
                     flag: 'wx',
                 });
                 this.cache = {};
             } else {
-                this.cache = JSON.parse(
+                this.cache = JSON.parse(this.node.fs.readFileSync(`${fpath}`));
-                    this.node.fs.readFileSync(`${this.name}.json`),
-                );
             }
         }
     }
@@ -80,14 +85,17 @@ export class OpenAPI {
         if (isQX) $prefs.setValueForKey(data, this.name);
         if (isLoon || isSurge) $persistentStore.write(data, this.name);
         if (isNode) {
+            const basePath =
+                eval('process.env.SUB_STORE_DATA_BASE_PATH') || '.';
+
             this.node.fs.writeFileSync(
-                `${this.name}.json`,
+                `${basePath}/${this.name}.json`,
                 data,
                 { flag: 'w' },
                 (err) => console.log(err),
             );
             this.node.fs.writeFileSync(
-                'root.json',
+                `${basePath}/root.json`,
                 JSON.stringify(this.root, null, 2),
                 { flag: 'w' },
                 (err) => console.log(err),
@@ -308,7 +316,9 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
         return (
             timer
                 ? Promise.race([timer, worker]).then((res) => {
-                      clearTimeout(timeoutid);
+                      if (typeof clearTimeout !== 'undefined') {
+                          clearTimeout(timeoutid);
+                      }
                       return res;
                   })
                 : worker

config/Loon.plugin

@@ -2,7 +2,7 @@
 #!desc=高级订阅管理工具
 #!openUrl=https://sub.store
 #!author=Peng-YM
-#!homepage=https://github.com/Peng-YM/Sub-Store
+#!homepage=https://github.com/sub-store-org/Sub-Store
 #!icon=https://raw.githubusercontent.com/58xinian/icon/master/Sub-Store1.png
 #!select = 节点缓存有效期,1分钟,5分钟,10分钟,30分钟,1小时,2小时,3小时,6小时,12小时,24小时,48小时,72小时,参数传入
 

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

@@ -1,20 +1,32 @@
 # Sub-Store 配置指南
 
+## 查看更新说明:
+
+Sub-Store Releases: [`https://github.com/sub-store-org/Sub-Store/releases`](https://github.com/sub-store-org/Sub-Store/releases)
+
+Telegram 频道: [`https://t.me/cool_scripts` ](https://t.me/cool_scripts)
+
 ## 脚本配置：
 
 ### 1. Loon
-安装使用[插件](https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/config/Loon.plugin)即可。
+安装使用 插件 [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Loon.plugin`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Loon.plugin) 即可。
+
 ### 2. Surge
-安装使用[模块](https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/config/Surge.sgmodule)即可。
+1. 官方默认版模块(目前不带 ability 参数, 不保证以后不会改动): [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule)
+
+2. 固定带 ability 参数版本,可能会爆内存, 如果需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 请使用此带 ability 参数版本: [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule)
+
+3. 固定不带 ability 参数版本： [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Noability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Noability.sgmodule)
+
 
 ### 3. QX
-订阅[重写](https://raw.githubusercontent.com/Peng-YM/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.snippet) 即可。
 
 ### 4. Stash
-安装使用[ Stash 覆写](https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/config/Stash.stoverride)即可。
+安装使用 覆写 [`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) 即可。
 
 ### 5. Shadowrocket
-安装使用[模块](https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/config/Surge.sgmodule)即可。
+安装使用 模块 [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule) 即可。
 
 ## 使用 Sub-Store
 1. 使用 Safari 打开这个 https://sub.store 如网页正常打开并且未弹出任何错误提示，说明 Sub-Store 已经配置成功。