🐞 fix(subscriptions): negative usage flow

.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,11 +17,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          ref: "master"
+          ref: 'master'
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "14"
       - name: Install dependencies
         run: |
           npm install -g pnpm
@@ -34,33 +34,21 @@ jobs:
         run: |
           cd backend
           pnpm run build
-      - name: Bundle
-        run: |
-          cd backend
-          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

@@ -1,17 +1,17 @@
 <div align="center">
 <br>
-<img width="200" src="https://raw.githubusercontent.com/cc63/ICON/main/Sub-Store.png" alt="Sub-Store">
+<img width="200" src="https://raw.githubusercontent.com/58xinian/icon/master/Sub-Store1.png" alt="Sub-Store">
 <br>
 <br>
 <h2 align="center">Sub-Store<h2>
 </div>
 
 <p align="center" color="#6a737d">
-Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.
+Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.
 </p>
 
-[![Build](https://github.com/sub-store-org/Sub-Store/actions/workflows/main.yml/badge.svg)](https://github.com/sub-store-org/Sub-Store/actions/workflows/main.yml) ![GitHub](https://img.shields.io/github/license/sub-store-org/Sub-Store) ![GitHub issues](https://img.shields.io/github/issues/sub-store-org/Sub-Store) ![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/Peng-Ym/Sub-Store) ![Lines of code](https://img.shields.io/tokei/lines/github/sub-store-org/Sub-Store) ![Size](https://img.shields.io/github/languages/code-size/sub-store-org/Sub-Store) 
-
+[![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,30 +28,18 @@ Core functionalities:
 - [x] SSR URI
 - [x] SSD URI
 - [x] V2RayN URI
-- [x] Hysteria 2 URI
-- [x] QX (SS, SSR, VMess, Trojan, HTTP, SOCKS5, VLESS)
-- [x] Loon (SS, SSR, VMess, Trojan, HTTP, SOCKS5, WireGuard, VLESS, Hysteria 2)
-- [x] Surge (SS, VMess, Trojan, HTTP, SOCKS5, TUIC, Snell, Hysteria 2, SSR(external, only for macOS), External Proxy Program(only for macOS), WireGuard(Surge to Surge))
-- [x] Surfboard (SS, VMess, Trojan, HTTP, SOCKS5, WireGuard(Surfboard to Surfboard))
-- [x] Shadowrocket (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC)
-- [x] Clash.Meta (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC)
-- [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC)
-- [x] Clash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard)
+- [x] QX (SS, SSR, VMess, Trojan, HTTP)
+- [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] Plain JSON
-- [x] Stash
-- [x] Clash.Meta(mihomo)
-- [x] Clash
-- [x] Surfboard
-- [x] Surge
-- [x] Loon
-- [x] Shadowrocket
 - [x] QX
-- [x] sing-box
-- [x] V2Ray
-- [x] V2Ray URI
+- [x] Loon
+- [x] Surge
+- [x] Stash & Clash
+- [x] ShadowRocket
 
 ## 2. Subscription Formatting
 
@@ -75,36 +61,34 @@ 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!
-- Special thanks to @Orz-3 and @58xinian for their awesome icons.
+- Speicial thanks to @Orz-3 and @58xinian for their awesome icons.

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.200",
+  "version": "2.13.5",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
@@ -8,18 +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",
-    "cron": "^3.1.6",
     "express": "^4.17.1",
-    "http-proxy-middleware": "^2.0.6",
     "js-base64": "^3.7.2",
     "lodash": "^4.17.21",
     "request": "^2.88.2",
@@ -34,13 +30,12 @@
     "@babel/preset-env": "^7.18.0",
     "@babel/register": "^7.17.7",
     "@types/gulp": "^4.0.9",
-    "axios": "^0.21.2",
+    "axios": "^0.20.0",
     "babel-plugin-relative-path-import": "^2.0.1",
     "babelify": "^10.0.0",
     "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",
@@ -56,4 +51,4 @@
     "prettier-plugin-sort-imports": "^1.6.1",
     "tinyify": "^3.0.0"
   }
-}
+}

backend/src/constants.js

@@ -2,16 +2,10 @@ 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';
 export const GIST_BACKUP_FILE_NAME = 'Sub-Store';
 export const ARTIFACT_REPOSITORY_KEY = 'Sub-Store Artifacts Repository';
 export const RESOURCE_CACHE_KEY = '#sub-store-cached-resource';
-export const HEADERS_RESOURCE_CACHE_KEY = '#sub-store-cached-headers-resource';
-export const CHR_EXPIRATION_TIME_KEY = '#sub-store-chr-expiration-time'; // Custom expiration time key; (Loon|Surge) Default write 1 min
 export const CACHE_EXPIRATION_TIME_MS = 60 * 60 * 1000; // 1 hour
-export const SCRIPT_RESOURCE_CACHE_KEY = '#sub-store-cached-script-resource'; // cached-script-resource CSR
-export const CSR_EXPIRATION_TIME_KEY = '#sub-store-csr-expiration-time'; // Custom expiration time key; (Loon|Surge) Default write 48 hour

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

@@ -1,6 +1,5 @@
-import YAML from '@/utils/yaml';
 import download from '@/utils/download';
-import { isIPv4, isIPv6, isValidPortNumber } from '@/utils';
+
 import PROXY_PROCESSORS, { ApplyProcessor } from './processors';
 import PROXY_PREPROCESSORS from './preprocessors';
 import PROXY_PRODUCERS from './producers';
@@ -37,7 +36,7 @@ function parse(raw) {
         if (lastParser) {
             const [proxy, error] = tryParse(lastParser, line);
             if (!error) {
-                proxies.push(lastParse(proxy));
+                proxies.push(proxy);
                 success = true;
             }
         }
@@ -47,7 +46,7 @@ function parse(raw) {
             for (const parser of PROXY_PARSERS) {
                 const [proxy, error] = tryParse(parser, line);
                 if (!error) {
-                    proxies.push(lastParse(proxy));
+                    proxies.push(proxy);
                     lastParser = parser;
                     success = true;
                     $.info(`${parser.name} is activated`);
@@ -60,53 +59,39 @@ function parse(raw) {
             $.error(`Failed to parse line: ${line}`);
         }
     }
+
     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, opts = {}) {
+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, opts = {}) {
 
     $.info(`Producing proxies for target: ${targetPlatform}`);
     if (typeof producer.type === 'undefined' || producer.type === 'SINGLE') {
-        let localPort = 10000;
-        const list = proxies
+        return proxies
             .map((proxy) => {
                 try {
-                    let line = producer.produce(proxy, type, opts);
-                    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(
@@ -179,10 +152,10 @@ function produce(proxies, targetPlatform, type, opts = {}) {
                     return '';
                 }
             })
-            .filter((line) => line.length > 0);
-        return type === 'internal' ? list : list.join('\n');
+            .filter((line) => line.length > 0)
+            .join('\n');
     } else if (producer.type === 'ALL') {
-        return producer.produce(proxies, type, opts);
+        return producer.produce(proxies);
     }
 }
 
@@ -190,10 +163,6 @@ export const ProxyUtils = {
     parse,
     process,
     produce,
-    isIPv4,
-    isIPv6,
-    isIP,
-    yaml: YAML,
 };
 
 function tryParse(parser, line) {
@@ -213,124 +182,3 @@ function safeMatch(parser, line) {
         return false;
     }
 }
-
-function lastParse(proxy) {
-    if (isValidPortNumber(proxy.port)) {
-        proxy.port = parseInt(proxy.port, 10);
-    }
-    if (proxy.server) {
-        proxy.server = `${proxy.server}`
-            .trim()
-            .replace(/^\[/, '')
-            .replace(/\]$/, '');
-    }
-    if (proxy.network === 'ws') {
-        if (!proxy['ws-opts'] && (proxy['ws-path'] || proxy['ws-headers'])) {
-            proxy['ws-opts'] = {};
-            if (proxy['ws-path']) {
-                proxy['ws-opts'].path = proxy['ws-path'];
-            }
-            if (proxy['ws-headers']) {
-                proxy['ws-opts'].headers = proxy['ws-headers'];
-            }
-        }
-        delete proxy['ws-path'];
-        delete proxy['ws-headers'];
-    }
-
-    if (proxy.type === 'trojan') {
-        if (proxy.network === 'tcp') {
-            delete proxy.network;
-        }
-    }
-    if (['vless'].includes(proxy.type)) {
-        if (!proxy.network) {
-            proxy.network = 'tcp';
-        }
-    }
-    if (['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(proxy.type)) {
-        proxy.tls = true;
-    }
-    if (proxy.network) {
-        let transportHost = proxy[`${proxy.network}-opts`]?.headers?.Host;
-        let transporthost = proxy[`${proxy.network}-opts`]?.headers?.host;
-        if (proxy.network === 'h2') {
-            if (!transporthost && transportHost) {
-                proxy[`${proxy.network}-opts`].headers.host = transportHost;
-                delete proxy[`${proxy.network}-opts`].headers.Host;
-            }
-        } else if (transporthost && !transportHost) {
-            proxy[`${proxy.network}-opts`].headers.Host = transporthost;
-            delete proxy[`${proxy.network}-opts`].headers.host;
-        }
-    }
-    if (proxy.network === 'h2') {
-        const host = proxy['h2-opts']?.headers?.host;
-        const path = proxy['h2-opts']?.path;
-        if (host && !Array.isArray(host)) {
-            proxy['h2-opts'].headers.host = [host];
-        }
-        if (Array.isArray(path)) {
-            proxy['h2-opts'].path = path[0];
-        }
-    }
-    if (proxy.tls && !proxy.sni) {
-        if (proxy.network) {
-            let transportHost = proxy[`${proxy.network}-opts`]?.headers?.Host;
-            transportHost = Array.isArray(transportHost)
-                ? transportHost[0]
-                : transportHost;
-            if (transportHost) {
-                proxy.sni = transportHost;
-            }
-        }
-        if (!proxy.sni && !isIP(proxy.server)) {
-            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];
-        }
-    }
-    if (['hysteria', 'hysteria2'].includes(proxy.type) && !proxy.ports) {
-        delete proxy.ports;
-    }
-    if (['vless'].includes(proxy.type)) {
-        if (['http'].includes(proxy.network)) {
-            let transportPath = proxy[`${proxy.network}-opts`]?.path;
-            if (!transportPath) {
-                if (!proxy[`${proxy.network}-opts`]) {
-                    proxy[`${proxy.network}-opts`] = {};
-                }
-                proxy[`${proxy.network}-opts`].path = ['/'];
-            }
-        }
-    }
-    return proxy;
-}
-
-function isIP(ip) {
-    return isIPv4(ip) || isIPv6(ip);
-}

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

@@ -1,11 +1,4 @@
-import {
-    isIPv4,
-    isIPv6,
-    getIfNotBlank,
-    isPresent,
-    isNotBlank,
-    getIfPresent,
-} from '@/utils';
+import { getIfNotBlank, isPresent, isNotBlank, getIfPresent } from '@/utils';
 import getSurgeParser from './peggy/surge';
 import getLoonParser from './peggy/loon';
 import getQXParser from './peggy/qx';
@@ -30,40 +23,12 @@ function URI_SS() {
         };
         content = content.split('#')[0]; // strip proxy name
         // handle IPV4 and IPV6
-        let serverAndPortArray = content.match(/@([^/]*)(\/|$)/);
-        let userInfoStr = Base64.decode(content.split('@')[0]);
-        let query = '';
-        if (!serverAndPortArray) {
-            if (content.includes('?')) {
-                const parsed = content.match(/^(.*)(\?.*)$/);
-                content = parsed[1];
-                query = parsed[2];
-            }
-            content = Base64.decode(content);
-            if (query) {
-                if (/(&|\?)v2ray-plugin=/.test(query)) {
-                    const parsed = query.match(/(&|\?)v2ray-plugin=(.*?)(&|$)/);
-                    let v2rayPlugin = parsed[2];
-                    if (v2rayPlugin) {
-                        proxy.plugin = 'v2ray-plugin';
-                        proxy['plugin-opts'] = JSON.parse(
-                            Base64.decode(v2rayPlugin),
-                        );
-                    }
-                }
-                content = `${content}${query}`;
-            }
-            userInfoStr = content.split('@')[0];
-            serverAndPortArray = content.match(/@([^/]*)(\/|$)/);
-        }
-        const serverAndPort = serverAndPortArray[1];
+        const serverAndPort = content.match(/@([^/]*)(\/|$)/)[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(':');
+        const userInfo = Base64.decode(content.split('@')[0]).split(':');
         proxy.cipher = userInfo[0];
         proxy.password = userInfo[1];
 
@@ -89,7 +54,7 @@ function URI_SS() {
                     };
                     break;
                 case 'v2ray-plugin':
-                    proxy.plugin = 'v2ray-plugin';
+                    proxy.obfs = 'v2ray-plugin';
                     proxy['plugin-opts'] = {
                         mode: 'websocket',
                         host: getIfNotBlank(params['obfs-host']),
@@ -103,12 +68,6 @@ function URI_SS() {
                     );
             }
         }
-        if (/(&|\?)uot=(1|true)/i.test(query)) {
-            proxy['udp-over-tcp'] = true;
-        }
-        if (/(&|\?)tfo=(1|true)/i.test(query)) {
-            proxy.tfo = true;
-        }
         return proxy;
     };
     return { name, test, parse };
@@ -191,7 +150,7 @@ function URI_VMess() {
     };
     const parse = (line) => {
         line = line.split('vmess://')[1];
-        let content = Base64.decode(line);
+        const content = Base64.decode(line);
         if (/=\s*vmess/.test(content)) {
             // Quantumult VMess URI format
             const partitions = content.split(',').map((p) => p.trim());
@@ -243,111 +202,30 @@ function URI_VMess() {
             }
             return proxy;
         } else {
-            let params = {};
-
-            try {
-                // V2rayN URI format
-                params = JSON.parse(content);
-            } catch (e) {
-                // Shadowrocket URI format
-                // eslint-disable-next-line no-unused-vars
-                let [__, base64Line, qs] = /(^[^?]+?)\/?\?(.*)$/.exec(line);
-                content = Base64.decode(base64Line);
-
-                for (const addon of qs.split('&')) {
-                    const [key, valueRaw] = addon.split('=');
-                    let value = valueRaw;
-                    value = decodeURIComponent(valueRaw);
-                    if (value.indexOf(',') === -1) {
-                        params[key] = value;
-                    } else {
-                        params[key] = value.split(',');
-                    }
-                }
-                // eslint-disable-next-line no-unused-vars
-                let [___, cipher, uuid, server, port] =
-                    /(^[^:]+?):([^:]+?)@(.*):(\d+)$/.exec(content);
-
-                params.scy = cipher;
-                params.id = uuid;
-                params.port = port;
-                params.add = server;
-            }
+            // V2rayN URI format
+            const params = JSON.parse(content);
             const proxy = {
-                name: params.ps ?? params.remarks,
+                name: params.ps,
                 type: 'vmess',
                 server: params.add,
-                port: parseInt(getIfPresent(params.port), 10),
-                cipher: getIfPresent(params.scy, 'auto'),
+                port: params.port,
+                cipher: 'auto', // V2rayN has no default cipher! use aes-128-gcm as default.
                 uuid: params.id,
-                alterId: parseInt(
-                    getIfPresent(params.aid ?? params.alterId, 0),
-                    10,
-                ),
-                tls: ['tls', true, 1, '1'].includes(params.tls),
+                alterId: getIfPresent(params.aid, 0),
+                tls: params.tls === 'tls' || params.tls === true,
                 'skip-cert-verify': isPresent(params.verify_cert)
                     ? !params.verify_cert
                     : undefined,
             };
-            // https://github.com/2dust/v2rayN/wiki/%E5%88%86%E4%BA%AB%E9%93%BE%E6%8E%A5%E6%A0%BC%E5%BC%8F%E8%AF%B4%E6%98%8E(ver-2)
-            if (proxy.tls && proxy.sni) {
-                proxy.sni = params.sni;
-            }
             // handle obfs
-            if (params.net === 'ws' || params.obfs === 'websocket') {
+            if (params.net === 'ws') {
                 proxy.network = 'ws';
-            } else if (
-                ['tcp', 'http'].includes(params.net) ||
-                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') {
-                    if (transportHost) {
-                        transportHost = Array.isArray(transportHost)
-                            ? transportHost[0]
-                            : transportHost;
-                    }
-                    if (transportPath) {
-                        transportPath = Array.isArray(transportPath)
-                            ? transportPath[0]
-                            : transportPath;
-                    }
-                }
-                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) },
-                        };
-                    }
-                } else {
-                    delete proxy.network;
-                }
-
-                // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/docs/config.yaml#L413
-                // sni 优先级应高于 host
-                if (proxy.tls && !proxy.sni && transportHost) {
-                    proxy.sni = transportHost;
+                proxy['ws-opts'] = {
+                    path: getIfNotBlank(params.path),
+                    headers: { Host: getIfNotBlank(params.host) },
+                };
+                if (proxy.tls && params.host) {
+                    proxy.sni = params.host;
                 }
             }
             return proxy;
@@ -356,196 +234,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];
-        let isShadowrocket;
-        let parsed = /^(.*?)@(.*?):(\d+)\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
-        if (!parsed) {
-            // eslint-disable-next-line no-unused-vars
-            let [_, base64, other] = /^(.*?)(\?.*?$)/.exec(line);
-            line = `${Base64.decode(base64)}${other}`;
-            parsed = /^(.*?)@(.*?):(\d+)\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
-            isShadowrocket = true;
-        }
-        // eslint-disable-next-line no-unused-vars
-        let [__, uuid, server, port, ___, addons = '', name] = parsed;
-        if (isShadowrocket) {
-            uuid = uuid.replace(/^.*?:/g, '');
-        }
-
-        port = parseInt(`${port}`, 10);
-        uuid = decodeURIComponent(uuid);
-        if (name != null) {
-            name = decodeURIComponent(name);
-        }
-
-        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.name = name ?? params.remarks ?? `VLESS ${server}:${port}`;
-
-        proxy.tls = params.security && params.security !== 'none';
-        if (isShadowrocket && /TRUE|1/i.test(params.tls)) {
-            proxy.tls = true;
-            params.security = params.security ?? 'reality';
-        }
-        proxy.sni = params.sni ?? params.peer;
-        proxy.flow = params.flow;
-        if (!proxy.flow && isShadowrocket && params.xtls) {
-            // "none" is undefined
-            const flow = [undefined, 'xtls-rprx-direct', 'xtls-rprx-vision'][
-                params.xtls
-            ];
-            if (flow) {
-                proxy.flow = 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[`${params.security}-opts`] = opts;
-            }
-        }
-        proxy.network = params.type;
-        if (proxy.network === 'tcp' && params.headerType === 'http') {
-            proxy.network = 'http';
-        }
-        if (!proxy.network && isShadowrocket && params.obfs) {
-            proxy.network = params.obfs;
-        }
-        if (['websocket'].includes(proxy.network)) {
-            proxy.network = 'ws';
-        }
-        if (proxy.network && !['tcp', 'none'].includes(proxy.network)) {
-            const opts = {};
-            const host = params.host ?? params.obfsParam;
-            if (host) {
-                if (params.obfsParam) {
-                    try {
-                        const parsed = JSON.parse(host);
-                        opts.headers = parsed;
-                    } catch (e) {
-                        opts.headers = { Host: host };
-                    }
-                } else {
-                    opts.headers = { Host: host };
-                }
-            }
-            if (params.serviceName) {
-                opts[`${proxy.network}-service-name`] = params.serviceName;
-            } else if (isShadowrocket && params.path) {
-                if (!['ws', 'http', 'h2'].includes(proxy.network)) {
-                    opts[`${proxy.network}-service-name`] = params.path;
-                    delete params.path;
-                }
-            }
-            if (params.path) {
-                opts.path = params.path;
-            }
-            // 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|hy2):\/\//.test(line);
-    };
-    const parse = (line) => {
-        line = line.split(/(hysteria2|hy2):\/\//)[2];
-        // 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);
-        if (name != null) {
-            name = decodeURIComponent(name);
-        }
-        name = 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';
@@ -554,16 +242,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 };
@@ -586,15 +266,10 @@ function Clash_All() {
                 'ss',
                 'ssr',
                 'vmess',
-                'socks5',
+                'socks',
                 'http',
                 'snell',
                 'trojan',
-                'tuic',
-                'vless',
-                'hysteria',
-                'hysteria2',
-                'wireguard',
             ].includes(proxy.type)
         ) {
             throw new Error(
@@ -603,27 +278,9 @@ function Clash_All() {
         }
 
         // handle vmess sni
-        if (['vmess', 'vless'].includes(proxy.type)) {
+        if (proxy.type === 'vmess') {
             proxy.sni = proxy.servername;
             delete proxy.servername;
-            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;
-                }
-            }
-        }
-
-        if (proxy.fingerprint) {
-            proxy['tls-fingerprint'] = proxy.fingerprint;
-        }
-
-        if (proxy['benchmark-url']) {
-            proxy['test-url'] = proxy['benchmark-url'];
         }
 
         return proxy;
@@ -667,15 +324,6 @@ function QX_VMess() {
     return { name, test, parse };
 }
 
-function QX_VLESS() {
-    const name = 'QX VLESS Parser';
-    const test = (line) => {
-        return /^vless\s*=/.test(line.split(',')[0].trim());
-    };
-    const parse = (line) => getQXParser().parse(line);
-    return { name, test, parse };
-}
-
 function QX_Trojan() {
     const name = 'QX Trojan Parser';
     const test = (line) => {
@@ -758,15 +406,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';
@@ -778,114 +417,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];
-        // https://github.com/MetaCubeX/mihomo/blob/0404e35be8736b695eae018a08debb175c1f96e6/docs/config.yaml#L717
-        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) => {
@@ -934,124 +465,19 @@ function Surge_Socks5() {
     return { name, test, parse };
 }
 
-function Surge_External() {
-    const name = 'Surge External Parser';
-    const test = (line) => {
-        return /^.*=\s*external/.test(line.split(',')[0]);
-    };
-    const parse = (line) => {
-        let parsed = /^\s*(.*?)\s*?=\s*?external\s*?,\s*(.*?)\s*$/.exec(line);
-
-        // eslint-disable-next-line no-unused-vars
-        let [_, name, other] = parsed;
-        line = other;
-
-        // exec = "/usr/bin/ssh" 或 exec = /usr/bin/ssh
-        let exec = /(,|^)\s*?exec\s*?=\s*"(.*?)"\s*?(,|$)/.exec(line)?.[2];
-        if (!exec) {
-            exec = /(,|^)\s*?exec\s*?=\s*(.*?)\s*?(,|$)/.exec(line)?.[2];
-        }
-
-        // local-port = "1080" 或 local-port = 1080
-        let localPort = /(,|^)\s*?local-port\s*?=\s*"(.*?)"\s*?(,|$)/.exec(
-            line,
-        )?.[2];
-        if (!localPort) {
-            localPort = /(,|^)\s*?local-port\s*?=\s*(.*?)\s*?(,|$)/.exec(
-                line,
-            )?.[2];
-        }
-        // args = "-m", args = "rc4-md5"
-        // args = -m, args = rc4-md5
-        const argsRegex = /(,|^)\s*?args\s*?=\s*("(.*?)"|(.*?))(?=\s*?(,|$))/g;
-        let argsMatch;
-        const args = [];
-        while ((argsMatch = argsRegex.exec(line)) !== null) {
-            if (argsMatch[3] != null) {
-                args.push(argsMatch[3]);
-            } else if (argsMatch[4] != null) {
-                args.push(argsMatch[4]);
-            }
-        }
-        // addresses = "[ipv6]",,addresses = "ipv6", addresses = "ipv4"
-        // addresses = [ipv6], addresses = ipv6, addresses = ipv4
-        const addressesRegex =
-            /(,|^)\s*?addresses\s*?=\s*("(.*?)"|(.*?))(?=\s*?(,|$))/g;
-        let addressesMatch;
-        const addresses = [];
-        while ((addressesMatch = addressesRegex.exec(line)) !== null) {
-            let ip;
-            if (addressesMatch[3] != null) {
-                ip = addressesMatch[3];
-            } else if (addressesMatch[4] != null) {
-                ip = addressesMatch[4];
-            }
-            if (ip != null) {
-                ip = `${ip}`.trim().replace(/^\[/, '').replace(/\]$/, '');
-            }
-            if (isIP(ip)) {
-                addresses.push(ip);
-            }
-        }
-
-        const proxy = {
-            type: 'external',
-            name,
-            exec,
-            'local-port': localPort,
-            args,
-            addresses,
-        };
-        return proxy;
-    };
-    return { name, test, parse };
-}
-
 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 };
 }
 
