feat: wireguard

.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,34 +34,21 @@ 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 "release_tag=$SUBSTORE_RELEASE" >> $GITHUB_OUTPUT
+          echo "::set-output name=release_tag::$SUBSTORE_RELEASE"
       - name: Release
         uses: softprops/action-gh-release@v1
-        if: ${{ success() }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ steps.tag.outputs.release_tag }}
-          generate_release_notes: true
           files: |
             ./backend/sub-store.min.js
             ./backend/dist/sub-store-0.min.js
             ./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,11 +127,4 @@ out
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
-
-# Dist files
-backend/dist/*
-!backend/dist/.gitkeep
-backend/sub-store.min.js
-
-CHANGELOG.md
+*.sw?

README.md

@@ -10,8 +10,8 @@
 Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.
 </p>
 
-[![Build](https://github.com/sub-store-org/Sub-Store/actions/workflows/main.yml/badge.svg)](https://github.com/sub-store-org/Sub-Store/actions/workflows/main.yml) ![GitHub](https://img.shields.io/github/license/sub-store-org/Sub-Store) ![GitHub issues](https://img.shields.io/github/issues/sub-store-org/Sub-Store) ![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/Peng-Ym/Sub-Store) ![Lines of code](https://img.shields.io/tokei/lines/github/sub-store-org/Sub-Store) ![Size](https://img.shields.io/github/languages/code-size/sub-store-org/Sub-Store) 
-
+[![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) 
+   
 [!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/PengYM)
    
 Core functionalities:
@@ -19,8 +19,6 @@ 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
 
@@ -30,27 +28,18 @@ 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, WireGuard, VLESS, Hysteria2)
-- [x] Surge (SS, VMess, Trojan, HTTP, TUIC, Snell, Hysteria2, SSR(external, only for macOS), WireGuard(Surge to Surge))
-- [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)
+- [x] Loon (SS, SSR, VMess, Trojan, HTTP)
+- [x] Surge (SS, VMess, Trojan, HTTP)
+- [x] Stash & Clash (SS, SSR, VMess, Trojan, HTTP)
 
 ### Supported Target Platforms
 
 - [x] QX
 - [x] Loon
 - [x] Surge
-- [x] Stash
-- [x] Clash.Meta
-- [x] Clash
+- [x] Stash & Clash
 - [x] ShadowRocket
-- [x] V2Ray
-- [x] V2Ray URI
-- [x] Plain JSON
 
 ## 2. Subscription Formatting
 
@@ -72,35 +61,33 @@ 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
 
-Install `pnpm`
-
-Go to `backend` directories, install node dependencies:
+Go to `backend` and `web` directories, install node dependencies:
 
 ```
-pnpm install
+npm install
 ```
 
 1. In `backend`, run the backend server on http://localhost:3000
 
 ```
-pnpm start
+npm run serve
 ```
 
+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/sub-store-org/Sub-Store
+ * @github: https://github.com/Peng-YM/Sub-Store
  * @documentation: https://www.notion.so/Sub-Store-6259586994d34c11a4ced5c406264b46
  */
 

backend/bundle.js

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

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.128",
+  "version": "2.14.28",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
@@ -8,17 +8,14 @@
     "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",