-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]);
-    };
-    const parse = (line) => getSurgeParser().parse(line);
-    return { name, test, parse };
-}
-
-function isIP(ip) {
-    return isIPv4(ip) || isIPv6(ip);
-}
-
 export default [
     URI_SS(),
     URI_SSR(),
     URI_VMess(),
-    URI_VLESS(),
-    URI_Hysteria2(),
     URI_Trojan(),
     Clash_All(),
     Surge_SS(),
@@ -1059,23 +485,16 @@ export default [
     Surge_Trojan(),
     Surge_Http(),
     Surge_Snell(),
-    Surge_Tuic(),
-    Surge_WireGuard(),
-    Surge_Hysteria2(),
     Surge_Socks5(),
-    Surge_External(),
     Loon_SS(),
     Loon_SSR(),
     Loon_VMess(),
     Loon_Vless(),
-    Loon_Hysteria2(),
     Loon_Trojan(),
     Loon_Http(),
-    Loon_WireGuard(),
     QX_SS(),
     QX_SSR(),
     QX_VMess(),
-    QX_VLESS(),
     QX_Trojan(),
     QX_Http(),
     QX_Socks5(),

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

@@ -38,18 +38,18 @@ const grammars = String.raw`
     }
 }
 
-start = (trojan/shadowsocks/vmess/vless/http/socks5) {
+start = (trojan/shadowsocks/vmess/http/socks5) {
     return proxy
 }
 
 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) {
@@ -91,20 +91,13 @@ vmess = "vmess" equals address
     handleObfs();
 }
 
-vless = "vless" 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)* {
-    proxy.type = "vless";
-    proxy.cipher = proxy.cipher || "none";
-    handleObfs();
-}
-
 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";
 }
     
@@ -162,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; }
@@ -181,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

@@ -36,18 +36,18 @@
     }
 }
 
-start = (trojan/shadowsocks/vmess/vless/http/socks5) {
+start = (trojan/shadowsocks/vmess/http/socks5) {
     return proxy
 }
 
 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) {
@@ -89,20 +89,13 @@ vmess = "vmess" equals address
     handleObfs();
 }
 
-vless = "vless" 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)* {
-    proxy.type = "vless";
-    proxy.cipher = proxy.cipher || "none";
-    handleObfs();
-}
-
 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";
 }
     
@@ -160,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; }
@@ -179,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

@@ -25,23 +25,15 @@ const grammars = String.raw`
             proxy.network = "ws";
             $set(proxy, "ws-opts.path", obfs.path);
             $set(proxy, "ws-opts.headers", obfs['ws-headers']);
-            if (proxy['ws-opts'] && proxy['ws-opts']['headers'] && proxy['ws-opts']['headers'].Host) {
-                proxy['ws-opts']['headers'].Host = proxy['ws-opts']['headers'].Host.replace(/^"(.*)"$/, '$1')
-            }
-        }
-    }
-    function handleShadowTLS() {
-        if (proxy['shadow-tls-password'] && !proxy['shadow-tls-version']) {
-            proxy['shadow-tls-version'] = 2;
         }
     }
 }
 
-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) {
     return proxy;
 }
 
-shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/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") {
@@ -50,9 +42,8 @@ shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/
         $set(proxy, "plugin-opts.host", obfs.host);
         $set(proxy, "plugin-opts.path", obfs.path);
     }
-    handleShadowTLS();
 }
-vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/ip_version/underlying_proxy/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) {
@@ -61,23 +52,19 @@ vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/
         proxy.alterId = proxy.alterId || 0;
     }
     handleWebsocket();
-    handleShadowTLS();
 }
-trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/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();
-    handleShadowTLS();
 }
-https = tag equals "https" address (username password)? (usernamek passwordk)? (sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/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;
-    handleShadowTLS();
 }
-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";
-    handleShadowTLS();
 }
-snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/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") {
@@ -85,33 +72,13 @@ snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_
         $set(proxy, "obfs-opts.host", obfs.host);
         $set(proxy, "obfs-opts.path", obfs.path);
     }
-    handleShadowTLS();
 }
-tuic = tag equals "tuic" address (alpn/token/ip_version/underlying_proxy/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
-    proxy.type = "tuic";
-    handleShadowTLS();
-}
-tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/underlying_proxy/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
-    proxy.type = "tuic";
-    proxy.version = 5;
-    handleShadowTLS();
-}
-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";
-    handleShadowTLS();
-}
-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";
-    handleShadowTLS();
-}
-socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/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";
-    handleShadowTLS();
 }
-socks5_tls = tag equals "socks5-tls" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/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;
-    handleShadowTLS();
 }
 
 address = comma server:server comma port:port {
@@ -180,7 +147,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; }
@@ -209,22 +175,6 @@ 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(""); }
 
 tag = match:[^=,]* { proxy.name = match.join("").trim(); }
 comma = _ "," _

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

@@ -23,23 +23,15 @@
             proxy.network = "ws";
             $set(proxy, "ws-opts.path", obfs.path);
             $set(proxy, "ws-opts.headers", obfs['ws-headers']);
-            if (proxy['ws-opts'] && proxy['ws-opts']['headers'] && proxy['ws-opts']['headers'].Host) {
-                proxy['ws-opts']['headers'].Host = proxy['ws-opts']['headers'].Host.replace(/^"(.*)"$/, '$1')
-            }
-        }
-    }
-    function handleShadowTLS() {
-        if (proxy['shadow-tls-password'] && !proxy['shadow-tls-version']) {
-            proxy['shadow-tls-version'] = 2;
         }
     }
 }
 
-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) {
     return proxy;
 }
 
-shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/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") {
@@ -48,9 +40,8 @@ shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/
         $set(proxy, "plugin-opts.host", obfs.host);
         $set(proxy, "plugin-opts.path", obfs.path);
     }
-    handleShadowTLS();
 }
-vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/ip_version/underlying_proxy/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) {
@@ -59,23 +50,19 @@ vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/
         proxy.alterId = proxy.alterId || 0;
     }
     handleWebsocket();
-    handleShadowTLS();
 }
-trojan = tag equals "trojan" address (passwordk/ws/ws_path/ws_headers/tls/sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/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();
-    handleShadowTLS();
 }
-https = tag equals "https" address (username password)? (usernamek passwordk)? (sni/tls_fingerprint/tls_verification/ip_version/underlying_proxy/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;
-    handleShadowTLS();
 }
-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";
-    handleShadowTLS();
 }
-snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/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") {
@@ -83,33 +70,13 @@ snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_
         $set(proxy, "obfs-opts.host", obfs.host);
         $set(proxy, "obfs-opts.path", obfs.path);
     }
-    handleShadowTLS();
 }
-tuic = tag equals "tuic" address (alpn/token/ip_version/underlying_proxy/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
-    proxy.type = "tuic";
-    handleShadowTLS();
-}
-tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/underlying_proxy/no_error_alert/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
-    proxy.type = "tuic";
-    proxy.version = 5;
-    handleShadowTLS();
-}
-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";
-    handleShadowTLS();
-}
-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";
-    handleShadowTLS();
-}
-socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/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";
-    handleShadowTLS();
 }
-socks5_tls = tag equals "socks5-tls" address (username password)? (usernamek passwordk)? (no_error_alert/ip_version/underlying_proxy/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;
-    handleShadowTLS();
 }
 
 address = comma server:server comma port:port {
@@ -178,7 +145,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; }
@@ -207,22 +173,6 @@ 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(""); }
 
 tag = match:[^=,]* { proxy.name = match.join("").trim(); }
 comma = _ "," _

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

@@ -79,7 +79,7 @@ port = digits:[0-9]+ {
   }
 }
 
-params = "/"? "?" head:param tail:("&"@param)* {
+params = "?" head:param tail:("&"@param)* {
   proxy["skip-cert-verify"] = toBool(params["allowInsecure"]);
   proxy.sni = params["sni"] || params["peer"];
 
@@ -87,23 +87,6 @@ params = "/"? "?" head:param tail:("&"@param)* {
     proxy.network = "ws";
     $set(proxy, "ws-opts.path", params["wspath"]);
   }
-  
-  if (params["type"]) {
-    proxy.network = params["type"]
-    if (['grpc'].includes(proxy.network)) {
-        proxy[proxy.network + '-opts'] = {
-            'grpc-service-name': params["serviceName"],
-            '_grpc-type': params["mode"],
-        };
-    } else {
-      if (params["path"]) {
-        $set(proxy, proxy.network+"-opts.path", decodeURIComponent(params["path"]));  
-      }
-      if (params["host"]) {
-        $set(proxy, proxy.network+"-opts.headers.Host", decodeURIComponent(params["host"])); 
-      }
-    }
-  }
 
   proxy.udp = toBool(params["udp"]);
   proxy.tfo = toBool(params["tfo"]);
@@ -111,7 +94,7 @@ params = "/"? "?" head:param tail:("&"@param)* {
 
 param = kv/single;
 
-kv = key:$[a-z]i+ "=" value:$[^&#]i* {
+kv = key:$[a-z]i+ "=" value:$[^&#]i+ {
   params[key] = value;
 }
 

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

@@ -77,7 +77,7 @@ port = digits:[0-9]+ {
   }
 }
 
-params = "/"? "?" head:param tail:("&"@param)* {
+params = "?" head:param tail:("&"@param)* {
   proxy["skip-cert-verify"] = toBool(params["allowInsecure"]);
   proxy.sni = params["sni"] || params["peer"];
 
@@ -85,23 +85,6 @@ params = "/"? "?" head:param tail:("&"@param)* {
     proxy.network = "ws";
     $set(proxy, "ws-opts.path", params["wspath"]);
   }
-  
-  if (params["type"]) {
-    proxy.network = params["type"]
-    if (['grpc'].includes(proxy.network)) {
-        proxy[proxy.network + '-opts'] = {
-            'grpc-service-name': params["serviceName"],
-            '_grpc-type': params["mode"],
-        };
-    } else {
-      if (params["path"]) {
-        $set(proxy, proxy.network+"-opts.path", decodeURIComponent(params["path"]));  
-      }
-      if (params["host"]) {
-        $set(proxy, proxy.network+"-opts.headers.Host", decodeURIComponent(params["host"])); 
-      }
-    }
-  }
 
   proxy.udp = toBool(params["udp"]);
   proxy.tfo = toBool(params["tfo"]);
@@ -109,7 +92,7 @@ params = "/"? "?" head:param tail:("&"@param)* {
 
 param = kv/single;
 
-kv = key:$[a-z]i+ "=" value:$[^&#]i* {
+kv = key:$[a-z]i+ "=" value:$[^&#]i+ {
   params[key] = value;
 }
 

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

@@ -1,4 +1,4 @@
-import { safeLoad } from '@/utils/yaml';
+import { safeLoad } from 'static-js-yaml';
 import { Base64 } from 'js-base64';
 
 function HTML() {
@@ -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,25 +35,12 @@ 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
-        const {
-            proxies,
-            'global-client-fingerprint': globalClientFingerprint,
-        } = safeLoad(raw);
-        return proxies
-            .map((p) => {
-                // https://github.com/MetaCubeX/mihomo/blob/Alpha/docs/config.yaml#L73C1-L73C26
-                if (globalClientFingerprint && !p['client-fingerprint']) {
-                    p['client-fingerprint'] = globalClientFingerprint;
-                }
-                return JSON.stringify(p);
-            })
-            .join('\n');
+        const proxies = safeLoad(raw).proxies;
+        return proxies.map((p) => JSON.stringify(p)).join('\n');
     };
     return { name, test, parse };
 }
@@ -113,12 +95,24 @@ function FullConfig() {
         return /^(\[server_local\]|\[Proxy\])/gm.test(raw);
     };
     const parse = function (raw) {
-        const match = raw.match(
-            /^\[server_local|Proxy\]([\s\S]+?)^\[.+?\](\r?\n|$)/im,
-        )?.[1];
-        return match || raw;
+        const regex = /^\[server_local]|\[Proxy]/gm;
+        const match = regex.exec(raw);
+        const results = [];
+
+        let first = true;
+        if (match) {
+            raw = raw.substring(match.index);
+            for (const line of raw.split('\n')) {
+                if (!first && !line.test(/^\s*\[/)) {
+                    results.push(line);
+                }
+                // skip the first line
+                first = false;
+            }
+            return results.join('\n');
+        }
     };
     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

@@ -1,5 +1,4 @@
 import resourceCache from '@/utils/resource-cache';
-import scriptResourceCache from '@/utils/script-resource-cache';
 import { isIPv4, isIPv6 } from '@/utils';
 import { FULL } from '@/utils/logical';
 import { getFlag } from '@/utils/geo';
@@ -7,16 +6,6 @@ import lodash from 'lodash';
 import $ from '@/core/app';
 import { hex_md5 } from '@/vendor/md5';
 import { ProxyUtils } from '@/core/proxy-utils';
-import { produceArtifact } from '@/restful/sync';
-
-import env from '@/utils/env';
-import {
-    getFlowField,
-    getFlowHeaders,
-    parseFlowHeaders,
-    validCheck,
-    flowTransfer,
-} from '@/utils/flow';
 
 /**
  The rule "(name CONTAINS "🇨🇳") AND (port IN [80, 443])" can be expressed as follows:
@@ -304,7 +293,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) => {
@@ -315,33 +304,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(input = []) {
-                        if (input && (input.$files || input.$content)) {
-                            let { $content, $files } = input
-                            ${script}
-                            return { $content, $files }
-                        } else {
-                            let proxies = input
-                            let list = []
-                            for await (let $server of proxies) {
-                                ${script}
-                                list.push($server)
-                            }
-                            return list
-                        }
-                      }`,
-                    $arguments,
-                );
-                output = operator(proxies, targetPlatform, { source, ...env });
+                output = operator(proxies, targetPlatform);
             })();
             return output;
         },
@@ -349,14 +312,14 @@ function ScriptOperator(script, targetPlatform, $arguments, source) {
 }
 
 const DOMAIN_RESOLVERS = {
-    Google: async function (domain, type) {
-        const id = hex_md5(`GOOGLE:${domain}:${type}`);
+    Google: async function (domain) {
+        const id = hex_md5(`GOOGLE:${domain}`);
         const cached = resourceCache.get(id);
         if (cached) return cached;
         const resp = await $.http.get({
             url: `https://8.8.4.4/resolve?name=${encodeURIComponent(
                 domain,
-            )}&type=${type === 'IPv6' ? 'AAAA' : 'A'}`,
+            )}&type=A`,
             headers: {
                 accept: 'application/dns-json',
             },
@@ -390,14 +353,14 @@ const DOMAIN_RESOLVERS = {
         resourceCache.set(id, result);
         return result;
     },
-    Cloudflare: async function (domain, type) {
-        const id = hex_md5(`CLOUDFLARE:${domain}:${type}`);
+    Cloudflare: async function (domain) {
+        const id = hex_md5(`CLOUDFLARE:${domain}`);
         const cached = resourceCache.get(id);
         if (cached) return cached;
         const resp = await $.http.get({
             url: `https://1.0.0.1/dns-query?name=${encodeURIComponent(
                 domain,
-            )}&type=${type === 'IPv6' ? 'AAAA' : 'A'}`,
+            )}&type=A`,
             headers: {
                 accept: 'application/dns-json',
             },
@@ -414,55 +377,12 @@ const DOMAIN_RESOLVERS = {
         resourceCache.set(id, result);
         return result;
     },
-    Ali: async function (domain, type) {
-        const id = hex_md5(`ALI:${domain}:${type}`);
-        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=${type === 'IPv6' ? 'AAAA' : '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, type) {
-        const id = hex_md5(`ALI:${domain}:${type}`);
-        const cached = resourceCache.get(id);
-        if (cached) return cached;
-        const resp = await $.http.get({
-            url: `http://119.28.28.28/d?type=${
-                type === 'IPv6' ? 'AAAA' : '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, type, filter }) {
-    if (type === 'IPv6' && ['IP-API'].includes(provider)) {
-        throw new Error(`域名解析服务提供方 ${provider} 不支持 IPv6`);
-    }
+function ResolveDomainOperator({ provider }) {
     const resolver = DOMAIN_RESOLVERS[provider];
     if (!resolver) {
-        throw new Error(`找不到域名解析服务提供方: ${provider}`);
+        throw new Error(`Cannot find resolver: ${provider}`);
     }
     return {
         name: 'Resolve Domain Operator',
@@ -471,9 +391,7 @@ function ResolveDomainOperator({ provider, type, filter }) {
             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);
@@ -481,7 +399,7 @@ function ResolveDomainOperator({ provider, type, filter }) {
                 const currentBatch = [];
                 for (let domain of totalDomain.splice(0, limit)) {
                     currentBatch.push(
-                        resolver(domain, type)
+                        resolver(domain)
                             .then((ip) => {
                                 results[domain] = ip;
                                 $.info(
@@ -497,30 +415,11 @@ function ResolveDomainOperator({ provider, type, filter }) {
                 }
                 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.filter((p) => {
-                if (filter === 'removeFailed') {
-                    return p['no-resolve'] || p.resolved;
-                } else if (filter === 'IPOnly') {
-                    return isIP(p.server);
-                } else if (filter === 'IPv4Only') {
-                    return isIPv4(p.server);
-                } else if (filter === 'IPv6Only') {
-                    return isIPv6(p.server);
-                } else {
-                    return true;
-                }
-            });
+            return proxies;
         },
     };
 }
@@ -622,7 +521,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) => {
@@ -633,29 +532,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(input = []) {
-                        let proxies = input
-                        let list = []
-                        const fn = async ($server) => {
-                            ${script}
-                        }
-                        for await (let $server of proxies) {
-                            list.push(await fn($server))
-                        }
-                        return list
-                      }`,
-                    $arguments,
-                );
-                output = filter(proxies, targetPlatform, { source, ...env });
+                output = filter(proxies, targetPlatform);
             })();
             return output;
         },
@@ -687,32 +564,8 @@ async function ApplyFilter(filter, objs) {
     try {
         selected = await filter.func(objs);
     } catch (err) {
-        let funcErr = '';
-        let funcErrMsg = `${err.message ?? err}`;
-        if (funcErrMsg.includes('$server is not defined')) {
-            funcErr = '';
-        } else {
-            $.error(
-                `Cannot apply filter ${filter.name}(function filter)! Reason: ${err}`,
-            );
-            funcErr = `执行 function filter 失败 ${funcErrMsg}; `;
-        }
-        try {
-            selected = await filter.nodeFunc(objs);
-        } catch (err) {
-            $.error(
-                `Cannot apply filter ${filter.name}(shortcut script)! Reason: ${err}`,
-            );
-            let nodeErr = '';
-            let nodeErrMsg = `${err.message ?? err}`;
-            if (funcErr && nodeErrMsg === funcErrMsg) {
-                nodeErr = '';
-                funcErr = `执行失败 ${funcErrMsg}`;
-            } else {
-                nodeErr = `执行快捷过滤脚本 失败 ${nodeErrMsg}`;
-            }
-            throw new Error(`脚本过滤 ${funcErr}${nodeErr}`);
-        }
+        // print log and skip this filter
+        $.log(`Cannot apply filter ${filter.name}\n Reason: ${err}`);
     }
     return objs.filter((_, i) => selected[i]);
 }
@@ -723,39 +576,8 @@ async function ApplyOperator(operator, objs) {
         const output_ = await operator.func(output);
         if (output_) output = output_;
     } catch (err) {
-        let funcErr = '';
-        let funcErrMsg = `${err.message ?? err}`;
-        if (
-            funcErrMsg.includes('$server is not defined') ||
-            funcErrMsg.includes('$content is not defined') ||
-            funcErrMsg.includes('$files is not defined') ||
-            output?.$files ||
-            output?.$content
-        ) {
-            funcErr = '';
-        } else {
-            $.error(
-                `Cannot apply operator ${operator.name}(function operator)! Reason: ${err}`,
-            );
-            funcErr = `执行 function operator 失败 ${funcErrMsg}; `;
-        }
-        try {
-            const output_ = await operator.nodeFunc(output);
-            if (output_) output = output_;
-        } catch (err) {
-            $.error(
-                `Cannot apply operator ${operator.name}(shortcut script)! Reason: ${err}`,
-            );
-            let nodeErr = '';
-            let nodeErrMsg = `${err.message ?? err}`;
-            if (funcErr && nodeErrMsg === funcErrMsg) {
-                nodeErr = '';
-                funcErr = `执行失败 ${funcErrMsg}`;
-            } else {
-                nodeErr = `执行快捷脚本 失败 ${nodeErrMsg}`;
-            }
-            throw new Error(`脚本操作 ${funcErr}${nodeErr}`);
-        }
+        // print log and skip this operator
+        $.log(`Cannot apply operator ${operator.name}! Reason: ${err}`);
     }
     return output;
 }
@@ -802,13 +624,6 @@ function removeFlag(str) {
 }
 
 function createDynamicFunction(name, script, $arguments) {
-    const flowUtils = {
-        getFlowField,
-        getFlowHeaders,
-        parseFlowHeaders,
-        flowTransfer,
-        validCheck,
-    };
     if ($.env.isLoon) {
         return new Function(
             '$arguments',
@@ -818,9 +633,6 @@ function createDynamicFunction(name, script, $arguments) {
             '$httpClient',
             '$notification',
             'ProxyUtils',
-            'scriptResourceCache',
-            'flowUtils',
-            'produceArtifact',
             `${script}\n return ${name}`,
         )(
             $arguments,
@@ -833,9 +645,6 @@ function createDynamicFunction(name, script, $arguments) {
             // eslint-disable-next-line no-undef
             $notification,
             ProxyUtils,
-            scriptResourceCache,
-            flowUtils,
-            produceArtifact,
         );
     } else {
         return new Function(
@@ -843,19 +652,7 @@ function createDynamicFunction(name, script, $arguments) {
             '$substore',
             'lodash',
             'ProxyUtils',
-            'scriptResourceCache',
-            'flowUtils',
-            'produceArtifact',
-
             `${script}\n return ${name}`,
-        )(
-            $arguments,
-            $,
-            lodash,
-            ProxyUtils,
-            scriptResourceCache,
-            flowUtils,
-            produceArtifact,
-        );
+        )($arguments, $, lodash, ProxyUtils);
     }
 }

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

@@ -2,168 +2,36 @@ import { isPresent } from '@/core/proxy-utils/producers/utils';
 
 export default function Clash_Producer() {
     const type = 'ALL';
-    const produce = (proxies, type, opts = {}) => {
-        // 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
+    const produce = (proxies) => {
         // filter unsupported proxies
-        // https://clash.wiki/configuration/outbound.html#shadowsocks
-        const list = proxies
-            .filter((proxy) => {
-                if (opts['include-unsupported-proxy']) return true;
-                if (
-                    ![
-                        'ss',
-                        'ssr',
-                        'vmess',
-                        'vless',
-                        'socks5',
-                        'http',
-                        'snell',
-                        'trojan',
-                        'wireguard',
-                    ].includes(proxy.type) ||
-                    (proxy.type === 'ss' &&
-                        ![
-                            'aes-128-gcm',
-                            'aes-192-gcm',
-                            'aes-256-gcm',
-                            'aes-128-cfb',
-                            'aes-192-cfb',
-                            'aes-256-cfb',
-                            'aes-128-ctr',
-                            'aes-192-ctr',
-                            'aes-256-ctr',
-                            'rc4-md5',
-                            'chacha20-ietf',
-                            'xchacha20',
-                            'chacha20-ietf-poly1305',
-                            'xchacha20-ietf-poly1305',
-                        ].includes(proxy.cipher)) ||
-                    (proxy.type === 'snell' && String(proxy.version) === '4') ||
-                    (proxy.type === 'vless' &&
-                        (typeof proxy.flow !== 'undefined' ||
-                            proxy['reality-opts']))
-                ) {
-                    return false;
-                }
-                return true;
-            })
-            .map((proxy) => {
-                if (proxy.type === 'vmess') {
-                    // handle vmess aead
-                    if (isPresent(proxy, 'aead')) {
-                        if (proxy.aead) {
-                            proxy.alterId = 0;
+        proxies = proxies.filter((proxy) =>
+            ['ss', 'ssr', 'vmess', 'socks', 'http', 'snell', 'trojan'].includes(
+                proxy.type,
+            ),
+        );
+        return (
+            'proxies:\n' +
+            proxies
+                .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;
                         }
-                        delete proxy.aead;
                     }
-                    if (isPresent(proxy, 'sni')) {
-                        proxy.servername = proxy.sni;
-                        delete proxy.sni;
-                    }
-                    // https://dreamacro.github.io/clash/configuration/outbound.html#vmess
-                    if (
-                        isPresent(proxy, 'cipher') &&
-                        ![
-                            'auto',
-                            'aes-128-gcm',
-                            'chacha20-poly1305',
-                            'none',
-                        ].includes(proxy.cipher)
-                    ) {
-                        proxy.cipher = 'auto';
-                    }
-                } 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 (
-                    ['vmess', 'vless'].includes(proxy.type) &&
-                    proxy.network === 'h2'
-                ) {
-                    let path = proxy['h2-opts']?.path;
-                    if (
-                        isPresent(proxy, 'h2-opts.path') &&
-                        Array.isArray(path)
-                    ) {
-                        proxy['h2-opts'].path = path[0];
-                    }
-                    let host = proxy['h2-opts']?.headers?.host;
-                    if (
-                        isPresent(proxy, 'h2-opts.headers.Host') &&
-                        !Array.isArray(host)
-                    ) {
-                        proxy['h2-opts'].headers.host = [host];
-                    }
-                }
-                if (proxy['plugin-opts']?.tls) {
-                    if (isPresent(proxy, 'skip-cert-verify')) {
-                        proxy['plugin-opts']['skip-cert-verify'] =
-                            proxy['skip-cert-verify'];
-                    }
-                }
-                if (
-                    ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
-                        proxy.type,
-                    )
-                ) {
-                    delete proxy.tls;
-                }
-
-                if (proxy['tls-fingerprint']) {
-                    proxy.fingerprint = proxy['tls-fingerprint'];
-                }
-                delete proxy['tls-fingerprint'];
-                if (isPresent(proxy, 'tls') && typeof proxy.tls !== 'boolean') {
-                    delete proxy.tls;
-                }
-
-                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('');
+                    delete proxy['tls-fingerprint'];
+                    return '  - ' + JSON.stringify(proxy) + '\n';
+                })
+                .join('')
+        );
     };
     return { type, produce };
 }

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

@@ -1,185 +0,0 @@
-import { isPresent } from '@/core/proxy-utils/producers/utils';
-
-export default function ClashMeta_Producer() {
-    const type = 'ALL';
-    const produce = (proxies, type, opts = {}) => {
-        const list = proxies
-            .filter((proxy) => {
-                if (opts['include-unsupported-proxy']) return true;
-                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;
-                    }
-                } else if (proxy.type === 'ss') {
-                    if (
-                        isPresent(proxy, 'shadow-tls-password') &&
-                        !isPresent(proxy, 'plugin')
-                    ) {
-                        proxy.plugin = 'shadow-tls';
-                        proxy['plugin-opts'] = {
-                            host: proxy['shadow-tls-sni'],
-                            password: proxy['shadow-tls-password'],
-                            version: proxy['shadow-tls-version'],
-                        };
-                    }
-                }
-
-                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 (
-                    ['vmess', 'vless'].includes(proxy.type) &&
-                    proxy.network === 'h2'
-                ) {
-                    let path = proxy['h2-opts']?.path;
-                    if (
-                        isPresent(proxy, 'h2-opts.path') &&
-                        Array.isArray(path)
-                    ) {
-                        proxy['h2-opts'].path = path[0];
-                    }
-                    let host = proxy['h2-opts']?.headers?.host;
-                    if (
-                        isPresent(proxy, 'h2-opts.headers.Host') &&
-                        !Array.isArray(host)
-                    ) {
-                        proxy['h2-opts'].headers.host = [host];
-                    }
-                }
-
-                if (proxy['plugin-opts']?.tls) {
-                    if (isPresent(proxy, 'skip-cert-verify')) {
-                        proxy['plugin-opts']['skip-cert-verify'] =
-                            proxy['skip-cert-verify'];
-                    }
-                }
-                if (
-                    ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
-                        proxy.type,
-                    )
-                ) {
-                    delete proxy.tls;
-                }
-
-                if (proxy['tls-fingerprint']) {
-                    proxy.fingerprint = proxy['tls-fingerprint'];
-                }
-                delete proxy['tls-fingerprint'];
-                if (isPresent(proxy, 'tls') && typeof proxy.tls !== 'boolean') {
-                    delete proxy.tls;
-                }
-                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,15 +1,9 @@
 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';
-import V2Ray_Producer from './v2ray';
 import QX_Producer from './qx';
-import Shadowrocket_Producer from './shadowrocket';
-import Surfboard_Producer from './surfboard';
-import singbox_Producer from './sing-box';
 
 function JSON_Producer() {
     const type = 'ALL';
@@ -19,18 +13,10 @@ function JSON_Producer() {
 
 export default {
     QX: QX_Producer(),
-    QuantumultX: 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(),
     Stash: Stash_Producer(),
-    Shadowrocket: Shadowrocket_Producer(),
-    ShadowRocket: Shadowrocket_Producer(),
-    Surfboard: Surfboard_Producer(),
-    'sing-box': singbox_Producer(),
 };

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

@@ -1,7 +1,6 @@
 /* eslint-disable no-case-declarations */
 const targetPlatform = 'Loon';
 import { isPresent, Result } from './utils';
-import { isIPv4, isIPv6 } from '@/utils';
 
 export default function Loon_Producer() {
     const produce = (proxy) => {
@@ -18,10 +17,6 @@ export default function Loon_Producer() {
                 return vless(proxy);
             case 'http':
                 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}`,
@@ -32,32 +27,6 @@ export default function Loon_Producer() {
 
 function shadowsocks(proxy) {
     const result = new Result(proxy);
-    if (
-        ![
-            'rc4',
-            'rc4-md5',
-            'aes-128-cfb',
-            'aes-192-cfb',
-            'aes-256-cfb',
-            'aes-128-ctr',
-            'aes-192-ctr',
-            'aes-256-ctr',
-            'bf-cfb',
-            'camellia-128-cfb',
-            'camellia-192-cfb',
-            'camellia-256-cfb',
-            'salsa20',
-            'chacha20',
-            'chacha20-ietf',
-            'aes-128-gcm',
-            'aes-192-gcm',
-            'aes-256-gcm',
-            'chacha20-ietf-poly1305',
-            'xchacha20-ietf-poly1305',
-        ].includes(proxy.cipher)
-    ) {
-        throw new Error(`cipher ${proxy.cipher} is not supported`);
-    }
     result.append(
         `${proxy.name}=shadowsocks,${proxy.server},${proxy.port},${proxy.cipher},"${proxy.password}"`,
     );
@@ -119,19 +88,17 @@ function trojan(proxy) {
     result.append(
         `${proxy.name}=trojan,${proxy.server},${proxy.port},"${proxy.password}"`,
     );
-    if (proxy.network === 'tcp') {
-        delete proxy.network;
-    }
+
     // transport
     if (isPresent(proxy, 'network')) {
         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 {
@@ -160,33 +127,31 @@ function trojan(proxy) {
 function vmess(proxy) {
     const result = new Result(proxy);
     result.append(
-        `${proxy.name}=vmess,${proxy.server},${proxy.port},${proxy.cipher},"${proxy.uuid}"`,
+        `${proxy.name}=vmess,${proxy.server},${proxy.port},${
+            proxy.cipher === 'auto' ? 'none' : proxy.cipher
+        },"${proxy.uuid}"`,
     );
-    if (proxy.network === 'tcp') {
-        delete proxy.network;
-    }
+
     // transport
     if (isPresent(proxy, 'network')) {
         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') {
             result.append(`,transport=http`);
-            let httpPath = proxy['http-opts']?.path;
-            let httpHost = proxy['http-opts']?.headers?.Host;
             result.appendIfPresent(
-                `,path=${Array.isArray(httpPath) ? httpPath[0] : httpPath}`,
+                `,path=${proxy['http-opts'].path}`,
                 'http-opts.path',
             );
             result.appendIfPresent(
-                `,host=${Array.isArray(httpHost) ? httpHost[0] : httpHost}`,
+                `,host=${proxy['http-opts'].headers.Host}`,
                 'http-opts.headers.Host',
             );
         } else {
@@ -224,38 +189,31 @@ function vmess(proxy) {
 }
 
 function vless(proxy) {
-    if (proxy['reality-opts']) {
-        throw new Error(`VLESS REALITY is unsupported`);
-    }
     const result = new Result(proxy);
     result.append(
         `${proxy.name}=vless,${proxy.server},${proxy.port},"${proxy.uuid}"`,
     );
-    if (proxy.network === 'tcp') {
-        delete proxy.network;
-    }
+
     // transport
     if (isPresent(proxy, 'network')) {
         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') {
             result.append(`,transport=http`);
-            let httpPath = proxy['http-opts']?.path;
-            let httpHost = proxy['http-opts']?.headers?.Host;
             result.appendIfPresent(
-                `,path=${Array.isArray(httpPath) ? httpPath[0] : httpPath}`,
+                `,path=${proxy['http-opts'].path}`,
                 'http-opts.path',
             );
             result.appendIfPresent(
-                `,host=${Array.isArray(httpHost) ? httpHost[0] : httpHost}`,
+                `,host=${proxy['http-opts'].headers.Host}`,
                 'http-opts.headers.Host',
             );
         } else {
@@ -308,94 +266,3 @@ function http(proxy) {
     result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
     return result.toString();
 }
-
-function wireguard(proxy) {
-    if (Array.isArray(proxy.peers) && proxy.peers.length > 0) {
-        proxy.server = proxy.peers[0].server;
-        proxy.port = proxy.peers[0].port;
-        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'];
-        // https://github.com/MetaCubeX/mihomo/blob/0404e35be8736b695eae018a08debb175c1f96e6/docs/config.yaml#L717
-        proxy['allowed-ips'] = proxy.peers[0]['allowed-ips'];
-        proxy.reserved = proxy.peers[0].reserved;
-    }
-    const result = new Result(proxy);
-    result.append(`${proxy.name}=wireguard`);
-
-    result.appendIfPresent(`,interface-ip=${proxy.ip}`, 'ip');
-    result.appendIfPresent(`,interface-ipv6=${proxy.ipv6}`, 'ipv6');
-
-    result.appendIfPresent(
-        `,private-key="${proxy['private-key']}"`,
-        'private-key',
-    );
-    result.appendIfPresent(`,mtu=${proxy.mtu}`, 'mtu');
-
-    if (proxy.dns) {
-        if (Array.isArray(proxy.dns)) {
-            proxy.dnsv6 = proxy.dns.find((i) => isIPv6(i));
-            proxy.dns = proxy.dns.find((i) => isIPv4(i));
-        }
-    }
-    result.appendIfPresent(`,dns=${proxy.dns}`, 'dns');
-    result.appendIfPresent(`,dnsv6=${proxy.dnsv6}`, 'dnsv6');
-    result.appendIfPresent(
-        `,keepalive=${proxy['persistent-keepalive']}`,
-        'persistent-keepalive',
-    );
-    result.appendIfPresent(`,keepalive=${proxy.keepalive}`, 'keepalive');
-    const allowedIps = Array.isArray(proxy['allowed-ips'])
-        ? proxy['allowed-ips'].join(',')
-        : proxy['allowed-ips'];
-    let reserved = Array.isArray(proxy.reserved)
-        ? proxy.reserved.join(',')
-        : proxy.reserved;
-    if (reserved) {
-        reserved = `,reserved=[${reserved}]`;
-    }
-    let presharedKey = proxy['preshared-key'] ?? proxy['pre-shared-key'];
-    if (presharedKey) {
-        presharedKey = `,preshared-key="${presharedKey}"`;
-    }
-    result.append(
-        `,peers=[{public-key="${proxy['public-key']}",allowed-ips="${
-            allowedIps ?? '0.0.0.0/0,::/0'
-        }",endpoint=${proxy.server}:${proxy.port}${reserved ?? ''}${
-            presharedKey ?? ''
-        }}]`,
-    );
-
-    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

@@ -3,7 +3,7 @@ import { isPresent, Result } from './utils';
 const targetPlatform = 'QX';
 
 export default function QX_Producer() {
-    const produce = (proxy, type, opts = {}) => {
+    const produce = (proxy) => {
         switch (proxy.type) {
             case 'ss':
                 return shadowsocks(proxy);
@@ -17,14 +17,6 @@ export default function QX_Producer() {
                 return http(proxy);
             case 'socks5':
                 return socks5(proxy);
-            case 'vless':
-                if (opts['include-unsupported-proxy']) {
-                    return vless(proxy);
-                } else {
-                    throw new Error(
-                        `Platform ${targetPlatform}(App Store Release) does not support proxy type: ${proxy.type}`,
-                    );
-                }
         }
         throw new Error(
             `Platform ${targetPlatform} does not support proxy type: ${proxy.type}`,
@@ -37,36 +29,7 @@ function shadowsocks(proxy) {
     const result = new Result(proxy);
     const append = result.append.bind(result);
     const appendIfPresent = result.appendIfPresent.bind(result);
-    if (!proxy.cipher) {
-        proxy.cipher = 'none';
-    }
-    if (
-        ![
-            'none',
-            'rc4-md5',
-            'rc4-md5-6',
-            'aes-128-cfb',
-            'aes-192-cfb',
-            'aes-256-cfb',
-            'aes-128-ctr',
-            'aes-192-ctr',
-            'aes-256-ctr',
-            'bf-cfb',
-            'cast5-cfb',
-            'des-cfb',
-            'rc2-cfb',
-            'salsa20',
-            'chacha20',
-            'chacha20-ietf',
-            'aes-128-gcm',
-            'aes-192-gcm',
-            'aes-256-gcm',
-            'chacha20-ietf-poly1305',
-            'xchacha20-ietf-poly1305',
-        ].includes(proxy.cipher)
-    ) {
-        throw new Error(`cipher ${proxy.cipher} is not supported`);
-    }
+
     append(`shadowsocks=${proxy.server}:${proxy.port}`);
     append(`,method=${proxy.cipher}`);
     append(`,password=${proxy.password}`);
@@ -99,33 +62,18 @@ 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']}`,
-            'tls-fingerprint',
-        );
+    // tls fingerprint
+    appendIfPresent(
+        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+        'tls-fingerprint',
+    );
 
-        // tls verification
-        appendIfPresent(
-            `,tls-verification=${!proxy['skip-cert-verify']}`,
-            'skip-cert-verify',
-        );
-        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
-    }
+    // tls verification
+    appendIfPresent(
+        `,tls-verification=${!proxy['skip-cert-verify']}`,
+        'skip-cert-verify',
+    );
+    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
 
     // tfo
     appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -133,12 +81,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}`);
 
@@ -171,12 +113,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}`);
 
@@ -197,11 +133,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 {
@@ -214,33 +150,18 @@ function trojan(proxy) {
         append(`,over-tls=true`);
     }
 
-    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']}`,
-            'tls-fingerprint',
-        );
+    // tls fingerprint
+    appendIfPresent(
+        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+        'tls-fingerprint',
+    );
 
-        // tls verification
-        appendIfPresent(
-            `,tls-verification=${!proxy['skip-cert-verify']}`,
-            'skip-cert-verify',
-        );
-        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
-    }
+    // tls verification
+    appendIfPresent(
+        `,tls-verification=${!proxy['skip-cert-verify']}`,
+        'skip-cert-verify',
+    );
+    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
 
     // tfo
     appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -248,12 +169,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}`);
 
@@ -291,18 +206,12 @@ function vmess(proxy) {
         } else {
             throw new Error(`network ${proxy.network} is unsupported`);
         }
-        let transportPath = proxy[`${proxy.network}-opts`]?.path;
-        let transportHost = proxy[`${proxy.network}-opts`]?.headers?.Host;
         appendIfPresent(
-            `,obfs-uri=${
-                Array.isArray(transportPath) ? transportPath[0] : transportPath
-            }`,
+            `,obfs-uri=${proxy[`${proxy.network}-opts`].path}`,
             `${proxy.network}-opts.path`,
         );
         appendIfPresent(
-            `,obfs-host=${
-                Array.isArray(transportHost) ? transportHost[0] : transportHost
-            }`,
+            `,obfs-host=${proxy[`${proxy.network}-opts`].headers.Host}`,
             `${proxy.network}-opts.headers.Host`,
         );
     } else {
@@ -310,33 +219,18 @@ function vmess(proxy) {
         if (proxy.tls) append(`,obfs=over-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']}`,
-            'tls-fingerprint',
-        );
+    // tls fingerprint
+    appendIfPresent(
+        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+        'tls-fingerprint',
+    );
 
-        // tls verification
-        appendIfPresent(
-            `,tls-verification=${!proxy['skip-cert-verify']}`,
-            'skip-cert-verify',
-        );
-        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
-    }
+    // tls verification
+    appendIfPresent(
+        `,tls-verification=${!proxy['skip-cert-verify']}`,
+        'skip-cert-verify',
+    );
+    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
 
     // AEAD
     if (isPresent(proxy, 'aead')) {
@@ -351,111 +245,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}`);
-
-    return result.toString();
-}
-function vless(proxy) {
-    if (typeof proxy.flow !== 'undefined' || proxy['reality-opts']) {
-        throw new Error(`VLESS XTLS/REALITY is not supported`);
-    }
-
-    const result = new Result(proxy);
-    const append = result.append.bind(result);
-    const appendIfPresent = result.appendIfPresent.bind(result);
-
-    append(`vless=${proxy.server}:${proxy.port}`);
-
-    // The method field for vless should be none.
-    let cipher = 'none';
-    // if (proxy.cipher === 'auto') {
-    //     cipher = 'chacha20-ietf-poly1305';
-    // } else {
-    //     cipher = proxy.cipher;
-    // }
-    append(`,method=${cipher}`);
-
-    append(`,password=${proxy.uuid}`);
-
-    // obfs
-    if (needTls(proxy)) {
-        proxy.tls = true;
-    }
-    if (isPresent(proxy, 'network')) {
-        if (proxy.network === 'ws') {
-            if (proxy.tls) append(`,obfs=wss`);
-            else append(`,obfs=ws`);
-        } else if (proxy.network === 'http') {
-            append(`,obfs=http`);
-        } else if (!['tcp'].includes(proxy.network)) {
-            throw new Error(`network ${proxy.network} is unsupported`);
-        }
-        let transportPath = proxy[`${proxy.network}-opts`]?.path;
-        let transportHost = proxy[`${proxy.network}-opts`]?.headers?.Host;
-        appendIfPresent(
-            `,obfs-uri=${
-                Array.isArray(transportPath) ? transportPath[0] : transportPath
-            }`,
-            `${proxy.network}-opts.path`,
-        );
-        appendIfPresent(
-            `,obfs-host=${
-                Array.isArray(transportHost) ? transportHost[0] : transportHost
-            }`,
-            `${proxy.network}-opts.headers.Host`,
-        );
-    } else {
-        // over-tls
-        if (proxy.tls) append(`,obfs=over-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']}`,
-            'tls-fingerprint',
-        );
-
-        // tls verification
-        appendIfPresent(
-            `,tls-verification=${!proxy['skip-cert-verify']}`,
-            'skip-cert-verify',
-        );
-        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
-    }
-
-    // tfo
-    appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
-
-    // 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}`);
 
@@ -477,33 +266,18 @@ 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']}`,
-            'tls-fingerprint',
-        );
+    // tls fingerprint
+    appendIfPresent(
+        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+        'tls-fingerprint',
+    );
 
-        // tls verification
-        appendIfPresent(
-            `,tls-verification=${!proxy['skip-cert-verify']}`,
-            'skip-cert-verify',
-        );
-        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
-    }
+    // tls verification
+    appendIfPresent(
+        `,tls-verification=${!proxy['skip-cert-verify']}`,
+        'skip-cert-verify',
+    );
+    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
 
     // tfo
     appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -511,12 +285,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}`);
 
@@ -538,33 +306,18 @@ 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']}`,
-            'tls-fingerprint',
-        );
+    // tls fingerprint
+    appendIfPresent(
+        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+        'tls-fingerprint',
+    );
 