-    "bundle": "node bundle.js"
+    "build": "gulp"
   },
   "author": "Peng-YM",
   "license": "GPL-3.0",
   "dependencies": {
     "automerge": "1.0.1-preview.7",
     "body-parser": "^1.19.0",
-    "connect-history-api-fallback": "^2.0.0",
     "express": "^4.17.1",
-    "http-proxy-middleware": "^2.0.6",
     "js-base64": "^3.7.2",
     "lodash": "^4.17.21",
     "request": "^2.88.2",
@@ -39,7 +36,6 @@
     "browser-pack-flat": "^3.4.2",
     "browserify": "^17.0.0",
     "chai": "^4.3.6",
-    "esbuild": "^0.19.8",
     "eslint": "^8.16.0",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",

backend/src/constants.js

@@ -2,8 +2,6 @@ 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,50 +63,35 @@ function parse(raw) {
     return proxies;
 }
 
-async function process(proxies, operators = [], targetPlatform, source) {
+async function process(proxies, operators = [], targetPlatform) {
     for (const item of operators) {
         // process script
         let script;
-        let $arguments = {};
+        const $arguments = {};
         if (item.type.indexOf('Script') !== -1) {
             const { mode, content } = item.args;
             if (mode === 'link') {
-                let noCache;
-                let url = content;
-                if (url.endsWith('#noCache')) {
-                    url = url.replace(/#noCache$/, '');
-                    noCache = true;
-                }
+                const url = content;
                 // extract link 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);
-                        }
+                    for (const pair of rawArgs[1].split('&')) {
+                        const key = pair.split('=')[0];
+                        const value = pair.split('=')[1] || true;
+                        $arguments[key] = value;
                     }
                 }
 
                 // if this is a remote script, download it
                 try {
-                    script = await download(
-                        `${url.split('#')[0]}${noCache ? '#noCache' : ''}`,
-                    );
+                    script = await download(url.split('#')[0]);
                     // $.info(`Script loaded: >>>\n ${script}`);
                 } catch (err) {
                     $.error(
                         `Error when downloading remote script: ${item.args.content}.\n Reason: ${err}`,
                     );
-                    throw new Error(`无法下载脚本: ${url}`);
+                    // skip the script if download failed.
+                    continue;
                 }
             } else {
                 script = content;
@@ -129,7 +114,6 @@ async function process(proxies, operators = [], targetPlatform, source) {
                 script,
                 targetPlatform,
                 $arguments,
-                source,
             );
         } else {
             processor = PROXY_PROCESSORS[item.type](item.args || {});
@@ -139,7 +123,7 @@ async function process(proxies, operators = [], targetPlatform, source) {
     return proxies;
 }
 
-function produce(proxies, targetPlatform, type) {
+function produce(proxies, targetPlatform) {
     const producer = PROXY_PRODUCERS[targetPlatform];
     if (!producer) {
         throw new Error(`Target platform: ${targetPlatform} is not supported!`);
@@ -153,21 +137,10 @@ function produce(proxies, targetPlatform, type) {
 
     $.info(`Producing proxies for target: ${targetPlatform}`);
     if (typeof producer.type === 'undefined' || producer.type === 'SINGLE') {
-        let localPort = 10000;
         return proxies
             .map((proxy) => {
                 try {
-                    let line = producer.produce(proxy, type);
-                    if (
-                        line.length > 0 &&
-                        line.includes('__SubStoreLocalPort__')
-                    ) {
-                        line = line.replace(
-                            /__SubStoreLocalPort__/g,
-                            localPort++,
-                        );
-                    }
-                    return line;
+                    return producer.produce(proxy);
                 } catch (err) {
                     $.error(
                         `Cannot produce proxy: ${JSON.stringify(
@@ -182,7 +155,7 @@ function produce(proxies, targetPlatform, type) {
             .filter((line) => line.length > 0)
             .join('\n');
     } else if (producer.type === 'ALL') {
-        return producer.produce(proxies, type);
+        return producer.produce(proxies);
     }
 }
 
@@ -190,9 +163,6 @@ export const ProxyUtils = {
     parse,
     process,
     produce,
-    isIPv4,
-    isIPv6,
-    isIP,
 };
 
 function tryParse(parser, line) {
@@ -214,28 +184,14 @@ function safeMatch(parser, line) {
 }
 
 function lastParse(proxy) {
-    if (proxy.server) {
-        proxy.server = proxy.server
-            .trim()
-            .replace(/^\[/, '')
-            .replace(/\]$/, '');
-    }
     if (proxy.type === 'trojan') {
         if (proxy.network === 'tcp') {
             delete proxy.network;
         }
     }
-    if (['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(proxy.type)) {
+    if (['trojan', 'tuic', 'hysteria'].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;
@@ -250,32 +206,6 @@ 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,9 +33,7 @@ function URI_SS() {
         const serverAndPort = serverAndPortArray[1];
         const portIdx = serverAndPort.lastIndexOf(':');
         proxy.server = serverAndPort.substring(0, portIdx);
-        proxy.port = `${serverAndPort.substring(portIdx + 1)}`.match(
-            /\d+/,
-        )?.[0];
+        proxy.port = serverAndPort.substring(portIdx + 1);
 
         const userInfo = userInfoStr.split(':');
         proxy.cipher = userInfo[0];
@@ -217,6 +215,7 @@ 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);
@@ -242,7 +241,7 @@ function URI_VMess() {
                 params.add = server;
             }
             const proxy = {
-                name: params.ps ?? params.remarks,
+                name: params.ps ?? params.remark,
                 type: 'vmess',
                 server: params.add,
                 port: parseInt(getIfPresent(params.port), 10),
@@ -269,19 +268,9 @@ 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') {
@@ -297,17 +286,10 @@ function URI_VMess() {
                     }
                 }
                 if (transportPath || transportHost) {
-                    if (['grpc'].includes(proxy.network)) {
-                        proxy[`${proxy.network}-opts`] = {
-                            'grpc-service-name': getIfNotBlank(transportPath),
-                            '_grpc-type': getIfNotBlank(params.type),
-                        };
-                    } else {
-                        proxy[`${proxy.network}-opts`] = {
-                            path: getIfNotBlank(transportPath),
-                            headers: { Host: getIfNotBlank(transportHost) },
-                        };
-                    }
+                    proxy[`${proxy.network}-opts`] = {
+                        path: getIfNotBlank(transportPath),
+                        headers: { Host: getIfNotBlank(transportHost) },
+                    };
                 } else {
                     delete proxy.network;
                 }
@@ -324,139 +306,6 @@ function URI_VMess() {
     return { name, test, parse };
 }
 
-function URI_VLESS() {
-    const name = 'URI VLESS Parser';
-    const test = (line) => {
-        return /^vless:\/\//.test(line);
-    };
-    const parse = (line) => {
-        line = line.split('vless://')[1];
-        // eslint-disable-next-line no-unused-vars
-        let [__, uuid, server, port, addons, name] =
-            /^(.*?)@(.*?):(\d+)\/?\?(.*?)(?:#(.*?))$/.exec(line);
-        port = parseInt(`${port}`, 10);
-        uuid = decodeURIComponent(uuid);
-        name = decodeURIComponent(name) ?? `VLESS ${server}:${port}`;
-        const proxy = {
-            type: 'vless',
-            name,
-            server,
-            port,
-            uuid,
-        };
-        const params = {};
-        for (const addon of addons.split('&')) {
-            const [key, valueRaw] = addon.split('=');
-            let value = valueRaw;
-            value = decodeURIComponent(valueRaw);
-            params[key] = value;
-        }
-
-        proxy.tls = params.security && params.security !== 'none';
-        proxy.sni = params.sni;
-        proxy.flow = params.flow;
-        proxy['client-fingerprint'] = params.fp;
-        proxy.alpn = params.alpn ? params.alpn.split(',') : undefined;
-        proxy['skip-cert-verify'] = /(TRUE)|1/i.test(params.allowInsecure);
-
-        if (['reality'].includes(params.security)) {
-            const opts = {};
-            if (params.pbk) {
-                opts['public-key'] = params.pbk;
-            }
-            if (params.sid) {
-                opts['short-id'] = params.sid;
-            }
-            if (Object.keys(opts).length > 0) {
-                proxy[`${params.security}-opts`] = opts;
-            }
-        }
-
-        proxy.network = params.type;
-        if (proxy.network && !['tcp', 'none'].includes(proxy.network)) {
-            const opts = {};
-            if (params.path) {
-                opts.path = params.path;
-            }
-            if (params.host) {
-                opts.headers = { Host: params.host };
-            }
-            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;
-            }
-        }
-
-        if (proxy.tls && !proxy.sni) {
-            if (proxy.network === 'ws') {
-                proxy.sni = proxy['ws-opts']?.headers?.Host;
-            } else if (proxy.network === 'http') {
-                let httpHost = proxy['http-opts']?.headers?.Host;
-                proxy.sni = Array.isArray(httpHost) ? httpHost[0] : httpHost;
-            }
-        }
-
-        return proxy;
-    };
-    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() {
     const name = 'URI Trojan Parser';
@@ -465,16 +314,8 @@ function URI_Trojan() {
     };
 
     const parse = (line) => {
-        let [newLine, name] = line.split(/#(.+)/, 2);
         const parser = getTrojanURIParser();
-        const proxy = parser.parse(newLine);
-        if (isNotBlank(name)) {
-            try {
-                proxy.name = decodeURIComponent(name);
-            } catch (e) {
-                console.log(e);
-            }
-        }
+        const proxy = parser.parse(line);
         return proxy;
     };
     return { name, test, parse };
@@ -497,14 +338,13 @@ function Clash_All() {
                 'ss',
                 'ssr',
                 'vmess',
-                'socks5',
+                'socks',
                 'http',
                 'snell',
                 'trojan',
                 'tuic',
                 'vless',
                 'hysteria',
-                'hysteria2',
                 'wireguard',
             ].includes(proxy.type)
         ) {
@@ -529,10 +369,6 @@ function Clash_All() {
             }
         }
 
-        if (proxy['benchmark-url']) {
-            proxy['test-url'] = proxy['benchmark-url'];
-        }
-
         return proxy;
     };
     return { name, test, parse };
@@ -656,15 +492,6 @@ 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';
@@ -676,113 +503,6 @@ function Loon_Http() {
     return { name, test, parse };
 }
 
-function Loon_WireGuard() {
-    const name = 'Loon WireGuard Parser';
-    const test = (line) => {
-        return /^.*=\s*wireguard/i.test(line.split(',')[0]);
-    };
-
-    const parse = (line) => {
-        const name = line.match(
-            /(^.*?)\s*?=\s*?wireguard\s*?,.+?\s*?=\s*?.+?/i,
-        )?.[1];
-        line = line.replace(name, '').replace(/^\s*?=\s*?wireguard\s*/i, '');
-        let peers = line.match(
-            /,\s*?peers\s*?=\s*?\[\s*?\{\s*?(.+?)\s*?\}\s*?\]/i,
-        )?.[1];
-        let serverPort = peers.match(
-            /(,|^)\s*?endpoint\s*?=\s*?"?(.+?):(\d+)"?\s*?(,|$)/i,
-        );
-        let server = serverPort?.[2];
-        let port = parseInt(serverPort?.[3], 10);
-        let mtu = line.match(/(,|^)\s*?mtu\s*?=\s*?"?(\d+?)"?\s*?(,|$)/i)?.[2];
-        if (mtu) {
-            mtu = parseInt(mtu, 10);
-        }
-        let keepalive = line.match(
-            /(,|^)\s*?keepalive\s*?=\s*?"?(\d+?)"?\s*?(,|$)/i,
-        )?.[2];
-        if (keepalive) {
-            keepalive = parseInt(keepalive, 10);
-        }
-        let reserved = peers.match(
-            /(,|^)\s*?reserved\s*?=\s*?"?(\[\s*?.+?\s*?\])"?\s*?(,|$)/i,
-        )?.[2];
-        if (reserved) {
-            reserved = JSON.parse(reserved);
-        }
-
-        let dns;
-        let dnsv4 = line.match(/(,|^)\s*?dns\s*?=\s*?"?(.+?)"?\s*?(,|$)/i)?.[2];
-        let dnsv6 = line.match(
-            /(,|^)\s*?dnsv6\s*?=\s*?"?(.+?)"?\s*?(,|$)/i,
-        )?.[2];
-        if (dnsv4 || dnsv6) {
-            dns = [];
-            if (dnsv4) {
-                dns.push(dnsv4);
-            }
-            if (dnsv6) {
-                dns.push(dnsv6);
-            }
-        }
-        let allowedIps = peers
-            .match(/(,|^)\s*?allowed-ips\s*?=\s*?"(.+?)"\s*?(,|$)/i)?.[2]
-            ?.split(',')
-            .map((i) => i.trim());
-        let preSharedKey = peers.match(
-            /(,|^)\s*?preshared-key\s*?=\s*?"?(.+?)"?\s*?(,|$)/i,
-        )?.[2];
-        let ip = line.match(
-            /(,|^)\s*?interface-ip\s*?=\s*?"?(.+?)"?\s*?(,|$)/i,
-        )?.[2];
-        let ipv6 = line.match(
-            /(,|^)\s*?interface-ipv6\s*?=\s*?"?(.+?)"?\s*?(,|$)/i,
-        )?.[2];
-        let publicKey = peers.match(
-            /(,|^)\s*?public-key\s*?=\s*?"?(.+?)"?\s*?(,|$)/i,
-        )?.[2];
-        const proxy = {
-            type: 'wireguard',
-            name,
-            server,
-            port,
-            ip,
-            ipv6,
-            'private-key': line.match(
-                /(,|^)\s*?private-key\s*?=\s*?"?(.+?)"?\s*?(,|$)/i,
-            )?.[2],
-            'public-key': publicKey,
-            mtu,
-            keepalive,
-            reserved,
-            'allowed-ips': allowedIps,
-            'preshared-key': preSharedKey,
-            dns,
-            udp: true,
-            peers: [
-                {
-                    server,
-                    port,
-                    ip,
-                    ipv6,
-                    'public-key': publicKey,
-                    'pre-shared-key': preSharedKey,
-                    allowed_ips: allowedIps,
-                    reserved,
-                },
-            ],
-        };
-
-        proxy;
-        if (Array.isArray(proxy.dns) && proxy.dns.length > 0) {
-            proxy['remote-dns-resolve'] = true;
-        }
-        return proxy;
-    };
-    return { name, test, parse };
-}
-
 function Surge_SS() {
     const name = 'Surge SS Parser';
     const test = (line) => {
@@ -834,7 +554,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 };
@@ -843,24 +563,7 @@ function Surge_Snell() {
 function Surge_Tuic() {
     const name = 'Surge Tuic Parser';
     const test = (line) => {
-        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]);
+        return /^.*=\s*tuic(-v5)??/.test(line.split(',')[0]);
     };
     const parse = (line) => getSurgeParser().parse(line);
     return { name, test, parse };
@@ -870,8 +573,6 @@ export default [
     URI_SS(),
     URI_SSR(),
     URI_VMess(),
-    URI_VLESS(),
-    URI_Hysteria2(),
     URI_Trojan(),
     Clash_All(),
     Surge_SS(),
@@ -880,17 +581,13 @@ 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(),
     QX_SS(),
     QX_SSR(),
     QX_VMess(),

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/hysteria2) {
+start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http) {
     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_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (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,9 +68,6 @@ 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;
@@ -145,9 +142,6 @@ 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; }
@@ -173,9 +167,6 @@ 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/hysteria2) {
+start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http) {
     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_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (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,9 +66,6 @@ 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;
@@ -143,9 +140,6 @@ 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; }
@@ -171,9 +165,6 @@ 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_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)* {
+    (password/over_tls/tls_host/tls_fingerprint/tls_verification/obfs/obfs_host/obfs_uri/tag/udp_relay/udp_over_tcp/fast_open/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_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)* {
+    (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)* {
     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_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)* {
+    (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)* {
     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_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)*{
+    (username/password/over_tls/tls_host/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/others)*{
     proxy.type = "http";
 }
 
 socks5 = "socks5" equals address
-    (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)* {
+    (username/password/password/over_tls/tls_host/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/others)* {
     proxy.type = "socks5";
 }
     
@@ -155,14 +155,6 @@ 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; }
@@ -174,8 +166,6 @@ 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_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)* {
+    (password/over_tls/tls_host/tls_fingerprint/tls_verification/obfs/obfs_host/obfs_uri/tag/udp_relay/udp_over_tcp/fast_open/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_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)* {
+    (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)* {
     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_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)* {
+    (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)* {
     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_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)*{
+    (username/password/over_tls/tls_host/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/others)*{
     proxy.type = "http";
 }
 
 socks5 = "socks5" equals address
-    (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)* {
+    (username/password/password/over_tls/tls_host/tls_fingerprint/tls_verification/tag/fast_open/udp_relay/udp_over_tcp/others)* {
     proxy.type = "socks5";
 }
     
@@ -153,14 +153,6 @@ 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; }
@@ -172,8 +164,6 @@ 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/wireguard/hysteria2) {
+start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v5) {
     return proxy;
 }
 
-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)* {
+shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/fast_open/udp_relay/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/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)* {
+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)* {
     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/ip_version/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/fast_open/udp_relay/others)* {
     proxy.type = "trojan";
     handleWebsocket();
 }
-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)* {
+https = tag equals "https" address (username password)? (sni/tls_fingerprint/tls_verification/fast_open/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-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)* {
+http = tag equals "http" address (username password)? (fast_open/others)* {
     proxy.type = "http";
 }
-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)* {
+snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
     proxy.type = "snell";
     // handle obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -76,23 +76,17 @@ 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/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+tuic = tag equals "tuic" address (alpn/token/ip_version/tls_verification/sni/fast_open/tfo/others)* {
     proxy.type = "tuic";
 }
-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)* {
+tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/tls_verification/sni/fast_open/tfo/others)* {
     proxy.type = "tuic";
     proxy.version = 5;
 }
-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)* {
+socks5 = tag equals "socks5" address (username password)? (fast_open/others)* {
     proxy.type = "socks5";
 }
-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)* {
+socks5_tls = tag equals "socks5-tls" address (username password)? (sni/tls_fingerprint/tls_verification/fast_open/others)* {
     proxy.type = "socks5";
     proxy.tls = true;
 }
@@ -163,7 +157,6 @@ 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; }
@@ -192,19 +185,8 @@ 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/wireguard/hysteria2) {
+start = (shadowsocks/vmess/trojan/https/http/snell/socks5/socks5_tls/tuic/tuic_v5) {
     return proxy;
 }
 
-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)* {
+shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/fast_open/udp_relay/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/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)* {
+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)* {
     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/ip_version/no_error_alert/fast_open/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/fast_open/udp_relay/others)* {
     proxy.type = "trojan";
     handleWebsocket();
 }
-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)* {
+https = tag equals "https" address (username password)? (sni/tls_fingerprint/tls_verification/fast_open/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-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)* {
+http = tag equals "http" address (username password)? (fast_open/others)* {
     proxy.type = "http";
 }
-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)* {
+snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
     proxy.type = "snell";
     // handle obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -74,23 +74,17 @@ 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/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
+tuic = tag equals "tuic" address (alpn/token/ip_version/tls_verification/sni/fast_open/tfo/others)* {
     proxy.type = "tuic";
 }
-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)* {
+tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/tls_verification/sni/fast_open/tfo/others)* {
     proxy.type = "tuic";
     proxy.version = 5;
 }
-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)* {
+socks5 = tag equals "socks5" address (username password)? (fast_open/others)* {
     proxy.type = "socks5";
 }
-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)* {
+socks5_tls = tag equals "socks5-tls" address (username password)? (sni/tls_fingerprint/tls_verification/fast_open/others)* {
     proxy.type = "socks5";
     proxy.tls = true;
 }
@@ -161,7 +155,6 @@ 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; }
@@ -190,19 +183,8 @@ 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,22 +13,17 @@ function Base64Encoded() {
     const name = 'Base64 Pre-processor';
 
     const keys = [
-        'dm1lc3M', // vmess
-        'c3NyOi8v', // ssr://
-        'dHJvamFu', // trojan
-        'c3M6Ly', // ss:/
-        'c3NkOi8v', // ssd://
-        'c2hhZG93', // shadow
-        'aHR0c', // htt
-        'dmxlc3M=', // vless
-        'aHlzdGVyaWEy', // hysteria2
+        'dm1lc3M',
+        'c3NyOi8v',
+        'dHJvamFu',
+        'c3M6Ly',
+        'c3NkOi8v',
+        'c2hhZG93',
+        'aHR0c',
     ];
 
     const test = function (raw) {
-        return (
-            !/^\w+:\/\/\w+/im.test(raw) &&
-            keys.some((k) => raw.indexOf(k) !== -1)
-        );
+        return keys.some((k) => raw.indexOf(k) !== -1);
     };
     const parse = function (raw) {
         raw = Base64.decode(raw);
@@ -40,9 +35,7 @@ function Base64Encoded() {
 function Clash() {
     const name = 'Clash Pre-processor';
     const test = function (raw) {
-        if (!/proxies/.test(raw)) return false;
-        const content = safeLoad(raw);
-        return content.proxies && Array.isArray(content.proxies);
+        return /proxies/.test(raw);
     };
     const parse = function (raw) {
         // Clash YAML format
@@ -110,4 +103,4 @@ function FullConfig() {
     return { name, test, parse };
 }
 
-export default [HTML(), Clash(), Base64Encoded(), SSD(), FullConfig()];
+export default [HTML(), Base64Encoded(), Clash(), SSD(), FullConfig()];

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

@@ -7,8 +7,6 @@ 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:
@@ -296,7 +294,7 @@ function RegexDeleteOperator(regex) {
  1. This function name should be `operator`!
  2. Always declare variables before using them!
  */
-function ScriptOperator(script, targetPlatform, $arguments, source) {
+function ScriptOperator(script, targetPlatform, $arguments) {
     return {
         name: 'Script Operator',
         func: async (proxies) => {
@@ -307,24 +305,7 @@ function ScriptOperator(script, targetPlatform, $arguments, source) {
                     script,
                     $arguments,
                 );
-                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 });
+                output = operator(proxies, targetPlatform);
             })();
             return output;
         },
@@ -397,46 +378,6 @@ 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 }) {
@@ -451,9 +392,7 @@ 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) && !p['no-resolve'])
-                        .map((c) => c.server),
+                    proxies.filter((p) => !isIP(p.server)).map((c) => c.server),
                 ),
             ];
             const totalBatch = Math.ceil(totalDomain.length / limit);
@@ -477,15 +416,8 @@ function ResolveDomainOperator({ provider }) {
                 }
                 await Promise.all(currentBatch);
             }
-            proxies.forEach((p) => {
-                if (!p['no-resolve']) {
-                    if (results[p.server]) {
-                        p.server = results[p.server];
-                        p.resolved = true;
-                    } else {
-                        p.resolved = false;
-                    }
-                }
+            proxies.forEach((proxy) => {
+                proxy.server = results[proxy.server] || proxy.server;
             });
 
             return proxies;
@@ -590,7 +522,7 @@ function TypeFilter(types) {
  1. This function name should be `filter`!
  2. Always declare variables before using them!
  */
-function ScriptFilter(script, targetPlatform, $arguments, source) {
+function ScriptFilter(script, targetPlatform, $arguments) {
     return {
         name: 'Script Filter',
         func: async (proxies) => {
@@ -601,23 +533,7 @@ function ScriptFilter(script, targetPlatform, $arguments, source) {
                     script,
                     $arguments,
                 );
-                output = filter(proxies, targetPlatform, { source, ...env });
-            })();
-            return output;
-        },
-        nodeFunc: async (proxies) => {
-            let output = FULL(proxies.length, true);
-            await (async function () {
-                const filter = createDynamicFunction(
-                    'filter',
-                    `async function filter(proxies = []) {
-                        return proxies.filter(($server = {}) => {
-                          ${script}
-                        })
-                      }`,
-                    $arguments,
-                );
-                output = filter(proxies, targetPlatform, { source, ...env });
+                output = filter(proxies, targetPlatform);
             })();
             return output;
         },
@@ -650,30 +566,7 @@ async function ApplyFilter(filter, objs) {
         selected = await filter.func(objs);
     } catch (err) {
         // print log and skip this filter
-        $.error(`Cannot apply filter ${filter.name}\n Reason: ${err}`);
-        let funcErr = '';
-        let funcErrMsg = `${err.message ?? err}`;
-        if (funcErrMsg.includes('$server is not defined')) {
-            funcErr = '';
-        } else {
-            funcErr = `执行 function filter 失败 ${funcErrMsg}; `;
-        }
-        try {
-            selected = await filter.nodeFunc(objs);
-        } catch (err) {
-            $.error(
-                `Cannot apply filter ${filter.name}(node script)! Reason: ${err}`,
-            );
-            let nodeErr = '';
-            let nodeErrMsg = `${err.message ?? err}`;
-            if (funcErr && nodeErrMsg === funcErrMsg) {
-                nodeErr = '';
-                funcErr = `执行失败 ${funcErrMsg}`;
-            } else {
-                nodeErr = `执行节点快捷过滤脚本 失败 ${nodeErr}`;
-            }
-            throw new Error(`脚本过滤 ${funcErr}${nodeErr}`);
-        }
+        $.log(`Cannot apply filter ${filter.name}\n Reason: ${err}`);
     }
     return objs.filter((_, i) => selected[i]);
 }
@@ -684,33 +577,8 @@ async function ApplyOperator(operator, objs) {
         const output_ = await operator.func(output);
         if (output_) output = output_;
     } catch (err) {
-        $.error(
-            `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}`);
-        }
+        // print log and skip this operator
+        $.log(`Cannot apply operator ${operator.name}! Reason: ${err}`);
     }
     return output;
 }
@@ -757,7 +625,6 @@ function removeFlag(str) {
 }
 
 function createDynamicFunction(name, script, $arguments) {
-    const flowUtils = { getFlowHeaders, parseFlowHeaders, flowTransfer };
     if ($.env.isLoon) {
         return new Function(
             '$arguments',
@@ -768,7 +635,6 @@ function createDynamicFunction(name, script, $arguments) {
             '$notification',
             'ProxyUtils',
             'scriptResourceCache',
-            'flowUtils',
             `${script}\n return ${name}`,
         )(
             $arguments,
@@ -782,7 +648,6 @@ function createDynamicFunction(name, script, $arguments) {
             $notification,
             ProxyUtils,
             scriptResourceCache,
-            flowUtils,
         );
     } else {
         return new Function(
@@ -791,9 +656,7 @@ function createDynamicFunction(name, script, $arguments) {
             'lodash',
             'ProxyUtils',
             'scriptResourceCache',
-            'flowUtils',
-
             `${script}\n return ${name}`,
-        )($arguments, $, lodash, ProxyUtils, scriptResourceCache, flowUtils);
+        )($arguments, $, lodash, ProxyUtils, scriptResourceCache);
     }
 }

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

@@ -3,45 +3,24 @@ 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
-        // https://clash.wiki/configuration/outbound.html#shadowsocks
         proxies = proxies.filter((proxy) => {
             if (
                 ![
                     'ss',
                     'ssr',
                     'vmess',
-                    'vless',
-                    'socks5',
+                    'socks',
                     'http',
                     'snell',
                     'trojan',
                     'wireguard',
-                ].includes(proxy.type) ||
-                (proxy.type === 'ss' &&
-                    ![
-                        'aes-128-gcm',
-                        'aes-192-gcm',
-                        'aes-256-gcm',
-                        'aes-128-cfb',
-                        'aes-192-cfb',
-                        'aes-256-cfb',
-                        'aes-128-ctr',
-                        'aes-192-ctr',
-                        'aes-256-ctr',
-                        'rc4-md5',
-                        'chacha20-ietf',
-                        'xchacha20',
-                        'chacha20-ietf-poly1305',
-                        'xchacha20-ietf-poly1305',
-                    ].includes(proxy.cipher)) ||
-                (proxy.type === 'snell' && String(proxy.version) === '4') ||
-                (proxy.type === 'vless' &&
-                    (typeof proxy.flow !== 'undefined' ||
-                        proxy['reality-opts']))
+                ].includes(proxy.type)
+            ) {
+                return false;
+            } else if (
+                proxy.type === 'snell' &&
+                String(proxy.version) === '4'
             ) {
                 return false;
             }
@@ -79,14 +58,6 @@ export default function Clash_Producer() {
                         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 (
@@ -108,26 +79,10 @@ export default function Clash_Producer() {
                             proxy['http-opts'].headers.Host = [httpHost];
                         }
                     }
-                    if (
-                        ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
-                            proxy.type,
-                        )
-                    ) {
+                    if (['trojan', 'tuic', 'hysteria'].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

@@ -1,144 +0,0 @@
-import { isPresent } from '@/core/proxy-utils/producers/utils';
-
-export default function ClashMeta_Producer() {
-    const type = 'ALL';
-    const produce = (proxies, type) => {
-        const list = 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 proxy;
-            });
-
-        return type === 'internal'
-            ? list
-            : 'proxies:\n' +
-                  list
-                      .map((proxy) => '  - ' + JSON.stringify(proxy) + '\n')
-                      .join('');
-    };
-    return { type, produce };
-}

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

@@ -1,7 +1,5 @@
 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';
@@ -18,10 +16,8 @@ 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,8 +20,6 @@ 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}`,
@@ -99,11 +97,11 @@ function trojan(proxy) {
         if (proxy.network === 'ws') {
             result.append(`,transport=ws`);
             result.appendIfPresent(
-                `,path=${proxy['ws-opts']?.path}`,
+                `,path=${proxy['ws-opts'].path}`,
                 'ws-opts.path',
             );
             result.appendIfPresent(
-                `,host=${proxy['ws-opts']?.headers?.Host}`,
+                `,host=${proxy['ws-opts'].headers.Host}`,
                 'ws-opts.headers.Host',
             );
         } else {
@@ -140,11 +138,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') {
@@ -207,11 +205,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') {
@@ -284,7 +282,7 @@ function wireguard(proxy) {
         proxy.ip = proxy.peers[0].ip;
         proxy.ipv6 = proxy.peers[0].ipv6;
         proxy['public-key'] = proxy.peers[0]['public-key'];
-        proxy['preshared-key'] = proxy.peers[0]['pre-shared-key'];
+        proxy['pre-shared-key'] = proxy.peers[0]['pre-shared-key'];
         proxy['allowed-ips'] = proxy.peers[0]['allowed_ips'];
         proxy.reserved = proxy.peers[0].reserved;
     }
@@ -322,13 +320,13 @@ function wireguard(proxy) {
     if (reserved) {
         reserved = `,reserved=[${reserved}]`;
     }
-    let presharedKey = proxy['preshared-key'] ?? proxy['pre-shared-key'];
+    let presharedKey = proxy['pre-shared-key'];
     if (presharedKey) {
-        presharedKey = `,preshared-key="${presharedKey}"`;
+        presharedKey = `,preshared-key="${presharedKey}"}`;
     }
     result.append(
         `,peers=[{public-key="${proxy['public-key']}",allowed-ips="${
-            allowedIps ?? '0.0.0.0/0,::/0'
+            allowedIps || '0.0.0.0/0,::/0'
         }",endpoint=${proxy.server}:${proxy.port}${reserved ?? ''}${
             presharedKey ?? ''
         }}]`,
@@ -336,33 +334,3 @@ 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,19 +63,6 @@ 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']}`,
@@ -96,12 +83,6 @@ 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}`);
 
@@ -134,12 +115,6 @@ 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}`);
 
@@ -160,11 +135,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 {
@@ -178,19 +153,6 @@ 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']}`,
@@ -211,12 +173,6 @@ 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}`);
 
@@ -274,19 +230,6 @@ 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']}`,
@@ -314,12 +257,6 @@ 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}`);
 
@@ -342,19 +279,6 @@ 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']}`,
@@ -375,12 +299,6 @@ 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}`);
 
@@ -403,19 +321,6 @@ 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']}`,
@@ -436,12 +341,6 @@ 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 ShadowRocket_Producer() {
+export default function Stash_Producer() {
     const type = 'ALL';
     const produce = (proxies) => {
         return (
@@ -63,32 +63,6 @@ export default function ShadowRocket_Producer() {
                             proxy.version = 5;
                         }
                     } else if (proxy.type === 'hysteria') {
-                        // auth_str 将会在未来某个时候删除 但是有的机场不规范
-                        if (
-                            isPresent(proxy, 'auth_str') &&
-                            !isPresent(proxy, 'auth-str')
-                        ) {
-                            proxy['auth-str'] = proxy['auth_str'];
-                        }
-                        if (isPresent(proxy, 'alpn')) {
-                            proxy.alpn = Array.isArray(proxy.alpn)
-                                ? proxy.alpn
-                                : [proxy.alpn];
-                        }
-                        if (
-                            isPresent(proxy, 'tfo') &&
-                            !isPresent(proxy, 'fast-open')
-                        ) {
-                            proxy['fast-open'] = proxy.tfo;
-                        }
-                    } else if (proxy.type === 'hysteria2') {
-                        if (
-                            proxy['obfs-password'] &&
-                            proxy.obfs == 'salamander'
-                        ) {
-                            proxy.obfs = proxy['obfs-password'];
-                            delete proxy['obfs-password'];
-                        }
                         if (isPresent(proxy, 'alpn')) {
                             proxy.alpn = Array.isArray(proxy.alpn)
                                 ? proxy.alpn
@@ -104,14 +78,6 @@ export default function ShadowRocket_Producer() {
                         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 (
@@ -134,26 +100,11 @@ export default function ShadowRocket_Producer() {
                         }
                     }
 
-                    if (
-                        ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
-                            proxy.type,
-                        )
-                    ) {
+                    if (['trojan', 'tuic', 'hysteria'].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

@@ -3,7 +3,6 @@ import { isPresent } from '@/core/proxy-utils/producers/utils';
 export default function Stash_Producer() {
     const type = 'ALL';
     const produce = (proxies) => {
-        // https://stash.wiki/proxy-protocols/proxy-types#shadowsocks
         return (
             'proxies:\n' +
             proxies
@@ -13,33 +12,14 @@ export default function Stash_Producer() {
                             'ss',
                             'ssr',
                             'vmess',
-                            'socks5',
+                            'socks',
                             'http',
                             'snell',
                             'trojan',
                             'tuic',
                             'vless',
                             'wireguard',
-                            'hysteria',
-                            'hysteria2',
                         ].includes(proxy.type) ||
-                        (proxy.type === 'ss' &&
-                            ![
-                                'aes-128-gcm',
-                                'aes-192-gcm',
-                                'aes-256-gcm',
-                                'aes-128-cfb',
-                                'aes-192-cfb',
-                                'aes-256-cfb',
-                                'aes-128-ctr',
-                                'aes-192-ctr',
-                                'aes-256-ctr',
-                                'rc4-md5',
-                                'chacha20-ietf',
-                                'xchacha20',
-                                'chacha20-ietf-poly1305',
-                                'xchacha20-ietf-poly1305',
-                            ].includes(proxy.cipher)) ||
                         (proxy.type === 'snell' &&
                             String(proxy.version) === '4') ||
                         (proxy.type === 'vless' && proxy['reality-opts'])
@@ -87,7 +67,6 @@ 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 (
@@ -97,13 +76,6 @@ 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
@@ -114,79 +86,11 @@ 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 =
                             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 (
@@ -208,31 +112,10 @@ export default function Stash_Producer() {
                             proxy['http-opts'].headers.Host = [httpHost];
                         }
                     }
-                    if (
-                        ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
-                            proxy.type,
-                        )
-                    ) {
+                    if (['trojan', 'tuic', 'hysteria'].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,10 +29,6 @@ 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}`,
@@ -47,16 +43,6 @@ 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') {
@@ -83,29 +69,6 @@ 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();
 }
 
@@ -114,16 +77,6 @@ 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);
 
@@ -152,29 +105,6 @@ 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();
 }
 
@@ -183,16 +113,6 @@ 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);
 
@@ -228,29 +148,6 @@ 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();
 }
 
@@ -261,16 +158,6 @@ 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']}`,
@@ -293,29 +180,6 @@ 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();
 }
 
@@ -326,16 +190,6 @@ 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']}`,
@@ -360,29 +214,6 @@ 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();
 }
 
@@ -392,16 +223,6 @@ 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}`,
@@ -422,29 +243,6 @@ 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');
 
@@ -474,11 +272,6 @@ 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(
@@ -486,169 +279,13 @@ function tuic(proxy) {
         'skip-cert-verify',
     );
 
-    // tls fingerprint
-    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']}`);
-    }
+    result.appendIfPresent(`,tfo=${proxy['fast-open']}`, 'fast-open');
+    result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
 
     // 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

@@ -1,65 +0,0 @@
-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

@@ -1,14 +1,10 @@
 /* eslint-disable no-case-declarations */
 import { Base64 } from 'js-base64';
-import { isIPv6 } from '@/utils';
 
 export default function URI_Producer() {
     const type = 'SINGLE';
     const produce = (proxy) => {
         let result = '';
-        if (proxy.server && isIPv6(proxy.server)) {
-            proxy.server = `[${proxy.server}]`;
-        }
         switch (proxy.type) {
             case 'ss':
                 const userinfo = `${proxy.cipher}:${proxy.password}`;
@@ -95,108 +91,9 @@ 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;
-            case 'vless':
-                let security = 'none';
-                const isReality = proxy['reality-opts'];
-                let sid = '';
-                let pbk = '';
-                if (isReality) {
-                    security = 'reality';
-                    const publicKey = proxy['reality-opts']?.['public-key'];
-                    if (publicKey) {
-                        pbk = `&pbk=${encodeURIComponent(publicKey)}`;
-                    }
-                    const shortId = proxy['reality-opts']?.['short-id'];
-                    if (shortId) {
-                        sid = `&sid=${encodeURIComponent(shortId)}`;
-                    }
-                } else if (proxy.tls) {
-                    security = 'tls';
-                }
-                let alpn = '';
-                if (proxy.alpn) {
-                    alpn = `&alpn=${encodeURIComponent(
-                        Array.isArray(proxy.alpn)
-                            ? proxy.alpn
-                            : proxy.alpn.join(','),
-                    )}`;
-                }
-                let allowInsecure = '';
-                if (proxy['skip-cert-verify']) {
-                    allowInsecure = `&allowInsecure=1`;
-                }
-                let sni = '';
-                if (proxy.sni) {
-                    sni = `&sni=${encodeURIComponent(proxy.sni)}`;
-                }
-                let fp = '';
-                if (proxy['client-fingerprint']) {
-                    fp = `&fp=${encodeURIComponent(
-                        proxy['client-fingerprint'],
-                    )}`;
-                }
-                let flow = '';
-                if (proxy.flow) {
-                    flow = `&flow=${encodeURIComponent(proxy.flow)}`;
-                }
-                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`]?.[
-                        `${proxy.network}-service-name`
-                    ];
-                let vlessTransportPath = proxy[`${proxy.network}-opts`]?.path;
-                let vlessTransportHost =
-                    proxy[`${proxy.network}-opts`]?.headers?.Host;
-                if (vlessTransportPath) {
-                    vlessTransport += `&path=${encodeURIComponent(
-                        Array.isArray(vlessTransportPath)
-                            ? vlessTransportPath[0]
-                            : vlessTransportPath,
-                    )}`;
-                }
-                if (vlessTransportHost) {
-                    vlessTransport += `&host=${encodeURIComponent(
-                        Array.isArray(vlessTransportHost)
-                            ? vlessTransportHost[0]
-                            : vlessTransportHost,
-                    )}`;
-                }
-                if (vlessTransportServiceName) {
-                    vlessTransport += `&serviceName=${encodeURIComponent(
-                        vlessTransportServiceName,
-                    )}`;
-                }
-
-                result = `vless://${proxy.uuid}@${proxy.server}:${
-                    proxy.port
-                }?${vlessTransport}&security=${encodeURIComponent(
-                    security,
-                )}${alpn}${allowInsecure}${sni}${fp}${flow}${sid}${pbk}#${encodeURIComponent(
-                    proxy.name,
-                )}`;
-                break;
             case 'trojan':
                 let trojanTransport = '';
                 if (proxy.network) {
@@ -226,44 +123,6 @@ export default function URI_Producer() {
                     proxy['skip-cert-verify'] ? '&allowInsecure=1' : ''
                 }${trojanTransport}#${encodeURIComponent(proxy.name)}`;
                 break;
-            case 'hysteria2':
-                let hysteria2params = [];
-                if (proxy['skip-cert-verify']) {
-                    hysteria2params.push(`insecure=1`);
-                }
-                if (proxy.obfs) {
-                    hysteria2params.push(
-                        `obfs=${encodeURIComponent(proxy.obfs)}`,
-                    );
-                    if (proxy['obfs-password']) {
-                        hysteria2params.push(
-                            `obfs-password=${encodeURIComponent(
-                                proxy['obfs-password'],
-                            )}`,
-                        );
-                    }
-                }
-                if (proxy.sni) {
-                    hysteria2params.push(
-                        `sni=${encodeURIComponent(proxy.sni)}`,
-                    );
-                }
-                if (proxy['tls-fingerprint']) {
-                    hysteria2params.push(
-                        `pinSHA256=${encodeURIComponent(
-                            proxy['tls-fingerprint'],
-                        )}`,
-                    );
-                }
-                if (proxy.tfo) {
-                    hysteria2params.push(`fastopen=1`);
-                }
-                result = `hysteria2://${encodeURIComponent(proxy.password)}@${
-                    proxy.server
-                }:${proxy.port}?${hysteria2params.join(
-                    '&',
-                )}#${encodeURIComponent(proxy.name)}`;
-                break;
         }
         return result;
     };

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

@@ -47,7 +47,7 @@ function AllRuleParser() {
                 }
                 if (!matched) throw new Error('Invalid rule type: ' + rawType);
             } catch (e) {
-                console.log(`Failed to parse line: ${line}\n Reason: ${e}`);
+                console.error(`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/sub-store-org/Sub-Store
+ * @github: https://github.com/Peng-YM/Sub-Store
  * @documentation: https://www.notion.so/Sub-Store-6259586994d34c11a4ced5c406264b46
  */
 import { version } from '../package.json';

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

@@ -20,8 +20,6 @@ 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();
@@ -32,8 +30,6 @@ function serve() {
     // register routes
     registerCollectionRoutes($app);
     registerSubscriptionRoutes($app);
-    registerFileRoutes($app);
-    registerModuleRoutes($app);
     registerArtifactRoutes($app);
     registerSettingRoutes($app);
     registerSortRoutes($app);

backend/src/restful/collections.js

@@ -22,16 +22,6 @@ 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(
@@ -41,7 +31,6 @@ function createCollection(req, res) {
                 `Collection ${collection.name} already exists.`,
             ),
         );
-        return;
     }
     allCols.push(collection);
     $.write(allCols, COLLECTIONS_KEY);

backend/src/restful/download.js

@@ -20,23 +20,6 @@ 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);
@@ -46,25 +29,13 @@ async function downloadSubscription(req, res) {
                 type: 'subscription',
                 name,
                 platform,
-                url,
-                ua,
-                content,
-                mergeSources,
             });
 
-            if (sub.source !== 'local' || url) {
-                try {
-                    // forward flow headers
-                    const flowInfo = await getFlowHeaders(url || sub.url);
-                    if (flowInfo) {
-                        res.set('subscription-userinfo', flowInfo);
-                    }
-                } catch (err) {
-                    $.error(
-                        `订阅 ${name} 获取流量信息时发生错误: ${JSON.stringify(
-                            err,
-                        )}`,
-                    );
+            if (sub.source !== 'local') {
+                // forward flow headers
+                const flowInfo = await getFlowHeaders(sub.url);
+                if (flowInfo) {
+                    res.set('subscription-userinfo', flowInfo);
                 }
             }
 
@@ -79,15 +50,15 @@ async function downloadSubscription(req, res) {
             $.notify(
                 `🌍 Sub-Store 下载订阅失败`,
                 `❌ 无法下载订阅：${name}！`,
-                `🤔 原因：${err.message ?? err}`,
+                `🤔 原因：${JSON.stringify(err)}`,
             );
-            $.error(err.message ?? err);
+            $.error(JSON.stringify(err));
             failed(
                 res,
                 new InternalServerError(
                     'INTERNAL_SERVER_ERROR',
                     `Failed to download subscription: ${name}`,
-                    `Reason: ${err.message ?? err}`,
+                    `Reason: ${JSON.stringify(err)}`,
                 ),
             );
         }
@@ -130,17 +101,9 @@ async function downloadCollection(req, res) {
             if (subnames.length > 0) {
                 const sub = findByName(allSubs, subnames[0]);
                 if (sub.source !== 'local') {
-                    try {
-                        const flowInfo = await getFlowHeaders(sub.url);
-                        if (flowInfo) {
-                            res.set('subscription-userinfo', flowInfo);
-                        }
-                    } catch (err) {
-                        $.error(
-                            `组合订阅 ${name} 中的子订阅 ${
-                                sub.name
-                            } 获取流量信息时发生错误: ${err.message ?? err}`,
-                        );
+                    const flowInfo = await getFlowHeaders(sub.url);
+                    if (flowInfo) {
+                        res.set('subscription-userinfo', flowInfo);
                     }
                 }
             }
@@ -163,7 +126,7 @@ async function downloadCollection(req, res) {
                 new InternalServerError(
                     'INTERNAL_SERVER_ERROR',
                     `Failed to download collection: ${name}`,
-                    `Reason: ${err.message ?? err}`,
+                    `Reason: ${JSON.stringify(err)}`,
                 ),
             );
         }

backend/src/restful/file.js

@@ -1,109 +0,0 @@
-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

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

backend/src/restful/miscs.js

@@ -1,6 +1,7 @@
 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 {
@@ -11,7 +12,6 @@ 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
@@ -22,26 +22,12 @@ export default function register($app) {
     // Storage management
     $app.route('/api/storage')
         .get((req, res) => {
-            res.set('content-type', 'application/json')
-                .set(
-                    'content-disposition',
-                    'attachment; filename="sub-store.json"',
-                )
-                .send(
-                    $.env.isNode
-                        ? JSON.stringify($.cache)
-                        : $.read('#sub-store'),
-                );
+            res.json($.read('#sub-store'));
         })
         .post((req, res) => {
-            const { content } = req.body;
-            $.write(content, '#sub-store');
-            if ($.env.isNode) {
-                $.cache = JSON.parse(content);
-                $.persistCache();
-            }
-            migrate();
-            success(res);
+            const data = req.body;
+            $.write(JSON.stringify(data), '#sub-store');
+            res.end();
         });
 
     // Redirect sub.store to vercel webpage
@@ -63,7 +49,19 @@ export default function register($app) {
 }
 
 function getEnv(req, res) {
-    success(res, env);
+    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';
+
+    success(res, {
+        backend,
+        version: substoreVersion,
+    });
 }
 
 async function refresh(_, res) {
@@ -120,23 +118,6 @@ 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) {
@@ -144,10 +125,8 @@ async function gistBackup(req, res) {
                         $.cache = content;
                         $.persistCache();
                     }
-                    $.info(`perform migration after restoring from gist...`);
+                    // perform migration after restoring from gist
                     migrate();
-                    $.info(`migration completed`);
-                    $.info(`还原备份完成`);
                     break;
             }
             success(res);
@@ -157,7 +136,7 @@ async function gistBackup(req, res) {
                 new InternalServerError(
                     'BACKUP_FAILED',
                     `Failed to ${action} data to gist!`,
-                    `Reason: ${err.message ?? err}`,
+                    `Reason: ${JSON.stringify(err)}`,
                 ),
             );
         }

backend/src/restful/module.js

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

backend/src/restful/settings.js

@@ -10,12 +10,7 @@ export default function register($app) {
 }
 
 async function getSettings(req, res) {
-    let settings = $.read(SETTINGS_KEY);
-    if (!settings) {
-        settings = {};
-        $.write(settings, SETTINGS_KEY);
-    }
-
+    const settings = $.read(SETTINGS_KEY);
     if (!settings.avatarUrl) await updateGitHubAvatar();
     if (!settings.artifactStore) await updateArtifactStore();
     success(res, settings);
@@ -49,12 +44,8 @@ export async function updateGitHubAvatar() {
                 .then((resp) => JSON.parse(resp.body));
             settings.avatarUrl = data['avatar_url'];
             $.write(settings, SETTINGS_KEY);
-        } catch (err) {
-            $.error(
-                `Failed to fetch GitHub avatar for User: ${username}. Reason: ${
-                    err.message ?? err
-                }`,
-            );
+        } catch (e) {
+            $.error('Failed to fetch GitHub avatar for User: ' + username);
         }
     }
 }
@@ -76,11 +67,7 @@ export async function updateArtifactStore() {
                 $.write(settings, SETTINGS_KEY);
             }
         } catch (err) {
-            $.error(
-                `Failed to fetch artifact store for User: ${githubUser}. Reason: ${
-                    err.message ?? err
-                }`,
-            );
+            $.error('Failed to fetch artifact store for User: ' + githubUser);
         }
     }
 }

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.name) - orders.indexOf(b.name));
+    allSubs.sort((a, b) => orders.indexOf(a) - orders.indexOf(b));
     $.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.name) - orders.indexOf(b.name));
+    allCols.sort((a, b) => orders.indexOf(a) - orders.indexOf(b));
     $.write(allCols, COLLECTIONS_KEY);
     success(res, allCols);
 }
@@ -27,9 +27,7 @@ function sortCollections(req, res) {
 function sortArtifacts(req, res) {
     const orders = req.body;
     const allArtifacts = $.read(ARTIFACTS_KEY);
-    allArtifacts.sort(
-        (a, b) => orders.indexOf(a.name) - orders.indexOf(b.name),
-    );
+    allArtifacts.sort((a, b) => orders.indexOf(a) - orders.indexOf(b));
     $.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, parseFlowHeaders } from '@/utils/flow';
+import { getFlowHeaders } from '@/utils/flow';
 import { success, failed } from './response';
 import $ from '@/core/app';
 
@@ -68,7 +68,20 @@ async function getFlowInfo(req, res) {
             return;
         }
 
-        success(res, parseFlowHeaders(flowHeaders));
+        // 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;
+
+        success(res, { expires, total, usage: { upload, download } });
     } catch (err) {
         failed(
             res,
@@ -83,16 +96,6 @@ 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(
@@ -102,7 +105,6 @@ function createSubscription(req, res) {
                 `Subscription ${sub.name} already exists.`,
             ),
         );
-        return;
     }
     allSubs.push(sub);
     $.write(allSubs, SUBS_KEY);

backend/src/restful/sync.js

@@ -22,80 +22,33 @@ export default function register($app) {
     $app.get('/api/sync/artifact/:name', syncArtifact);
 }
 
-async function produceArtifact({
-    type,
-    name,
-    platform,
-    url,
-    ua,
-    content,
-    mergeSources,
-}) {
+async function produceArtifact({ type, name, platform }) {
     platform = platform || 'JSON';
 
     if (type === 'subscription') {
         const allSubs = $.read(SUBS_KEY);
         const sub = findByName(allSubs, name);
         let raw;
-        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)
-        ) {
+        if (sub.source === 'local') {
             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);
-            }
+            raw = await download(sub.url, sub.ua);
         }
         // parse proxies
-        let proxies = (Array.isArray(raw) ? raw : [raw])
-            .map((i) => ProxyUtils.parse(i))
-            .flat();
-
-        proxies.forEach((proxy) => {
-            proxy.subName = sub.name;
-        });
+        let proxies = ProxyUtils.parse(raw);
         // apply processors
         proxies = await ProxyUtils.process(
             proxies,
             sub.process || [],
             platform,
-            { [sub.name]: sub },
         );
-        if (proxies.length === 0) {
-            throw new Error(`订阅 ${name} 中不含有效节点`);
-        }
         // check duplicate
         const exist = {};
         for (const proxy of proxies) {
             if (exist[proxy.name]) {
                 $.notify(
                     '🌍 Sub-Store',
-                    `⚠️ 订阅 ${name} 包含重复节点 ${proxy.name}！`,
+                    '⚠️ 订阅包含重复节点！',
                     '请仔细检测配置！',
                     {
                         'media-url':
@@ -114,7 +67,6 @@ async function produceArtifact({
         const collection = findByName(allCols, name);
         const subnames = collection.subscriptions;
         const results = {};
-        const errors = {};
         let processed = 0;
 
         await Promise.all(
@@ -123,43 +75,18 @@ async function produceArtifact({
                 try {
                     $.info(`正在处理子订阅：${sub.name}...`);
                     let raw;
-                    if (
-                        sub.source === 'local' &&
-                        !['localFirst', 'remoteFirst'].includes(
-                            sub.mergeSources,
-                        )
-                    ) {
+                    if (sub.source === 'local') {
                         raw = sub.content;
                     } else {
-                        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);
-                        }
+                        raw = await download(sub.url, sub.ua);
                     }
                     // 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;
-                    });
-
+                    let currentProxies = ProxyUtils.parse(raw);
                     // apply processors
                     currentProxies = await ProxyUtils.process(
                         currentProxies,
                         sub.process || [],
                         platform,
-                        { [sub.name]: sub, _collection: collection },
                     );
                     results[name] = currentProxies;
                     processed++;
@@ -170,7 +97,6 @@ async function produceArtifact({
                     );
                 } catch (err) {
                     processed++;
-                    errors[name] = err;
                     $.error(
                         `❌ 处理组合订阅中的子订阅: ${
                             sub.name
@@ -182,33 +108,20 @@ async function produceArtifact({
             }),
         );
 
-        if (Object.keys(errors).length > 0) {
-            throw new Error(
-                `组合订阅 ${name} 中的子订阅 ${Object.keys(errors).join(
-                    ', ',
-                )} 发生错误, 请查看日志`,
-            );
-        }
-
         // merge proxies with the original order
         let proxies = Array.prototype.concat.apply(
             [],
-            subnames.map((name) => results[name] || []),
+            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} 中不含有效节点`);
+            throw new Error(`组合订阅中不含有效节点！`);
         }
         // check duplicate
         const exist = {};
@@ -216,7 +129,7 @@ async function produceArtifact({
             if (exist[proxy.name]) {
                 $.notify(
                     '🌍 Sub-Store',
-                    `⚠️ 组合订阅 ${name} 包含重复节点 ${proxy.name}！`,
+                    '⚠️ 订阅包含重复节点！',
                     '请仔细检测配置！',
                     {
                         'media-url':
@@ -329,20 +242,20 @@ async function syncArtifact(req, res) {
         return;
     }
 
-    try {
-        const output = await produceArtifact({
-            type: artifact.type,
-            name: artifact.source,
-            platform: artifact.platform,
-        });
+    const output = await produceArtifact({
+        type: artifact.type,
+        name: artifact.source,
+        platform: artifact.platform,
+    });
 
-        $.info(
-            `正在上传配置：${artifact.name}\n>>>${JSON.stringify(
-                artifact,
-                null,
-                2,
-            )}`,
-        );
+    $.info(
+        `正在上传配置：${artifact.name}\n>>>${JSON.stringify(
+            artifact,
+            null,
+            2,
+        )}`,
+    );
+    try {
         const resp = await syncToGist({
             [encodeURIComponent(artifact.name)]: {
                 content: output,

backend/src/utils/download.js

@@ -1,52 +1,12 @@
-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();
-    const { defaultUserAgent } = $.read(SETTINGS_KEY);
-    ua = ua || defaultUserAgent || 'clash.meta';
+    ua = ua || 'Quantumult%20X/1.0.29 (iPhone14,5; iOS 15.4.1)';
     const id = hex_md5(ua + url);
     if (!isNode && tasks.has(id)) {
         return tasks.get(id);
@@ -61,10 +21,9 @@ 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 (!$arguments?.noCache && cached) {
+        if (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

@@ -1,16 +0,0 @@
-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,10 +3,7 @@ import { HTTP } from '@/vendor/open-api';
 export async function getFlowHeaders(url) {
     const http = HTTP();
     const { headers } = await http.get({
-        url: url
-            .split(/[\r\n]+/)
-            .map((i) => i.trim())
-            .filter((i) => i.length)[0],
+        url,
         headers: {
             'User-Agent': 'Quantumult%20X/1.0.30 (iPhone14,2; iOS 15.6)',
         },
@@ -16,28 +13,3 @@ 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,18 +1,14 @@
 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) {
@@ -21,15 +17,6 @@ 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,7 +1,8 @@
 /* eslint-disable no-undef */
 import { ENV } from './open-api';
 
-export default function express({ substore: $, port, host }) {
+export default function express({ substore: $, port }) {
+    port = port || 3000;
     const { isNode } = ENV();
     const DEFAULT_HEADERS = {
         'Content-Type': 'text/plain;charset=UTF-8',
@@ -16,7 +17,7 @@ export default function express({ substore: $, port, host }) {
         const express_ = eval(`require("express")`);
         const bodyParser = eval(`require("body-parser")`);
         const app = express_();
-        app.use(bodyParser.json({ verify: rawBodySaver, limit: '1mb' }));
+        app.use(bodyParser.json({ verify: rawBodySaver }));
         app.use(
             bodyParser.urlencoded({ verify: rawBodySaver, extended: true }),
         );
@@ -28,9 +29,8 @@ export default function express({ substore: $, port, host }) {
 
         // adapter
         app.start = () => {
-            const listener = app.listen(port, host, () => {
-                const { address, port } = listener.address();
-                $.info(`[BACKEND] ${address}:${port}`);
+            app.listen(port, () => {
+                $.info(`Express started on port: ${port}`);
             });
         };
         return app;

backend/src/vendor/open-api.js

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

config/Loon.plugin

@@ -2,7 +2,7 @@
 #!desc=高级订阅管理工具
 #!openUrl=https://sub.store
 #!author=Peng-YM
-#!homepage=https://github.com/sub-store-org/Sub-Store
+#!homepage=https://github.com/Peng-YM/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

@@ -1,7 +0,0 @@
-{
-    "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,32 +1,20 @@
 # 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/sub-store-org/Sub-Store/master/config/Loon.plugin`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Loon.plugin) 即可。
-
+安装使用[插件](https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/config/Loon.plugin)即可。
 ### 2. Surge
-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)
-
+安装使用[模块](https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/config/Surge.sgmodule)即可。
 
 ### 3. QX
-订阅 重写 [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/QX.snippet`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/QX.snippet) 即可。
+订阅[重写](https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/config/QX.snippet)即可
 
 ### 4. Stash
-安装使用 覆写 [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Stash.stoverride`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Stash.stoverride) 即可。
+安装使用[ Stash 覆写](https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/config/Stash.stoverride)即可。
 
 ### 5. Shadowrocket
-安装使用 模块 [`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) 即可。
+安装使用[模块](https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/config/Surge.sgmodule)即可。
 
 ## 使用 Sub-Store
 1. 使用 Safari 打开这个 https://sub.store 如网页正常打开并且未弹出任何错误提示，说明 Sub-Store 已经配置成功。

package-lock.json

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