-        // tls verification
-        appendIfPresent(
-            `,tls-verification=${!proxy['skip-cert-verify']}`,
-            'skip-cert-verify',
-        );
-        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
-    }
+    // tls verification
+    appendIfPresent(
+        `,tls-verification=${!proxy['skip-cert-verify']}`,
+        'skip-cert-verify',
+    );
+    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
 
     // tfo
     appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -572,12 +325,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}`);
 
@@ -585,5 +332,11 @@ function socks5(proxy) {
 }
 
 function needTls(proxy) {
-    return proxy.tls;
+    return (
+        proxy.tls ||
+        proxy.sni ||
+        typeof proxy['skip-cert-verify'] !== 'undefined' ||
+        typeof proxy['tls-fingerprint'] !== 'undefined' ||
+        typeof proxy['tls-host'] !== 'undefined'
+    );
 }

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

@@ -1,189 +0,0 @@
-import { isPresent } from '@/core/proxy-utils/producers/utils';
-
-export default function ShadowRocket_Producer() {
-    const type = 'ALL';
-    const produce = (proxies, type, opts = {}) => {
-        const list = proxies
-            .filter((proxy) => {
-                if (opts['include-unsupported-proxy']) return true;
-                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 === '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
-                            : [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 (
-                    ['vmess', 'vless'].includes(proxy.type) &&
-                    proxy.network === 'h2'
-                ) {
-                    let path = proxy['h2-opts']?.path;
-                    if (
-                        isPresent(proxy, 'h2-opts.path') &&
-                        Array.isArray(path)
-                    ) {
-                        proxy['h2-opts'].path = path[0];
-                    }
-                    let host = proxy['h2-opts']?.headers?.host;
-                    if (
-                        isPresent(proxy, 'h2-opts.headers.Host') &&
-                        !Array.isArray(host)
-                    ) {
-                        proxy['h2-opts'].headers.host = [host];
-                    }
-                }
-                if (proxy['plugin-opts']?.tls) {
-                    if (isPresent(proxy, 'skip-cert-verify')) {
-                        proxy['plugin-opts']['skip-cert-verify'] =
-                            proxy['skip-cert-verify'];
-                    }
-                }
-                if (
-                    ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
-                        proxy.type,
-                    )
-                ) {
-                    delete proxy.tls;
-                }
-
-                if (proxy['tls-fingerprint']) {
-                    proxy.fingerprint = proxy['tls-fingerprint'];
-                }
-                delete proxy['tls-fingerprint'];
-                if (isPresent(proxy, 'tls') && typeof proxy.tls !== 'boolean') {
-                    delete proxy.tls;
-                }
-                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) => {
-                          return '  - ' + JSON.stringify(proxy) + '\n';
-                      })
-                      .join('');
-    };
-    return { type, produce };
-}

backend/src/core/proxy-utils/producers/sing-box.js

@@ -1,724 +0,0 @@
-import ClashMeta_Producer from './clashmeta';
-import $ from '@/core/app';
-
-const tfoParser = (proxy, parsedProxy) => {
-    parsedProxy.tcp_fast_open = false;
-    if (proxy.tfo) parsedProxy.tcp_fast_open = true;
-    if (proxy.tcp_fast_open) parsedProxy.tcp_fast_open = true;
-    if (proxy['tcp-fast-open']) parsedProxy.tcp_fast_open = true;
-    if (!parsedProxy.tcp_fast_open) delete parsedProxy.tcp_fast_open;
-};
-
-const smuxParser = (smux, proxy) => {
-    if (!smux || !smux.enabled) return;
-    proxy.multiplex = { enabled: true };
-    proxy.multiplex.protocol = smux.protocol;
-    if (smux['max-connections'])
-        proxy.multiplex.max_connections = parseInt(
-            `${smux['max-connections']}`,
-            10,
-        );
-    if (smux['max-streams'])
-        proxy.multiplex.max_streams = parseInt(`${smux['max-streams']}`, 10);
-    if (smux['min-streams'])
-        proxy.multiplex.min_streams = parseInt(`${smux['min-streams']}`, 10);
-    if (smux.padding) proxy.multiplex.padding = true;
-};
-
-const wsParser = (proxy, parsedProxy) => {
-    const transport = { type: 'ws', headers: {} };
-    if (proxy['ws-opts']) {
-        const { path: wsPath = '', headers: wsHeaders = {} } = proxy['ws-opts'];
-        if (wsPath !== '') transport.path = `${wsPath}`;
-        if (Object.keys(wsHeaders).length > 0) {
-            const headers = {};
-            for (const key of Object.keys(wsHeaders)) {
-                let value = wsHeaders[key];
-                if (value === '') continue;
-                if (!Array.isArray(value)) value = [`${value}`];
-                if (value.length > 0) headers[key] = value;
-            }
-            const { Host: wsHost } = headers;
-            if (wsHost.length === 1)
-                for (const item of `Host:${wsHost[0]}`.split('\n')) {
-                    const [key, value] = item.split(':');
-                    if (value.trim() === '') continue;
-                    headers[key.trim()] = value.trim().split(',');
-                }
-            transport.headers = headers;
-        }
-    }
-    if (proxy['ws-headers']) {
-        const headers = {};
-        for (const key of Object.keys(proxy['ws-headers'])) {
-            let value = proxy['ws-headers'][key];
-            if (value === '') continue;
-            if (!Array.isArray(value)) value = [`${value}`];
-            if (value.length > 0) headers[key] = value;
-        }
-        const { Host: wsHost } = headers;
-        if (wsHost.length === 1)
-            for (const item of `Host:${wsHost[0]}`.split('\n')) {
-                const [key, value] = item.split(':');
-                if (value.trim() === '') continue;
-                headers[key.trim()] = value.trim().split(',');
-            }
-        for (const key of Object.keys(headers))
-            transport.headers[key] = headers[key];
-    }
-    if (proxy['ws-path'] && proxy['ws-path'] !== '')
-        transport.path = `${proxy['ws-path']}`;
-    if (transport.path) {
-        const reg = /^(.*?)(?:\?ed=(\d+))?$/;
-        // eslint-disable-next-line no-unused-vars
-        const [_, path = '', ed = ''] = reg.exec(transport.path);
-        transport.path = path;
-        if (ed !== '') {
-            transport.early_data_header_name = 'Sec-WebSocket-Protocol';
-            transport.max_early_data = parseInt(ed, 10);
-        }
-    }
-
-    if (parsedProxy.tls.insecure)
-        parsedProxy.tls.server_name = transport.headers.Host[0];
-    if (proxy['ws-opts'] && proxy['ws-opts']['v2ray-http-upgrade']) {
-        transport.type = 'httpupgrade';
-        if (transport.headers.Host) {
-            transport.host = transport.headers.Host[0];
-            delete transport.headers.Host;
-        }
-        if (transport.max_early_data) delete transport.max_early_data;
-        if (transport.early_data_header_name)
-            delete transport.early_data_header_name;
-    }
-    for (const key of Object.keys(transport.headers)) {
-        const value = transport.headers[key];
-        if (value.length === 1) transport.headers[key] = value[0];
-    }
-    parsedProxy.transport = transport;
-};
-
-const h1Parser = (proxy, parsedProxy) => {
-    const transport = { type: 'http', headers: {} };
-    if (proxy['http-opts']) {
-        const {
-            method = '',
-            path: h1Path = '',
-            headers: h1Headers = {},
-        } = proxy['http-opts'];
-        if (method !== '') transport.method = method;
-        if (Array.isArray(h1Path)) {
-            transport.path = `${h1Path[0]}`;
-        } else if (h1Path !== '') transport.path = `${h1Path}`;
-        for (const key of Object.keys(h1Headers)) {
-            let value = h1Headers[key];
-            if (value === '') continue;
-            if (key.toLowerCase() === 'host') {
-                let host = value;
-                if (!Array.isArray(host))
-                    host = `${host}`.split(',').map((i) => i.trim());
-                if (host.length > 0) transport.host = host;
-                continue;
-            }
-            if (!Array.isArray(value))
-                value = `${value}`.split(',').map((i) => i.trim());
-            if (value.length > 0) transport.headers[key] = value;
-        }
-    }
-    if (proxy['http-host'] && proxy['http-host'] !== '') {
-        let host = proxy['http-host'];
-        if (!Array.isArray(host))
-            host = `${host}`.split(',').map((i) => i.trim());
-        if (host.length > 0) transport.host = host;
-    }
-    if (!transport.host) return;
-    if (proxy['http-path'] && proxy['http-path'] !== '') {
-        const path = proxy['http-path'];
-        if (Array.isArray(path)) {
-            transport.path = `${path[0]}`;
-        } else if (path !== '') transport.path = `${path}`;
-    }
-    if (parsedProxy.tls.insecure)
-        parsedProxy.tls.server_name = transport.host[0];
-    if (transport.host.length === 1) transport.host = transport.host[0];
-    for (const key of Object.keys(transport.headers)) {
-        const value = transport.headers[key];
-        if (value.length === 1) transport.headers[key] = value[0];
-    }
-    parsedProxy.transport = transport;
-};
-
-const h2Parser = (proxy, parsedProxy) => {
-    const transport = { type: 'http' };
-    if (proxy['h2-opts']) {
-        let { host = '', path = '' } = proxy['h2-opts'];
-        if (path !== '') transport.path = `${path}`;
-        if (host !== '') {
-            if (!Array.isArray(host))
-                host = `${host}`.split(',').map((i) => i.trim());
-            if (host.length > 0) transport.host = host;
-        }
-    }
-    if (proxy['h2-host'] && proxy['h2-host'] !== '') {
-        let host = proxy['h2-host'];
-        if (!Array.isArray(host))
-            host = `${host}`.split(',').map((i) => i.trim());
-        if (host.length > 0) transport.host = host;
-    }
-    if (proxy['h2-path'] && proxy['h2-path'] !== '')
-        transport.path = `${proxy['h2-path']}`;
-    parsedProxy.tls.enabled = true;
-    if (parsedProxy.tls.insecure)
-        parsedProxy.tls.server_name = transport.host[0];
-    if (transport.host.length === 1) transport.host = transport.host[0];
-    parsedProxy.transport = transport;
-};
-
-const grpcParser = (proxy, parsedProxy) => {
-    const transport = { type: 'grpc' };
-    if (proxy['grpc-opts']) {
-        const serviceName = proxy['grpc-opts']['grpc-service-name'];
-        if (serviceName && serviceName !== '')
-            transport.service_name = serviceName;
-    }
-    parsedProxy.transport = transport;
-};
-
-const tlsParser = (proxy, parsedProxy) => {
-    if (proxy.tls) parsedProxy.tls.enabled = true;
-    if (proxy.servername && proxy.servername !== '')
-        parsedProxy.tls.server_name = proxy.servername;
-    if (proxy.peer && proxy.peer !== '')
-        parsedProxy.tls.server_name = proxy.peer;
-    if (proxy.sni && proxy.sni !== '') parsedProxy.tls.server_name = proxy.sni;
-    if (proxy['skip-cert-verify']) parsedProxy.tls.insecure = true;
-    if (proxy.insecure) parsedProxy.tls.insecure = true;
-    if (proxy['disable-sni']) parsedProxy.tls.disable_sni = true;
-    if (typeof proxy.alpn === 'string') {
-        parsedProxy.tls.alpn = [proxy.alpn];
-    } else if (Array.isArray(proxy.alpn)) parsedProxy.tls.alpn = proxy.alpn;
-    if (proxy.ca) parsedProxy.tls.certificate_path = `${proxy.ca}`;
-    if (proxy.ca_str) parsedProxy.tls.certificate = proxy.ca_sStr;
-    if (proxy['ca-str']) parsedProxy.tls.certificate = proxy['ca-str'];
-    if (proxy['client-fingerprint'] && proxy['client-fingerprint'] !== '')
-        parsedProxy.tls.utls = {
-            enabled: true,
-            fingerprint: proxy['client-fingerprint'],
-        };
-    if (proxy['reality-opts']) {
-        parsedProxy.tls.reality = { enabled: true };
-        if (proxy['reality-opts']['public-key'])
-            parsedProxy.tls.reality.public_key =
-                proxy['reality-opts']['public-key'];
-        if (proxy['reality-opts']['short-id'])
-            parsedProxy.tls.reality.short_id =
-                proxy['reality-opts']['short-id'];
-    }
-    if (!parsedProxy.tls.enabled) delete parsedProxy.tls;
-};
-
-const httpParser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'http',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        tls: { enabled: false, server_name: proxy.server, insecure: false },
-    };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy.username) parsedProxy.username = proxy.username;
-    if (proxy.password) parsedProxy.password = proxy.password;
-    if (proxy.headers) {
-        parsedProxy.headers = {};
-        for (const k of Object.keys(proxy.headers)) {
-            parsedProxy.headers[k] = `${proxy.headers[k]}`;
-        }
-        if (Object.keys(parsedProxy.headers).length === 0)
-            delete parsedProxy.headers;
-    }
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    tfoParser(proxy, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    return parsedProxy;
-};
-
-const socks5Parser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'socks',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        password: proxy.password,
-        version: '5',
-    };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy.username) parsedProxy.username = proxy.username;
-    if (proxy.password) parsedProxy.password = proxy.password;
-    if (proxy.uot) parsedProxy.udp_over_tcp = true;
-    if (proxy['udp-over-tcp']) parsedProxy.udp_over_tcp = true;
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    tfoParser(proxy, parsedProxy);
-    return parsedProxy;
-};
-
-const shadowTLSParser = (proxy = {}) => {
-    const ssPart = {
-        tag: proxy.name,
-        type: 'shadowsocks',
-        method: proxy.cipher,
-        password: proxy.password,
-        detour: `${proxy.name}_shadowtls`,
-    };
-    const stPart = {
-        tag: `${proxy.name}_shadowtls`,
-        type: 'shadowtls',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        version: proxy['plugin-opts'].version,
-        password: proxy['plugin-opts'].password,
-        tls: {
-            enabled: true,
-            server_name: proxy['plugin-opts'].host,
-            utls: {
-                enabled: true,
-                fingerprint: proxy['client-fingerprint'],
-            },
-        },
-    };
-    if (stPart.server_port < 1 || stPart.server_port > 65535)
-        throw '端口值非法';
-    if (proxy['fast-open'] === true) stPart.udp_fragment = true;
-    tfoParser(proxy, stPart);
-    smuxParser(proxy.smux, ssPart);
-    return { type: 'ss-with-st', ssPart, stPart };
-};
-const ssParser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'shadowsocks',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        method: proxy.cipher,
-        password: proxy.password,
-    };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy.uot) parsedProxy.udp_over_tcp = true;
-    if (proxy['udp-over-tcp']) parsedProxy.udp_over_tcp = true;
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    tfoParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    if (proxy.plugin) {
-        const optArr = [];
-        if (proxy.plugin === 'obfs') {
-            parsedProxy.plugin = 'obfs-local';
-            parsedProxy.plugin_opts = '';
-            if (proxy['obfs-host'])
-                proxy['plugin-opts'].host = proxy['obfs-host'];
-            Object.keys(proxy['plugin-opts']).forEach((k) => {
-                switch (k) {
-                    case 'mode':
-                        optArr.push(`obfs=${proxy['plugin-opts'].mode}`);
-                        break;
-                    case 'host':
-                        optArr.push(`obfs-host=${proxy['plugin-opts'].host}`);
-                        break;
-                    default:
-                        optArr.push(`${k}=${proxy['plugin-opts'][k]}`);
-                        break;
-                }
-            });
-        }
-        if (proxy.plugin === 'v2ray-plugin') {
-            parsedProxy.plugin = 'v2ray-plugin';
-            if (proxy['ws-host']) proxy['plugin-opts'].host = proxy['ws-host'];
-            if (proxy['ws-path']) proxy['plugin-opts'].path = proxy['ws-path'];
-            Object.keys(proxy['plugin-opts']).forEach((k) => {
-                switch (k) {
-                    case 'tls':
-                        if (proxy['plugin-opts'].tls) optArr.push('tls');
-                        break;
-                    case 'host':
-                        optArr.push(`host=${proxy['plugin-opts'].host}`);
-                        break;
-                    case 'path':
-                        optArr.push(`path=${proxy['plugin-opts'].path}`);
-                        break;
-                    case 'headers':
-                        optArr.push(
-                            `headers=${JSON.stringify(
-                                proxy['plugin-opts'].headers,
-                            )}`,
-                        );
-                        break;
-                    case 'mux':
-                        if (proxy['plugin-opts'].mux)
-                            parsedProxy.multiplex = { enabled: true };
-                        break;
-                    default:
-                        optArr.push(`${k}=${proxy['plugin-opts'][k]}`);
-                }
-            });
-        }
-        parsedProxy.plugin_opts = optArr.join(';');
-    }
-
-    return parsedProxy;
-};
-// eslint-disable-next-line no-unused-vars
-const ssrParser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'shadowsocksr',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        method: proxy.cipher,
-        password: proxy.password,
-        obfs: proxy.obfs,
-        protocol: proxy.protocol,
-    };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy['obfs-param']) parsedProxy.obfs_param = proxy['obfs-param'];
-    if (proxy['protocol-param'] && proxy['protocol-param'] !== '')
-        parsedProxy.protocol_param = proxy['protocol-param'];
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    tfoParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    return parsedProxy;
-};
-
-const vmessParser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'vmess',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        uuid: proxy.uuid,
-        security: proxy.cipher,
-        alter_id: parseInt(`${proxy.alterId}`, 10),
-        tls: { enabled: false, server_name: proxy.server, insecure: false },
-    };
-    if (
-        [
-            'auto',
-            'none',
-            'zero',
-            'aes-128-gcm',
-            'chacha20-poly1305',
-            'aes-128-ctr',
-        ].indexOf(parsedProxy.security) === -1
-    )
-        parsedProxy.security = 'auto';
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy.xudp) parsedProxy.packet_encoding = 'xudp';
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    if (proxy.network === 'ws') wsParser(proxy, parsedProxy);
-    if (proxy.network === 'h2') h2Parser(proxy, parsedProxy);
-    if (proxy.network === 'http') h1Parser(proxy, parsedProxy);
-    if (proxy.network === 'grpc') grpcParser(proxy, parsedProxy);
-
-    tfoParser(proxy, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    return parsedProxy;
-};
-
-const vlessParser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'vless',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        uuid: proxy.uuid,
-        tls: { enabled: false, server_name: proxy.server, insecure: false },
-    };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    if (proxy.flow === 'xtls-rprx-vision') parsedProxy.flow = proxy.flow;
-    if (proxy.network === 'ws') wsParser(proxy, parsedProxy);
-    if (proxy.network === 'grpc') grpcParser(proxy, parsedProxy);
-
-    tfoParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    return parsedProxy;
-};
-const trojanParser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'trojan',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        password: proxy.password,
-        tls: { enabled: true, server_name: proxy.server, insecure: false },
-    };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    if (proxy.network === 'grpc') grpcParser(proxy, parsedProxy);
-    if (proxy.network === 'ws') wsParser(proxy, parsedProxy);
-
-    tfoParser(proxy, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    return parsedProxy;
-};
-const hysteriaParser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'hysteria',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        disable_mtu_discovery: false,
-        tls: { enabled: true, server_name: proxy.server, insecure: false },
-    };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy.auth_str) parsedProxy.auth_str = `${proxy.auth_str}`;
-    if (proxy['auth-str']) parsedProxy.auth_str = `${proxy['auth-str']}`;
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    // eslint-disable-next-line no-control-regex
-    const reg = new RegExp('^[0-9]+[ \t]*[KMGT]*[Bb]ps$');
-    if (reg.test(`${proxy.up}`)) {
-        parsedProxy.up = `${proxy.up}`;
-    } else {
-        parsedProxy.up_mbps = parseInt(`${proxy.up}`, 10);
-    }
-    if (reg.test(`${proxy.down}`)) {
-        parsedProxy.down = `${proxy.down}`;
-    } else {
-        parsedProxy.down_mbps = parseInt(`${proxy.down}`, 10);
-    }
-    if (proxy.obfs) parsedProxy.obfs = proxy.obfs;
-    if (proxy.recv_window_conn)
-        parsedProxy.recv_window_conn = proxy.recv_window_conn;
-    if (proxy['recv-window-conn'])
-        parsedProxy.recv_window_conn = proxy['recv-window-conn'];
-    if (proxy.recv_window) parsedProxy.recv_window = proxy.recv_window;
-    if (proxy['recv-window']) parsedProxy.recv_window = proxy['recv-window'];
-    if (proxy.disable_mtu_discovery) {
-        if (typeof proxy.disable_mtu_discovery === 'boolean') {
-            parsedProxy.disable_mtu_discovery = proxy.disable_mtu_discovery;
-        } else {
-            if (proxy.disable_mtu_discovery === 1)
-                parsedProxy.disable_mtu_discovery = true;
-        }
-    }
-    tlsParser(proxy, parsedProxy);
-    tfoParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    return parsedProxy;
-};
-const hysteria2Parser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'hysteria2',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        password: proxy.password,
-        obfs: {},
-        tls: { enabled: true, server_name: proxy.server, insecure: false },
-    };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy.up) parsedProxy.up_mbps = parseInt(`${proxy.up}`, 10);
-    if (proxy.down) parsedProxy.down_mbps = parseInt(`${proxy.down}`, 10);
-    if (proxy.obfs === 'salamander') parsedProxy.obfs.type = 'salamander';
-    if (proxy['obfs-password'])
-        parsedProxy.obfs.password = proxy['obfs-password'];
-    if (!parsedProxy.obfs.type) delete parsedProxy.obfs;
-    tlsParser(proxy, parsedProxy);
-    tfoParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    return parsedProxy;
-};
-const tuic5Parser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'tuic',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        uuid: proxy.uuid,
-        password: proxy.password,
-        tls: { enabled: true, server_name: proxy.server, insecure: false },
-    };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    if (
-        proxy['congestion-controller'] &&
-        proxy['congestion-controller'] !== 'cubic'
-    )
-        parsedProxy.congestion_control = proxy['congestion-controller'];
-    if (proxy['udp-relay-mode'] && proxy['udp-relay-mode'] !== 'native')
-        parsedProxy.udp_relay_mode = proxy['udp-relay-mode'];
-    if (proxy['reduce-rtt']) parsedProxy.zero_rtt_handshake = true;
-    if (proxy['udp-over-stream']) parsedProxy.udp_over_stream = true;
-    if (proxy['heartbeat-interval'])
-        parsedProxy.heartbeat = `${proxy['heartbeat-interval']}ms`;
-    tfoParser(proxy, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    return parsedProxy;
-};
-
-const wireguardParser = (proxy = {}) => {
-    const local_address = ['ip', 'ipv6']
-        .map((i) => proxy[i])
-        .filter((i) => i)
-        .map((i) => (/\\/.test(i) ? i : `${i}/32`));
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'wireguard',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        local_address,
-        private_key: proxy['private-key'],
-        peer_public_key: proxy['public-key'],
-        pre_shared_key: proxy['pre-shared-key'],
-        reserved: [],
-    };
-    if (parsedProxy.server_port < 1 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    if (typeof proxy.reserved === 'string') {
-        parsedProxy.reserved.push(proxy.reserved);
-    } else {
-        for (const r of proxy.reserved) parsedProxy.reserved.push(r);
-    }
-    if (proxy.peers && proxy.peers.length > 0) {
-        parsedProxy.peers = [];
-        for (const p of proxy.peers) {
-            const peer = {
-                server: p.server,
-                server_port: parseInt(`${p.port}`, 10),
-                public_key: p['public-key'],
-                allowed_ips: p['allowed-ips'] || p.allowed_ips,
-                reserved: [],
-            };
-            if (typeof p.reserved === 'string') {
-                peer.reserved.push(p.reserved);
-            } else {
-                for (const r of p.reserved) peer.reserved.push(r);
-            }
-            if (p['pre-shared-key']) peer.pre_shared_key = p['pre-shared-key'];
-            parsedProxy.peers.push(peer);
-        }
-    }
-    tfoParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    return parsedProxy;
-};
-
-export default function singbox_Producer() {
-    const type = 'ALL';
-    const produce = (proxies, type, opts = {}) => {
-        const list = [];
-        ClashMeta_Producer()
-            .produce(proxies, 'internal', { 'include-unsupported-proxy': true })
-            .map((proxy) => {
-                try {
-                    switch (proxy.type) {
-                        case 'http':
-                            list.push(httpParser(proxy));
-                            break;
-                        case 'socks5':
-                            if (proxy.tls) {
-                                throw new Error(
-                                    `Platform sing-box does not support proxy type: ${proxy.type} with tls`,
-                                );
-                            } else {
-                                list.push(socks5Parser(proxy));
-                            }
-                            break;
-                        case 'ss':
-                            if (proxy.plugin === 'shadow-tls') {
-                                const { ssPart, stPart } =
-                                    shadowTLSParser(proxy);
-                                list.push(ssPart);
-                                list.push(stPart);
-                            } else {
-                                list.push(ssParser(proxy));
-                            }
-                            break;
-                        case 'ssr':
-                            if (opts['include-unsupported-proxy']) {
-                                list.push(ssrParser(proxy));
-                            } else {
-                                throw new Error(
-                                    `Platform sing-box does not support proxy type: ${proxy.type}`,
-                                );
-                            }
-                            break;
-                        case 'vmess':
-                            if (
-                                !proxy.network ||
-                                ['ws', 'grpc', 'h2', 'http'].includes(
-                                    proxy.network,
-                                )
-                            ) {
-                                list.push(vmessParser(proxy));
-                            } else {
-                                throw new Error(
-                                    `Platform sing-box does not support proxy type: ${proxy.type} with network ${proxy.network}`,
-                                );
-                            }
-                            break;
-                        case 'vless':
-                            if (
-                                !proxy.flow ||
-                                ['xtls-rprx-vision'].includes(proxy.flow)
-                            ) {
-                                list.push(vlessParser(proxy));
-                            } else {
-                                throw new Error(
-                                    `Platform sing-box does not support proxy type: ${proxy.type} with flow ${proxy.flow}`,
-                                );
-                            }
-                            break;
-                        case 'trojan':
-                            if (!proxy.flow) {
-                                list.push(trojanParser(proxy));
-                            } else {
-                                throw new Error(
-                                    `Platform sing-box does not support proxy type: ${proxy.type} with flow ${proxy.flow}`,
-                                );
-                            }
-                            break;
-                        case 'hysteria':
-                            list.push(hysteriaParser(proxy));
-                            break;
-                        case 'hysteria2':
-                            list.push(hysteria2Parser(proxy));
-                            break;
-                        case 'tuic':
-                            if (!proxy.token || proxy.token.length === 0) {
-                                list.push(tuic5Parser(proxy));
-                            } else {
-                                throw new Error(
-                                    `Platform sing-box does not support proxy type: TUIC v4`,
-                                );
-                            }
-                            break;
-                        case 'wireguard':
-                            list.push(wireguardParser(proxy));
-                            break;
-                        default:
-                            throw new Error(
-                                `Platform sing-box does not support proxy type: ${proxy.type}`,
-                            );
-                    }
-                } catch (e) {
-                    // console.log(e);
-                    $.error(e.message ?? e);
-                }
-            });
-        return type === 'internal' ? list : JSON.stringify(list, null, 2);
-    };
-    return { type, produce };
-}

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

@@ -2,271 +2,30 @@ import { isPresent } from '@/core/proxy-utils/producers/utils';
 
 export default function Stash_Producer() {
     const type = 'ALL';
-    const produce = (proxies, type, opts = {}) => {
-        // https://stash.wiki/proxy-protocols/proxy-types#shadowsocks
-        const list = proxies
-            .filter((proxy) => {
-                if (opts['include-unsupported-proxy']) return true;
-                if (
-                    ![
-                        'ss',
-                        'ssr',
-                        'vmess',
-                        'socks5',
-                        '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'])
-                ) {
-                    return false;
-                }
-                return true;
-            })
-            .map((proxy) => {
-                if (proxy.type === 'vmess') {
-                    // handle vmess aead
-                    if (isPresent(proxy, 'aead')) {
-                        if (proxy.aead) {
-                            proxy.alterId = 0;
+    const produce = (proxies) => {
+        return (
+            'proxies:\n' +
+            proxies
+                .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;
                         }
-                        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;
-                        delete 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;
-                        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 (
-                    ['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 (
-                    ['vmess', 'vless'].includes(proxy.type) &&
-                    proxy.network === 'h2'
-                ) {
-                    let path = proxy['h2-opts']?.path;
-                    if (
-                        isPresent(proxy, 'h2-opts.path') &&
-                        Array.isArray(path)
-                    ) {
-                        proxy['h2-opts'].path = path[0];
-                    }
-                    let host = proxy['h2-opts']?.headers?.host;
-                    if (
-                        isPresent(proxy, 'h2-opts.headers.Host') &&
-                        !Array.isArray(host)
-                    ) {
-                        proxy['h2-opts'].headers.host = [host];
-                    }
-                }
-                if (proxy['plugin-opts']?.tls) {
-                    if (isPresent(proxy, 'skip-cert-verify')) {
-                        proxy['plugin-opts']['skip-cert-verify'] =
-                            proxy['skip-cert-verify'];
-                    }
-                }
-                if (
-                    ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
-                        proxy.type,
-                    )
-                ) {
-                    delete proxy.tls;
-                }
-                if (proxy['tls-fingerprint']) {
-                    proxy.fingerprint = proxy['tls-fingerprint'];
-                }
-                delete proxy['tls-fingerprint'];
-                if (isPresent(proxy, 'tls') && typeof proxy.tls !== 'boolean') {
-                    delete proxy.tls;
-                }
-
-                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 proxy;
-            });
-        return type === 'internal'
-            ? list
-            : 'proxies:\n' +
-                  list
-                      .map((proxy) => '  - ' + JSON.stringify(proxy) + '\n')
-                      .join('');
+                    delete proxy['tls-fingerprint'];
+                    return '  - ' + JSON.stringify(proxy) + '\n';
+                })
+                .join('')
+        );
     };
     return { type, produce };
 }

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

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

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

@@ -4,14 +4,6 @@ import $ from '@/core/app';
 
 const targetPlatform = 'Surge';
 
-const ipVersions = {
-    dual: 'dual',
-    ipv4: 'v4-only',
-    ipv6: 'v6-only',
-    'ipv4-prefer': 'prefer-v4',
-    'ipv6-prefer': 'prefer-v6',
-};
-
 export default function Surge_Producer() {
     const produce = (proxy) => {
         switch (proxy.type) {
@@ -27,12 +19,6 @@ export default function Surge_Producer() {
                 return socks5(proxy);
             case 'snell':
                 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}`,
@@ -44,54 +30,9 @@ export default function Surge_Producer() {
 function shadowsocks(proxy) {
     const result = new Result(proxy);
     result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
-    if (!proxy.cipher) {
-        proxy.cipher = 'none';
-    }
-    if (
-        ![
-            'aes-128-gcm',
-            'aes-192-gcm',
-            'aes-256-gcm',
-            'chacha20-ietf-poly1305',
-            'xchacha20-ietf-poly1305',
-            'rc4',
-            'rc4-md5',
-            'aes-128-cfb',
-            'aes-192-cfb',
-            'aes-256-cfb',
-            'aes-128-ctr',
-            'aes-192-ctr',
-            'aes-256-ctr',
-            'bf-cfb',
-            'camellia-128-cfb',
-            'camellia-192-cfb',
-            'camellia-256-cfb',
-            'cast5-cfb',
-            'des-cfb',
-            'idea-cfb',
-            'rc2-cfb',
-            'seed-cfb',
-            'salsa20',
-            'chacha20',
-            'chacha20-ietf',
-            'none',
-        ].includes(proxy.cipher)
-    ) {
-        throw new Error(`cipher ${proxy.cipher} is not supported`);
-    }
     result.append(`,encrypt-method=${proxy.cipher}`);
     result.appendIfPresent(`,password=${proxy.password}`, 'password');
 
-    result.appendIfPresent(
-        `,ip-version=${ipVersions[proxy['ip-version']] || proxy['ip-version']}`,
-        'ip-version',
-    );
-
-    result.appendIfPresent(
-        `,no-error-alert=${proxy['no-error-alert']}`,
-        'no-error-alert',
-    );
-
     // obfs
     if (isPresent(proxy, 'plugin')) {
         if (proxy.plugin === 'obfs') {
@@ -104,7 +45,7 @@ function shadowsocks(proxy) {
                 `,obfs-uri=${proxy['plugin-opts'].path}`,
                 'plugin-opts.path',
             );
-        } else if (!['shadow-tls'].includes(proxy.plugin)) {
+        } else {
             throw new Error(`plugin ${proxy.plugin} is not supported`);
         }
     }
@@ -114,51 +55,6 @@ function shadowsocks(proxy) {
 
     // udp
     result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
-
-    // 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',
-        );
-    } else if (['shadow-tls'].includes(proxy.plugin) && proxy['plugin-opts']) {
-        const password = proxy['plugin-opts'].password;
-        const host = proxy['plugin-opts'].host;
-        const version = proxy['plugin-opts'].version;
-        if (password) {
-            result.append(`,shadow-tls-password=${password}`);
-            if (host) {
-                result.append(`,shadow-tls-sni=${host}`);
-            }
-            if (version) {
-                if (version < 2) {
-                    throw new Error(
-                        `shadow-tls version ${version} is not supported`,
-                    );
-                }
-                result.append(`,shadow-tls-version=${version}`);
-            }
-        }
-    }
-
-    // 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();
 }
 
@@ -167,16 +63,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);
 
@@ -201,33 +87,6 @@ function trojan(proxy) {
 
     // udp
     result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
-
-    // 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();
 }
 
@@ -236,16 +95,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);
 
@@ -278,32 +127,6 @@ function vmess(proxy) {
     // udp
     result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
 
-    // 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();
 }
 
@@ -314,16 +137,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']}`,
@@ -342,33 +155,6 @@ function http(proxy) {
 
     // udp
     result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
-
-    // 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();
 }
 
@@ -379,16 +165,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']}`,
@@ -409,33 +185,6 @@ function socks5(proxy) {
 
     // udp
     result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
-
-    // 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();
 }
 
@@ -445,266 +194,22 @@ 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}`,
+        `,obfs=${proxy['obfs-opts'].mode}`,
         'obfs-opts.mode',
     );
     result.appendIfPresent(
-        `,obfs-host=${proxy['obfs-opts']?.host}`,
+        `,obfs-host=${proxy['obfs-opts'].host}`,
         'obfs-opts.host',
     );
     result.appendIfPresent(
-        `,obfs-uri=${proxy['obfs-opts']?.path}`,
+        `,obfs-uri=${proxy['obfs-opts'].path}`,
         'obfs-opts.path',
     );
 
-    // tfo
-    result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
-
     // udp
     result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
-
-    // 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');
-
-    return result.toString();
-}
-
-function tuic(proxy) {
-    const result = new Result(proxy);
-    // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/adapter/outbound/tuic.go#L197
-    let type = proxy.type;
-    if (!proxy.token || proxy.token.length === 0) {
-        type = 'tuic-v5';
-    }
-    result.append(`${proxy.name}=${type},${proxy.server},${proxy.port}`);
-
-    result.appendIfPresent(`,uuid=${proxy.uuid}`, 'uuid');
-    result.appendIfPresent(`,password=${proxy.password}`, 'password');
-    result.appendIfPresent(`,token=${proxy.token}`, 'token');
-
-    result.appendIfPresent(
-        `,alpn=${Array.isArray(proxy.alpn) ? proxy.alpn[0] : proxy.alpn}`,
-        'alpn',
-    );
-
-    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',
-    );
-
-    // 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']}`);
-    }
-
-    // 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();
 }
 
@@ -720,13 +225,7 @@ function handleTransport(result, proxy) {
                 if (isPresent(proxy, 'ws-opts.headers')) {
                     const headers = proxy['ws-opts'].headers;
                     const value = Object.keys(headers)
-                        .map((k) => {
-                            let v = headers[k];
-                            if (['Host'].includes(k)) {
-                                v = `"${v}"`;
-                            }
-                            return `${k}:${v}`;
-                        })
+                        .map((k) => `${k}:${headers[k]}`)
                         .join('|');
                     if (isNotBlank(value)) {
                         result.append(`,ws-headers=${value}`);

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

@@ -1,104 +0,0 @@
-import { Result } from './utils';
-import Surge_Producer from './surge';
-import { isIPv4, isIPv6, isPresent } from '@/utils';
-import $ from '@/core/app';
-
-const targetPlatform = 'SurgeMac';
-
-const surge_Producer = Surge_Producer();
-
-export default function SurgeMac_Producer() {
-    const produce = (proxy) => {
-        switch (proxy.type) {
-            case 'external':
-                return external(proxy);
-            case 'ssr':
-                return shadowsocksr(proxy);
-            default:
-                return surge_Producer.produce(proxy);
-        }
-    };
-    return { produce };
-}
-function external(proxy) {
-    const result = new Result(proxy);
-    if (!proxy.exec || !proxy['local-port']) {
-        throw new Error(`${proxy.type}: exec and local-port are required`);
-    }
-    result.append(
-        `${proxy.name}=external,exec="${proxy.exec}",local-port=${proxy['local-port']}`,
-    );
-
-    if (Array.isArray(proxy.args)) {
-        proxy.args.map((args) => {
-            result.append(`,args="${args}"`);
-        });
-    }
-    if (Array.isArray(proxy.addresses)) {
-        proxy.addresses.map((addresses) => {
-            result.append(`,addresses=${addresses}`);
-        });
-    }
-
-    result.appendIfPresent(
-        `,no-error-alert=${proxy['no-error-alert']}`,
-        'no-error-alert',
-    );
-
-    // 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');
-
-    // block-quic
-    result.appendIfPresent(`,block-quic=${proxy['block-quic']}`, 'block-quic');
-
-    return result.toString();
-}
-function shadowsocksr(proxy) {
-    const external_proxy = {
-        ...proxy,
-        type: 'external',
-        exec: proxy.exec || '/usr/local/bin/ssr-local',
-        'local-port': '__SubStoreLocalPort__',
-        args: [],
-        addresses: [],
-        'local-address':
-            proxy.local_address ?? proxy['local-address'] ?? '127.0.0.1',
-    };
-
-    // https://manual.nssurge.com/policy/external-proxy.html
-    if (isIP(proxy.server)) {
-        external_proxy.addresses.push(proxy.server);
-    } else {
-        $.log(
-            `Platform ${targetPlatform}, proxy type ${proxy.type}: addresses should be an IP address, but got ${proxy.server}`,
-        );
-    }
-
-    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',
-    })) {
-        external_proxy.args.push(value);
-        external_proxy.args.push(external_proxy[key]);
-    }
-
-    return external(external_proxy);
-}
-
-function isIP(ip) {
-    return isIPv4(ip) || isIPv6(ip);
-}

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}`;
@@ -39,12 +35,6 @@ export default function URI_Producer() {
                             );
                     }
                 }
-                if (proxy['udp-over-tcp']) {
-                    result = `${result}${proxy.plugin ? '&' : '?'}uot=1`;
-                }
-                if (proxy.tfo) {
-                    result = `${result}${proxy.plugin ? '&' : '?'}tfo=1`;
-                }
                 result += `#${encodeURIComponent(proxy.name)}`;
                 break;
             case 'ssr':
@@ -65,225 +55,27 @@ export default function URI_Producer() {
                 break;
             case 'vmess':
                 // V2RayN URI format
-                let type = '';
-                let net = proxy.network || 'tcp';
-                if (proxy.network === 'http') {
-                    net = 'tcp';
-                    type = 'http';
-                }
                 result = {
-                    v: '2',
                     ps: proxy.name,
                     add: proxy.server,
                     port: proxy.port,
                     id: proxy.uuid,
-                    type,
+                    type: '',
                     aid: 0,
-                    net,
+                    net: proxy.network || 'tcp',
                     tls: proxy.tls ? 'tls' : '',
                 };
-                if (proxy.tls && proxy.sni) {
-                    result.sni = proxy.sni;
-                }
                 // obfs
-                if (proxy.network) {
-                    let vmessTransportPath =
-                        proxy[`${proxy.network}-opts`]?.path;
-                    let vmessTransportHost =
-                        proxy[`${proxy.network}-opts`]?.headers?.Host;
-                    if (vmessTransportPath) {
-                        result.path = Array.isArray(vmessTransportPath)
-                            ? vmessTransportPath[0]
-                            : vmessTransportPath;
-                    }
-                    if (vmessTransportHost) {
-                        result.host = Array.isArray(vmessTransportHost)
-                            ? 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';
-                    }
+                if (proxy.network === 'ws') {
+                    result.path = proxy['ws-opts'].path || '/';
+                    result.host = proxy['ws-opts'].headers.Host || proxy.server;
                 }
                 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) {
-                    trojanTransport = `&type=${proxy.network}`;
-                    if (['grpc'].includes(proxy.network)) {
-                        let trojanTransportServiceName =
-                            proxy[`${proxy.network}-opts`]?.[
-                                `${proxy.network}-service-name`
-                            ];
-                        if (trojanTransportServiceName) {
-                            trojanTransport += `&serviceName=${encodeURIComponent(
-                                trojanTransportServiceName,
-                            )}`;
-                        }
-                        trojanTransport += `&mode=${encodeURIComponent(
-                            proxy[`${proxy.network}-opts`]?.['_grpc-type'] ||
-                                'gun',
-                        )}`;
-                    }
-                    let trojanTransportPath =
-                        proxy[`${proxy.network}-opts`]?.path;
-                    let trojanTransportHost =
-                        proxy[`${proxy.network}-opts`]?.headers?.Host;
-                    if (trojanTransportPath) {
-                        trojanTransport += `&path=${encodeURIComponent(
-                            Array.isArray(trojanTransportPath)
-                                ? trojanTransportPath[0]
-                                : trojanTransportPath,
-                        )}`;
-                    }
-                    if (trojanTransportHost) {
-                        trojanTransport += `&host=${encodeURIComponent(
-                            Array.isArray(trojanTransportHost)
-                                ? trojanTransportHost[0]
-                                : trojanTransportHost,
-                        )}`;
-                    }
-                }
                 result = `trojan://${proxy.password}@${proxy.server}:${
                     proxy.port
-                }?sni=${encodeURIComponent(proxy.sni || proxy.server)}${
-                    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)}`;
+                }#${encodeURIComponent(proxy.name)}`;
                 break;
         }
         return result;

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

@@ -1,12 +0,0 @@
-/* eslint-disable no-case-declarations */
-import { Base64 } from 'js-base64';
-import URI_Producer from './uri';
-
-const URI = URI_Producer();
-
-export default function V2Ray_Producer() {
-    const type = 'ALL';
-    const produce = (proxies) =>
-        Base64.encode(proxies.map((proxy) => URI.produce(proxy)).join('\n'));
-    return { type, produce };
-}

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/core/rule-utils/preprocessors.js

@@ -8,7 +8,7 @@ function HTML() {
 
 function ClashProvider() {
     const name = 'Clash Provider';
-    const test = (raw) => /^payload:/gm.exec(raw).index >= 0;
+    const test = (raw) => raw.indexOf('payload:') === 0;
     const parse = (raw) => {
         return raw.replace('payload:', '').replace(/^\s*-\s*/gm, '');
     };

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

@@ -1,4 +1,4 @@
-import YAML from '@/utils/yaml';
+import YAML from 'static-js-yaml';
 
 function QXFilter() {
     const type = 'SINGLE';

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/cron-sync-artifacts.js

@@ -40,7 +40,7 @@ async function doSync() {
                         platform: artifact.platform,
                     });
 
-                    files[encodeURIComponent(artifact.name)] = {
+                    files[artifact.name] = {
                         content: output,
                     };
                 }
@@ -54,18 +54,10 @@ async function doSync() {
             if (artifact.sync) {
                 artifact.updated = new Date().getTime();
                 // extract real url from gist
-                let files = body.files;
-                let isGitLab;
-                if (Array.isArray(files)) {
-                    isGitLab = true;
-                    files = Object.fromEntries(
-                        files.map((item) => [item.path, item]),
-                    );
-                }
-                const url = files[encodeURIComponent(artifact.name)]?.raw_url;
-                artifact.url = isGitLab
-                    ? url
-                    : url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+                artifact.url = body.files[artifact.name].raw_url.replace(
+                    /\/raw\/[^/]*\/(.*)/,
+                    '/raw/$1',
+                );
             }
         }
 

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/artifacts.js

@@ -19,12 +19,7 @@ export default function register($app) {
     if (!$.read(ARTIFACTS_KEY)) $.write({}, ARTIFACTS_KEY);
 
     // RESTful APIs
-    $app.get('/api/artifacts/restore', restoreArtifacts);
-
-    $app.route('/api/artifacts')
-        .get(getAllArtifacts)
-        .post(createArtifact)
-        .put(replaceArtifact);
+    $app.route('/api/artifacts').get(getAllArtifacts).post(createArtifact);
 
     $app.route('/api/artifact/:name')
         .get(getArtifact)
@@ -32,84 +27,11 @@ export default function register($app) {
         .delete(deleteArtifact);
 }
 
-async function restoreArtifacts(_, res) {
-    $.info('开始恢复远程配置...');
-    try {
-        const { gistToken, syncPlatform } = $.read(SETTINGS_KEY);
-        if (!gistToken) {
-            return Promise.reject('未设置 GitHub Token！');
-        }
-        const manager = new Gist({
-            token: gistToken,
-            key: ARTIFACT_REPOSITORY_KEY,
-            syncPlatform,
-        });
-
-        try {
-            const gist = await manager.locate();
-            if (!gist?.files) {
-                throw new Error(`找不到 Sub-Store Gist 文件列表`);
-            }
-            const allArtifacts = $.read(ARTIFACTS_KEY);
-            const failed = [];
-            Object.keys(gist.files).map((key) => {
-                const filename = gist.files[key]?.filename;
-                if (filename) {
-                    if (encodeURIComponent(filename) !== filename) {
-                        $.error(`文件名 ${filename} 未编码 不保存`);
-                        failed.push(filename);
-                    } else {
-                        const artifact = findByName(allArtifacts, filename);
-                        if (artifact) {
-                            updateByName(allArtifacts, filename, {
-                                ...artifact,
-                                url: gist.files[key]?.raw_url.replace(
-                                    /\/raw\/[^/]*\/(.*)/,
-                                    '/raw/$1',
-                                ),
-                            });
-                        } else {
-                            allArtifacts.push({
-                                name: `${filename}`,
-                                url: gist.files[key]?.raw_url.replace(
-                                    /\/raw\/[^/]*\/(.*)/,
-                                    '/raw/$1',
-                                ),
-                            });
-                        }
-                    }
-                }
-            });
-            $.write(allArtifacts, ARTIFACTS_KEY);
-        } catch (err) {
-            $.error(`查找 Sub-Store Gist 时发生错误: ${err.message ?? err}`);
-            throw err;
-        }
-        success(res);
-    } catch (e) {
-        $.error(`恢复远程配置失败，原因：${e.message ?? e}`);
-        failed(
-            res,
-            new InternalServerError(
-                `FAILED_TO_RESTORE_ARTIFACTS`,
-                `Failed to restore artifacts`,
-                `Reason: ${e.message ?? e}`,
-            ),
-        );
-    }
-}
-
 function getAllArtifacts(req, res) {
     const allArtifacts = $.read(ARTIFACTS_KEY);
     success(res, allArtifacts);
 }
 
-function replaceArtifact(req, res) {
-    const allArtifacts = req.body;
-    $.write(allArtifacts, ARTIFACTS_KEY);
-    success(res);
-}
-
 async function getArtifact(req, res) {
     let { name } = req.params;
     name = decodeURIComponent(name);
@@ -209,18 +131,7 @@ async function deleteArtifact(req, res) {
             files[encodeURIComponent(artifact.name)] = {
                 content: '',
             };
-            if (encodeURIComponent(artifact.name) !== artifact.name) {
-                files[artifact.name] = {
-                    content: '',
-                };
-            }
-
-            // 当别的Sub 删了同步订阅 或 gist里面删了 当前设备没有删除 时 无法删除的bug
-            try {
-                await syncToGist(files);
-            } catch (i) {
-                $.error(`Function syncToGist: ${name} : ${i}`);
-            }
+            await syncToGist(files);
         }
         // delete local cache
         deleteByName(allArtifacts, name);
@@ -244,14 +155,13 @@ function validateArtifactName(name) {
 }
 
 async function syncToGist(files) {
-    const { gistToken, syncPlatform } = $.read(SETTINGS_KEY);
+    const { gistToken } = $.read(SETTINGS_KEY);
     if (!gistToken) {
-        return Promise.reject('未设置 GitHub Token！');
+        return Promise.reject('未设置Gist Token！');
     }
     const manager = new Gist({
         token: gistToken,
         key: ARTIFACT_REPOSITORY_KEY,
-        syncPlatform,
     });
     return manager.upload(files);
 }

backend/src/restful/collections.js

@@ -14,24 +14,13 @@ export default function register($app) {
 
     $app.route('/api/collections')
         .get(getAllCollections)
-        .post(createCollection)
-        .put(replaceCollection);
+        .post(createCollection);
 }
 
 // collection API
 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 +30,6 @@ function createCollection(req, res) {
                 `Collection ${collection.name} already exists.`,
             ),
         );
-        return;
     }
     allCols.push(collection);
     $.write(allCols, COLLECTIONS_KEY);
@@ -123,9 +111,3 @@ function getAllCollections(req, res) {
     const allCols = $.read(COLLECTIONS_KEY);
     success(res, allCols);
 }
-
-function replaceCollection(req, res) {
-    const allCols = req.body;
-    $.write(allCols, COLLECTIONS_KEY);
-    success(res);
-}

backend/src/restful/download.js

@@ -20,43 +20,6 @@ async function downloadSubscription(req, res) {
         req.query.target || getPlatformFromHeaders(req.headers) || 'JSON';
 
     $.info(`正在下载订阅：${name}`);
-    let {
-        url,
-        ua,
-        content,
-        mergeSources,
-        ignoreFailedRemoteSub,
-        produceType,
-        includeUnsupportedProxy,
-    } = req.query;
-    if (url) {
-        url = decodeURIComponent(url);
-        $.info(`指定远程订阅 URL: ${url}`);
-    }
-    if (ua) {
-        ua = decodeURIComponent(ua);
-        $.info(`指定远程订阅 User-Agent: ${ua}`);
-    }
-    if (content) {
-        content = decodeURIComponent(content);
-        $.info(`指定本地订阅: ${content}`);
-    }
-    if (mergeSources) {
-        mergeSources = decodeURIComponent(mergeSources);
-        $.info(`指定合并来源: ${mergeSources}`);
-    }
-    if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
-        ignoreFailedRemoteSub = decodeURIComponent(ignoreFailedRemoteSub);
-        $.info(`指定忽略失败的远程订阅: ${ignoreFailedRemoteSub}`);
-    }
-    if (produceType) {
-        produceType = decodeURIComponent(produceType);
-        $.info(`指定生产类型: ${produceType}`);
-    }
-    if (includeUnsupportedProxy) {
-        includeUnsupportedProxy = decodeURIComponent(includeUnsupportedProxy);
-        $.info(`包含不支持的节点: ${includeUnsupportedProxy}`);
-    }
 
     const allSubs = $.read(SUBS_KEY);
     const sub = findByName(allSubs, name);
@@ -66,30 +29,13 @@ async function downloadSubscription(req, res) {
                 type: 'subscription',
                 name,
                 platform,
-                url,
-                ua,
-                content,
-                mergeSources,
-                ignoreFailedRemoteSub,
-                produceType,
-                produceOpts: {
-                    'include-unsupported-proxy': includeUnsupportedProxy,
-                },
             });
 
-            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);
                 }
             }
 
@@ -104,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)}`,
                 ),
             );
         }
@@ -141,34 +87,12 @@ async function downloadCollection(req, res) {
 
     $.info(`正在下载组合订阅：${name}`);
 
-    let { ignoreFailedRemoteSub, produceType, includeUnsupportedProxy } =
-        req.query;
-
-    if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
-        ignoreFailedRemoteSub = decodeURIComponent(ignoreFailedRemoteSub);
-        $.info(`指定忽略失败的远程订阅: ${ignoreFailedRemoteSub}`);
-    }
-    if (produceType) {
-        produceType = decodeURIComponent(produceType);
-        $.info(`指定生产类型: ${produceType}`);
-    }
-
-    if (includeUnsupportedProxy) {
-        includeUnsupportedProxy = decodeURIComponent(includeUnsupportedProxy);
-        $.info(`包含不支持的节点: ${includeUnsupportedProxy}`);
-    }
-
     if (collection) {
         try {
             const output = await produceArtifact({
                 type: 'collection',
                 name,
                 platform,
-                ignoreFailedRemoteSub,
-                produceType,
-                produceOpts: {
-                    'include-unsupported-proxy': includeUnsupportedProxy,
-                },
             });
 
             // forward flow header from the first subscription in this collection
@@ -177,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);
                     }
                 }
             }
@@ -210,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,194 +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,
-    InternalServerError,
-} from '@/restful/errors';
-import { produceArtifact } from '@/restful/sync';
-
-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/wholeFile/:name').get(getWholeFile);
-
-    $app.route('/api/files').get(getAllFiles).post(createFile).put(replaceFile);
-    $app.route('/api/wholeFiles').get(getAllWholeFiles);
-}
-
-// 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);
-}
-
-async function getFile(req, res) {
-    let { name } = req.params;
-    name = decodeURIComponent(name);
-
-    $.info(`正在下载文件：${name}`);
-    let { url, ua, content, mergeSources, ignoreFailedRemoteFile } = req.query;
-    if (url) {
-        url = decodeURIComponent(url);
-        $.info(`指定远程文件 URL: ${url}`);
-    }
-    if (ua) {
-        ua = decodeURIComponent(ua);
-        $.info(`指定远程文件 User-Agent: ${ua}`);
-    }
-    if (content) {
-        content = decodeURIComponent(content);
-        $.info(`指定本地文件: ${content}`);
-    }
-    if (mergeSources) {
-        mergeSources = decodeURIComponent(mergeSources);
-        $.info(`指定合并来源: ${mergeSources}`);
-    }
-    if (ignoreFailedRemoteFile != null && ignoreFailedRemoteFile !== '') {
-        ignoreFailedRemoteFile = decodeURIComponent(ignoreFailedRemoteFile);
-        $.info(`指定忽略失败的远程文件: ${ignoreFailedRemoteFile}`);
-    }
-
-    const allFiles = $.read(FILES_KEY);
-    const file = findByName(allFiles, name);
-    if (file) {
-        try {
-            const output = await produceArtifact({
-                type: 'file',
-                name,
-                url,
-                ua,
-                content,
-                mergeSources,
-                ignoreFailedRemoteFile,
-            });
-
-            res.set('Content-Type', 'text/plain; charset=utf-8').send(
-                output ?? '',
-            );
-        } catch (err) {
-            $.notify(
-                `🌍 Sub-Store 下载文件失败`,
-                `❌ 无法下载文件：${name}！`,
-                `🤔 原因：${err.message ?? err}`,
-            );
-            $.error(err.message ?? err);
-            failed(
-                res,
-                new InternalServerError(
-                    'INTERNAL_SERVER_ERROR',
-                    `Failed to download file: ${name}`,
-                    `Reason: ${err.message ?? err}`,
-                ),
-            );
-        }
-    } else {
-        $.notify(`🌍 Sub-Store 下载文件失败`, `❌ 未找到文件：${name}！`);
-        failed(
-            res,
-            new ResourceNotFoundError(
-                'RESOURCE_NOT_FOUND',
-                `File ${name} does not exist!`,
-            ),
-            404,
-        );
-    }
-}
-function getWholeFile(req, res) {
-    let { name } = req.params;
-    name = decodeURIComponent(name);
-    const allFiles = $.read(FILES_KEY);
-    const file = findByName(allFiles, name);
-    if (file) {
-        success(res, file);
-    } else {
-        failed(
-            res,
-            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 getAllWholeFiles(req, res) {
-    const allFiles = $.read(FILES_KEY);
-    success(res, allFiles);
-}
-
-function replaceFile(req, res) {
-    const allFiles = req.body;
-    $.write(allFiles, FILES_KEY);
-    success(res);
-}

backend/src/restful/index.js

@@ -1,14 +1,9 @@
 import express from '@/vendor/express';
 import $ from '@/core/app';
-import migrate from '@/utils/migration';
-import download from '@/utils/download';
-import { syncArtifacts } from '@/restful/sync';
 
 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';
@@ -16,16 +11,10 @@ import registerPreviewRoutes from './preview';
 import registerSortingRoutes from './sort';
 import registerMiscRoutes from './miscs';
 import registerNodeInfoRoutes from './node-info';
-import registerParserRoutes from './parser';
 
 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);
@@ -34,150 +23,9 @@ export default function serve() {
     registerSortingRoutes($app);
     registerSettingRoutes($app);
     registerArtifactRoutes($app);
-    registerFileRoutes($app);
-    registerModuleRoutes($app);
     registerSyncRoutes($app);
     registerNodeInfoRoutes($app);
     registerMiscRoutes($app);
-    registerParserRoutes($app);
 
     $app.start();
-
-    if ($.env.isNode) {
-        const backend_cron = eval('process.env.SUB_STORE_BACKEND_CRON');
-        if (backend_cron) {
-            $.info(`[CRON] ${backend_cron} enabled`);
-            const { CronJob } = eval(`require("cron")`);
-            new CronJob(
-                backend_cron,
-                async function () {
-                    try {
-                        $.info(`[CRON] ${backend_cron} started`);
-                        await syncArtifacts();
-                        $.info(`[CRON] ${backend_cron} finished`);
-                    } catch (e) {
-                        $.error(
-                            `[CRON] ${backend_cron} error: ${e.message ?? e}`,
-                        );
-                    }
-                }, // onTick
-                null, // onComplete
-                true, // start
-                // 'Asia/Shanghai' // timeZone
-            );
-        }
-        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,7 +1,8 @@
 import $ from '@/core/app';
 import { ENV } from '@/vendor/open-api';
 import { failed, success } from '@/restful/response';
-import { updateArtifactStore, updateAvatar } from '@/restful/settings';
+import { version as substoreVersion } from '../../package.json';
+import { updateArtifactStore, updateGitHubAvatar } from '@/restful/settings';
 import resourceCache from '@/utils/resource-cache';
 import {
     GIST_BACKUP_FILE_NAME,
@@ -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,12 +49,24 @@ 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) {
     // 1. get GitHub avatar and artifact store
-    await updateAvatar();
+    await updateGitHubAvatar();
     await updateArtifactStore();
 
     // 2. clear resource cache
@@ -79,7 +77,7 @@ async function refresh(_, res) {
 async function gistBackup(req, res) {
     const { action } = req.query;
     // read token
-    const { gistToken, syncPlatform } = $.read(SETTINGS_KEY);
+    const { gistToken } = $.read(SETTINGS_KEY);
     if (!gistToken) {
         failed(
             res,
@@ -92,7 +90,6 @@ async function gistBackup(req, res) {
         const gist = new Gist({
             token: gistToken,
             key: GIST_BACKUP_KEY,
-            syncPlatform,
         });
         try {
             let content;
@@ -121,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) {
@@ -145,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);
@@ -158,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,116 +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.set('Content-Type', 'text/plain; charset=utf-8').send(
-            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/node-info.js

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

backend/src/restful/parser.js

@@ -1,54 +0,0 @@
-import { success, failed } from '@/restful/response';
-import { ProxyUtils } from '@/core/proxy-utils';
-import { RuleUtils } from '@/core/rule-utils';
-
-export default function register($app) {
-    $app.route('/api/proxy/parse').post(proxy_parser);
-    $app.route('/api/rule/parse').post(rule_parser);
-}
-
-/***
- * 感谢 izhangxm 的 PR!
- * 目前没有节点操作, 没有支持完整参数, 以后再完善一下
- */
-
-/***
- * 代理服务器协议转换接口。
- * 请求方法为POST，数据为json。需要提供data和client字段。
- * data: string, 协议数据，每行一个或者是clash
- * client: string, 目标平台名称，见backend/src/core/proxy-utils/producers/index.js
- *
- */
-function proxy_parser(req, res) {
-    const { data, client, content, platform } = req.body;
-    var result = {};
-    try {
-        var proxies = ProxyUtils.parse(data ?? content);
-        var par_res = ProxyUtils.produce(proxies, client ?? platform);
-        result['par_res'] = par_res;
-    } catch (err) {
-        failed(res, err);
-        return;
-    }
-    success(res, result);
-}
-/**
- * 规则转换接口。
- * 请求方法为POST，数据为json。需要提供data和client字段。
- * data: string, 多行规则字符串
- * client: string, 目标平台名称，具体见backend/src/core/rule-utils/producers.js
- */
-function rule_parser(req, res) {
-    const { data, client, content, platform } = req.body;
-    var result = {};
-    try {
-        const rules = RuleUtils.parse(data ?? content);
-        var par_res = RuleUtils.produce(rules, client ?? platform);
-        result['par_res'] = par_res;
-    } catch (err) {
-        failed(res, err);
-        return;
-    }
-
-    success(res, result);
-}

backend/src/restful/preview.js

@@ -1,4 +1,4 @@
-import { InternalServerError } from './errors';
+import { InternalServerError, NetworkError } from './errors';
 import { ProxyUtils } from '@/core/proxy-utils';
 import { findByName } from '@/utils/database';
 import { success, failed } from './response';
@@ -9,287 +9,101 @@ import $ from '@/core/app';
 export default function register($app) {
     $app.post('/api/preview/sub', compareSub);
     $app.post('/api/preview/collection', compareCollection);
-    $app.post('/api/preview/file', previewFile);
-}
-
-async function previewFile(req, res) {
-    try {
-        const file = req.body;
-        let content;
-        if (
-            file.source === 'local' &&
-            !['localFirst', 'remoteFirst'].includes(file.mergeSources)
-        ) {
-            content = file.content;
-        } else {
-            const errors = {};
-            content = await Promise.all(
-                file.url
-                    .split(/[\r\n]+/)
-                    .map((i) => i.trim())
-                    .filter((i) => i.length)
-                    .map(async (url) => {
-                        try {
-                            return await download(url, file.ua);
-                        } catch (err) {
-                            errors[url] = err;
-                            $.error(
-                                `文件 ${file.name} 的远程文件 ${url} 发生错误: ${err}`,
-                            );
-                            return '';
-                        }
-                    }),
-            );
-
-            if (
-                !file.ignoreFailedRemoteFile &&
-                Object.keys(errors).length > 0
-            ) {
-                throw new Error(
-                    `文件 ${file.name} 的远程文件 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
-                );
-            }
-            if (file.mergeSources === 'localFirst') {
-                content.unshift(file.content);
-            } else if (file.mergeSources === 'remoteFirst') {
-                content.push(file.content);
-            }
-        }
-        // parse proxies
-        const files = (Array.isArray(content) ? content : [content]).flat();
-        let filesContent = files
-            .filter((i) => i != null && i !== '')
-            .join('\n');
-
-        // apply processors
-        const processed =
-            Array.isArray(file.process) && file.process.length > 0
-                ? await ProxyUtils.process(
-                      { $files: files, $content: filesContent },
-                      file.process,
-                  )
-                : { $content: filesContent, $files: files };
-
-        // produce
-        success(res, {
-            original: filesContent,
-            processed: processed?.$content ?? '',
-        });
-    } catch (err) {
-        $.error(err.message ?? err);
-        failed(
-            res,
-            new InternalServerError(
-                `INTERNAL_SERVER_ERROR`,
-                `Failed to preview file`,
-                `Reason: ${err.message ?? err}`,
-            ),
-        );
-    }
 }
 
 async function compareSub(req, res) {
-    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 {
-            const errors = {};
-            content = await Promise.all(
-                sub.url
-                    .split(/[\r\n]+/)
-                    .map((i) => i.trim())
-                    .filter((i) => i.length)
-                    .map(async (url) => {
-                        try {
-                            return await download(url, sub.ua);
-                        } catch (err) {
-                            errors[url] = err;
-                            $.error(
-                                `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
-                            );
-                            return '';
-                        }
-                    }),
+    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}`,
+                ),
             );
-
-            if (!sub.ignoreFailedRemoteSub && Object.keys(errors).length > 0) {
-                throw new Error(
-                    `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
-                );
-            }
-            if (sub.mergeSources === 'localFirst') {
-                content.unshift(sub.content);
-            } else if (sub.mergeSources === 'remoteFirst') {
-                content.push(sub.content);
-            }
+            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 = {};
-        const errors = {};
-        await Promise.all(
-            subnames.map(async (name) => {
-                const sub = findByName(allSubs, name);
-                try {
-                    let raw;
-                    if (
-                        sub.source === 'local' &&
-                        !['localFirst', 'remoteFirst'].includes(
-                            sub.mergeSources,
-                        )
-                    ) {
-                        raw = sub.content;
-                    } else {
-                        const errors = {};
-                        raw = await Promise.all(
-                            sub.url
-                                .split(/[\r\n]+/)
-                                .map((i) => i.trim())
-                                .filter((i) => i.length)
-                                .map(async (url) => {
-                                    try {
-                                        return await download(url, sub.ua);
-                                    } catch (err) {
-                                        errors[url] = err;
-                                        $.error(
-                                            `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
-                                        );
-                                        return '';
-                                    }
-                                }),
-                        );
-                        if (
-                            !sub.ignoreFailedRemoteSub &&
-                            Object.keys(errors).length > 0
-                        ) {
-                            throw new Error(
-                                `订阅 ${sub.name} 的远程订阅 ${Object.keys(
-                                    errors,
-                                ).join(', ')} 发生错误, 请查看日志`,
-                            );
-                        }
-                        if (sub.mergeSources === 'localFirst') {
-                            raw.unshift(sub.content);
-                        } else if (sub.mergeSources === 'remoteFirst') {
-                            raw.push(sub.content);
-                        }
-                    }
-                    // parse proxies
-                    let currentProxies = (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) {
-                    errors[name] = err;
-
-                    $.error(
-                        `❌ 处理组合订阅中的子订阅: ${
-                            sub.name
-                        }时出现错误：${err}！进度--${
-                            100 * (processed / subnames.length).toFixed(1)
-                        }%`,
-                    );
+    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 (
-            !collection.ignoreFailedRemoteSub &&
-            Object.keys(errors).length > 0
-        ) {
-            throw new Error(
-                `组合订阅 ${collection.name} 中的子订阅 ${Object.keys(
-                    errors,
-                ).join(', ')} 发生错误, 请查看日志`,
-            );
-        }
-        // merge proxies with the original order
-        const original = Array.prototype.concat.apply(
-            [],
-            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

@@ -1,6 +1,5 @@
 import { SETTINGS_KEY, ARTIFACT_REPOSITORY_KEY } from '@/constants';
-import { success, failed } from './response';
-import { InternalServerError } from '@/restful/errors';
+import { success } from './response';
 import $ from '@/core/app';
 import Gist from '@/utils/gist';
 
@@ -11,105 +10,42 @@ export default function register($app) {
 }
 
 async function getSettings(req, res) {
-    try {
-        let settings = $.read(SETTINGS_KEY);
-        if (!settings) {
-            settings = {};
-            $.write(settings, SETTINGS_KEY);
-        }
-
-        if (!settings.avatarUrl) await updateAvatar();
-        if (!settings.artifactStore) await updateArtifactStore();
-
-        success(res, settings);
-    } catch (e) {
-        $.error(`Failed to get settings: ${e.message ?? e}`);
-        failed(
-            res,
-            new InternalServerError(
-                `FAILED_TO_GET_SETTINGS`,
-                `Failed to get settings`,
-                `Reason: ${e.message ?? e}`,
-            ),
-        );
-    }
+    const settings = $.read(SETTINGS_KEY);
+    if (!settings.avatarUrl) await updateGitHubAvatar();
+    if (!settings.artifactStore) await updateArtifactStore();
+    success(res, settings);
 }
 
 async function updateSettings(req, res) {
-    try {
-        const settings = $.read(SETTINGS_KEY);
-        const newSettings = {
-            ...settings,
-            ...req.body,
-        };
-        $.write(newSettings, SETTINGS_KEY);
-        await updateAvatar();
-        await updateArtifactStore();
-        success(res, newSettings);
-    } catch (e) {
-        $.error(`Failed to update settings: ${e.message ?? e}`);
-        failed(
-            res,
-            new InternalServerError(
-                `FAILED_TO_UPDATE_SETTINGS`,
-                `Failed to update settings`,
-                `Reason: ${e.message ?? e}`,
-            ),
-        );
-    }
+    const settings = $.read(SETTINGS_KEY);
+    const newSettings = {
+        ...settings,
+        ...req.body,
+    };
+    $.write(newSettings, SETTINGS_KEY);
+    await updateGitHubAvatar();
+    await updateArtifactStore();
+    success(res, newSettings);
 }
 
-export async function updateAvatar() {
+export async function updateGitHubAvatar() {
     const settings = $.read(SETTINGS_KEY);
-    const { githubUser: username, syncPlatform } = settings;
+    const username = settings.githubUser;
     if (username) {
-        if (syncPlatform === 'gitlab') {
-            try {
-                const data = await $.http
-                    .get({
-                        url: `https://gitlab.com/api/v4/users?username=${encodeURIComponent(
-                            username,
-                        )}`,
-                        headers: {
-                            'User-Agent':
-                                'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.141 Safari/537.36',
-                        },
-                    })
-                    .then((resp) => JSON.parse(resp.body));
-                settings.avatarUrl = data[0]['avatar_url'].replace(
-                    /(\?|&)s=\d+(&|$)/,
-                    '$1s=160$2',
-                );
-                $.write(settings, SETTINGS_KEY);
-            } catch (err) {
-                $.error(
-                    `Failed to fetch GitLab avatar for User: ${username}. Reason: ${
-                        err.message ?? err
-                    }`,
-                );
-            }
-        } else {
-            try {
-                const data = await $.http
-                    .get({
-                        url: `https://api.github.com/users/${encodeURIComponent(
-                            username,
-                        )}`,
-                        headers: {
-                            'User-Agent':
-                                'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.141 Safari/537.36',
-                        },
-                    })
-                    .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
-                    }`,
-                );
-            }
+        try {
+            const data = await $.http
+                .get({
+                    url: `https://api.github.com/users/${username}`,
+                    headers: {
+                        'User-Agent':
+                            'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.141 Safari/537.36',
+                    },
+                })
+                .then((resp) => JSON.parse(resp.body));
+            settings.avatarUrl = data['avatar_url'];
+            $.write(settings, SETTINGS_KEY);
+        } catch (e) {
+            $.error('Failed to fetch GitHub avatar for User: ' + username);
         }
     }
 }
@@ -117,30 +53,21 @@ export async function updateAvatar() {
 export async function updateArtifactStore() {
     $.log('Updating artifact store');
     const settings = $.read(SETTINGS_KEY);
-    const { gistToken, syncPlatform } = settings;
-    if (gistToken) {
+    const { githubUser, gistToken } = settings;
+    if (githubUser && gistToken) {
         const manager = new Gist({
             token: gistToken,
             key: ARTIFACT_REPOSITORY_KEY,
-            syncPlatform,
         });
 
         try {
-            const gist = await manager.locate();
-            const url = gist?.html_url ?? gist?.web_url;
-            if (url) {
-                $.log(`找到 Sub-Store Gist: ${url}`);
-                // 只需要保证 token 是对的, 现在 username 错误只会导致头像错误
-                settings.artifactStore = url;
-                settings.artifactStoreStatus = 'VALID';
-            } else {
-                $.error(`找不到 Sub-Store Gist`);
-                settings.artifactStoreStatus = 'NOT FOUND';
+            const gistId = await manager.locate();
+            if (gistId !== -1) {
+                settings.artifactStore = `https://gist.github.com/${githubUser}/${gistId}`;
+                $.write(settings, SETTINGS_KEY);
             }
         } catch (err) {
-            $.error(`查找 Sub-Store Gist 时发生错误: ${err.message ?? err}`);
-            settings.artifactStoreStatus = 'ERROR';
+            $.error('Failed to fetch artifact store for User: ' + githubUser);
         }
-        $.write(settings, SETTINGS_KEY);
     }
 }

backend/src/restful/sort.js

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

backend/src/restful/subscriptions.js

@@ -6,7 +6,7 @@ import {
 } from './errors';
 import { deleteByName, findByName, updateByName } from '@/utils/database';
 import { SUBS_KEY, COLLECTIONS_KEY, ARTIFACTS_KEY } from '@/constants';
-import { getFlowHeaders, parseFlowHeaders } from '@/utils/flow';
+import { getFlowHeaders } from '@/utils/flow';
 import { success, failed } from './response';
 import $ from '@/core/app';
 
@@ -20,10 +20,7 @@ export default function register($app) {
         .patch(updateSubscription)
         .delete(deleteSubscription);
 
-    $app.route('/api/subs')
-        .get(getAllSubscriptions)
-        .post(createSubscription)
-        .put(replaceSubscriptions);
+    $app.route('/api/subs').get(getAllSubscriptions).post(createSubscription);
 }
 
 // subscriptions API
@@ -68,7 +65,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 +93,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 +102,6 @@ function createSubscription(req, res) {
                 `Subscription ${sub.name} already exists.`,
             ),
         );
-        return;
     }
     allSubs.push(sub);
     $.write(allSubs, SUBS_KEY);
@@ -203,9 +202,3 @@ function getAllSubscriptions(req, res) {
     const allSubs = $.read(SUBS_KEY);
     success(res, allSubs);
 }
-
-function replaceSubscriptions(req, res) {
-    const allSubs = req.body;
-    $.write(allSubs, SUBS_KEY);
-    success(res);
-}

backend/src/restful/sync.js

@@ -4,7 +4,6 @@ import {
     COLLECTIONS_KEY,
     RULES_KEY,
     SUBS_KEY,
-    FILES_KEY,
 } from '@/constants';
 import { failed, success } from '@/restful/response';
 import { InternalServerError, ResourceNotFoundError } from '@/restful/errors';
@@ -23,129 +22,36 @@ export default function register($app) {
     $app.get('/api/sync/artifact/:name', syncArtifact);
 }
 
-async function produceArtifact({
-    type,
-    name,
-    platform,
-    url,
-    ua,
-    content,
-    mergeSources,
-    ignoreFailedRemoteSub,
-    ignoreFailedRemoteFile,
-    produceType,
-    produceOpts = {},
-}) {
+async function produceArtifact({ type, name, platform }) {
     platform = platform || 'JSON';
 
+    // produce Clash node format for ShadowRocket
+    if (platform === 'ShadowRocket') platform = 'Clash';
+
     if (type === 'subscription') {
         const allSubs = $.read(SUBS_KEY);
         const sub = findByName(allSubs, name);
-        if (!sub) throw new Error(`找不到订阅 ${name}`);
         let raw;
-        if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) {
-            raw = content;
-        } else if (url) {
-            const errors = {};
-            raw = await Promise.all(
-                url
-                    .split(/[\r\n]+/)
-                    .map((i) => i.trim())
-                    .filter((i) => i.length)
-                    .map(async (url) => {
-                        try {
-                            return await download(url, ua || sub.ua);
-                        } catch (err) {
-                            errors[url] = err;
-                            $.error(
-                                `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
-                            );
-                            return '';
-                        }
-                    }),
-            );
-            let subIgnoreFailedRemoteSub = sub.ignoreFailedRemoteSub;
-            if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
-                subIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
-            }
-            if (!subIgnoreFailedRemoteSub && Object.keys(errors).length > 0) {
-                throw new Error(
-                    `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
-                );
-            }
-            if (mergeSources === 'localFirst') {
-                raw.unshift(content);
-            } else if (mergeSources === 'remoteFirst') {
-                raw.push(content);
-            }
-        } else if (
-            sub.source === 'local' &&
-            !['localFirst', 'remoteFirst'].includes(sub.mergeSources)
-        ) {
+        if (sub.source === 'local') {
             raw = sub.content;
         } else {
-            const errors = {};
-            raw = await Promise.all(
-                sub.url
-                    .split(/[\r\n]+/)
-                    .map((i) => i.trim())
-                    .filter((i) => i.length)
-                    .map(async (url) => {
-                        try {
-                            return await download(url, ua || sub.ua);
-                        } catch (err) {
-                            errors[url] = err;
-                            $.error(
-                                `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
-                            );
-                            return '';
-                        }
-                    }),
-            );
-            let subIgnoreFailedRemoteSub = sub.ignoreFailedRemoteSub;
-            if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
-                subIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
-            }
-            if (!subIgnoreFailedRemoteSub && Object.keys(errors).length > 0) {
-                throw new Error(
-                    `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
-                );
-            }
-            if (sub.mergeSources === 'localFirst') {
-                raw.unshift(sub.content);
-            } else if (sub.mergeSources === 'remoteFirst') {
-                raw.push(sub.content);
-            }
+            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':
@@ -157,15 +63,13 @@ async function produceArtifact({
             exist[proxy.name] = true;
         }
         // produce
-        return ProxyUtils.produce(proxies, platform, produceType, produceOpts);
+        return ProxyUtils.produce(proxies, platform);
     } else if (type === 'collection') {
         const allSubs = $.read(SUBS_KEY);
         const allCols = $.read(COLLECTIONS_KEY);
         const collection = findByName(allCols, name);
-        if (!collection) throw new Error(`找不到组合订阅 ${name}`);
         const subnames = collection.subscriptions;
         const results = {};
-        const errors = {};
         let processed = 0;
 
         await Promise.all(
@@ -174,64 +78,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 {
-                        const errors = {};
-                        raw = await await Promise.all(
-                            sub.url
-                                .split(/[\r\n]+/)
-                                .map((i) => i.trim())
-                                .filter((i) => i.length)
-                                .map(async (url) => {
-                                    try {
-                                        return await download(url, sub.ua);
-                                    } catch (err) {
-                                        errors[url] = err;
-                                        $.error(
-                                            `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
-                                        );
-                                        return '';
-                                    }
-                                }),
-                        );
-                        if (
-                            !sub.ignoreFailedRemoteSub &&
-                            Object.keys(errors).length > 0
-                        ) {
-                            throw new Error(
-                                `订阅 ${sub.name} 的远程订阅 ${Object.keys(
-                                    errors,
-                                ).join(', ')} 发生错误, 请查看日志`,
-                            );
-                        }
-                        if (sub.mergeSources === 'localFirst') {
-                            raw.unshift(sub.content);
-                        } else if (sub.mergeSources === 'remoteFirst') {
-                            raw.push(sub.content);
-                        }
+                        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++;
@@ -242,51 +100,31 @@ async function produceArtifact({
                     );
                 } catch (err) {
                     processed++;
-                    errors[name] = err;
                     $.error(
                         `❌ 处理组合订阅中的子订阅: ${
                             sub.name
-                        }时出现错误：${err}！进度--${
+                        }时出现错误：${err}，该订阅已被跳过！进度--${
                             100 * (processed / subnames.length).toFixed(1)
                         }%`,
                     );
                 }
             }),
         );
-        let collectionIgnoreFailedRemoteSub = collection.ignoreFailedRemoteSub;
-        if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
-            collectionIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
-        }
-        if (
-            !collectionIgnoreFailedRemoteSub &&
-            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 = {};
@@ -294,7 +132,7 @@ async function produceArtifact({
             if (exist[proxy.name]) {
                 $.notify(
                     '🌍 Sub-Store',
-                    `⚠️ 组合订阅 ${name} 包含重复节点 ${proxy.name}！`,
+                    '⚠️ 订阅包含重复节点！',
                     '请仔细检测配置！',
                     {
                         'media-url':
@@ -305,11 +143,10 @@ async function produceArtifact({
             }
             exist[proxy.name] = true;
         }
-        return ProxyUtils.produce(proxies, platform, produceType, produceOpts);
+        return ProxyUtils.produce(proxies, platform);
     } else if (type === 'rule') {
         const allRules = $.read(RULES_KEY);
         const rule = findByName(allRules, name);
-        if (!rule) throw new Error(`找不到规则 ${name}`);
         let rules = [];
         for (let i = 0; i < rule.urls.length; i++) {
             const url = rule.urls[i];
@@ -334,157 +171,32 @@ async function produceArtifact({
         ]);
         // produce output
         return RuleUtils.produce(rules, platform);
-    } else if (type === 'file') {
-        const allFiles = $.read(FILES_KEY);
-        const file = findByName(allFiles, name);
-        if (!file) throw new Error(`找不到文件 ${name}`);
-        let raw;
-        if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) {
-            raw = content;
-        } else if (url) {
-            const errors = {};
-            raw = await Promise.all(
-                url
-                    .split(/[\r\n]+/)
-                    .map((i) => i.trim())
-                    .filter((i) => i.length)
-                    .map(async (url) => {
-                        try {
-                            return await download(url, ua || file.ua);
-                        } catch (err) {
-                            errors[url] = err;
-                            $.error(
-                                `文件 ${file.name} 的远程文件 ${url} 发生错误: ${err}`,
-                            );
-                            return '';
-                        }
-                    }),
-            );
-            let fileIgnoreFailedRemoteFile = file.ignoreFailedRemoteFile;
-            if (
-                ignoreFailedRemoteFile != null &&
-                ignoreFailedRemoteFile !== ''
-            ) {
-                fileIgnoreFailedRemoteFile = ignoreFailedRemoteFile;
-            }
-            if (!fileIgnoreFailedRemoteFile && Object.keys(errors).length > 0) {
-                throw new Error(
-                    `文件 ${file.name} 的远程文件 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
-                );
-            }
-            if (mergeSources === 'localFirst') {
-                raw.unshift(content);
-            } else if (mergeSources === 'remoteFirst') {
-                raw.push(content);
-            }
-        } else if (
-            file.source === 'local' &&
-            !['localFirst', 'remoteFirst'].includes(file.mergeSources)
-        ) {
-            raw = file.content;
-        } else {
-            const errors = {};
-            raw = await Promise.all(
-                file.url
-                    .split(/[\r\n]+/)
-                    .map((i) => i.trim())
-                    .filter((i) => i.length)
-                    .map(async (url) => {
-                        try {
-                            return await download(url, ua || file.ua);
-                        } catch (err) {
-                            errors[url] = err;
-                            $.error(
-                                `文件 ${file.name} 的远程文件 ${url} 发生错误: ${err}`,
-                            );
-                            return '';
-                        }
-                    }),
-            );
-            let fileIgnoreFailedRemoteFile = file.ignoreFailedRemoteFile;
-            if (
-                ignoreFailedRemoteFile != null &&
-                ignoreFailedRemoteFile !== ''
-            ) {
-                fileIgnoreFailedRemoteFile = ignoreFailedRemoteFile;
-            }
-            if (!fileIgnoreFailedRemoteFile && Object.keys(errors).length > 0) {
-                throw new Error(
-                    `文件 ${file.name} 的远程文件 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
-                );
-            }
-            if (file.mergeSources === 'localFirst') {
-                raw.unshift(file.content);
-            } else if (file.mergeSources === 'remoteFirst') {
-                raw.push(file.content);
-            }
-        }
-        const files = (Array.isArray(raw) ? raw : [raw]).flat();
-        let filesContent = files
-            .filter((i) => i != null && i !== '')
-            .join('\n');
-
-        // apply processors
-        const processed =
-            Array.isArray(file.process) && file.process.length > 0
-                ? await ProxyUtils.process(
-                      { $files: files, $content: filesContent },
-                      file.process,
-                  )
-                : { $content: filesContent, $files: files };
-
-        return processed?.$content ?? '';
     }
 }
 
-async function syncArtifacts() {
+async function syncAllArtifacts(_, res) {
     $.info('开始同步所有远程配置...');
     const allArtifacts = $.read(ARTIFACTS_KEY);
     const files = {};
 
     try {
-        const invalid = [];
         await Promise.all(
             allArtifacts.map(async (artifact) => {
-                try {
-                    if (artifact.sync && artifact.source) {
-                        $.info(`正在同步云配置：${artifact.name}...`);
-                        const output = await produceArtifact({
-                            type: artifact.type,
-                            name: artifact.source,
-                            platform: artifact.platform,
-                            produceOpts: {
-                                'include-unsupported-proxy':
-                                    artifact.includeUnsupportedProxy,
-                            },
-                        });
+                if (artifact.sync) {
+                    $.info(`正在同步云配置：${artifact.name}...`);
+                    const output = await produceArtifact({
+                        type: artifact.type,
+                        name: artifact.source,
+                        platform: artifact.platform,
+                    });
 
-                        // if (!output || output.length === 0)
-                        //     throw new Error('该配置的结果为空 不进行上传');
-
-                        files[encodeURIComponent(artifact.name)] = {
-                            content: output,
-                        };
-                    }
-                } catch (e) {
-                    $.error(
-                        `同步配置 ${artifact.name} 发生错误: ${e.message ?? e}`,
-                    );
-                    invalid.push(artifact.name);
+                    files[artifact.name] = {
+                        content: output,
+                    };
                 }
             }),
         );
 
-        if (invalid.length > 0) {
-            throw new Error(
-                `同步配置 ${invalid.join(', ')} 发生错误 详情请查看日志`,
-            );
-        }
-
         const resp = await syncToGist(files);
         const body = JSON.parse(resp.body);
 
@@ -492,98 +204,61 @@ async function syncArtifacts() {
             if (artifact.sync) {
                 artifact.updated = new Date().getTime();
                 // extract real url from gist
-                let files = body.files;
-                let isGitLab;
-                if (Array.isArray(files)) {
-                    isGitLab = true;
-                    files = Object.fromEntries(
-                        files.map((item) => [item.path, item]),
-                    );
-                }
-                const url = files[encodeURIComponent(artifact.name)]?.raw_url;
-                artifact.url = isGitLab
-                    ? url
-                    : url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+                artifact.url = body.files[artifact.name].raw_url.replace(
+                    /\/raw\/[^/]*\/(.*)/,
+                    '/raw/$1',
+                );
             }
         }
 
         $.write(allArtifacts, ARTIFACTS_KEY);
         $.info('全部订阅同步成功！');
-    } catch (e) {
-        $.error(`同步订阅失败，原因：${e.message ?? e}`);
-        throw e;
-    }
-}
-async function syncAllArtifacts(_, res) {
-    $.info('开始同步所有远程配置...');
-    try {
-        await syncArtifacts();
         success(res);
-    } catch (e) {
-        $.error(`同步订阅失败，原因：${e.message ?? e}`);
+    } catch (err) {
         failed(
             res,
             new InternalServerError(
                 `FAILED_TO_SYNC_ARTIFACTS`,
                 `Failed to sync all artifacts`,
-                `Reason: ${e.message ?? e}`,
+                `Reason: ${err}`,
             ),
         );
+        $.info(`同步订阅失败，原因：${err}`);
     }
 }
 
 async function syncArtifact(req, res) {
     let { name } = req.params;
     name = decodeURIComponent(name);
-    $.info(`开始同步远程配置 ${name}...`);
     const allArtifacts = $.read(ARTIFACTS_KEY);
     const artifact = findByName(allArtifacts, name);
 
     if (!artifact) {
-        $.error(`找不到远程配置 ${name}`);
         failed(
             res,
             new ResourceNotFoundError(
                 'RESOURCE_NOT_FOUND',
-                `找不到远程配置 ${name}`,
+                `Artifact ${name} does not exist!`,
             ),
             404,
         );
         return;
     }
 
-    if (!artifact.source) {
-        $.error(`远程配置 ${name} 未设置来源`);
-        failed(
-            res,
-            new ResourceNotFoundError(
-                'RESOURCE_HAS_NO_SOURCE',
-                `远程配置 ${name} 未设置来源`,
-            ),
-            404,
-        );
-        return;
-    }
+    const output = await produceArtifact({
+        type: artifact.type,
+        name: artifact.source,
+        platform: artifact.platform,
+    });
 
+    $.info(
+        `正在上传配置：${artifact.name}\n>>>${JSON.stringify(
+            artifact,
+            null,
+            2,
+        )}`,
+    );
     try {
-        const output = await produceArtifact({
-            type: artifact.type,
-            name: artifact.source,
-            platform: artifact.platform,
-            produceOpts: {
-                'include-unsupported-proxy': artifact.includeUnsupportedProxy,
-            },
-        });
-
-        $.info(
-            `正在上传配置：${artifact.name}\n>>>${JSON.stringify(
-                artifact,
-                null,
-                2,
-            )}`,
-        );
-        // if (!output || output.length === 0)
-        //     throw new Error('该配置的结果为空 不进行上传');
         const resp = await syncToGist({
             [encodeURIComponent(artifact.name)]: {
                 content: output,
@@ -591,20 +266,12 @@ async function syncArtifact(req, res) {
         });
         artifact.updated = new Date().getTime();
         const body = JSON.parse(resp.body);
-        let files = body.files;
-        let isGitLab;
-        if (Array.isArray(files)) {
-            isGitLab = true;
-            files = Object.fromEntries(files.map((item) => [item.path, item]));
-        }
-        const url = files[encodeURIComponent(artifact.name)]?.raw_url;
-        artifact.url = isGitLab
-            ? url
-            : url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+        artifact.url = body.files[
+            encodeURIComponent(artifact.name)
+        ].raw_url.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
         $.write(allArtifacts, ARTIFACTS_KEY);
         success(res, artifact);
     } catch (err) {
-        $.error(`远程配置 ${artifact.name} 发生错误: ${err.message ?? err}`);
         failed(
             res,
             new InternalServerError(
@@ -616,4 +283,4 @@ async function syncArtifact(req, res) {
     }
 }
 
-export { produceArtifact, syncArtifacts };
+export { produceArtifact };

backend/src/utils/download.js

@@ -1,111 +1,44 @@
-import { FILES_KEY, MODULES_KEY, SETTINGS_KEY } from '@/constants';
-import { findByName } from '@/utils/database';
-import { HTTP, ENV } from '@/vendor/open-api';
+import { HTTP } from '@/vendor/open-api';
 import { hex_md5 } from '@/vendor/md5';
 import resourceCache from '@/utils/resource-cache';
-import headersResourceCache from '@/utils/headers-resource-cache';
-import {
-    getFlowField,
-    getFlowHeaders,
-    parseFlowHeaders,
-    validCheck,
-} from '@/utils/flow';
-import $ from '@/core/app';
 
 const tasks = new Map();
 
-export default async function download(rawUrl, ua, timeout) {
-    let $arguments = {};
-    let url = rawUrl.replace(/#noFlow$/, '');
-    const rawArgs = url.split('#');
-    url = url.split('#')[0];
-    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, defaultTimeout } = $.read(SETTINGS_KEY);
-    const userAgent = ua || defaultUserAgent || 'clash.meta';
-    const requestTimeout = timeout || defaultTimeout;
-    const id = hex_md5(userAgent + url);
-    if (!isNode && tasks.has(id)) {
+export default async function download(url, ua) {
+    ua = ua || 'Quantumult%20X/1.0.29 (iPhone14,5; iOS 15.4.1)';
+    const id = hex_md5(ua + url);
+    if (tasks.has(id)) {
         return tasks.get(id);
     }
 
     const http = HTTP({
         headers: {
-            'User-Agent': userAgent,
+            'User-Agent': ua,
         },
-        timeout: requestTimeout,
     });
 
-    let result;
-
-    // try to find in app cache
-    const cached = resourceCache.get(id);
-    if (!$arguments?.noCache && cached) {
-        result = cached;
-    } else {
-        $.info(
-            `Downloading...\nUser-Agent: ${userAgent}\nTimeout: ${requestTimeout}\nURL: ${url}`,
-        );
-        try {
-            const { body, headers } = await http.get(url);
-
-            if (headers) {
-                const flowInfo = getFlowField(headers);
-                if (flowInfo) {
-                    headersResourceCache.set(url, flowInfo);
-                }
-            }
-            if (body.replace(/\s/g, '').length === 0)
-                throw new Error(new Error('远程资源内容为空'));
-
-            resourceCache.set(id, body);
-            result = body;
-        } catch (e) {
-            throw new Error(`无法下载 URL ${url}: ${e.message ?? e}`);
+    const result = new Promise((resolve, reject) => {
+        // try to find in app cache
+        const cached = resourceCache.get(id);
+        if (cached) {
+            resolve(cached);
+        } else {
+            http.get(url)
+                .then((resp) => {
+                    const body = resp.body;
+                    if (body.replace(/\s/g, '').length === 0)
+                        reject(new Error('远程资源内容为空！'));
+                    else {
+                        resourceCache.set(id, body);
+                        resolve(body);
+                    }
+                })
+                .catch(() => {
+                    reject(new Error(`无法下载 URL：${url}`));
+                });
         }
-    }
+    });
 
-    // 检查订阅有效性
-
-    if ($arguments?.validCheck) {
-        await validCheck(parseFlowHeaders(await getFlowHeaders(url)));
-    }
-
-    if (!isNode) {
-        tasks.set(id, result);
-    }
+    tasks.set(id, result);
     return result;
 }

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

@@ -1,145 +1,15 @@
-import { SETTINGS_KEY } from '@/constants';
 import { HTTP } from '@/vendor/open-api';
-import $ from '@/core/app';
-import headersResourceCache from '@/utils/headers-resource-cache';
 
-export function getFlowField(headers) {
+export async function getFlowHeaders(url) {
+    const http = HTTP();
+    const { headers } = await http.get({
+        url,
+        headers: {
+            'User-Agent': 'Quantumult%20X/1.0.30 (iPhone14,2; iOS 15.6)',
+        },
+    });
     const subkey = Object.keys(headers).filter((k) =>
         /SUBSCRIPTION-USERINFO/i.test(k),
     )[0];
     return headers[subkey];
 }
-export async function getFlowHeaders(rawUrl, ua, timeout) {
-    let url = rawUrl;
-    let $arguments = {};
-    const rawArgs = url.split('#');
-    url = url.split('#')[0];
-    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);
-            }
-        }
-    }
-    if ($arguments?.noFlow) {
-        return;
-    }
-    const cached = headersResourceCache.get(url);
-    let flowInfo;
-    if (!$arguments?.noCache && cached) {
-        // $.info(`使用缓存的流量信息: ${url}`);
-        flowInfo = cached;
-    } else {
-        const { defaultFlowUserAgent, defaultTimeout } = $.read(SETTINGS_KEY);
-        const userAgent =
-            ua ||
-            defaultFlowUserAgent ||
-            'Quantumult%20X/1.0.30 (iPhone14,2; iOS 15.6)';
-        const requestTimeout = timeout || defaultTimeout;
-        const http = HTTP();
-        try {
-            // $.info(`使用 HEAD 方法获取流量信息: ${url}`);
-            const { headers } = await http.head({
-                url: url
-                    .split(/[\r\n]+/)
-                    .map((i) => i.trim())
-                    .filter((i) => i.length)[0],
-                headers: {
-                    'User-Agent': userAgent,
-                },
-                timeout: requestTimeout,
-            });
-            flowInfo = getFlowField(headers);
-        } catch (e) {
-            $.error(
-                `使用 HEAD 方法获取流量信息失败: ${url}: ${e.message ?? e}`,
-            );
-        }
-        if (!flowInfo) {
-            $.info(`使用 GET 方法获取流量信息: ${url}`);
-            const { headers } = await http.get({
-                url: url
-                    .split(/[\r\n]+/)
-                    .map((i) => i.trim())
-                    .filter((i) => i.length)[0],
-                headers: {
-                    'User-Agent': userAgent,
-                },
-                timeout: requestTimeout,
-            });
-            flowInfo = getFlowField(headers);
-        }
-        if (flowInfo) {
-            headersResourceCache.set(url, flowInfo);
-        }
-    }
-
-    return flowInfo;
-}
-export function parseFlowHeaders(flowHeaders) {
-    if (!flowHeaders) return;
-    // unit is KB
-    const uploadMatch = flowHeaders.match(
-        /upload=([-+]?)([0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)/,
-    );
-    const upload = Number(uploadMatch[1] + uploadMatch[2]);
-
-    const downloadMatch = flowHeaders.match(
-        /download=([-+]?)([0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)/,
-    );
-    const download = Number(downloadMatch[1] + downloadMatch[2]);
-    const totalMatch = flowHeaders.match(
-        /total=([-+]?)([0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)/,
-    );
-    const total = Number(totalMatch[1] + totalMatch[2]);
-
-    // optional expire timestamp
-    const expireMatch = flowHeaders.match(
-        /expire=([-+]?)([0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)/,
-    );
-    const expires = expireMatch
-        ? Number(expireMatch[1] + expireMatch[2])
-        : 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]);
-}
-
-export function validCheck(flow) {
-    if (!flow) {
-        throw new Error('没有流量信息');
-    }
-    if (flow?.expires && flow.expires * 1000 < Date.now()) {
-        const date = new Date(flow.expires * 1000).toLocaleDateString();
-        throw new Error(`订阅已过期: ${date}`);
-    }
-    if (flow?.total) {
-        const upload = flow.usage?.upload || 0;
-        const download = flow.usage?.download || 0;
-        if (flow.total - upload - download < 0) {
-            const current = upload + download;
-            const currT = flowTransfer(Math.abs(current));
-            currT.value = current < 0 ? '-' + currT.value : currT.value;
-            const totalT = flowTransfer(flow.total);
-            throw new Error(
-                `流量已用完: ${currT.value} ${currT.unit} / ${totalT.value} ${totalT.unit}`,
-            );
-        }
-    }
-}

backend/src/utils/geo.js

@@ -155,7 +155,7 @@ export function getFlag(name) {
         '🇲🇴': ['Macao', '澳门', '澳門', 'CTM'],
         '🇲🇹': ['Malta', '马耳他'],
         '🇲🇽': ['Mexico', '墨西哥'],
-        '🇲🇾': ['Malaysia', '马来', '馬來', '吉隆坡', '大馬'],
+        '🇲🇾': ['Malaysia', '马来西亚', '馬來西亞', '吉隆坡', '大馬'],
         '🇳🇱': ['Netherlands', '荷兰', '荷蘭', '尼德蘭', '阿姆斯特丹'],
         '🇳🇴': ['Norway', '挪威'],
         '🇳🇵': ['Nepal', '尼泊尔'],

backend/src/utils/gist.js

@@ -4,233 +4,77 @@ import { HTTP } from '@/vendor/open-api';
  * Gist backup
  */
 export default class Gist {
-    constructor({ token, key, syncPlatform }) {
-        if (syncPlatform === 'gitlab') {
-            this.headers = {
-                'PRIVATE-TOKEN': `${token}`,
-                'User-Agent':
-                    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.141 Safari/537.36',
-            };
-            this.http = HTTP({
-                baseURL: 'https://gitlab.com/api/v4',
-                headers: { ...this.headers },
-                events: {
-                    onResponse: (resp) => {
-                        if (/^[45]/.test(String(resp.statusCode))) {
-                            const body = JSON.parse(resp.body);
-                            return Promise.reject(
-                                `ERROR: ${body.message?.error ?? body.message}`,
-                            );
-                        } else {
-                            return resp;
-                        }
-                    },
-                },
-            });
-        } else {
-            this.headers = {
+    constructor({ token, key }) {
+        this.http = HTTP({
+            baseURL: 'https://api.github.com',
+            headers: {
                 Authorization: `token ${token}`,
                 'User-Agent':
                     'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.141 Safari/537.36',
-            };
-            this.http = HTTP({
-                baseURL: 'https://api.github.com',
-                headers: { ...this.headers },
-                events: {
-                    onResponse: (resp) => {
-                        if (/^[45]/.test(String(resp.statusCode))) {
-                            return Promise.reject(
-                                `ERROR: ${JSON.parse(resp.body).message}`,
-                            );
-                        } else {
-                            return resp;
-                        }
-                    },
+            },
+            events: {
+                onResponse: (resp) => {
+                    if (/^[45]/.test(String(resp.statusCode))) {
+                        return Promise.reject(
+                            `ERROR: ${JSON.parse(resp.body).message}`,
+                        );
+                    } else {
+                        return resp;
+                    }
                 },
-            });
-        }
-
+            },
+        });
         this.key = key;
-        this.syncPlatform = syncPlatform;
     }
 
     async locate() {
-        if (this.syncPlatform === 'gitlab') {
-            return this.http.get('/snippets').then((response) => {
-                const gists = JSON.parse(response.body);
-
-                for (let g of gists) {
-                    if (g.title === this.key) {
-                        return g;
-                    }
+        return this.http.get('/gists').then((response) => {
+            const gists = JSON.parse(response.body);
+            for (let g of gists) {
+                if (g.description === this.key) {
+                    return g.id;
                 }
-                return;
-            });
-        } else {
-            return this.http.get('/gists').then((response) => {
-                const gists = JSON.parse(response.body);
-                for (let g of gists) {
-                    if (g.description === this.key) {
-                        return g;
-                    }
-                }
-                return;
-            });
-        }
+            }
+            return -1;
+        });
     }
 
-    async upload(input) {
-        if (Object.keys(input).length === 0) {
-            return Promise.reject('未提供需上传的文件');
-        }
+    async upload(files) {
+        const id = await this.locate();
 
-        const gist = await this.locate();
-
-        let files = input;
-
-        if (gist?.id) {
-            if (this.syncPlatform === 'gitlab') {
-                gist.files = gist.files.reduce((acc, item) => {
-                    acc[item.path] = item;
-                    return acc;
-                }, {});
-            }
-            // console.log(`files`, files);
-            // console.log(`gist`, gist.files);
-            let actions = [];
-            const result = { ...gist.files };
-            Object.keys(files).map((key) => {
-                if (result[key]) {
-                    if (
-                        files[key].content == null ||
-                        files[key].content === ''
-                    ) {
-                        delete result[key];
-                        actions.push({
-                            action: 'delete',
-                            file_path: key,
-                        });
-                    } else {
-                        result[key] = files[key];
-                        actions.push({
-                            action: 'update',
-                            file_path: key,
-                            content: files[key].content,
-                        });
-                    }
-                } else {
-                    if (
-                        files[key].content == null ||
-                        files[key].content === ''
-                    ) {
-                        delete result[key];
-                        delete files[key];
-                    } else {
-                        result[key] = files[key];
-                        actions.push({
-                            action: 'create',
-                            file_path: key,
-                            content: files[key].content,
-                        });
-                    }
-                }
+        if (id === -1) {
+            // create a new gist for backup
+            return this.http.post({
+                url: '/gists',
+                body: JSON.stringify({
+                    description: this.key,
+                    public: false,
+                    files,
+                }),
             });
-            console.log(`result`, result);
-            console.log(`files`, files);
-            console.log(`actions`, actions);
-
-            if (this.syncPlatform === 'gitlab') {
-                if (Object.keys(result).length === 0) {
-                    return Promise.reject(
-                        '本次操作将导致所有文件的内容都为空, 无法更新 snippet',
-                    );
-                }
-                if (Object.keys(result).length > 10) {
-                    return Promise.reject(
-                        '本次操作将导致 snippet 的文件数超过 10, 无法更新 snippet',
-                    );
-                }
-                files = actions;
-                return this.http.put({
-                    headers: {
-                        ...this.headers,
-                        'Content-Type': 'application/json',
-                    },
-                    url: `/snippets/${gist.id}`,
-                    body: JSON.stringify({ files }),
-                });
-            } else {
-                if (Object.keys(result).length === 0) {
-                    return Promise.reject(
-                        '本次操作将导致所有文件的内容都为空, 无法更新 gist',
-                    );
-                }
-                return this.http.patch({
-                    url: `/gists/${gist.id}`,
-                    body: JSON.stringify({ files }),
-                });
-            }
         } else {
-            files = Object.entries(files).reduce((acc, [key, file]) => {
-                if (file.content !== null && file.content !== '') {
-                    acc[key] = file;
-                }
-                return acc;
-            }, {});
-            if (this.syncPlatform === 'gitlab') {
-                if (Object.keys(files).length === 0) {
-                    return Promise.reject(
-                        '所有文件的内容都为空, 无法创建 snippet',
-                    );
-                }
-                files = Object.keys(files).map((key) => ({
-                    file_path: key,
-                    content: files[key].content,
-                }));
-                return this.http.post({
-                    headers: {
-                        ...this.headers,
-                        'Content-Type': 'application/json',
-                    },
-                    url: '/snippets',
-                    body: JSON.stringify({
-                        title: this.key,
-                        visibility: 'private',
-                        files,
-                    }),
-                });
-            } else {
-                if (Object.keys(files).length === 0) {
-                    return Promise.reject(
-                        '所有文件的内容都为空, 无法创建 gist',
-                    );
-                }
-                return this.http.post({
-                    url: '/gists',
-                    body: JSON.stringify({
-                        description: this.key,
-                        public: false,
-                        files,
-                    }),
-                });
-            }
+            // update an existing gist
+            return this.http.patch({
+                url: `/gists/${id}`,
+                body: JSON.stringify({ files }),
+            });
         }
     }
 
     async download(filename) {
-        const gist = await this.locate();
-        if (gist?.id) {
+        const id = await this.locate();
+        if (id === -1) {
+            return Promise.reject('未找到Gist备份！');
+        } else {
             try {
                 const { files } = await this.http
-                    .get(`/gists/${gist.id}`)
+                    .get(`/gists/${id}`)
                     .then((resp) => JSON.parse(resp.body));
                 const url = files[filename].raw_url;
                 return await this.http.get(url).then((resp) => resp.body);
             } catch (err) {
                 return Promise.reject(err);
             }
-        } else {
-            return Promise.reject('找不到 Sub-Store Gist');
         }
     }
 }

backend/src/utils/headers-resource-cache.js

@@ -1,107 +0,0 @@
-import $ from '@/core/app';
-import {
-    HEADERS_RESOURCE_CACHE_KEY,
-    CHR_EXPIRATION_TIME_KEY,
-} from '@/constants';
-
-class ResourceCache {
-    constructor() {
-        this.expires = getExpiredTime();
-        if (!$.read(HEADERS_RESOURCE_CACHE_KEY)) {
-            $.write('{}', HEADERS_RESOURCE_CACHE_KEY);
-        }
-        this.resourceCache = JSON.parse($.read(HEADERS_RESOURCE_CACHE_KEY));
-        this._cleanup();
-    }
-
-    _cleanup() {
-        // clear obsolete cached resource
-        let clear = false;
-        Object.entries(this.resourceCache).forEach((entry) => {
-            const [id, updated] = entry;
-            if (!updated.time) {
-                // clear old version cache
-                delete this.resourceCache[id];
-                $.delete(`#${id}`);
-                clear = true;
-            }
-            if (new Date().getTime() - updated.time > this.expires) {
-                delete this.resourceCache[id];
-                clear = true;
-            }
-        });
-        if (clear) this._persist();
-    }
-
-    revokeAll() {
-        this.resourceCache = {};
-        this._persist();
-    }
-
-    _persist() {
-        $.write(JSON.stringify(this.resourceCache), HEADERS_RESOURCE_CACHE_KEY);
-    }
-
-    get(id) {
-        const updated = this.resourceCache[id] && this.resourceCache[id].time;
-        if (updated && new Date().getTime() - updated <= this.expires) {
-            return this.resourceCache[id].data;
-        }
-        return null;
-    }
-
-    gettime(id) {
-        const updated = this.resourceCache[id] && this.resourceCache[id].time;
-        if (updated && new Date().getTime() - updated <= this.expires) {
-            return this.resourceCache[id].time;
-        }
-        return null;
-    }
-
-    set(id, value) {
-        this.resourceCache[id] = { time: new Date().getTime(), data: value };
-        this._persist();
-    }
-}
-
-function getExpiredTime() {
-    // console.log($.read(CHR_EXPIRATION_TIME_KEY));
-    if (!$.read(CHR_EXPIRATION_TIME_KEY)) {
-        $.write('6e4', CHR_EXPIRATION_TIME_KEY); // 1分钟
-    }
-    let expiration = 6e4;
-    if ($.env.isLoon) {
-        const loont = {
-            // Loon 插件自义定
-            '1\u5206\u949f': 6e4,
-            '5\u5206\u949f': 3e5,
-            '10\u5206\u949f': 6e5,
-            '30\u5206\u949f': 18e5, // "30分钟"
-            '1\u5c0f\u65f6': 36e5,
-            '2\u5c0f\u65f6': 72e5,
-            '3\u5c0f\u65f6': 108e5,
-            '6\u5c0f\u65f6': 216e5,
-            '12\u5c0f\u65f6': 432e5,
-            '24\u5c0f\u65f6': 864e5,
-            '48\u5c0f\u65f6': 1728e5,
-            '72\u5c0f\u65f6': 2592e5, // "72小时"
-            '\u53c2\u6570\u4f20\u5165': 'readcachets', // "参数输入"
-        };
-        let intimed = $.read(
-            '#\u54cd\u5e94\u5934\u7f13\u5b58\u6709\u6548\u671f',
-        ); // Loon #响应头缓存有效期
-        // console.log(intimed);
-        if (intimed in loont) {
-            expiration = loont[intimed];
-            if (expiration === 'readcachets') {
-                expiration = intimed;
-            }
-        }
-        return expiration;
-    } else {
-        expiration = $.read(CHR_EXPIRATION_TIME_KEY);
-        return expiration;
-    }
-}
-
-export default new ResourceCache();

backend/src/utils/index.js

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

backend/src/utils/platform.js

@@ -1,39 +1,22 @@
 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('Surfboard') !== -1) {
-        return 'Surfboard';
-    } 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) {
         return 'Loon';
     } else if (UA.indexOf('Shadowrocket') !== -1) {
-        return 'Shadowrocket';
+        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 if (ua.indexOf('sing-box') !== -1) {
-        return 'sing-box';
     } else {
         return 'JSON';
     }

backend/src/utils/resource-cache.js

@@ -16,13 +16,8 @@ class ResourceCache {
         let clear = false;
         Object.entries(this.resourceCache).forEach((entry) => {
             const [id, updated] = entry;
-            if (!updated.time) {
-                // clear old version cache
-                delete this.resourceCache[id];
+            if (new Date().getTime() - updated > this.expires) {
                 $.delete(`#${id}`);
-                clear = true;
-            }
-            if (new Date().getTime() - updated.time > this.expires) {
                 delete this.resourceCache[id];
                 clear = true;
             }
@@ -31,6 +26,9 @@ class ResourceCache {
     }
 
     revokeAll() {
+        Object.keys(this.resourceCache).forEach((id) => {
+            $.delete(`#${id}`);
+        });
         this.resourceCache = {};
         this._persist();
     }
@@ -40,16 +38,17 @@ class ResourceCache {
     }
 
     get(id) {
-        const updated = this.resourceCache[id] && this.resourceCache[id].time;
+        const updated = this.resourceCache[id];
         if (updated && new Date().getTime() - updated <= this.expires) {
-            return this.resourceCache[id].data;
+            return $.read(`#${id}`);
         }
         return null;
     }
 
     set(id, value) {
-        this.resourceCache[id] = { time: new Date().getTime(), data: value };
+        this.resourceCache[id] = new Date().getTime();
         this._persist();
+        $.write(value, `#${id}`);
     }
 }
 

backend/src/utils/script-resource-cache.js

@@ -1,105 +0,0 @@
-import $ from '@/core/app';
-import {
-    SCRIPT_RESOURCE_CACHE_KEY,
-    CSR_EXPIRATION_TIME_KEY,
-} from '@/constants';
-
-class ResourceCache {
-    constructor() {
-        this.expires = getExpiredTime();
-        if (!$.read(SCRIPT_RESOURCE_CACHE_KEY)) {
-            $.write('{}', SCRIPT_RESOURCE_CACHE_KEY);
-        }
-        this.resourceCache = JSON.parse($.read(SCRIPT_RESOURCE_CACHE_KEY));
-        this._cleanup();
-    }
-
-    _cleanup() {
-        // clear obsolete cached resource
-        let clear = false;
-        Object.entries(this.resourceCache).forEach((entry) => {
-            const [id, updated] = entry;
-            if (!updated.time) {
-                // clear old version cache
-                delete this.resourceCache[id];
-                $.delete(`#${id}`);
-                clear = true;
-            }
-            if (new Date().getTime() - updated.time > this.expires) {
-                delete this.resourceCache[id];
-                clear = true;
-            }
-        });
-        if (clear) this._persist();
-    }
-
-    revokeAll() {
-        this.resourceCache = {};
-        this._persist();
-    }
-
-    _persist() {
-        $.write(JSON.stringify(this.resourceCache), SCRIPT_RESOURCE_CACHE_KEY);
-    }
-
-    get(id) {
-        const updated = this.resourceCache[id] && this.resourceCache[id].time;
-        if (updated && new Date().getTime() - updated <= this.expires) {
-            return this.resourceCache[id].data;
-        }
-        return null;
-    }
-
-    gettime(id) {
-        const updated = this.resourceCache[id] && this.resourceCache[id].time;
-        if (updated && new Date().getTime() - updated <= this.expires) {
-            return this.resourceCache[id].time;
-        }
-        return null;
-    }
-
-    set(id, value) {
-        this.resourceCache[id] = { time: new Date().getTime(), data: value };
-        this._persist();
-    }
-}
-
-function getExpiredTime() {
-    // console.log($.read(CSR_EXPIRATION_TIME_KEY));
-    if (!$.read(CSR_EXPIRATION_TIME_KEY)) {
-        $.write('1728e5', CSR_EXPIRATION_TIME_KEY); // 48 * 3600 * 1000
-    }
-    let expiration = 1728e5;
-    if ($.env.isLoon) {
-        const loont = {
-            // Loon 插件自义定
-            '1\u5206\u949f': 6e4,
-            '5\u5206\u949f': 3e5,
-            '10\u5206\u949f': 6e5,
-            '30\u5206\u949f': 18e5, // "30分钟"
-            '1\u5c0f\u65f6': 36e5,
-            '2\u5c0f\u65f6': 72e5,
-            '3\u5c0f\u65f6': 108e5,
-            '6\u5c0f\u65f6': 216e5,
-            '12\u5c0f\u65f6': 432e5,
-            '24\u5c0f\u65f6': 864e5,
-            '48\u5c0f\u65f6': 1728e5,
-            '72\u5c0f\u65f6': 2592e5, // "72小时"
-            '\u53c2\u6570\u4f20\u5165': 'readcachets', // "参数输入"
-        };
-        let intimed = $.read('#\u8282\u70b9\u7f13\u5b58\u6709\u6548\u671f'); // Loon #节点缓存有效期
-        // console.log(intimed);
-        if (intimed in loont) {
-            expiration = loont[intimed];
-            if (expiration === 'readcachets') {
-                expiration = intimed;
-            }
-        }
-        return expiration;
-    } else {
-        expiration = $.read(CSR_EXPIRATION_TIME_KEY);
-        return expiration;
-    }
-}
-
-export default new ResourceCache();

backend/src/utils/yaml.js

@@ -1,37 +0,0 @@
-import YAML from 'static-js-yaml';
-
-function retry(fn, content, ...args) {
-    try {
-        return fn(content, ...args);
-    } catch (e) {
-        return fn(
-            dump(
-                fn(
-                    content.replace(/!<str>\s*/g, '__SubStoreJSYAMLString__'),
-                    ...args,
-                ),
-            ).replace(/__SubStoreJSYAMLString__/g, ''),
-            ...args,
-        );
-    }
-}
-
-export function safeLoad(content, ...args) {
-    return retry(YAML.safeLoad, content, ...args);
-}
-export function load(content, ...args) {
-    return retry(YAML.load, content, ...args);
-}
-export function safeDump(...args) {
-    return YAML.safeDump(...args);
-}
-export function dump(...args) {
-    return YAML.dump(...args);
-}
-
-export default {
-    safeLoad,
-    load,
-    safeDump,
-    dump,
-};

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),
@@ -191,32 +183,6 @@ export class OpenAPI {
                 (openURL ? `\n点击跳转: ${openURL}` : '') +
                 (mediaURL ? `\n多媒体: ${mediaURL}` : '');
             console.log(`${title}\n${subtitle}\n${content_}\n\n`);
-
-            let push = eval('process.env.SUB_STORE_PUSH_SERVICE');
-            if (push) {
-                const url = push
-                    .replace(
-                        '[推送标题]',
-                        encodeURIComponent(title || 'Sub-Store'),
-                    )
-                    .replace(
-                        '[推送内容]',
-                        encodeURIComponent(
-                            [subtitle, content_].map((i) => i).join('\n'),
-                        ),
-                    );
-                const $http = HTTP();
-                $http
-                    .get({ url })
-                    .then((resp) => {
-                        console.log(
-                            `[Push Service] URL: ${url}\nRES: ${resp.statusCode} ${resp.body}`,
-                        );
-                    })
-                    .catch((e) => {
-                        console.log(`[Push Service] URL: ${url}\nERROR: ${e}`);
-                    });
-            }
         }
     }
 
@@ -314,17 +280,6 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                 request[method.toLowerCase()](
                     options,
                     (err, response, body) => {
-                        // if (err) {
-                        //     console.log(err);
-                        // } else {
-                        //     console.log({
-                        //         statusCode:
-                        //             response.status || response.statusCode,
-                        //         headers: response.headers,
-                        //         body,
-                        //     });
-                        // }
-
                         if (err) reject(err);
                         else
                             resolve({
@@ -353,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

@@ -1,20 +1,15 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具. 定时任务默认为每天 0 点
+#!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小时,参数传入
-#!select = 响应头缓存有效期,1分钟,5分钟,10分钟,30分钟,1小时,2小时,3小时,6小时,12小时,24小时,48小时,72小时,参数传入
-
-[Rule]
-DOMAIN,sub-store.vercel.app,PROXY
 
 [MITM]
 hostname=sub.store
 
 [Script]
 http-request ^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))) script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js, requires-body=true, timeout=120, tag=Sub-Store Core
-http-request ^https?:\/\/sub\.store script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js, requires-body=true, timeout=120, tag=Sub-Store Simple
+http-request https?:\/\/sub\.store script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js, requires-body=true, timeout=120, tag=Sub-Store Simple
 
 cron "0 0 * * *" script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js, tag=Sub-Store Sync

config/QX-Task.json

@@ -1,7 +0,0 @@
-{
-  "name": "Sub-Store",
-  "description": "定时任务默认为每天 0 点",
-  "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,37 +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
-
-0. 最新 Surge iOS TestFlight 版本 可使用 Beta 版(支持最新 Surge iOS TestFlight 版本的分类和参数设置): [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Beta.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Beta.sgmodule)
-
-1. 官方默认版模块(目前不带 ability 参数, 不保证以后不会改动): [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule)
-
-2. 固定带 ability 参数版本,可能会爆内存, 如果需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 请使用此带 ability 参数版本: [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule)
-
-3. 固定不带 ability 参数版本： [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Noability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Noability.sgmodule)
-
+安装使用[模块](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/sub-store-org/Sub-Store/master/config/QX-Task.json`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/QX-Task.json)
+订阅[重写](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 已经配置成功。

config/Stash.stoverride

@@ -1,5 +1,5 @@
 name: Sub-Store
-desc: 高级订阅管理工具 @Peng-YM. 定时任务默认为每天 0 点
+desc: 高级订阅管理工具 @Peng-YM
 
 http:
   mitm:
@@ -33,4 +33,4 @@ script-providers:
 
   cron-sync-artifacts:
     url: https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js
-    interval: 86400
+    interval: 86400

config/Surge-Beta.sgmodule

@@ -1,15 +0,0 @@
-#!name=Sub-Store(β)
-#!desc=支持最新 Surge iOS TestFlight 版本的参数设置功能. 测落地功能 ability: http-client-policy, 同步配置的定时 cronexp: 0 0 * * *
-#!category=订阅管理
-#!arguments=ability:http-client-policy,cronexp:0 0 * * *,sync:"Sub-Store Sync"
-#!arguments-desc="\n1️⃣ ability\n默认已开启测落地能力\n需要配合脚本操作\n如 https://raw.githubusercontent.com/Keywos/rule/main/cname.js\n⚠️ Surge 上时候可能会爆内存\n不需要使用的时候应该关闭\n填写任意其他值关闭\n\n2️⃣ cronexp\n同步配置定时任务\n默认为每天 0 点\n\n3️⃣ sync\n自定义定时任务名\n便于在脚本编辑器中选择\n若设为 # 可取消定时任务"
-
-[MITM]
-hostname = %APPEND% sub.store
-
-[Script]
-Sub-Store Core=type=http-request,pattern=^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))),script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js,requires-body=true,timeout=120,ability="{{{ability}}}"
-
-Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true
-
-{{{sync}}}=type=cron,cronexp="{{{cronexp}}}",wake-system=1,timeout=120,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js

config/Surge-Noability.sgmodule

@@ -1,13 +0,0 @@
-#!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 可以用带 ability 参数. 定时任务默认为每天 0 点
-#!category=订阅管理
-
-[MITM]
-hostname = %APPEND% sub.store
-
-[Script]
-# 主程序 已经去掉 Sub-Store Core 的参数 [,ability=http-client-policy] 不会爆内存，这个参数在 Surge 非常占用内存； 如果不需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 则可以使用此脚本
-Sub-Store Core=type=http-request,pattern=^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))),script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js,requires-body=true,timeout=120
-Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true
-
-Sub-Store Sync=type=cron,cronexp=0 0 * * *,wake-system=1,timeout=120,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js

config/Surge-ability.sgmodule

@@ -1,12 +0,0 @@
-#!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  带 ability 参数版本, 可能会爆内存, 如果不需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 可以用不带 ability 参数版本. 定时任务默认为每天 0 点
-#!category=订阅管理
-
-[MITM]
-hostname = %APPEND% sub.store
-
-[Script]
-Sub-Store Core=type=http-request,pattern=^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))),script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js,requires-body=true,timeout=120,ability=http-client-policy
-Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true
-
-Sub-Store Sync=type=cron,cronexp=0 0 * * *,wake-system=1,timeout=120,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js

config/Surge.sgmodule

@@ -1,12 +1,10 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 可以用带 ability 参数. 定时任务默认为每天 0 点
-#!category=订阅管理
-
+#!desc=高级订阅管理工具 @Peng-YM
 [MITM]
-hostname = %APPEND% sub.store
+hostname=%APPEND% sub.store
 
 [Script]
-Sub-Store Core=type=http-request,pattern=^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))),script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js,requires-body=true,timeout=120
+Sub-Store Core=type=http-request,pattern=^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))),script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js,requires-body=true,timeout=120,ability=http-client-policy
 Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true
 
 Sub-Store Sync=type=cron,cronexp=0 0 * * *,wake-system=1,timeout=120,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js

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="
+    }
+  }
+}

scripts/demo.js

@@ -1,131 +0,0 @@
-function operator(proxies = [], targetPlatform, context) {
-  // 支持快捷操作 不一定要写一个 function
-  // 可参考 https://t.me/zhetengsha/970
-  // https://t.me/zhetengsha/1009 
-
-
-  // proxies 为传入的内部节点数组
-  // 结构大致参考了 Clash.Meta(mihomo) 有私货
-  // 可在预览界面点击节点查看 JSON 结构 或查看 `target=JSON` 的通用订阅
-  // 1. `no-resolve` 为不解析域名
-  // 2. 域名解析后 会多一个 `resolved` 字段
-  // 3. 节点字段 `exec` 为 `ssr-local` 路径, 默认 `/usr/local/bin/ssr-local`; 端口从 10000 开始递增(暂不支持配置)
-
-  // $arguments 为传入的脚本参数
-
-  // targetPlatform 为输出的目标平台
-
-  // lodash
-
-  // $substore 为 OpenAPI
-  // 参考 https://github.com/Peng-YM/QuanX/blob/master/Tools/OpenAPI/README.md
-  
-  // scriptResourceCache 缓存
-  // 可参考 https://t.me/zhetengsha/1003
-
-  // ProxyUtils 为节点处理工具
-  // 可参考 https://t.me/zhetengsha/1066
-  // const ProxyUtils = {
-  //     parse, // 订阅解析
-  //     process, // 节点操作/文件操作
-  //     produce, // 输出订阅
-  //     isIPv4,
-  //     isIPv6,
-  //     isIP,
-  //     yaml, // yaml 解析和生成
-  // }
-
-  // flowUtils 为机场订阅流量信息处理工具
-  // 可参考 https://t.me/zhetengsha/948
-  // https://github.com/sub-store-org/Sub-Store/blob/31b6dd0507a9286d6ab834ec94ad3050f6bdc86b/backend/src/utils/download.js#L104
-
-  // context 为传入的上下文
-  // 有三种情况, 按需判断
-
-  // 若存在 `source._collection` 且 `source._collection.subscriptions` 中的 key 在 `source` 上也存在, 说明输出结果为组合订阅, 但是脚本设置在单条订阅上
-
-  // 若存在 `source._collection` 但 `source._collection.subscriptions` 中的 key 在 `source` 上不存在, 说明输出结果为组合订阅, 脚本设置在组合订阅上
-
-  // 若不存在 `source._collection`, 说明输出结果为单条订阅, 脚本设置在此单条订阅上
-
-  // 1. 输出单条订阅 sub-1 时, 该单条订阅中的脚本上下文为:
-  // {
-  //   "source": {
-  //     "sub-1": {
-  //       "name": "sub-1",
-  //       "displayName": "",
-  //       "mergeSources": "",
-  //       "ignoreFailedRemoteSub": true,
-  //       "process": [],
-  //       "icon": "",
-  //       "source": "local",
-  //       "url": "",
-  //       "content": "",
-  //       "ua": "",
-  //       "display-name": "",
-  //       "useCacheForFailedRemoteSub": false
-  //     }
-  //   },
-  //   "backend": "Node",
-  //   "version": "2.14.198"
-  // }
-  // 2. 输出组合订阅 collection-1 时, 该组合订阅中的脚本上下文为:
-  // {
-  //   "source": {
-  //     "_collection": {
-  //       "name": "collection-1",
-  //       "displayName": "",
-  //       "mergeSources": "",
-  //       "ignoreFailedRemoteSub": false,
-  //       "icon": "",
-  //       "process": [],
-  //       "subscriptions": [
-  //         "sub-1"
-  //       ],
-  //       "display-name": ""
-  //     }
-  //   },
-  //   "backend": "Node",
-  //   "version": "2.14.198"
-  // }
-  // 3. 输出组合订阅 collection-1 时, 该组合订阅中的单条订阅 sub-1 中的某个脚本上下文为:
-  // {
-  //   "source": {
-  //     "sub-1": {
-  //       "name": "sub-1",
-  //       "displayName": "",
-  //       "mergeSources": "",
-  //       "ignoreFailedRemoteSub": true,
-  //       "icon": "",
-  //       "process": [],
-  //       "source": "local",
-  //       "url": "",
-  //       "content": "",
-  //       "ua": "",
-  //       "display-name": "",
-  //       "useCacheForFailedRemoteSub": false
-  //     },
-  //     "_collection": {
-  //       "name": "collection-1",
-  //       "displayName": "",
-  //       "mergeSources": "",
-  //       "ignoreFailedRemoteSub": false,
-  //       "icon": "",
-  //       "process": [],
-  //       "subscriptions": [
-  //         "sub-1"
-  //       ],
-  //       "display-name": ""
-  //     }
-  //   },
-  //   "backend": "Node",
-  //   "version": "2.14.198"
-  // }
-
-  // 参数说明
-  // 可参考 https://github.com/sub-store-org/Sub-Store/wiki/%E9%93%BE%E6%8E%A5%E5%8F%82%E6%95%B0%E8%AF%B4%E6%98%8E
-
-  console.log(JSON.stringify(context, null, 2))
-
-  return proxies
-}

scripts/ip-flag.js

@@ -17,13 +17,8 @@ class ResourceCache {
         let clear = false;
         Object.entries(this.resourceCache).forEach((entry) => {
             const [id, updated] = entry;
-            if (!updated.time) {
-                // clear old version cache
-                delete this.resourceCache[id];
+            if (new Date().getTime() - updated > this.expires) {
                 $.delete(`#${id}`);
-                clear = true;
-            }
-            if (new Date().getTime() - updated.time > this.expires) {
                 delete this.resourceCache[id];
                 clear = true;
             }
@@ -32,6 +27,9 @@ class ResourceCache {
     }
 
     revokeAll() {
+        Object.keys(this.resourceCache).forEach((id) => {
+            $.delete(`#${id}`);
+        });
         this.resourceCache = {};
         this._persist();
     }
@@ -41,16 +39,17 @@ class ResourceCache {
     }
 
     get(id) {
-        const updated = this.resourceCache[id] && this.resourceCache[id].time;
+        const updated = this.resourceCache[id];
         if (updated && new Date().getTime() - updated <= this.expires) {
-            return this.resourceCache[id].data;
+            return $.read(`#${id}`);
         }
         return null;
     }
 
     set(id, value) {
-        this.resourceCache[id] = { time: new Date().getTime(), data: value }
+        this.resourceCache[id] = new Date().getTime();
         this._persist();
+        $.write(value, `#${id}`);
     }
 }