🐞 fix(subscriptions): negative usage flow

.github/workflows/main.yml

@@ -1,16 +1,15 @@
 name: build
-on:
-  workflow_dispatch:
+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
@@ -18,67 +17,38 @@ 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: "20"
+          node-version: "14"
       - name: Install dependencies
         run: |
           npm install -g pnpm
-          cd backend && pnpm i --no-frozen-lockfile
-      # - name: Test
-      #   run: |
-      #     cd backend
-      #     pnpm test
-      # - name: Build
-      #   run: |
-      #     cd backend
-      #     pnpm run build
-      - name: Bundle
+          cd backend && pnpm i
+      - name: Test
         run: |
           cd backend
-          pnpm bundle:esbuild
+          pnpm test
+      - name: Build
+        run: |
+          cd backend
+          pnpm run build
       - 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
-      - name: Prepare release
-        run: |
-          cd backend
-          pnpm i -D conventional-changelog-cli
-          pnpm run changelog
+          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:
-          body_path: ./backend/CHANGELOG.md
           tag_name: ${{ steps.tag.outputs.release_tag }}
-          # generate_release_notes: true
           files: |
             ./backend/sub-store.min.js
             ./backend/dist/sub-store-0.min.js
             ./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: Git push assets to "release" branch
-        run: |
-          cd backend/dist || exit 1
-          git init
-          git config --local user.name "github-actions[bot]"
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git checkout -b release
-          git add .
-          git commit -m "release: ${{ steps.tag.outputs.release_tag }}"
-          git remote add origin "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}"
-          git push -f -u origin release
-      # - 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?

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "web"]
+	path = web
+	url = https://github.com/sub-store-org/Sub-Store-Front-End.git

README.md

@@ -1,71 +1,45 @@
 <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, Egern 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)
-<a href="https://trendshift.io/repositories/4572" target="_blank"><img src="https://trendshift.io/api/badge/repositories/4572" alt="sub-store-org%2FSub-Store | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+[![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:
 
 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
 
 ### Supported Input Formats
 
-> ⚠️ Do not use `Shadowrocket` or `NekoBox` to export URI and then import it as input. The URIs exported in this way may not be standard URIs. However, we have already supported some very common non-standard URIs (such as VMess, VLESS).
-
-- [x] Proxy URI Scheme(`socks5`, `socks5+tls`, `http`, `https`(it's ok))
-
-  example: `socks5+tls://user:pass@ip:port#name`
-
-- [x] URI(AnyTLS, SOCKS, SS, SSR, VMess, VLESS, Trojan, Hysteria, Hysteria 2, TUIC v5, WireGuard)
-  > Please note, HTTP(s) does not have a standard URI format, so it is not supported. Please use other formats.
-- [x] Clash Proxies YAML
-- [x] Clash Proxy JSON(single line)
-- [x] QX (SS, SSR, VMess, Trojan, HTTP, SOCKS5, VLESS)
-- [x] Loon (SS, SSR, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard, VLESS, Hysteria 2)
-- [x] Surge (Direct, SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, TUIC, Snell, Hysteria 2, SSH(Password authentication only), External Proxy Program(only for macOS), WireGuard(Surge to Surge))
-- [x] Surfboard (SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard(Surfboard to Surfboard))
-- [x] Clash.Meta (Direct, SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC, SSH, mieru, AnyTLS)
-- [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC, Juicity, SSH)
-
-Deprecated(The frontend doesn't show it, but the backend still supports it, with the query parameter `target=Clash`):
-
-- [x] Clash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard)
+- [x] SS URI
+- [x] SSR URI
+- [x] SSD URI
+- [x] V2RayN URI
+- [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] Surfboard
-- [x] Surge
-- [x] SurgeMac(Use mihomo to support protocols that are not supported by Surge itself)
-- [x] Loon
-- [x] Egern
-- [x] Shadowrocket
 - [x] QX
-- [x] sing-box
-- [x] V2Ray
-- [x] V2Ray URI
-
-Deprecated:
-
-- [x] Clash
+- [x] Loon
+- [x] Surge
+- [x] Stash & Clash
+- [x] ShadowRocket
 
 ## 2. Subscription Formatting
 
@@ -87,33 +61,26 @@ Deprecated:
 - [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 i
+npm install
 ```
 
 1. In `backend`, run the backend server on http://localhost:3000
 
-babel(old school)
-
 ```
-pnpm start
+npm run serve
 ```
 
-or
-
-esbuild(experimental)
-
-```
-SUB_STORE_BACKEND_API_PORT=3000 pnpm run --parallel "/^dev:.*/"
-```
+2. In`web`, start the vue-cli server
+   
+   ```
+   npm start
+   ```
 
 ## LICENSE
 
@@ -121,17 +88,7 @@ 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.
-
-## Sponsors
-
-[![image](./support.nodeseek.com_page_promotion_id=8.png)](https://yxvm.com)
-
-[NodeSupport](https://github.com/NodeSeekDev/NodeSupport) sponsored this project.
+- Speicial thanks to @Orz-3 and @58xinian for their awesome icons.

backend/banner

@@ -5,11 +5,11 @@
  *  ╚════██║██║   ██║██╔══██╗╚════╝╚════██║   ██║   ██║   ██║██╔══██╗██╔══╝
  *  ███████║╚██████╔╝██████╔╝      ███████║   ██║   ╚██████╔╝██║  ██║███████╗
  *  ╚══════╝ ╚═════╝ ╚═════╝       ╚══════╝   ╚═╝    ╚═════╝ ╚═╝  ╚═╝╚══════╝
- * Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket!
+ * Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket!
  * @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-esbuild.js

@@ -1,77 +0,0 @@
-#!/usr/bin/env node
-const fs = require('fs');
-const path = require('path');
-const { build } = require('esbuild');
-
-!(async () => {
-    const version = JSON.parse(
-        fs.readFileSync(path.join(__dirname, 'package.json'), 'utf-8'),
-    ).version.trim();
-
-    const artifacts = [
-        { src: 'src/main.js', dest: 'sub-store.min.js' },
-        {
-            src: 'src/products/resource-parser.loon.js',
-            dest: 'dist/sub-store-parser.loon.min.js',
-        },
-        {
-            src: 'src/products/cron-sync-artifacts.js',
-            dest: 'dist/cron-sync-artifacts.min.js',
-        },
-        { src: 'src/products/sub-store-0.js', dest: 'dist/sub-store-0.min.js' },
-        { src: 'src/products/sub-store-1.js', dest: 'dist/sub-store-1.min.js' },
-    ];
-
-    for await (const artifact of artifacts) {
-        await build({
-            entryPoints: [artifact.src],
-            bundle: true,
-            minify: true,
-            sourcemap: false,
-            platform: 'browser',
-            format: 'iife',
-            outfile: artifact.dest,
-        });
-    }
-
-    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',
-        },
-    );
-
-    await build({
-        entryPoints: ['dist/sub-store.no-bundle.js'],
-        bundle: true,
-        minify: true,
-        sourcemap: false,
-        platform: 'node',
-        format: 'cjs',
-        outfile: 'dist/sub-store.bundle.js',
-    });
-    fs.writeFileSync(
-        path.join(__dirname, 'dist/sub-store.bundle.js'),
-        `// SUB_STORE_BACKEND_VERSION: ${version}
-${fs.readFileSync(path.join(__dirname, 'dist/sub-store.bundle.js'), {
-    encoding: 'utf8',
-})}`,
-        {
-            encoding: 'utf8',
-        },
-    );
-})()
-    .catch((e) => {
-        console.log(e);
-    })
-    .finally(() => {
-        console.log('done');
-    });

backend/bundle.js

@@ -1,51 +0,0 @@
-#!/usr/bin/env node
-const fs = require('fs');
-const path = require('path');
-const { build } = require('esbuild');
-
-!(async () => {
-    const version = JSON.parse(
-        fs.readFileSync(path.join(__dirname, 'package.json'), 'utf-8'),
-    ).version.trim();
-
-    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',
-        },
-    );
-
-    await build({
-        entryPoints: ['dist/sub-store.no-bundle.js'],
-        bundle: true,
-        minify: true,
-        sourcemap: true,
-        platform: 'node',
-        format: 'cjs',
-        outfile: 'dist/sub-store.bundle.js',
-    });
-    fs.writeFileSync(
-        path.join(__dirname, 'dist/sub-store.bundle.js'),
-        `// SUB_STORE_BACKEND_VERSION: ${version}
-${fs.readFileSync(path.join(__dirname, 'dist/sub-store.bundle.js'), {
-    encoding: 'utf8',
-})}`,
-        {
-            encoding: 'utf8',
-        },
-    );
-})()
-    .catch((e) => {
-        console.log(e);
-    })
-    .finally(() => {
-        console.log('done');
-    });

backend/dev-esbuild.js

@@ -1,24 +0,0 @@
-#!/usr/bin/env node
-const { build } = require('esbuild');
-
-!(async () => {
-    const artifacts = [{ src: 'src/main.js', dest: 'sub-store.min.js' }];
-
-    for await (const artifact of artifacts) {
-        await build({
-            entryPoints: [artifact.src],
-            bundle: true,
-            minify: false,
-            sourcemap: false,
-            platform: 'node',
-            format: 'cjs',
-            outfile: artifact.dest,
-        });
-    }
-})()
-    .catch((e) => {
-        console.log(e);
-    })
-    .finally(() => {
-        console.log('done');
-    });

backend/package.json

@@ -1,50 +1,28 @@
 {
   "name": "sub-store",
-  "version": "2.19.89",
-  "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
+  "version": "2.13.5",
+  "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "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",
-    "dev:esbuild": "nodemon -w src -w package.json dev-esbuild.js",
-    "dev:run": "nodemon -w sub-store.min.js sub-store.min.js",
-    "build": "gulp",
-    "bundle": "node bundle.js",
-    "bundle:esbuild": "node bundle-esbuild.js",
-    "changelog": "conventional-changelog -p cli -i CHANGELOG.md -s"
+    "build": "gulp"
   },
   "author": "Peng-YM",
   "license": "GPL-3.0",
-  "pnpm": {
-    "patchedDependencies": {
-      "http-proxy@1.18.1": "patches/http-proxy@1.18.1.patch"
-    }
-  },
   "dependencies": {
-    "@maxmind/geoip2-node": "^5.0.0",
     "automerge": "1.0.1-preview.7",
     "body-parser": "^1.19.0",
-    "buffer": "^6.0.3",
-    "connect-history-api-fallback": "^2.0.0",
-    "cron": "^3.1.6",
-    "dns-packet": "^5.6.1",
-    "dotenv": "^16.4.7",
     "express": "^4.17.1",
-    "fetch-socks": "^1.3.2",
-    "http-proxy-middleware": "^3.0.3",
-    "ip-address": "^9.0.5",
     "js-base64": "^3.7.2",
-    "json5": "^2.2.3",
-    "jsrsasign": "^11.1.0",
     "lodash": "^4.17.21",
-    "mime-types": "^2.1.35",
-    "ms": "^2.1.3",
-    "nanoid": "^3.3.3",
-    "semver": "^7.6.3",
+    "request": "^2.88.2",
+    "requests": "^0.3.0",
+    "semver": "^7.3.7",
     "static-js-yaml": "^1.0.0",
-    "undici": "^7.4.0"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@babel/core": "^7.18.0",
@@ -52,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",
@@ -74,4 +51,4 @@
     "prettier-plugin-sort-imports": "^1.6.1",
     "tinyify": "^3.0.0"
   }
-}
+}

backend/patches/http-proxy@1.18.1.patch

@@ -1,46 +0,0 @@
-diff --git a/lib/http-proxy/common.js b/lib/http-proxy/common.js
-index 6513e81d80d5250ea249ea833f819ece67897c7e..486d4c896d65a3bb7cf63307af68facb3ddb886b 100644
---- a/lib/http-proxy/common.js
-+++ b/lib/http-proxy/common.js
-@@ -1,6 +1,5 @@
- var common   = exports,
-     url      = require('url'),
--    extend   = require('util')._extend,
-     required = require('requires-port');
- 
- var upgradeHeader = /(^|,)\s*upgrade\s*($|,)/i,
-@@ -40,10 +39,10 @@ common.setupOutgoing = function(outgoing, options, req, forward) {
-   );
- 
-   outgoing.method = options.method || req.method;
--  outgoing.headers = extend({}, req.headers);
-+  outgoing.headers = Object.assign({}, req.headers);
- 
-   if (options.headers){
--    extend(outgoing.headers, options.headers);
-+    Object.assign(outgoing.headers, options.headers);
-   }
- 
-   if (options.auth) {
-diff --git a/lib/http-proxy/index.js b/lib/http-proxy/index.js
-index 977a4b3622b9eaac27689f06347ea4c5173a96cd..88b2d0fcfa03c3aafa47c7e6d38e64412c45a7cc 100644
---- a/lib/http-proxy/index.js
-+++ b/lib/http-proxy/index.js
-@@ -1,5 +1,4 @@
- var httpProxy = module.exports,
--    extend    = require('util')._extend,
-     parse_url = require('url').parse,
-     EE3       = require('eventemitter3'),
-     http      = require('http'),
-@@ -47,9 +46,9 @@ function createRightProxy(type) {
-         args[cntr] !== res
-       ) {
-         //Copy global options
--        requestOptions = extend({}, options);
-+        requestOptions = Object.assign({}, options);
-         //Overwrite with request options
--        extend(requestOptions, args[cntr]);
-+        Object.assign(requestOptions, args[cntr]);
- 
-         cntr--;
-       }

backend/src/constants.js

@@ -2,17 +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 TOKENS_KEY = 'tokens';
 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,31 +1,10 @@
-import { Base64 } from 'js-base64';
-import { Buffer } from 'buffer';
-import rs from '@/utils/rs';
-import YAML from '@/utils/yaml';
-import download, { downloadFile } from '@/utils/download';
-import {
-    isIPv4,
-    isIPv6,
-    isValidPortNumber,
-    isValidUUID,
-    isNotBlank,
-    ipAddress,
-    getRandomPort,
-    numberToString,
-} from '@/utils';
+import download from '@/utils/download';
+
 import PROXY_PROCESSORS, { ApplyProcessor } from './processors';
 import PROXY_PREPROCESSORS from './preprocessors';
 import PROXY_PRODUCERS from './producers';
 import PROXY_PARSERS from './parsers';
 import $ from '@/core/app';
-import { FILES_KEY, MODULES_KEY } from '@/constants';
-import { findByName } from '@/utils/database';
-import { produceArtifact } from '@/restful/sync';
-import { getFlag, removeFlag, getISO, MMDB } from '@/utils/geo';
-import Gist from '@/utils/gist';
-import { isPresent } from './producers/utils';
-import { doh } from '@/utils/dns';
-import JSON5 from 'json5';
 
 function preprocess(raw) {
     for (const processor of PROXY_PREPROCESSORS) {
@@ -57,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;
             }
         }
@@ -67,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`);
@@ -80,127 +59,42 @@ function parse(raw) {
             $.error(`Failed to parse line: ${line}`);
         }
     }
-    return proxies.filter((proxy) => {
-        if (['vless', 'vmess'].includes(proxy.type)) {
-            const isProxyUUIDValid = isValidUUID(proxy.uuid);
-            if (!isProxyUUIDValid) {
-                $.error(`UUID may be invalid: ${proxy.name} ${proxy.uuid}`);
-            }
-            // return isProxyUUIDValid;
-        }
-        return true;
-    });
+
+    return proxies;
 }
 
-async function processFn(
-    proxies,
-    operators = [],
-    targetPlatform,
-    source,
-    $options,
-) {
+async function process(proxies, operators = [], targetPlatform) {
     for (const item of operators) {
-        if (item.disabled) {
-            $.log(
-                `Skipping disabled operator: "${
-                    item.type
-                }" with arguments:\n >>> ${
-                    JSON.stringify(item.args, null, 2) || 'None'
-                }`,
-            );
-            continue;
-        }
         // process script
         let script;
-        let $arguments = {};
+        const $arguments = {};
         if (item.type.indexOf('Script') !== -1) {
             const { mode, content } = item.args;
             if (mode === 'link') {
-                let url = content || '';
+                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;
                     }
                 }
-                url = `${url.split('#')[0]}${
-                    rawArgs[2]
-                        ? `#${rawArgs[2]}`
-                        : $arguments?.noCache != null ||
-                          $arguments?.insecure != null
-                        ? `#${rawArgs[1]}`
-                        : ''
-                }`;
-                const downloadUrlMatch = url
-                    .split('#')[0]
-                    .match(/^\/api\/(file|module)\/(.+)/);
-                if (downloadUrlMatch) {
-                    let type = '';
-                    try {
-                        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}`);
-                        }
 
-                        if (type === 'module') {
-                            script = item.content;
-                        } else {
-                            script = await produceArtifact({
-                                type: 'file',
-                                name,
-                            });
-                        }
-                    } catch (err) {
-                        $.error(
-                            `Error when loading ${type}: ${item.args.content}.\n Reason: ${err}`,
-                        );
-                        throw new Error(`无法加载 ${type}: ${url}`);
-                    }
-                } else if (url?.startsWith('/')) {
-                    try {
-                        const fs = eval(`require("fs")`);
-                        script = fs.readFileSync(url.split('#')[0], 'utf8');
-                        // $.info(`Script loaded: >>>\n ${script}`);
-                    } catch (err) {
-                        $.error(
-                            `Error when reading local script: ${item.args.content}.\n Reason: ${err}`,
-                        );
-                        throw new Error(`无法从该路径读取脚本文件: ${url}`);
-                    }
-                } else {
-                    // if this is a remote script, download it
-                    try {
-                        script = await download(url);
-                        // $.info(`Script loaded: >>>\n ${script}`);
-                    } catch (err) {
-                        $.error(
-                            `Error when downloading remote script: ${item.args.content}.\n Reason: ${err}`,
-                        );
-                        throw new Error(`无法下载脚本: ${url}`);
-                    }
+                // if this is a remote script, download it
+                try {
+                    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}`,
+                    );
+                    // skip the script if download failed.
+                    continue;
                 }
             } else {
                 script = content;
-                $arguments = item.args.arguments || {};
             }
         }
 
@@ -209,7 +103,7 @@ async function processFn(
             continue;
         }
 
-        $.log(
+        $.info(
             `Applying "${item.type}" with arguments:\n >>> ${
                 JSON.stringify(item.args, null, 2) || 'None'
             }`,
@@ -220,8 +114,6 @@ async function processFn(
                 script,
                 targetPlatform,
                 $arguments,
-                source,
-                $options,
             );
         } else {
             processor = PROXY_PROCESSORS[item.type](item.args || {});
@@ -231,73 +123,24 @@ async function processFn(
     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!`);
     }
 
-    const sni_off_supported = /Surge|SurgeMac|Shadowrocket/i.test(
-        targetPlatform,
+    // filter unsupported proxies
+    proxies = proxies.filter(
+        (proxy) =>
+            !(proxy.supported && proxy.supported[targetPlatform] === false),
     );
 
-    // filter unsupported proxies
-    proxies = proxies.filter((proxy) => {
-        // 检查代理是否支持目标平台
-        if (proxy.supported && proxy.supported[targetPlatform] === false) {
-            return false;
-        }
-
-        // 对于 vless 和 vmess 代理,需要额外验证 UUID
-        if (['vless', 'vmess'].includes(proxy.type)) {
-            const isProxyUUIDValid = isValidUUID(proxy.uuid);
-            if (!isProxyUUIDValid)
-                $.error(`UUID may be invalid: ${proxy.name} ${proxy.uuid}`);
-            // return isProxyUUIDValid;
-        }
-
-        return true;
-    });
-
-    proxies = proxies.map((proxy) => {
-        proxy._resolved = proxy.resolved;
-
-        if (!isNotBlank(proxy.name)) {
-            proxy.name = `${proxy.type} ${proxy.server}:${proxy.port}`;
-        }
-        if (proxy['disable-sni']) {
-            if (sni_off_supported) {
-                proxy.sni = 'off';
-            } else if (!['tuic'].includes(proxy.type)) {
-                $.error(
-                    `Target platform ${targetPlatform} does not support sni off. Proxy's fields (sni, tls-fingerprint and skip-cert-verify) will be modified.`,
-                );
-                proxy.sni = '';
-                proxy['skip-cert-verify'] = true;
-                delete proxy['tls-fingerprint'];
-            }
-        }
-
-        // 处理 端口跳跃
-        if (proxy.ports) {
-            proxy.ports = String(proxy.ports);
-            if (!['ClashMeta'].includes(targetPlatform)) {
-                proxy.ports = proxy.ports.replace(/\//g, ',');
-            }
-            if (!proxy.port) {
-                proxy.port = getRandomPort(proxy.ports);
-            }
-        }
-
-        return proxy;
-    });
-
-    $.log(`Producing proxies for target: ${targetPlatform}`);
+    $.info(`Producing proxies for target: ${targetPlatform}`);
     if (typeof producer.type === 'undefined' || producer.type === 'SINGLE') {
-        let list = proxies
+        return proxies
             .map((proxy) => {
                 try {
-                    return producer.produce(proxy, type, opts);
+                    return producer.produce(proxy);
                 } catch (err) {
                     $.error(
                         `Cannot produce proxy: ${JSON.stringify(
@@ -309,46 +152,17 @@ function produce(proxies, targetPlatform, type, opts = {}) {
                     return '';
                 }
             })
-            .filter((line) => line.length > 0);
-        list = type === 'internal' ? list : list.join('\n');
-        if (
-            targetPlatform.startsWith('Surge') &&
-            proxies.length > 0 &&
-            proxies.every((p) => p.type === 'wireguard')
-        ) {
-            list = `#!name=${proxies[0]?._subName}
-#!desc=${proxies[0]?._desc ?? ''}
-#!category=${proxies[0]?._category ?? ''}
-${list}`;
-        }
-        return list;
+            .filter((line) => line.length > 0)
+            .join('\n');
     } else if (producer.type === 'ALL') {
-        return producer.produce(proxies, type, opts);
+        return producer.produce(proxies);
     }
 }
 
 export const ProxyUtils = {
     parse,
-    process: processFn,
+    process,
     produce,
-    ipAddress,
-    getRandomPort,
-    isIPv4,
-    isIPv6,
-    isIP,
-    yaml: YAML,
-    getFlag,
-    removeFlag,
-    getISO,
-    MMDB,
-    Gist,
-    download,
-    downloadFile,
-    isValidUUID,
-    doh,
-    Buffer,
-    Base64,
-    JSON5,
 };
 
 function tryParse(parser, line) {
@@ -368,286 +182,3 @@ function safeMatch(parser, line) {
         return false;
     }
 }
-
-function formatTransportPath(path) {
-    if (typeof path === 'string' || typeof path === 'number') {
-        path = String(path).trim();
-
-        if (path === '') {
-            return '/';
-        } else if (!path.startsWith('/')) {
-            return '/' + path;
-        }
-    }
-    return path;
-}
-
-function lastParse(proxy) {
-    if (typeof proxy.cipher === 'string') {
-        proxy.cipher = proxy.cipher.toLowerCase();
-    }
-    if (typeof proxy.password === 'number') {
-        proxy.password = numberToString(proxy.password);
-    }
-    if (
-        ['ss'].includes(proxy.type) &&
-        proxy.cipher === 'none' &&
-        !proxy.password
-    ) {
-        // https://github.com/MetaCubeX/mihomo/issues/1677
-        proxy.password = '';
-    }
-    if (proxy.interface) {
-        proxy['interface-name'] = proxy.interface;
-        delete proxy.interface;
-    }
-    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'];
-    }
-
-    const transportPath = proxy[`${proxy.network}-opts`]?.path;
-
-    if (Array.isArray(transportPath)) {
-        proxy[`${proxy.network}-opts`].path = transportPath.map((item) =>
-            formatTransportPath(item),
-        );
-    } else if (transportPath != null) {
-        proxy[`${proxy.network}-opts`].path =
-            formatTransportPath(transportPath);
-    }
-
-    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',
-            'juicity',
-            'anytls',
-        ].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];
-        }
-    }
-
-    // 非 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 (proxy.tls && !proxy.sni) {
-        if (!isIP(proxy.server)) {
-            proxy.sni = proxy.server;
-        }
-        if (!proxy.sni && proxy.network) {
-            let transportHost = proxy[`${proxy.network}-opts`]?.headers?.Host;
-            transportHost = Array.isArray(transportHost)
-                ? transportHost[0]
-                : transportHost;
-            if (transportHost) {
-                proxy.sni = transportHost;
-            }
-        }
-    }
-    // if (['hysteria', 'hysteria2', 'tuic'].includes(proxy.type)) {
-    if (proxy.ports) {
-        proxy.ports = String(proxy.ports).replace(/\//g, ',');
-    } else {
-        delete proxy.ports;
-    }
-    // }
-    if (
-        ['hysteria2'].includes(proxy.type) &&
-        proxy.obfs &&
-        !['salamander'].includes(proxy.obfs) &&
-        !proxy['obfs-password']
-    ) {
-        proxy['obfs-password'] = proxy.obfs;
-        proxy.obfs = 'salamander';
-    }
-    if (
-        ['hysteria2'].includes(proxy.type) &&
-        !proxy['obfs-password'] &&
-        proxy['obfs_password']
-    ) {
-        proxy['obfs-password'] = proxy['obfs_password'];
-        delete proxy['obfs_password'];
-    }
-    if (['vless'].includes(proxy.type)) {
-        // 删除 reality-opts: {}
-        if (
-            proxy['reality-opts'] &&
-            Object.keys(proxy['reality-opts']).length === 0
-        ) {
-            delete proxy['reality-opts'];
-        }
-        // 删除 grpc-opts: {}
-        if (
-            proxy['grpc-opts'] &&
-            Object.keys(proxy['grpc-opts']).length === 0
-        ) {
-            delete proxy['grpc-opts'];
-        }
-        // 非 reality, 空 flow 没有意义
-        if (!proxy['reality-opts'] && !proxy.flow) {
-            delete proxy.flow;
-        }
-        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 = ['/'];
-            }
-        }
-    }
-
-    if (typeof proxy.name !== 'string') {
-        if (/^\d+$/.test(proxy.name)) {
-            proxy.name = `${proxy.name}`;
-        } else {
-            try {
-                if (proxy.name?.data) {
-                    proxy.name = Buffer.from(proxy.name.data).toString('utf8');
-                } else {
-                    proxy.name = Buffer.from(proxy.name).toString('utf8');
-                }
-            } catch (e) {
-                $.error(`proxy.name decode failed\nReason: ${e}`);
-                proxy.name = `${proxy.type} ${proxy.server}:${proxy.port}`;
-            }
-        }
-    }
-    if (['ws', 'http', 'h2'].includes(proxy.network)) {
-        if (
-            ['ws', 'h2'].includes(proxy.network) &&
-            !proxy[`${proxy.network}-opts`]?.path
-        ) {
-            proxy[`${proxy.network}-opts`] =
-                proxy[`${proxy.network}-opts`] || {};
-            proxy[`${proxy.network}-opts`].path = '/';
-        } else if (
-            proxy.network === 'http' &&
-            (!Array.isArray(proxy[`${proxy.network}-opts`]?.path) ||
-                proxy[`${proxy.network}-opts`]?.path.every((i) => !i))
-        ) {
-            proxy[`${proxy.network}-opts`] =
-                proxy[`${proxy.network}-opts`] || {};
-            proxy[`${proxy.network}-opts`].path = ['/'];
-        }
-    }
-    if (['', 'off'].includes(proxy.sni)) {
-        proxy['disable-sni'] = true;
-    }
-    let caStr = proxy['ca_str'];
-    if (proxy['ca-str']) {
-        caStr = proxy['ca-str'];
-    } else if (caStr) {
-        delete proxy['ca_str'];
-        proxy['ca-str'] = caStr;
-    }
-    try {
-        if ($.env.isNode && !caStr && proxy['_ca']) {
-            caStr = $.node.fs.readFileSync(proxy['_ca'], {
-                encoding: 'utf8',
-            });
-        }
-    } catch (e) {
-        $.error(`Read ca file failed\nReason: ${e}`);
-    }
-    if (!proxy['tls-fingerprint'] && caStr) {
-        proxy['tls-fingerprint'] = rs.generateFingerprint(caStr);
-    }
-    if (
-        ['ss'].includes(proxy.type) &&
-        isPresent(proxy, 'shadow-tls-password')
-    ) {
-        proxy.plugin = 'shadow-tls';
-        proxy['plugin-opts'] = {
-            host: proxy['shadow-tls-sni'],
-            password: proxy['shadow-tls-password'],
-            version: proxy['shadow-tls-version'],
-        };
-        delete proxy['shadow-tls-sni'];
-        delete proxy['shadow-tls-password'];
-        delete proxy['shadow-tls-version'];
-    }
-    return proxy;
-}
-
-function isIP(ip) {
-    return isIPv4(ip) || isIPv6(ip);
-}

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

@@ -35,16 +35,16 @@ const grammars = String.raw`
     }
 }
 
-start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/socks5/hysteria2) {
+start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http) {
     return proxy;
 }
 
-shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/block_quic/others)*{
+shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/others)*{
     proxy.type = "ssr";
     // 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/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/block_quic/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") {
@@ -54,33 +54,27 @@ shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs
         $set(proxy, "plugin-opts.path", obfs.path);
     }
 }
-vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/others)* {
+vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/vmess_alterId/fast_open/udp_relay/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     proxy.alterId = proxy.alterId || 0;
     handleTransport();
 }
-vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/others)* {
+vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/fast_open/udp_relay/others)* {
     proxy.type = "vless";
     handleTransport();
 }
-trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/fast_open/udp_relay/others)* {
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/block_quic/others)* {
-    proxy.type = "hysteria2";
-}
-https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+https = tag equals "https"i address (username password)? (tls_host/tls_verification/fast_open/udp_relay/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/block_quic/others)* {
+http = tag equals "http"i address (username password)? (fast_open/udp_relay/others)* {
     proxy.type = "http";
 }
-socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
-    proxy.type = "socks5";
-}
 
 address = comma server:server comma port:port {
     proxy.server = server;
@@ -120,7 +114,7 @@ port = digits:[0-9]+ {
 method = comma cipher:cipher { 
     proxy.cipher = cipher;
 }
-cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"auto"/"bf-cfb"/"camellia-128-cfb"/"camellia-192-cfb"/"camellia-256-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"none"/"rc4-md5"/"rc4"/"salsa20"/"xchacha20-ietf-poly1305"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
+cipher = ("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"/"xchacha20-ietf-poly1305"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"none"/"auto");
 
 username = & {
     let j = peg$currPos; 
@@ -148,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; }
@@ -169,30 +160,12 @@ ssr_protocol_param = comma "protocol-param" equals param:$[^=,]+ { proxy["protoc
 
 vmess_alterId = comma "alterId" equals alterId:$[0-9]+ { proxy.alterId = parseInt(alterId); } 
 
-udp_port = comma "udp-port" equals match:$[0-9]+ { proxy["udp-port"] = parseInt(match.trim()); }
-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(""); }
-
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }
-tls_host = comma sni:("tls-name"/"sni") equals host:domain { proxy.sni = host; }
+tls_host = comma "tls-name" equals host:domain { proxy.sni = host; }
 tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-verify"] = flag; }
-tls_cert_sha256 = comma "tls-cert-sha256" equals match:[^,]+ { proxy["tls-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals match:[^,]+ { proxy["tls-pubkey-sha256"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-
-flow = comma "flow" equals match:[^,]+ { proxy["flow"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-public_key = comma "public-key" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["public-key"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-short_id = comma "short-id" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["short-id"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
-ip_mode = comma "ip-mode" equals match:[^,]+ { proxy["ip-version"] = match.join(""); }
-
-ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
-download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
-salamander_password = comma "salamander-password" equals match:[^,]+ { proxy['obfs-password'] = match.join(""); proxy.obfs = 'salamander'; }
-
-block_quic = comma "block-quic" equals flag:bool { if(flag) proxy["block-quic"] = "on"; else proxy["block-quic"] = "off"; }
 
 tag = match:[^=,]* { proxy.name = match.join("").trim(); }
 comma = _ "," _

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

@@ -33,16 +33,16 @@
     }
 }
 
-start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/socks5/hysteria2) {
+start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http) {
     return proxy;
 }
 
-shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/block_quic/others)*{
+shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/ssr_protocol_param/obfs_ssr/obfs_ssr_param/obfs_host/obfs_uri/fast_open/udp_relay/others)*{
     proxy.type = "ssr";
     // 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/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/ip_mode/block_quic/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") {
@@ -52,33 +52,27 @@ shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs
         $set(proxy, "plugin-opts.path", obfs.path);
     }
 }
-vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/others)* {
+vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/vmess_alterId/fast_open/udp_relay/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     proxy.alterId = proxy.alterId || 0;
     handleTransport();
 }
-vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/others)* {
+vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/fast_open/udp_relay/others)* {
     proxy.type = "vless";
     handleTransport();
 }
-trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/fast_open/udp_relay/others)* {
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/block_quic/others)* {
-    proxy.type = "hysteria2";
-}
-https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+https = tag equals "https"i address (username password)? (tls_host/tls_verification/fast_open/udp_relay/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
-http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/block_quic/others)* {
+http = tag equals "http"i address (username password)? (fast_open/udp_relay/others)* {
     proxy.type = "http";
 }
-socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
-    proxy.type = "socks5";
-}
 
 address = comma server:server comma port:port {
     proxy.server = server;
@@ -118,7 +112,7 @@ port = digits:[0-9]+ {
 method = comma cipher:cipher { 
     proxy.cipher = cipher;
 }
-cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"auto"/"bf-cfb"/"camellia-128-cfb"/"camellia-192-cfb"/"camellia-256-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"none"/"rc4-md5"/"rc4"/"salsa20"/"xchacha20-ietf-poly1305"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
+cipher = ("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"/"xchacha20-ietf-poly1305"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"none"/"auto");
 
 username = & {
     let j = peg$currPos; 
@@ -146,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; }
@@ -167,30 +158,12 @@ ssr_protocol_param = comma "protocol-param" equals param:$[^=,]+ { proxy["protoc
 
 vmess_alterId = comma "alterId" equals alterId:$[0-9]+ { proxy.alterId = parseInt(alterId); } 
 
-udp_port = comma "udp-port" equals match:$[0-9]+ { proxy["udp-port"] = parseInt(match.trim()); }
-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(""); }
-
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }
-tls_host = comma sni:("tls-name"/"sni") equals host:domain { proxy.sni = host; }
+tls_host = comma "tls-name" equals host:domain { proxy.sni = host; }
 tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-verify"] = flag; }
-tls_cert_sha256 = comma "tls-cert-sha256" equals match:[^,]+ { proxy["tls-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals match:[^,]+ { proxy["tls-pubkey-sha256"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-
-flow = comma "flow" equals match:[^,]+ { proxy["flow"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-public_key = comma "public-key" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["public-key"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-short_id = comma "short-id" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["short-id"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
-ip_mode = comma "ip-mode" equals match:[^,]+ { proxy["ip-version"] = match.join(""); }
-
-ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
-download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
-salamander_password = comma "salamander-password" equals match:[^,]+ { proxy['obfs-password'] = match.join(""); proxy.obfs = 'salamander'; }
-
-block_quic = comma "block-quic" equals flag:bool { if(flag) proxy["block-quic"] = "on"; else proxy["block-quic"] = "off"; }
 
 tag = match:[^=,]* { proxy.name = match.join("").trim(); }
 comma = _ "," _

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

@@ -38,23 +38,20 @@ 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_new/fast_open/tag/server_check_url/others)* {
-    if (proxy.protocol || proxy.type === "ssr") {
+    (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";
-        if (!proxy.protocol) {
-            proxy.protocol = "origin";
-        }
         // handle ssr obfs
         if (obfs.host) proxy["obfs-param"] = obfs.host;
         if (obfs.type) proxy.obfs = obfs.type;
@@ -83,31 +80,24 @@ 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 === false) {
-        proxy.alterId = 1;
-    } else {
+    if (proxy.aead) {
         proxy.alterId = 0;
+    } else {
+        proxy.alterId = proxy.alterId || 0;
     }
     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";
 }
     
@@ -145,20 +135,18 @@ port = digits:[0-9]+ {
     }
 }
 
-username = comma "username" equals username:[^,]+ { proxy.username = username.join("").trim(); }
-password = comma "password" equals password:[^,]+ { proxy.password = password.join("").trim(); }
-uuid = comma "password" equals uuid:[^,]+ { proxy.uuid = uuid.join("").trim(); }
+username = comma "username" equals username:[^=,]+ { proxy.username = username.join("").trim(); }
+password = comma "password" equals password:[^=,]+ { proxy.password = password.join("").trim(); }
+uuid = comma "password" equals uuid:[^=,]+ { proxy.uuid = uuid.join("").trim(); }
 
 method = comma "method" equals cipher:cipher { 
     proxy.cipher = cipher;
 };
-cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"none"/"rc2-cfb"/"rc4-md5-6"/"rc4-md5"/"salsa20"/"xchacha20-ietf-poly1305"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
+cipher = ("aes-128-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"/"xchacha20-ietf-poly1305"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"none");
 aead = comma "aead" equals flag:bool { proxy.aead = flag; }
 
 udp_relay = comma "udp-relay" equals flag:bool { proxy.udp = flag; }
 udp_over_tcp = comma "udp-over-tcp" equals flag:bool { throw new Error("UDP over TCP is not supported"); }
-udp_over_tcp_new = comma "udp-over-tcp" equals param:$[^=,]+ { if (param === "sp.v1") { proxy["udp-over-tcp"] = true; proxy["udp-over-tcp-version"] = 1; } else if (param === "sp.v2") { proxy["udp-over-tcp"] = true; proxy["udp-over-tcp-version"] = 2; } else if (param === "true") { proxy["_ssr_python_uot"] = true; } else { throw new Error("Invalid value for udp-over-tcp"); } }
-
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }
@@ -167,17 +155,9 @@ 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") { proxy.type = "ssr"; 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; }
 obfs = comma "obfs" equals type:("wss"/"ws"/"over-tls"/"http") { obfs.type = type; return type; };
 
 obfs_host = comma "obfs-host" equals host:domain { obfs.host = host; }
@@ -186,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,23 +36,20 @@
     }
 }
 
-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_new/fast_open/tag/server_check_url/others)* {
-    if (proxy.protocol || proxy.type === "ssr") {
+    (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";
-        if (!proxy.protocol) {
-            proxy.protocol = "origin";
-        }
         // handle ssr obfs
         if (obfs.host) proxy["obfs-param"] = obfs.host;
         if (obfs.type) proxy.obfs = obfs.type;
@@ -81,31 +78,24 @@ 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 === false) {
-        proxy.alterId = 1;
-    } else {
+    if (proxy.aead) {
         proxy.alterId = 0;
+    } else {
+        proxy.alterId = proxy.alterId || 0;
     }
     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";
 }
     
@@ -143,20 +133,18 @@ port = digits:[0-9]+ {
     }
 }
 
-username = comma "username" equals username:[^,]+ { proxy.username = username.join("").trim(); }
-password = comma "password" equals password:[^,]+ { proxy.password = password.join("").trim(); }
-uuid = comma "password" equals uuid:[^,]+ { proxy.uuid = uuid.join("").trim(); }
+username = comma "username" equals username:[^=,]+ { proxy.username = username.join("").trim(); }
+password = comma "password" equals password:[^=,]+ { proxy.password = password.join("").trim(); }
+uuid = comma "password" equals uuid:[^=,]+ { proxy.uuid = uuid.join("").trim(); }
 
 method = comma "method" equals cipher:cipher { 
     proxy.cipher = cipher;
 };
-cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"none"/"rc2-cfb"/"rc4-md5-6"/"rc4-md5"/"salsa20"/"xchacha20-ietf-poly1305"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
+cipher = ("aes-128-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"/"xchacha20-ietf-poly1305"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"none");
 aead = comma "aead" equals flag:bool { proxy.aead = flag; }
 
 udp_relay = comma "udp-relay" equals flag:bool { proxy.udp = flag; }
 udp_over_tcp = comma "udp-over-tcp" equals flag:bool { throw new Error("UDP over TCP is not supported"); }
-udp_over_tcp_new = comma "udp-over-tcp" equals param:$[^=,]+ { if (param === "sp.v1") { proxy["udp-over-tcp"] = true; proxy["udp-over-tcp-version"] = 1; } else if (param === "sp.v2") { proxy["udp-over-tcp"] = true; proxy["udp-over-tcp-version"] = 2; } else if (param === "true") { proxy["_ssr_python_uot"] = true; } else { throw new Error("Invalid value for udp-over-tcp"); } }
-
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }
@@ -165,17 +153,9 @@ 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") { proxy.type = "ssr"; 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; }
 obfs = comma "obfs" equals type:("wss"/"ws"/"over-tls"/"http") { obfs.type = type; return type; };
 
 obfs_host = comma "obfs-host" equals host:domain { obfs.host = host; }
@@ -184,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/ssh/direct) {
+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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/udp_port/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,39 +42,29 @@ 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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls/sni/tls_fingerprint/tls_verification/fast_open/tfo/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";
-    // Surfboard 与 Surge 默认不一致, 不管 Surfboard https://getsurfboard.com/docs/profile-format/proxy/external-proxy/vmess
     if (proxy.aead) {
         proxy.alterId = 0;
     } else {
-        proxy.alterId = 1;
+        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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/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/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/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();
 }
-ssh = tag equals "ssh" address (username password)? (usernamek passwordk)? (server_fingerprint/idle_timeout/private_key/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
-    proxy.type = "ssh";
-    handleShadowTLS();
-}
-snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/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") {
@@ -90,37 +72,15 @@ 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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls_fingerprint/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/port_hopping_interval/others)* {
-    proxy.type = "tuic";
-    handleShadowTLS();
-}
-tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls_fingerprint/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/port_hopping_interval/others)* {
-    proxy.type = "tuic";
-    proxy.version = 5;
-    handleShadowTLS();
-}
-wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/sni/tls_verification/passwordk/tls_fingerprint/download_bandwidth/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/port_hopping_interval/others)* {
-    proxy.type = "hysteria2";
-    handleShadowTLS();
-}
-socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (udp_relay/no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/fast_open/tfo/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)? (udp_relay/no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/sni/tls_fingerprint/tls_verification/fast_open/tfo/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();
-}
-direct = tag equals "direct" (udp_relay/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/block_quic/others)* {
-    proxy.type = "direct";
 }
+
 address = comma server:server comma port:port {
     proxy.server = server;
     proxy.port = port;
@@ -154,8 +114,6 @@ port = digits:[0-9]+ {
     }
 }
 
-port_hopping_interval = comma "port-hopping-interval" equals match:$[0-9]+ { proxy["hop-interval"] = parseInt(match.trim()); }
-
 username = & {
     let j = peg$currPos; 
     let start, end;
@@ -178,32 +136,25 @@ username = & {
         peg$currPos = end;
         return true;
     }
-} { proxy.username = $.username.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
-password = comma match:[^,]+ { proxy.password = match.join("").replace(/^"(.*)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+} { proxy.username = $.username; }
+password = comma match:[^,]+ { proxy.password = match.join(""); }
 
 tls = comma "tls" equals flag:bool { proxy.tls = flag; }
-sni = comma "sni" equals sni:("off"/domain) { 
-    if (sni === "off") {
-        proxy["disable-sni"] = true;
-    } else {
-        proxy.sni = sni;
-    }
-}
+sni = comma "sni" equals sni:domain { proxy.sni = sni; }
 tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-verify"] = flag; }
 tls_fingerprint = comma "server-cert-fingerprint-sha256" equals tls_fingerprint:$[^,]+ { proxy["tls-fingerprint"] = tls_fingerprint.trim(); }
 
 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("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
-passwordk = comma "password" equals match:[^,]+ { proxy.password = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+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; }
 
 method = comma "encrypt-method" equals cipher:cipher {
     proxy.cipher = cipher;
 }
-cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"camellia-128-cfb"/"camellia-192-cfb"/"camellia-256-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"idea-cfb"/"none"/"rc2-cfb"/"rc4-md5"/"rc4"/"salsa20"/"seed-cfb"/"xchacha20-ietf-poly1305"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
+cipher = ("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"/"xchacha20-ietf-poly1305"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"none");
 
 ws = comma "ws" equals flag:bool { obfs.type = "ws"; }
 ws_headers = comma "ws-headers" equals headers:$[^,]+ {
@@ -211,45 +162,19 @@ ws_headers = comma "ws-headers" equals headers:$[^,]+ {
     const result = {};
     pairs.forEach(pair => {
         const [key, value] = pair.trim().split(":");
-        result[key.trim()] = value.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1');
+        result[key.trim()] = value.trim();
     })
     obfs["ws-headers"] = result;
 }
-ws_path = comma "ws-path" equals path:uri { obfs.path = path.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+ws_path = comma "ws-path" equals path:uri { obfs.path = path; }
 
 obfs = comma "obfs" equals type:("http"/"tls") { obfs.type = type; }
 obfs_host = comma "obfs-host" equals host:domain { obfs.host = host; };
 obfs_uri = comma "obfs-uri" equals path:uri { obfs.path = path }
 uri = $[^,]+
 
-udp_relay = comma "udp-relay" equals flag:bool { proxy.udp = flag; }
+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(""); }
-test_udp = comma "test-udp" equals match:[^,]+ { proxy["test-udp"] = match.join(""); }
-test_timeout = comma "test-timeout" equals match:$[0-9]+ { proxy["test-timeout"] = parseInt(match.trim()); }
-tos = comma "tos" equals match:$[0-9]+ { proxy.tos = parseInt(match.trim()); }
-interface = comma "interface" equals match:[^,]+ { proxy.interface = match.join(""); }
-allow_other_interface = comma "allow-other-interface" equals flag:bool { proxy["allow-other-interface"] = flag; }
-hybrid = comma "hybrid" equals flag:bool { proxy.hybrid = flag; }
-idle_timeout = comma "idle-timeout" equals match:$[0-9]+ { proxy["idle-timeout"] = parseInt(match.trim()); }
-private_key = comma "private-key" equals match:[^,]+ { proxy["keystore-private-key"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-server_fingerprint = comma "server-fingerprint" equals match:[^,]+ { proxy["server-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-block_quic = comma "block-quic" equals match:[^,]+ { proxy["block-quic"] = match.join(""); }
-udp_port = comma "udp-port" equals match:$[0-9]+ { proxy["udp-port"] = parseInt(match.trim()); }
-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("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
-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/ssh/direct) {
+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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/udp_port/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,39 +40,29 @@ 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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls/sni/tls_fingerprint/tls_verification/fast_open/tfo/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";
-    // Surfboard 与 Surge 默认不一致, 不管 Surfboard https://getsurfboard.com/docs/profile-format/proxy/external-proxy/vmess
     if (proxy.aead) {
         proxy.alterId = 0;
     } else {
-        proxy.alterId = 1;
+        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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/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/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/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();
 }
-ssh = tag equals "ssh" address (username password)? (usernamek passwordk)? (server_fingerprint/idle_timeout/private_key/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
-    proxy.type = "ssh";
-    handleShadowTLS();
-}
-snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_uri/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/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") {
@@ -88,37 +70,15 @@ 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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls_fingerprint/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/port_hopping_interval/others)* {
-    proxy.type = "tuic";
-    handleShadowTLS();
-}
-tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls_fingerprint/tls_verification/sni/fast_open/tfo/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/port_hopping_interval/others)* {
-    proxy.type = "tuic";
-    proxy.version = 5;
-    handleShadowTLS();
-}
-wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/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/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/sni/tls_verification/passwordk/tls_fingerprint/download_bandwidth/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/port_hopping_interval/others)* {
-    proxy.type = "hysteria2";
-    handleShadowTLS();
-}
-socks5 = tag equals "socks5" address (username password)? (usernamek passwordk)? (udp_relay/no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/fast_open/tfo/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)? (udp_relay/no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/sni/tls_fingerprint/tls_verification/fast_open/tfo/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();
-}
-direct = tag equals "direct" (udp_relay/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/block_quic/others)* {
-    proxy.type = "direct";
 }
+
 address = comma server:server comma port:port {
     proxy.server = server;
     proxy.port = port;
@@ -152,8 +112,6 @@ port = digits:[0-9]+ {
     }
 }
 
-port_hopping_interval = comma "port-hopping-interval" equals match:$[0-9]+ { proxy["hop-interval"] = parseInt(match.trim()); }
-
 username = & {
     let j = peg$currPos; 
     let start, end;
@@ -176,32 +134,25 @@ username = & {
         peg$currPos = end;
         return true;
     }
-} { proxy.username = $.username.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
-password = comma match:[^,]+ { proxy.password = match.join("").replace(/^"(.*)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+} { proxy.username = $.username; }
+password = comma match:[^,]+ { proxy.password = match.join(""); }
 
 tls = comma "tls" equals flag:bool { proxy.tls = flag; }
-sni = comma "sni" equals sni:("off"/domain) { 
-    if (sni === "off") {
-        proxy["disable-sni"] = true;
-    } else {
-        proxy.sni = sni;
-    }
-}
+sni = comma "sni" equals sni:domain { proxy.sni = sni; }
 tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-verify"] = flag; }
 tls_fingerprint = comma "server-cert-fingerprint-sha256" equals tls_fingerprint:$[^,]+ { proxy["tls-fingerprint"] = tls_fingerprint.trim(); }
 
 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("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
-passwordk = comma "password" equals match:[^,]+ { proxy.password = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+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; }
 
 method = comma "encrypt-method" equals cipher:cipher {
     proxy.cipher = cipher;
 }
-cipher = ("aes-128-cfb"/"aes-128-ctr"/"aes-128-gcm"/"aes-192-cfb"/"aes-192-ctr"/"aes-192-gcm"/"aes-256-cfb"/"aes-256-ctr"/"aes-256-gcm"/"bf-cfb"/"camellia-128-cfb"/"camellia-192-cfb"/"camellia-256-cfb"/"cast5-cfb"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"des-cfb"/"idea-cfb"/"none"/"rc2-cfb"/"rc4-md5"/"rc4"/"salsa20"/"seed-cfb"/"xchacha20-ietf-poly1305"/"2022-blake3-aes-128-gcm"/"2022-blake3-aes-256-gcm");
+cipher = ("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"/"xchacha20-ietf-poly1305"/"chacha20-ietf-poly1305"/"chacha20-ietf"/"chacha20-poly1305"/"chacha20"/"none");
 
 ws = comma "ws" equals flag:bool { obfs.type = "ws"; }
 ws_headers = comma "ws-headers" equals headers:$[^,]+ {
@@ -209,45 +160,19 @@ ws_headers = comma "ws-headers" equals headers:$[^,]+ {
     const result = {};
     pairs.forEach(pair => {
         const [key, value] = pair.trim().split(":");
-        result[key.trim()] = value.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1');
+        result[key.trim()] = value.trim();
     })
     obfs["ws-headers"] = result;
 }
-ws_path = comma "ws-path" equals path:uri { obfs.path = path.trim().replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
+ws_path = comma "ws-path" equals path:uri { obfs.path = path; }
 
 obfs = comma "obfs" equals type:("http"/"tls") { obfs.type = type; }
 obfs_host = comma "obfs-host" equals host:domain { obfs.host = host; };
 obfs_uri = comma "obfs-uri" equals path:uri { obfs.path = path }
 uri = $[^,]+
 
-udp_relay = comma "udp-relay" equals flag:bool { proxy.udp = flag; }
+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(""); }
-test_udp = comma "test-udp" equals match:[^,]+ { proxy["test-udp"] = match.join(""); }
-test_timeout = comma "test-timeout" equals match:$[0-9]+ { proxy["test-timeout"] = parseInt(match.trim()); }
-tos = comma "tos" equals match:$[0-9]+ { proxy.tos = parseInt(match.trim()); }
-interface = comma "interface" equals match:[^,]+ { proxy.interface = match.join(""); }
-allow_other_interface = comma "allow-other-interface" equals flag:bool { proxy["allow-other-interface"] = flag; }
-hybrid = comma "hybrid" equals flag:bool { proxy.hybrid = flag; }
-idle_timeout = comma "idle-timeout" equals match:$[0-9]+ { proxy["idle-timeout"] = parseInt(match.trim()); }
-private_key = comma "private-key" equals match:[^,]+ { proxy["keystore-private-key"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-server_fingerprint = comma "server-fingerprint" equals match:[^,]+ { proxy["server-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
-block_quic = comma "block-quic" equals match:[^,]+ { proxy["block-quic"] = match.join(""); }
-udp_port = comma "udp-port" equals match:$[0-9]+ { proxy["udp-port"] = parseInt(match.trim()); }
-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("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
-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

@@ -30,7 +30,7 @@ start = (trojan) {
   return proxy
 }
 
-trojan = "trojan://" password:password "@" server:server ":" port:port "/"? params? name:name?{
+trojan = "trojan://" password:password "@" server:server ":" port:port params? name:name?{
   proxy.type = "trojan";
   proxy.password = password;
   proxy.server = server;
@@ -80,66 +80,13 @@ port = digits:[0-9]+ {
 }
 
 params = "?" head:param tail:("&"@param)* {
-  for (const [key, value] of Object.entries(params)) {
-    params[key] = decodeURIComponent(value);
-  }
   proxy["skip-cert-verify"] = toBool(params["allowInsecure"]);
   proxy.sni = params["sni"] || params["peer"];
-  proxy['client-fingerprint'] = params.fp;
-  proxy.alpn = params.alpn ? decodeURIComponent(params.alpn).split(',') : undefined;
 
   if (toBool(params["ws"])) {
     proxy.network = "ws";
     $set(proxy, "ws-opts.path", params["wspath"]);
   }
-  
-  if (params["type"]) {
-    let httpupgrade
-    proxy.network = params["type"]
-    if(proxy.network === 'httpupgrade') {
-      proxy.network = 'ws'
-      httpupgrade = true
-    }
-    if (['grpc'].includes(proxy.network)) {
-        proxy[proxy.network + '-opts'] = {
-            'grpc-service-name': params["serviceName"],
-            '_grpc-type': params["mode"],
-            '_grpc-authority': params["authority"],
-        };
-    } 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"])); 
-      }
-      if (httpupgrade) {
-        $set(proxy, proxy.network+"-opts.v2ray-http-upgrade", true); 
-        $set(proxy, proxy.network+"-opts.v2ray-http-upgrade-fast-open", true); 
-      }
-    }
-    if (['reality'].includes(params.security)) {
-      const opts = {};
-      if (params.pbk) {
-        opts['public-key'] = params.pbk;
-      }
-      if (params.sid) {
-        opts['short-id'] = params.sid;
-      }
-      if (params.spx) {
-        opts['_spider-x'] = params.spx;
-      }
-      if (params.mode) {
-        proxy._mode = params.mode;
-      }
-      if (params.extra) {
-        proxy._extra = params.extra;
-      }
-      if (Object.keys(opts).length > 0) {
-        $set(proxy, params.security+"-opts", opts); 
-      }
-    }
-  }
 
   proxy.udp = toBool(params["udp"]);
   proxy.tfo = toBool(params["tfo"]);
@@ -147,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

@@ -28,7 +28,7 @@ start = (trojan) {
   return proxy
 }
 
-trojan = "trojan://" password:password "@" server:server ":" port:port "/"? params? name:name?{
+trojan = "trojan://" password:password "@" server:server ":" port:port params? name:name?{
   proxy.type = "trojan";
   proxy.password = password;
   proxy.server = server;
@@ -78,66 +78,13 @@ port = digits:[0-9]+ {
 }
 
 params = "?" head:param tail:("&"@param)* {
-  for (const [key, value] of Object.entries(params)) {
-    params[key] = decodeURIComponent(value);
-  }
   proxy["skip-cert-verify"] = toBool(params["allowInsecure"]);
   proxy.sni = params["sni"] || params["peer"];
-  proxy['client-fingerprint'] = params.fp;
-  proxy.alpn = params.alpn ? decodeURIComponent(params.alpn).split(',') : undefined;
 
   if (toBool(params["ws"])) {
     proxy.network = "ws";
     $set(proxy, "ws-opts.path", params["wspath"]);
   }
-  
-  if (params["type"]) {
-    let httpupgrade
-    proxy.network = params["type"]
-    if(proxy.network === 'httpupgrade') {
-      proxy.network = 'ws'
-      httpupgrade = true
-    }
-    if (['grpc'].includes(proxy.network)) {
-        proxy[proxy.network + '-opts'] = {
-            'grpc-service-name': params["serviceName"],
-            '_grpc-type': params["mode"],
-            '_grpc-authority': params["authority"],
-        };
-    } 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"])); 
-      }
-      if (httpupgrade) {
-        $set(proxy, proxy.network+"-opts.v2ray-http-upgrade", true); 
-        $set(proxy, proxy.network+"-opts.v2ray-http-upgrade-fast-open", true); 
-      }
-    }
-    if (['reality'].includes(params.security)) {
-      const opts = {};
-      if (params.pbk) {
-        opts['public-key'] = params.pbk;
-      }
-      if (params.sid) {
-        opts['short-id'] = params.sid;
-      }
-      if (params.spx) {
-        opts['_spider-x'] = params.spx;
-      }
-      if (params.mode) {
-        proxy._mode = params.mode;
-      }
-      if (params.extra) {
-        proxy._extra = params.extra;
-      }
-      if (Object.keys(opts).length > 0) {
-        $set(proxy, params.security+"-opts", opts); 
-      }
-    }
-  }
 
   proxy.udp = toBool(params["udp"]);
   proxy.tfo = toBool(params["tfo"]);
@@ -145,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,6 +1,5 @@
-import { safeLoad } from '@/utils/yaml';
+import { safeLoad } from 'static-js-yaml';
 import { Base64 } from 'js-base64';
-import $ from '@/core/app';
 
 function HTML() {
     const name = 'HTML';
@@ -14,58 +13,21 @@ function Base64Encoded() {
     const name = 'Base64 Pre-processor';
 
     const keys = [
-        'dm1lc3M', // vmess
-        'c3NyOi8v', // ssr://
-        'c29ja3M6Ly', // socks://
-        'dHJvamFu', // trojan
-        'c3M6Ly', // ss:/
-        'c3NkOi8v', // ssd://
-        'c2hhZG93', // shadow
-        'aHR0c', // htt
-        'dmxlc3M=', // vless
-        'aHlzdGVyaWEy', // hysteria2
-        'aHkyOi8v', // hy2://
-        'd2lyZWd1YXJkOi8v', // wireguard://
-        'd2c6Ly8=', // wg://
-        'dHVpYzovLw==', // tuic://
+        '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) {
-        const decoded = Base64.decode(raw);
-        if (!/^\w+(:\/\/|\s*?=\s*?)\w+/m.test(decoded)) {
-            $.error(
-                `Base64 Pre-processor error: decoded line does not start with protocol`,
-            );
-            return raw;
-        }
-
-        return decoded;
-    };
-    return { name, test, parse };
-}
-
-function fallbackBase64Encoded() {
-    const name = 'Fallback Base64 Pre-processor';
-
-    const test = function (raw) {
-        return true;
-    };
-    const parse = function (raw) {
-        const decoded = Base64.decode(raw);
-        if (!/^\w+(:\/\/|\s*?=\s*?)\w+/m.test(decoded)) {
-            $.error(
-                `Fallback Base64 Pre-processor error: decoded line does not start with protocol`,
-            );
-            return raw;
-        }
-
-        return decoded;
+        raw = Base64.decode(raw);
+        return raw;
     };
     return { name, test, parse };
 }
@@ -73,54 +35,12 @@ function fallbackBase64Encoded() {
 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, includeProxies) {
+    const parse = function (raw) {
         // Clash YAML format
-
-        // 防止 VLESS节点 reality-opts 选项中的 short-id 被解析成 Infinity
-        // 匹配 short-id 冒号后面的值(包含空格和引号)
-        const afterReplace = raw.replace(
-            /short-id:([ \t]*[^#\n,}]*)/g,
-            (matched, value) => {
-                const afterTrim = value.trim();
-
-                // 为空
-                if (!afterTrim || afterTrim === '') {
-                    return 'short-id: ""';
-                }
-
-                // 是否被引号包裹
-                if (/^(['"]).*\1$/.test(afterTrim)) {
-                    return `short-id: ${afterTrim}`;
-                } else if (['null'].includes(afterTrim)) {
-                    return `short-id: ${afterTrim}`;
-                } else {
-                    return `short-id: "${afterTrim}"`;
-                }
-            },
-        );
-
-        const {
-            proxies,
-            'global-client-fingerprint': globalClientFingerprint,
-        } = safeLoad(afterReplace);
-        return (
-            (includeProxies ? 'proxies:\n' : '') +
-            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 `${includeProxies ? '  - ' : ''}${JSON.stringify(
-                        p,
-                    )}\n`;
-                })
-                .join('')
-        );
+        const proxies = safeLoad(raw).proxies;
+        return proxies.map((p) => JSON.stringify(p)).join('\n');
     };
     return { name, test, parse };
 }
@@ -175,19 +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(),
-    fallbackBase64Encoded(),
-];
+export default [HTML(), Base64Encoded(), Clash(), SSD(), FullConfig()];

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

@@ -1,68 +1,12 @@
 import resourceCache from '@/utils/resource-cache';
-import scriptResourceCache from '@/utils/script-resource-cache';
-import { isIPv4, isIPv6, ipAddress } from '@/utils';
+import { isIPv4, isIPv6 } from '@/utils';
 import { FULL } from '@/utils/logical';
-import { getFlag, removeFlag } from '@/utils/geo';
-import { doh } from '@/utils/dns';
+import { getFlag } from '@/utils/geo';
 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 { SETTINGS_KEY } from '@/constants';
-import YAML from '@/utils/yaml';
 
-import env from '@/utils/env';
-import {
-    getFlowField,
-    getFlowHeaders,
-    parseFlowHeaders,
-    validCheck,
-    flowTransfer,
-    getRmainingDays,
-    normalizeFlowHeader,
-} from '@/utils/flow';
-
-function isObject(item) {
-    return item && typeof item === 'object' && !Array.isArray(item);
-}
-function trimWrap(str) {
-    if (str.startsWith('<') && str.endsWith('>')) {
-        return str.slice(1, -1);
-    }
-    return str;
-}
-function deepMerge(target, _other) {
-    const other = typeof _other === 'string' ? JSON.parse(_other) : _other;
-    for (const key in other) {
-        if (isObject(other[key])) {
-            if (key.endsWith('!')) {
-                const k = trimWrap(key.slice(0, -1));
-                target[k] = other[key];
-            } else {
-                const k = trimWrap(key);
-                if (!target[k]) Object.assign(target, { [k]: {} });
-                deepMerge(target[k], other[k]);
-            }
-        } else if (Array.isArray(other[key])) {
-            if (key.startsWith('+')) {
-                const k = trimWrap(key.slice(1));
-                if (!target[k]) Object.assign(target, { [k]: [] });
-                target[k] = [...other[key], ...target[k]];
-            } else if (key.endsWith('+')) {
-                const k = trimWrap(key.slice(0, -1));
-                if (!target[k]) Object.assign(target, { [k]: [] });
-                target[k] = [...target[k], ...other[key]];
-            } else {
-                const k = trimWrap(key);
-                Object.assign(target, { [k]: other[key] });
-            }
-        } else {
-            Object.assign(target, { [key]: other[key] });
-        }
-    }
-    return target;
-}
 /**
  The rule "(name CONTAINS "🇨🇳") AND (port IN [80, 443])" can be expressed as follows:
  {
@@ -132,15 +76,12 @@ function QuickSettingOperator(args) {
             if (get(args.useless)) {
                 const filter = UselessFilter();
                 const selected = filter.func(proxies);
-                proxies = proxies.filter(
-                    (p, i) => selected[i] && p.port > 0 && p.port <= 65535,
-                );
+                proxies.filter((_, i) => selected[i]);
             }
 
             return proxies.map((proxy) => {
                 proxy.udp = get(args.udp, proxy.udp);
                 proxy.tfo = get(args.tfo, proxy.tfo);
-                proxy['fast-open'] = get(args.tfo, proxy['fast-open']);
                 proxy['skip-cert-verify'] = get(
                     args.scert,
                     proxy['skip-cert-verify'],
@@ -166,7 +107,7 @@ function QuickSettingOperator(args) {
 }
 
 // add or remove flag for proxies
-function FlagOperator({ mode, tw }) {
+function FlagOperator({ mode }) {
     return {
         name: 'Flag Operator',
         func: (proxies) => {
@@ -180,13 +121,7 @@ function FlagOperator({ mode, tw }) {
                     // remove old flag
                     proxy.name = removeFlag(proxy.name);
                     proxy.name = newFlag + ' ' + proxy.name;
-                    if (tw == 'ws') {
-                        proxy.name = proxy.name.replace(/🇹🇼/g, '🇼🇸');
-                    } else if (tw == 'tw') {
-                        // 不变
-                    } else {
-                        proxy.name = proxy.name.replace(/🇹🇼/g, '🇨🇳');
-                    }
+                    proxy.name = proxy.name.replace(/🇹🇼/g, '🇨🇳');
                 }
                 return proxy;
             });
@@ -284,15 +219,7 @@ function SortOperator(order = 'asc') {
 }
 
 // sort by regex
-function RegexSortOperator(input) {
-    const order = input.order || 'asc';
-    let expressions = input.expressions;
-    if (Array.isArray(input)) {
-        expressions = input;
-    }
-    if (!Array.isArray(expressions)) {
-        expressions = [];
-    }
+function RegexSortOperator(expressions) {
     return {
         name: 'Regex Sort Operator',
         func: (proxies) => {
@@ -303,13 +230,8 @@ function RegexSortOperator(input) {
                 if (oA && !oB) return -1;
                 if (oB && !oA) return 1;
                 if (oA && oB) return oA < oB ? -1 : 1;
-                if (order === 'original') {
-                    return 0;
-                } else if (order === 'desc') {
-                    return a.name < b.name ? 1 : -1;
-                } else {
-                    return a.name < b.name ? -1 : 1;
-                }
+                if ((!oA && !oB) || (oA && oB && oA === oB))
+                    return a.name < b.name ? -1 : 1; // fallback to normal sort
             });
         },
     };
@@ -371,345 +293,105 @@ function RegexDeleteOperator(regex) {
  1. This function name should be `operator`!
  2. Always declare variables before using them!
  */
-function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
+function ScriptOperator(script, targetPlatform, $arguments) {
     return {
         name: 'Script Operator',
         func: async (proxies) => {
             let output = proxies;
-            if (output?.$file?.type === 'mihomoProfile') {
-                try {
-                    let patch = YAML.safeLoad(script);
-                    let config;
-                    if (output?.$content) {
-                        try {
-                            config = YAML.safeLoad(output?.$content);
-                        } catch (e) {
-                            $.error(e.message ?? e);
-                        }
-                    }
-                    // if (typeof patch !== 'object') patch = {};
-                    if (typeof patch !== 'object')
-                        throw new Error('patch is not an object');
-                    output.$content = ProxyUtils.yaml.safeDump(
-                        deepMerge(
-                            config ||
-                                (output?.$file?.sourceType === 'none'
-                                    ? {}
-                                    : {
-                                          proxies: await produceArtifact({
-                                              type:
-                                                  output?.$file?.sourceType ||
-                                                  'collection',
-                                              name: output?.$file?.sourceName,
-                                              platform: 'mihomo',
-                                              produceType: 'internal',
-                                              produceOpts: {
-                                                  'delete-underscore-fields': true,
-                                              },
-                                          }),
-                                      }),
-                            patch,
-                        ),
-                    );
-                    return output;
-                } catch (e) {
-                    // console.log(e);
-                }
-            }
             await (async function () {
                 const operator = createDynamicFunction(
                     'operator',
                     script,
                     $arguments,
-                    $options,
                 );
-                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, $options, $file } = input
-                            if($file.type === 'mihomoProfile') {
-                                ${script}
-                                if(typeof main === 'function') {
-                                    let config;
-                                    if ($content) {
-                                        try {
-                                            config = ProxyUtils.yaml.safeLoad($content);
-                                        } catch (e) {
-                                            console.log(e.message ?? e);
-                                        }
-                                    }
-                                    $content = ProxyUtils.yaml.safeDump(await main(config || ($file.sourceType === 'none' ? {} : {
-                                        proxies: await produceArtifact({
-                                            type: $file.sourceType || 'collection',
-                                            name: $file.sourceName,
-                                            platform: 'mihomo',
-                                            produceType: 'internal',
-                                            produceOpts: {
-                                                'delete-underscore-fields': true
-                                            }
-                                        }),
-                                    })))
-                                }
-                            } else {
-                                ${script}
-                            }
-                            return { $content, $files, $options, $file }
-                        } else {
-                            let proxies = input
-                            let list = []
-                            for await (let $server of proxies) {
-                                ${script}
-                                list.push($server)
-                            }
-                            return list
-                        }
-                      }`,
-                    $arguments,
-                    $options,
-                );
-                output = operator(proxies, targetPlatform, { source, ...env });
+                output = operator(proxies, targetPlatform);
             })();
             return output;
         },
     };
 }
 
-function parseIP4P(IP4P) {
-    let server;
-    let port;
-    try {
-        let array = IP4P.split(':');
-
-        port = parseInt(array[2], 16);
-        let ipab = parseInt(array[3], 16);
-        let ipcd = parseInt(array[4], 16);
-        let ipa = ipab >> 8;
-        let ipb = ipab & 0xff;
-        let ipc = ipcd >> 8;
-        let ipd = ipcd & 0xff;
-        server = `${ipa}.${ipb}.${ipc}.${ipd}`;
-        if (port <= 0 || port > 65535) {
-            throw new Error(`Invalid port number: ${port}`);
-        }
-        if (!isIPv4(server)) {
-            throw new Error(`Invalid IP address: ${server}`);
-        }
-    } catch (e) {
-        // throw new Error(`IP4P 解析失败: ${e}`);
-        $.error(`IP4P 解析失败: ${e}`);
-    }
-    return { server, port };
-}
-
 const DOMAIN_RESOLVERS = {
-    Custom: async function (domain, type, noCache, timeout, edns, url) {
-        const id = hex_md5(`CUSTOM:${url}:${domain}:${type}`);
+    Google: async function (domain) {
+        const id = hex_md5(`GOOGLE:${domain}`);
         const cached = resourceCache.get(id);
-        if (!noCache && cached) return cached;
-        const answerType = type === 'IPv6' ? 'AAAA' : 'A';
-        const res = await doh({
-            url,
-            domain,
-            type: answerType,
-            timeout,
-            edns,
+        if (cached) return cached;
+        const resp = await $.http.get({
+            url: `https://8.8.4.4/resolve?name=${encodeURIComponent(
+                domain,
+            )}&type=A`,
+            headers: {
+                accept: 'application/dns-json',
+            },
         });
-
-        const { answers } = res;
-        if (!Array.isArray(answers) || answers.length === 0) {
-            throw new Error('No answers');
-        }
-        const result = answers
-            .filter((i) => i?.type === answerType)
-            .map((i) => i?.data)
-            .filter((i) => i);
-        if (result.length === 0) {
+        const body = JSON.parse(resp.body);
+        if (body['Status'] !== 0) {
+            throw new Error(`Status is ${body['Status']}`);
+        }
+        const answers = body['Answer'];
+        if (answers.length === 0) {
             throw new Error('No answers');
         }
+        const result = answers[answers.length - 1].data;
         resourceCache.set(id, result);
         return result;
     },
-    Google: async function (domain, type, noCache, timeout, edns) {
-        const id = hex_md5(`GOOGLE:${domain}:${type}`);
-        const cached = resourceCache.get(id);
-        if (!noCache && cached) return cached;
-        const answerType = type === 'IPv6' ? 'AAAA' : 'A';
-        const res = await doh({
-            url: 'https://8.8.4.4/dns-query',
-            domain,
-            type: answerType,
-            timeout,
-            edns,
-        });
-
-        const { answers } = res;
-        if (!Array.isArray(answers) || answers.length === 0) {
-            throw new Error('No answers');
-        }
-        const result = answers
-            .filter((i) => i?.type === answerType)
-            .map((i) => i?.data)
-            .filter((i) => i);
-        if (result.length === 0) {
-            throw new Error('No answers');
-        }
-        resourceCache.set(id, result);
-        return result;
-    },
-    'IP-API': async function (domain, type, noCache, timeout) {
-        if (['IPv6'].includes(type)) {
-            throw new Error(`域名解析服务提供方 IP-API 不支持 ${type}`);
-        }
+    'IP-API': async function (domain) {
         const id = hex_md5(`IP-API:${domain}`);
         const cached = resourceCache.get(id);
-        if (!noCache && cached) return cached;
+        if (cached) return cached;
         const resp = await $.http.get({
             url: `http://ip-api.com/json/${encodeURIComponent(
                 domain,
             )}?lang=zh-CN`,
-            timeout,
         });
         const body = JSON.parse(resp.body);
         if (body['status'] !== 'success') {
             throw new Error(`Status is ${body['status']}`);
         }
-        if (!body.query || body.query === 0) {
-            throw new Error('No answers');
-        }
-        const result = [body.query];
-        if (result.length === 0) {
-            throw new Error('No answers');
-        }
+        const result = body.query;
         resourceCache.set(id, result);
         return result;
     },
-    Cloudflare: async function (domain, type, noCache, timeout, edns) {
-        const id = hex_md5(`CLOUDFLARE:${domain}:${type}`);
+    Cloudflare: async function (domain) {
+        const id = hex_md5(`CLOUDFLARE:${domain}`);
         const cached = resourceCache.get(id);
-        if (!noCache && cached) return cached;
-        const answerType = type === 'IPv6' ? 'AAAA' : 'A';
-        const res = await doh({
-            url: 'https://1.0.0.1/dns-query',
-            domain,
-            type: answerType,
-            timeout,
-            edns,
-        });
-
-        const { answers } = res;
-        if (!Array.isArray(answers) || answers.length === 0) {
-            throw new Error('No answers');
-        }
-        const result = answers
-            .filter((i) => i?.type === answerType)
-            .map((i) => i?.data)
-            .filter((i) => i);
-        if (result.length === 0) {
-            throw new Error('No answers');
-        }
-        resourceCache.set(id, result);
-        return result;
-    },
-    Ali: async function (domain, type, noCache, timeout, edns) {
-        const id = hex_md5(`ALI:${domain}:${type}`);
-        const cached = resourceCache.get(id);
-        if (!noCache && cached) return cached;
+        if (cached) return cached;
         const resp = await $.http.get({
-            url: `http://223.6.6.6/resolve?edns_client_subnet=${edns}/${
-                isIPv4(edns) ? 24 : 56
-            }&name=${encodeURIComponent(domain)}&type=${
-                type === 'IPv6' ? 'AAAA' : 'A'
-            }&short=1`,
+            url: `https://1.0.0.1/dns-query?name=${encodeURIComponent(
+                domain,
+            )}&type=A`,
             headers: {
                 accept: 'application/dns-json',
             },
-            timeout,
         });
-        const answers = JSON.parse(resp.body);
-        if (!Array.isArray(answers) || answers.length === 0) {
-            throw new Error('No answers');
-        }
-        const result = answers;
-        if (result.length === 0) {
-            throw new Error('No answers');
-        }
-        resourceCache.set(id, result);
-        return result;
-    },
-    Tencent: async function (domain, type, noCache, timeout, edns) {
-        const id = hex_md5(`TENCENT:${domain}:${type}`);
-        const cached = resourceCache.get(id);
-        if (!noCache && cached) return cached;
-        const resp = await $.http.get({
-            url: `http://119.28.28.28/d?ip=${edns}&type=${
-                type === 'IPv6' ? 'AAAA' : 'A'
-            }&dn=${encodeURIComponent(domain)}`,
-            headers: {
-                accept: 'application/dns-json',
-            },
-            timeout,
-        });
-        const answers = resp.body.split(';').map((i) => i.split(',')[0]);
-        if (answers.length === 0 || String(answers) === '0') {
-            throw new Error('No answers');
-        }
-        const result = answers;
-        if (result.length === 0) {
+        const body = JSON.parse(resp.body);
+        if (body['Status'] !== 0) {
+            throw new Error(`Status is ${body['Status']}`);
+        }
+        const answers = body['Answer'];
+        if (answers.length === 0) {
             throw new Error('No answers');
         }
+        const result = answers[answers.length - 1].data;
         resourceCache.set(id, result);
         return result;
     },
 };
 
-function ResolveDomainOperator({
-    provider,
-    type: _type,
-    filter,
-    cache,
-    url,
-    timeout,
-    edns: _edns,
-}) {
-    if (['IPv6', 'IP4P'].includes(_type) && ['IP-API'].includes(provider)) {
-        throw new Error(`域名解析服务提供方 ${provider} 不支持 ${_type}`);
-    }
-    const { defaultTimeout } = $.read(SETTINGS_KEY);
-    const requestTimeout = timeout || defaultTimeout || 8000;
-    let type = ['IPv6', 'IP4P'].includes(_type) ? 'IPv6' : 'IPv4';
-
+function ResolveDomainOperator({ provider }) {
     const resolver = DOMAIN_RESOLVERS[provider];
     if (!resolver) {
-        throw new Error(`找不到域名解析服务提供方: ${provider}`);
+        throw new Error(`Cannot find resolver: ${provider}`);
     }
-    let edns = _edns || '223.6.6.6';
-    if (!isIP(edns)) throw new Error(`域名解析 EDNS 应为 IP`);
-    $.info(
-        `Domain Resolver: [${_type}] ${provider} ${edns || ''} ${url || ''}`,
-    );
     return {
         name: 'Resolve Domain Operator',
         func: async (proxies) => {
-            proxies.forEach((p, i) => {
-                if (!p['_no-resolve'] && p['no-resolve']) {
-                    proxies[i]['_no-resolve'] = p['no-resolve'];
-                }
-            });
             const results = {};
             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);
@@ -717,14 +399,7 @@ function ResolveDomainOperator({
                 const currentBatch = [];
                 for (let domain of totalDomain.splice(0, limit)) {
                     currentBatch.push(
-                        resolver(
-                            domain,
-                            type,
-                            cache === 'disabled',
-                            requestTimeout,
-                            edns,
-                            url,
-                        )
+                        resolver(domain)
                             .then((ip) => {
                                 results[domain] = ip;
                                 $.info(
@@ -740,77 +415,11 @@ function ResolveDomainOperator({
                 }
                 await Promise.all(currentBatch);
             }
-            proxies.forEach((p) => {
-                if (!p['_no-resolve']) {
-                    if (results[p.server]) {
-                        p._resolved_ips = results[p.server];
-                        let ip = Array.isArray(results[p.server])
-                            ? results[p.server][
-                                  Math.floor(
-                                      Math.random() * results[p.server].length,
-                                  )
-                              ]
-                            : results[p.server];
-                        if (type === 'IPv6' && isIPv6(ip)) {
-                            try {
-                                ip = new ipAddress.Address6(ip).correctForm();
-                            } catch (e) {
-                                $.error(
-                                    `Failed to parse IPv6 address: ${ip}: ${e}`,
-                                );
-                            }
-                            if (/^2001::[^:]+:[^:]+:[^:]+$/.test(ip)) {
-                                p._IP4P = ip;
-                                const { server, port } = parseIP4P(ip);
-                                if (server && port) {
-                                    p._domain = p.server;
-                                    p.server = server;
-                                    p.port = port;
-                                    p.resolved = true;
-                                    p._IPv4 = p.server;
-                                    if (!isIP(p._IP)) {
-                                        p._IP = p.server;
-                                    }
-                                } else if (!p.resolved) {
-                                    p.resolved = false;
-                                }
-                            } else {
-                                p._domain = p.server;
-                                p.server = ip;
-                                p.resolved = true;
-                                p[`_${type}`] = p.server;
-                                if (!isIP(p._IP)) {
-                                    p._IP = p.server;
-                                }
-                            }
-                        } else {
-                            p._domain = p.server;
-                            p.server = ip;
-                            p.resolved = true;
-                            p[`_${type}`] = p.server;
-                            if (!isIP(p._IP)) {
-                                p._IP = p.server;
-                            }
-                        }
-                    } else if (!p.resolved) {
-                        p.resolved = false;
-                    }
-                }
+            proxies.forEach((proxy) => {
+                proxy.server = results[proxy.server] || proxy.server;
             });
 
-            return proxies.filter((p) => {
-                if (filter === 'removeFailed') {
-                    return isIP(p.server) || 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;
         },
     };
 }
@@ -821,55 +430,29 @@ function isIP(ip) {
 
 ResolveDomainOperator.resolver = DOMAIN_RESOLVERS;
 
-function isAscii(str) {
-    // eslint-disable-next-line no-control-regex
-    var pattern = /^[\x00-\x7F]+$/; // ASCII 范围的 Unicode 编码
-    return pattern.test(str);
-}
-
 /**************************** Filters ***************************************/
 // filter useless proxies
 function UselessFilter() {
+    const KEYWORDS = [
+        '网址',
+        '流量',
+        '时间',
+        '应急',
+        '过期',
+        'Bandwidth',
+        'expire',
+    ];
     return {
         name: 'Useless Filter',
-        func: (proxies) => {
-            return proxies.map((proxy) => {
-                if (proxy.cipher && !isAscii(proxy.cipher)) {
-                    return false;
-                } else if (proxy.password && !isAscii(proxy.password)) {
-                    return false;
-                } else {
-                    if (proxy.network) {
-                        let transportHosts =
-                            proxy[`${proxy.network}-opts`]?.headers?.Host ||
-                            proxy[`${proxy.network}-opts`]?.headers?.host;
-                        transportHosts = Array.isArray(transportHosts)
-                            ? transportHosts
-                            : [transportHosts];
-                        if (
-                            transportHosts.some(
-                                (host) => host && !isAscii(host),
-                            )
-                        ) {
-                            return false;
-                        }
-                    }
-                    return !/网址|流量|时间|应急|过期|Bandwidth|expire/.test(
-                        proxy.name,
-                    );
-                }
-            });
-        },
+        func: RegexFilter({
+            regex: KEYWORDS,
+            keep: false,
+        }).func,
     };
 }
 
 // filter by regions
-function RegionFilter(input) {
-    let regions = input?.value || input;
-    if (!Array.isArray(regions)) {
-        regions = [];
-    }
-    const keep = input?.keep ?? true;
+function RegionFilter(regions) {
     const REGION_MAP = {
         HK: '🇭🇰',
         TW: '🇹🇼',
@@ -877,8 +460,6 @@ function RegionFilter(input) {
         SG: '🇸🇬',
         JP: '🇯🇵',
         UK: '🇬🇧',
-        DE: '🇩🇪',
-        KR: '🇰🇷',
     };
     return {
         name: 'Region Filter',
@@ -886,8 +467,7 @@ function RegionFilter(input) {
             // this would be high memory usage
             return proxies.map((proxy) => {
                 const flag = getFlag(proxy.name);
-                const selected = regions.some((r) => REGION_MAP[r] === flag);
-                return keep ? selected : !selected;
+                return regions.some((r) => REGION_MAP[r] === flag);
             });
         },
     };
@@ -919,19 +499,11 @@ function buildRegex(str, ...options) {
 }
 
 // filter by proxy types
-function TypeFilter(input) {
-    let types = input?.value || input;
-    if (!Array.isArray(types)) {
-        types = [];
-    }
-    const keep = input?.keep ?? true;
+function TypeFilter(types) {
     return {
         name: 'Type Filter',
         func: (proxies) => {
-            return proxies.map((proxy) => {
-                const selected = types.some((t) => proxy.type === t);
-                return keep ? selected : !selected;
-            });
+            return proxies.map((proxy) => types.some((t) => proxy.type === t));
         },
     };
 }
@@ -949,7 +521,7 @@ function TypeFilter(input) {
  1. This function name should be `filter`!
  2. Always declare variables before using them!
  */
-function ScriptFilter(script, targetPlatform, $arguments, source, $options) {
+function ScriptFilter(script, targetPlatform, $arguments) {
     return {
         name: 'Script Filter',
         func: async (proxies) => {
@@ -959,32 +531,8 @@ function ScriptFilter(script, targetPlatform, $arguments, source, $options) {
                     'filter',
                     script,
                     $arguments,
-                    $options,
                 );
-                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,
-                    $options,
-                );
-                output = filter(proxies, targetPlatform, { source, ...env });
+                output = filter(proxies, targetPlatform);
             })();
             return output;
         },
@@ -1016,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]);
 }
@@ -1052,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;
 }
@@ -1123,38 +616,26 @@ function clone(object) {
     return JSON.parse(JSON.stringify(object));
 }
 
-function createDynamicFunction(name, script, $arguments, $options) {
-    const flowUtils = {
-        getFlowField,
-        getFlowHeaders,
-        parseFlowHeaders,
-        flowTransfer,
-        validCheck,
-        getRmainingDays,
-        normalizeFlowHeader,
-    };
+// remove flag
+function removeFlag(str) {
+    return str
+        .replace(/[\uD83C][\uDDE6-\uDDFF][\uD83C][\uDDE6-\uDDFF]/g, '')
+        .trim();
+}
+
+function createDynamicFunction(name, script, $arguments) {
     if ($.env.isLoon) {
         return new Function(
             '$arguments',
-            '$options',
             '$substore',
             'lodash',
             '$persistentStore',
             '$httpClient',
             '$notification',
             'ProxyUtils',
-            'yaml',
-            'Buffer',
-            'b64d',
-            'b64e',
-            'scriptResourceCache',
-            'flowUtils',
-            'produceArtifact',
-            'require',
             `${script}\n return ${name}`,
         )(
             $arguments,
-            $options,
             $,
             lodash,
             // eslint-disable-next-line no-undef
@@ -1164,45 +645,14 @@ function createDynamicFunction(name, script, $arguments, $options) {
             // eslint-disable-next-line no-undef
             $notification,
             ProxyUtils,
-            ProxyUtils.yaml,
-            ProxyUtils.Buffer,
-            ProxyUtils.Base64.decode,
-            ProxyUtils.Base64.encode,
-            scriptResourceCache,
-            flowUtils,
-            produceArtifact,
-            eval(`typeof require !== "undefined"`) ? require : undefined,
         );
     } else {
         return new Function(
             '$arguments',
-            '$options',
             '$substore',
             'lodash',
             'ProxyUtils',
-            'yaml',
-            'Buffer',
-            'b64d',
-            'b64e',
-            'scriptResourceCache',
-            'flowUtils',
-            'produceArtifact',
-            'require',
             `${script}\n return ${name}`,
-        )(
-            $arguments,
-            $options,
-            $,
-            lodash,
-            ProxyUtils,
-            ProxyUtils.yaml,
-            ProxyUtils.Buffer,
-            ProxyUtils.Base64.decode,
-            ProxyUtils.Base64.encode,
-            scriptResourceCache,
-            flowUtils,
-            produceArtifact,
-            eval(`typeof require !== "undefined"`) ? require : undefined,
-        );
+        )($arguments, $, lodash, ProxyUtils);
     }
 }

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

@@ -1,206 +1,37 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
-import $ from '@/core/app';
 
 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' && proxy.version >= 4) ||
-                    (proxy.type === 'vless' &&
-                        (typeof proxy.flow !== 'undefined' ||
-                            proxy['reality-opts']))
-                ) {
-                    return false;
-                } else if (proxy['underlying-proxy'] || proxy['dialer-proxy']) {
-                    $.error(
-                        `Clash 不支持前置代理字段. 已过滤节点 ${proxy.name}`,
-                    );
-                    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;
                         }
-                        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 === 'snell' && proxy.version < 3) {
-                    delete proxy.udp;
-                } 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.network === 'ws') {
-                    const wsPath = proxy['ws-opts']?.path;
-                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
-                    // eslint-disable-next-line no-unused-vars
-                    const [_, path = '', ed = ''] = reg.exec(wsPath);
-                    proxy['ws-opts'].path = path;
-                    if (ed !== '') {
-                        proxy['ws-opts']['early-data-header-name'] =
-                            'Sec-WebSocket-Protocol';
-                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
-                    }
-                }
-                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',
-                        'juicity',
-                        'anytls',
-                    ].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;
-                delete proxy.id;
-                delete proxy.resolved;
-                delete proxy['no-resolve'];
-                if (type !== 'internal') {
-                    for (const key in proxy) {
-                        if (proxy[key] == null || /^_/i.test(key)) {
-                            delete proxy[key];
+                        if (isPresent(proxy, 'sni')) {
+                            proxy.servername = proxy.sni;
+                            delete proxy.sni;
                         }
                     }
-                }
-                if (
-                    ['grpc'].includes(proxy.network) &&
-                    proxy[`${proxy.network}-opts`]
-                ) {
-                    delete proxy[`${proxy.network}-opts`]['_grpc-type'];
-                    delete proxy[`${proxy.network}-opts`]['_grpc-authority'];
-                }
-                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,281 +0,0 @@
-import { isPresent } from '@/core/proxy-utils/producers/utils';
-
-const ipVersions = {
-    dual: 'dual',
-    'v4-only': 'ipv4',
-    'v6-only': 'ipv6',
-    'prefer-v4': 'ipv4-prefer',
-    'prefer-v6': 'ipv6-prefer',
-};
-
-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' && proxy.version >= 4) {
-                    return false;
-                } else if (['juicity'].includes(proxy.type)) {
-                    return false;
-                } else if (
-                    ['ss'].includes(proxy.type) &&
-                    ![
-                        'aes-128-ctr',
-                        'aes-192-ctr',
-                        'aes-256-ctr',
-                        'aes-128-cfb',
-                        'aes-192-cfb',
-                        'aes-256-cfb',
-                        'aes-128-gcm',
-                        'aes-192-gcm',
-                        'aes-256-gcm',
-                        'aes-128-ccm',
-                        'aes-192-ccm',
-                        'aes-256-ccm',
-                        'aes-128-gcm-siv',
-                        'aes-256-gcm-siv',
-                        'chacha20-ietf',
-                        'chacha20',
-                        'xchacha20',
-                        'chacha20-ietf-poly1305',
-                        'xchacha20-ietf-poly1305',
-                        'chacha8-ietf-poly1305',
-                        'xchacha8-ietf-poly1305',
-                        '2022-blake3-aes-128-gcm',
-                        '2022-blake3-aes-256-gcm',
-                        '2022-blake3-chacha20-poly1305',
-                        'lea-128-gcm',
-                        'lea-192-gcm',
-                        'lea-256-gcm',
-                        'rabbit128-poly1305',
-                        'aegis-128l',
-                        'aegis-256',
-                        'aez-384',
-                        'deoxys-ii-256-128',
-                        'rc4-md5',
-                        'none',
-                    ].includes(proxy.cipher)
-                ) {
-                    // https://wiki.metacubex.one/config/proxies/ss/#cipher
-                    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',
-                            'none',
-                            'zero',
-                            'aes-128-gcm',
-                            'chacha20-poly1305',
-                        ].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 === 'snell' && proxy.version < 3) {
-                    delete proxy.udp;
-                } 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'],
-                        };
-                        delete proxy['shadow-tls-password'];
-                        delete proxy['shadow-tls-sni'];
-                        delete 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.network === 'ws') {
-                    const wsPath = proxy['ws-opts']?.path;
-                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
-                    // eslint-disable-next-line no-unused-vars
-                    const [_, path = '', ed = ''] = reg.exec(wsPath);
-                    proxy['ws-opts'].path = path;
-                    if (ed !== '') {
-                        proxy['ws-opts']['early-data-header-name'] =
-                            'Sec-WebSocket-Protocol';
-                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
-                    }
-                }
-
-                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',
-                        'juicity',
-                        'anytls',
-                    ].includes(proxy.type)
-                ) {
-                    delete proxy.tls;
-                }
-
-                if (proxy['tls-fingerprint']) {
-                    proxy.fingerprint = proxy['tls-fingerprint'];
-                }
-                delete proxy['tls-fingerprint'];
-
-                if (proxy['underlying-proxy']) {
-                    proxy['dialer-proxy'] = proxy['underlying-proxy'];
-                }
-                delete proxy['underlying-proxy'];
-
-                if (isPresent(proxy, 'tls') && typeof proxy.tls !== 'boolean') {
-                    delete proxy.tls;
-                }
-                delete proxy.subName;
-                delete proxy.collectionName;
-                delete proxy.id;
-                delete proxy.resolved;
-                delete proxy['no-resolve'];
-                if (type !== 'internal' || opts['delete-underscore-fields']) {
-                    for (const key in proxy) {
-                        if (proxy[key] == null || /^_/i.test(key)) {
-                            delete proxy[key];
-                        }
-                    }
-                }
-                if (
-                    ['grpc'].includes(proxy.network) &&
-                    proxy[`${proxy.network}-opts`]
-                ) {
-                    delete proxy[`${proxy.network}-opts`]['_grpc-type'];
-                    delete proxy[`${proxy.network}-opts`]['_grpc-authority'];
-                }
-
-                if (proxy['ip-version']) {
-                    proxy['ip-version'] =
-                        ipVersions[proxy['ip-version']] || proxy['ip-version'];
-                }
-                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/egern.js

@@ -1,420 +0,0 @@
-import { isPresent } from './utils';
-
-export default function Egern_Producer() {
-    const type = 'ALL';
-    const produce = (proxies, type) => {
-        // https://egernapp.com/zh-CN/docs/configuration/proxies
-        const list = proxies
-            .filter((proxy) => {
-                // if (opts['include-unsupported-proxy']) return true;
-                if (
-                    ![
-                        'http',
-                        'socks5',
-                        'ss',
-                        'trojan',
-                        'hysteria2',
-                        'vless',
-                        'vmess',
-                        'tuic',
-                    ].includes(proxy.type) ||
-                    (proxy.type === 'ss' &&
-                        ((proxy.plugin === 'obfs' &&
-                            !['http', 'tls'].includes(
-                                proxy['plugin-opts']?.mode,
-                            )) ||
-                            ![
-                                'chacha20-ietf-poly1305',
-                                'chacha20-poly1305',
-                                'aes-256-gcm',
-                                'aes-128-gcm',
-                                'none',
-                                'tbale',
-                                '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',
-                                '2022-blake3-aes-128-gcm',
-                                '2022-blake3-aes-256-gcm',
-                            ].includes(proxy.cipher))) ||
-                    (proxy.type === 'vmess' &&
-                        !['http', 'ws', 'tcp'].includes(proxy.network) &&
-                        proxy.network) ||
-                    (proxy.type === 'trojan' &&
-                        !['http', 'ws', 'tcp'].includes(proxy.network) &&
-                        proxy.network) ||
-                    (proxy.type === 'vless' &&
-                        (typeof proxy.flow !== 'undefined' ||
-                            proxy['reality-opts'] ||
-                            (!['http', 'ws', 'tcp'].includes(proxy.network) &&
-                                proxy.network))) ||
-                    (proxy.type === 'tuic' &&
-                        proxy.token &&
-                        proxy.token.length !== 0)
-                ) {
-                    return false;
-                }
-                return true;
-            })
-            .map((proxy) => {
-                const original = { ...proxy };
-                if (proxy.tls && !proxy.sni) {
-                    proxy.sni = proxy.server;
-                }
-                const prev_hop =
-                    proxy.prev_hop ||
-                    proxy['underlying-proxy'] ||
-                    proxy['dialer-proxy'] ||
-                    proxy.detour;
-
-                if (proxy.type === 'http') {
-                    proxy = {
-                        type: 'http',
-                        name: proxy.name,
-                        server: proxy.server,
-                        port: proxy.port,
-                        username: proxy.username,
-                        password: proxy.password,
-                        tfo: proxy.tfo || proxy['fast-open'],
-                        next_hop: proxy.next_hop,
-                    };
-                } else if (proxy.type === 'socks5') {
-                    proxy = {
-                        type: 'socks5',
-                        name: proxy.name,
-                        server: proxy.server,
-                        port: proxy.port,
-                        username: proxy.username,
-                        password: proxy.password,
-                        tfo: proxy.tfo || proxy['fast-open'],
-                        udp_relay:
-                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
-                        next_hop: proxy.next_hop,
-                    };
-                } else if (proxy.type === 'ss') {
-                    proxy = {
-                        type: 'shadowsocks',
-                        name: proxy.name,
-                        method:
-                            proxy.cipher === 'chacha20-ietf-poly1305'
-                                ? 'chacha20-poly1305'
-                                : proxy.cipher,
-                        server: proxy.server,
-                        port: proxy.port,
-                        password: proxy.password,
-                        tfo: proxy.tfo || proxy['fast-open'],
-                        udp_relay:
-                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
-                        next_hop: proxy.next_hop,
-                    };
-                    if (original.plugin === 'obfs') {
-                        proxy.obfs = original['plugin-opts'].mode;
-                        proxy.obfs_host = original['plugin-opts'].host;
-                        proxy.obfs_uri = original['plugin-opts'].path;
-                    }
-                } else if (proxy.type === 'hysteria2') {
-                    proxy = {
-                        type: 'hysteria2',
-                        name: proxy.name,
-                        server: proxy.server,
-                        port: proxy.port,
-                        auth: proxy.password,
-                        tfo: proxy.tfo || proxy['fast-open'],
-                        udp_relay:
-                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
-                        next_hop: proxy.next_hop,
-                        sni: proxy.sni,
-                        skip_tls_verify: proxy['skip-cert-verify'],
-                        port_hopping: proxy.ports,
-                        port_hopping_interval: proxy['hop-interval'],
-                    };
-                    if (
-                        original['obfs-password'] &&
-                        original.obfs == 'salamander'
-                    ) {
-                        proxy.obfs = 'salamander';
-                        proxy.obfs_password = original['obfs-password'];
-                    }
-                } else if (proxy.type === 'tuic') {
-                    proxy = {
-                        type: 'tuic',
-                        name: proxy.name,
-                        server: proxy.server,
-                        port: proxy.port,
-                        uuid: proxy.uuid,
-                        password: proxy.password,
-                        next_hop: proxy.next_hop,
-                        sni: proxy.sni,
-                        alpn: Array.isArray(proxy.alpn)
-                            ? proxy.alpn
-                            : [proxy.alpn || 'h3'],
-                        skip_tls_verify: proxy['skip-cert-verify'],
-                        port_hopping: proxy.ports,
-                        port_hopping_interval: proxy['hop-interval'],
-                    };
-                } else if (proxy.type === 'trojan') {
-                    if (proxy.network === 'ws') {
-                        proxy.websocket = {
-                            path: proxy['ws-opts']?.path,
-                            host: proxy['ws-opts']?.headers?.Host,
-                        };
-                    }
-                    proxy = {
-                        type: 'trojan',
-                        name: proxy.name,
-                        server: proxy.server,
-                        port: proxy.port,
-                        password: proxy.password,
-                        tfo: proxy.tfo || proxy['fast-open'],
-                        udp_relay:
-                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
-                        next_hop: proxy.next_hop,
-                        sni: proxy.sni,
-                        skip_tls_verify: proxy['skip-cert-verify'],
-                        websocket: proxy.websocket,
-                    };
-                } else if (proxy.type === 'vmess') {
-                    // Egern：传输层，支持 ws/wss/http1/http2/tls，不配置则为 tcp
-                    let security = proxy.cipher;
-                    if (
-                        security &&
-                        ![
-                            'auto',
-                            'none',
-                            'zero',
-                            'aes-128-gcm',
-                            'chacha20-poly1305',
-                        ].includes(security)
-                    ) {
-                        security = 'auto';
-                    }
-                    if (proxy.network === 'ws') {
-                        proxy.transport = {
-                            [proxy.tls ? 'wss' : 'ws']: {
-                                path: proxy['ws-opts']?.path,
-                                headers: {
-                                    Host: proxy['ws-opts']?.headers?.Host,
-                                },
-                                sni: proxy.tls ? proxy.sni : undefined,
-                                skip_tls_verify: proxy.tls
-                                    ? proxy['skip-cert-verify']
-                                    : undefined,
-                            },
-                        };
-                    } else if (proxy.network === 'http') {
-                        proxy.transport = {
-                            http1: {
-                                method: proxy['http-opts']?.method,
-                                path: Array.isArray(proxy['http-opts']?.path)
-                                    ? proxy['http-opts']?.path[0]
-                                    : proxy['http-opts']?.path,
-                                headers: {
-                                    Host: Array.isArray(
-                                        proxy['http-opts']?.headers?.Host,
-                                    )
-                                        ? proxy['http-opts']?.headers?.Host[0]
-                                        : proxy['http-opts']?.headers?.Host,
-                                },
-                                skip_tls_verify: proxy['skip-cert-verify'],
-                            },
-                        };
-                    } else if (proxy.network === 'h2') {
-                        proxy.transport = {
-                            http2: {
-                                method: proxy['h2-opts']?.method,
-                                path: Array.isArray(proxy['h2-opts']?.path)
-                                    ? proxy['h2-opts']?.path[0]
-                                    : proxy['h2-opts']?.path,
-                                headers: {
-                                    Host: Array.isArray(
-                                        proxy['h2-opts']?.headers?.Host,
-                                    )
-                                        ? proxy['h2-opts']?.headers?.Host[0]
-                                        : proxy['h2-opts']?.headers?.Host,
-                                },
-                                skip_tls_verify: proxy['skip-cert-verify'],
-                            },
-                        };
-                    } else if (
-                        (proxy.network === 'tcp' || !proxy.network) &&
-                        proxy.tls
-                    ) {
-                        proxy.transport = {
-                            tls: {
-                                sni: proxy.tls ? proxy.sni : undefined,
-                                skip_tls_verify: proxy.tls
-                                    ? proxy['skip-cert-verify']
-                                    : undefined,
-                            },
-                        };
-                    }
-                    proxy = {
-                        type: 'vmess',
-                        name: proxy.name,
-                        server: proxy.server,
-                        port: proxy.port,
-                        user_id: proxy.uuid,
-                        security,
-                        tfo: proxy.tfo || proxy['fast-open'],
-                        legacy: proxy.legacy,
-                        udp_relay:
-                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
-                        next_hop: proxy.next_hop,
-                        transport: proxy.transport,
-                        // sni: proxy.sni,
-                        // skip_tls_verify: proxy['skip-cert-verify'],
-                    };
-                } else if (proxy.type === 'vless') {
-                    if (proxy.network === 'ws') {
-                        proxy.transport = {
-                            [proxy.tls ? 'wss' : 'ws']: {
-                                path: proxy['ws-opts']?.path,
-                                headers: {
-                                    Host: proxy['ws-opts']?.headers?.Host,
-                                },
-                                sni: proxy.tls ? proxy.sni : undefined,
-                                skip_tls_verify: proxy.tls
-                                    ? proxy['skip-cert-verify']
-                                    : undefined,
-                            },
-                        };
-                    } else if (proxy.network === 'http') {
-                        proxy.transport = {
-                            http: {
-                                method: proxy['http-opts']?.method,
-                                path: Array.isArray(proxy['http-opts']?.path)
-                                    ? proxy['http-opts']?.path[0]
-                                    : proxy['http-opts']?.path,
-                                headers: {
-                                    Host: Array.isArray(
-                                        proxy['http-opts']?.headers?.Host,
-                                    )
-                                        ? proxy['http-opts']?.headers?.Host[0]
-                                        : proxy['http-opts']?.headers?.Host,
-                                },
-                                skip_tls_verify: proxy['skip-cert-verify'],
-                            },
-                        };
-                    } else if (proxy.network === 'tcp' || !proxy.network) {
-                        proxy.transport = {
-                            [proxy.tls ? 'tls' : 'tcp']: {
-                                sni: proxy.tls ? proxy.sni : undefined,
-                                skip_tls_verify: proxy.tls
-                                    ? proxy['skip-cert-verify']
-                                    : undefined,
-                            },
-                        };
-                    }
-                    proxy = {
-                        type: 'vless',
-                        name: proxy.name,
-                        server: proxy.server,
-                        port: proxy.port,
-                        user_id: proxy.uuid,
-                        security: proxy.cipher,
-                        tfo: proxy.tfo || proxy['fast-open'],
-                        legacy: proxy.legacy,
-                        udp_relay:
-                            proxy.udp || proxy.udp_relay || proxy.udp_relay,
-                        next_hop: proxy.next_hop,
-                        transport: proxy.transport,
-                        // sni: proxy.sni,
-                        // skip_tls_verify: proxy['skip-cert-verify'],
-                    };
-                }
-                if (
-                    [
-                        'http',
-                        'socks5',
-                        'ss',
-                        'trojan',
-                        'vless',
-                        'vmess',
-                    ].includes(original.type)
-                ) {
-                    if (isPresent(original, 'shadow-tls-password')) {
-                        if (original['shadow-tls-version'] != 3)
-                            throw new Error(
-                                `shadow-tls version ${original['shadow-tls-version']} is not supported`,
-                            );
-                        proxy.shadow_tls = {
-                            password: original['shadow-tls-password'],
-                            sni: original['shadow-tls-sni'],
-                        };
-                    } else if (
-                        ['shadow-tls'].includes(original.plugin) &&
-                        original['plugin-opts']
-                    ) {
-                        if (original['plugin-opts'].version != 3)
-                            throw new Error(
-                                `shadow-tls version ${original['plugin-opts'].version} is not supported`,
-                            );
-                        proxy.shadow_tls = {
-                            password: original['plugin-opts'].password,
-                            sni: original['plugin-opts'].host,
-                        };
-                    }
-                }
-
-                delete proxy.subName;
-                delete proxy.collectionName;
-                delete proxy.id;
-                delete proxy.resolved;
-                delete proxy['no-resolve'];
-
-                if (proxy.transport) {
-                    for (const key in proxy.transport) {
-                        if (
-                            Object.keys(proxy.transport[key]).length === 0 ||
-                            Object.values(proxy.transport[key]).every(
-                                (v) => v == null,
-                            )
-                        ) {
-                            delete proxy.transport[key];
-                        }
-                    }
-                    if (Object.keys(proxy.transport).length === 0) {
-                        delete proxy.transport;
-                    }
-                }
-
-                if (type !== 'internal') {
-                    for (const key in proxy) {
-                        if (proxy[key] == null || /^_/i.test(key)) {
-                            delete proxy[key];
-                        }
-                    }
-                }
-                return {
-                    [proxy.type]: {
-                        ...proxy,
-                        type: undefined,
-                        prev_hop,
-                    },
-                };
-            });
-        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,56 +1,22 @@
 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';
-import Egern_Producer from './egern';
 
 function JSON_Producer() {
     const type = 'ALL';
-    const produce = (proxies, type) =>
-        type === 'internal' ? proxies : JSON.stringify(proxies, null, 2);
+    const produce = (proxies) => JSON.stringify(proxies, null, 2);
     return { type, produce };
 }
 
 export default {
-    qx: QX_Producer(),
     QX: QX_Producer(),
-    QuantumultX: QX_Producer(),
-    surge: Surge_Producer(),
     Surge: Surge_Producer(),
-    SurgeMac: SurgeMac_Producer(),
     Loon: Loon_Producer(),
     Clash: Clash_Producer(),
-    meta: ClashMeta_Producer(),
-    clashmeta: ClashMeta_Producer(),
-    'clash.meta': ClashMeta_Producer(),
-    'Clash.Meta': ClashMeta_Producer(),
-    ClashMeta: ClashMeta_Producer(),
-    mihomo: ClashMeta_Producer(),
-    Mihomo: ClashMeta_Producer(),
-    uri: URI_Producer(),
     URI: URI_Producer(),
-    v2: V2Ray_Producer(),
-    v2ray: V2Ray_Producer(),
-    V2Ray: V2Ray_Producer(),
-    json: JSON_Producer(),
     JSON: JSON_Producer(),
-    stash: Stash_Producer(),
     Stash: Stash_Producer(),
-    shadowrocket: Shadowrocket_Producer(),
-    Shadowrocket: Shadowrocket_Producer(),
-    ShadowRocket: Shadowrocket_Producer(),
-    surfboard: Surfboard_Producer(),
-    Surfboard: Surfboard_Producer(),
-    singbox: singbox_Producer(),
-    'sing-box': singbox_Producer(),
-    egern: Egern_Producer(),
-    Egern: Egern_Producer(),
 };

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

@@ -1,18 +1,9 @@
 /* eslint-disable no-case-declarations */
 const targetPlatform = 'Loon';
 import { isPresent, Result } from './utils';
-import { isIPv4, isIPv6 } from '@/utils';
-
-const ipVersions = {
-    dual: 'dual',
-    ipv4: 'v4-only',
-    ipv6: 'v6-only',
-    'ipv4-prefer': 'prefer-v4',
-    'ipv6-prefer': 'prefer-v6',
-};
 
 export default function Loon_Producer() {
-    const produce = (proxy, type, opts = {}) => {
+    const produce = (proxy) => {
         switch (proxy.type) {
             case 'ss':
                 return shadowsocks(proxy);
@@ -21,17 +12,11 @@ export default function Loon_Producer() {
             case 'trojan':
                 return trojan(proxy);
             case 'vmess':
-                return vmess(proxy, opts['include-unsupported-proxy']);
+                return vmess(proxy);
             case 'vless':
-                return vless(proxy, opts['include-unsupported-proxy']);
+                return vless(proxy);
             case 'http':
                 return http(proxy);
-            case 'socks5':
-                return socks5(proxy);
-            case 'wireguard':
-                return wireguard(proxy);
-            case 'hysteria2':
-                return hysteria2(proxy);
         }
         throw new Error(
             `Platform ${targetPlatform} does not support proxy type: ${proxy.type}`,
@@ -42,34 +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',
-            '2022-blake3-aes-128-gcm',
-            '2022-blake3-aes-256-gcm',
-        ].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}"`,
     );
@@ -86,67 +43,16 @@ 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`);
         }
     }
 
-    // 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',
-        );
-        // udp-port
-        result.appendIfPresent(`,udp-port=${proxy['udp-port']}`, 'udp-port');
-    } 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}`);
-            }
-            // udp-port
-            result.appendIfPresent(
-                `,udp-port=${proxy['udp-port']}`,
-                'udp-port',
-            );
-        }
-    }
-
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
-    // block-quic
-    if (proxy['block-quic'] === 'on') {
-        result.append(',block-quic=true');
-    } else if (proxy['block-quic'] === 'off') {
-        result.append(',block-quic=false');
-    }
-
     // udp
-    if (proxy.udp) {
-        result.append(`,udp=true`);
-    }
-
-    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
-    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
+    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
 
     return result.toString();
 }
@@ -168,62 +74,11 @@ function shadowsocksr(proxy) {
     result.appendIfPresent(`,obfs=${proxy.obfs}`, 'obfs');
     result.appendIfPresent(`,obfs-param=${proxy['obfs-param']}`, 'obfs-param');
 
-    // 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',
-        );
-        // udp-port
-        result.appendIfPresent(`,udp-port=${proxy['udp-port']}`, 'udp-port');
-    } 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}`);
-            }
-            // udp-port
-            result.appendIfPresent(
-                `,udp-port=${proxy['udp-port']}`,
-                'udp-port',
-            );
-        }
-    }
-
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
-    // block-quic
-    if (proxy['block-quic'] === 'on') {
-        result.append(',block-quic=true');
-    } else if (proxy['block-quic'] === 'off') {
-        result.append(',block-quic=false');
-    }
-
     // udp
-    if (proxy.udp) {
-        result.append(`,udp=true`);
-    }
-
-    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
-    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
+    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
 
     return result.toString();
 }
@@ -233,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 {
@@ -261,67 +114,44 @@ function trojan(proxy) {
 
     // sni
     result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
-    result.appendIfPresent(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
-    result.appendIfPresent(
-        `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
-        'tls-pubkey-sha256',
-    );
 
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
-    // block-quic
-    if (proxy['block-quic'] === 'on') {
-        result.append(',block-quic=true');
-    } else if (proxy['block-quic'] === 'off') {
-        result.append(',block-quic=false');
-    }
-
     // udp
-    if (proxy.udp) {
-        result.append(`,udp=true`);
-    }
-    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
-    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
+    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
 
     return result.toString();
 }
 
 function vmess(proxy) {
-    const isReality = !!proxy['reality-opts'];
-
     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 {
@@ -340,32 +170,12 @@ function vmess(proxy) {
         'skip-cert-verify',
     );
 
-    if (isReality) {
-        result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
-        result.appendIfPresent(
-            `,public-key="${proxy['reality-opts']['public-key']}"`,
-            'reality-opts.public-key',
-        );
-        result.appendIfPresent(
-            `,short-id=${proxy['reality-opts']['short-id']}`,
-            'reality-opts.short-id',
-        );
-    } else {
-        // sni
-        result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
-        result.appendIfPresent(
-            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-            'tls-fingerprint',
-        );
-        result.appendIfPresent(
-            `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
-            'tls-pubkey-sha256',
-        );
-    }
+    // sni
+    result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
 
     // AEAD
     if (isPresent(proxy, 'aead')) {
-        result.append(`,alterId=${proxy.aead ? 0 : 1}`);
+        result.append(`,alterId=0`);
     } else {
         result.append(`,alterId=${proxy.alterId}`);
     }
@@ -373,63 +183,37 @@ function vmess(proxy) {
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
-    // block-quic
-    if (proxy['block-quic'] === 'on') {
-        result.append(',block-quic=true');
-    } else if (proxy['block-quic'] === 'off') {
-        result.append(',block-quic=false');
-    }
-
     // udp
-    if (proxy.udp) {
-        result.append(`,udp=true`);
-    }
-    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
-    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
+    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
     return result.toString();
 }
 
 function vless(proxy) {
-    let isXtls = false;
-    const isReality = !!proxy['reality-opts'];
-
-    if (typeof proxy.flow !== 'undefined') {
-        if (['xtls-rprx-vision'].includes(proxy.flow)) {
-            isXtls = true;
-        } else {
-            throw new Error(`VLESS flow(${proxy.flow}) is not supported`);
-        }
-    }
-
     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 {
@@ -448,48 +232,14 @@ function vless(proxy) {
         'skip-cert-verify',
     );
 
-    if (isXtls) {
-        result.appendIfPresent(`,flow=${proxy.flow}`, 'flow');
-    }
-    if (isReality) {
-        result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
-        result.appendIfPresent(
-            `,public-key="${proxy['reality-opts']['public-key']}"`,
-            'reality-opts.public-key',
-        );
-        result.appendIfPresent(
-            `,short-id=${proxy['reality-opts']['short-id']}`,
-            'reality-opts.short-id',
-        );
-    } else {
-        // sni
-        result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
-        result.appendIfPresent(
-            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-            'tls-fingerprint',
-        );
-        result.appendIfPresent(
-            `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
-            'tls-pubkey-sha256',
-        );
-    }
+    // sni
+    result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
 
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
-    // block-quic
-    if (proxy['block-quic'] === 'on') {
-        result.append(',block-quic=true');
-    } else if (proxy['block-quic'] === 'off') {
-        result.append(',block-quic=false');
-    }
-
     // udp
-    if (proxy.udp) {
-        result.append(`,udp=true`);
-    }
-    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
-    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
+    result.appendIfPresent(`,udp=${proxy.udp}`, 'udp');
     return result.toString();
 }
 
@@ -512,182 +262,7 @@ function http(proxy) {
     // tfo
     result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
 
-    // block-quic
-    if (proxy['block-quic'] === 'on') {
-        result.append(',block-quic=true');
-    } else if (proxy['block-quic'] === 'off') {
-        result.append(',block-quic=false');
-    }
-
-    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
-    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
-
-    return result.toString();
-}
-function socks5(proxy) {
-    const result = new Result(proxy);
-    result.append(`${proxy.name}=socks5,${proxy.server},${proxy.port}`);
-    result.appendIfPresent(`,${proxy.username}`, 'username');
-    result.appendIfPresent(`,"${proxy.password}"`, 'password');
-
-    // tls
-    result.appendIfPresent(`,over-tls=${proxy.tls}`, 'tls');
-
-    // sni
-    result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
-
-    // tls verification
-    result.appendIfPresent(
-        `,skip-cert-verify=${proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-
-    // tfo
-    result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
-
-    // block-quic
-    if (proxy['block-quic'] === 'on') {
-        result.append(',block-quic=true');
-    } else if (proxy['block-quic'] === 'off') {
-        result.append(',block-quic=false');
-    }
-
     // udp
-    if (proxy.udp) {
-        result.append(`,udp=true`);
-    }
-    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
-    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
-
-    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));
-            let dns = proxy.dns.find((i) => isIPv4(i));
-            if (!dns) {
-                dns = proxy.dns.find((i) => !isIPv4(i) && !isIPv6(i));
-            }
-            proxy.dns = dns;
-        }
-    }
-    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 ?? ''
-        }}]`,
-    );
-    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
-    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
-
-    // block-quic
-    if (proxy['block-quic'] === 'on') {
-        result.append(',block-quic=true');
-    } else if (proxy['block-quic'] === 'off') {
-        result.append(',block-quic=false');
-    }
-
-    return result.toString();
-}
-
-function hysteria2(proxy) {
-    if (proxy['obfs-password'] && proxy.obfs != 'salamander') {
-        throw new Error(`only salamander obfs is supported`);
-    }
-    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(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
-    result.appendIfPresent(
-        `,tls-pubkey-sha256=${proxy['tls-pubkey-sha256']}`,
-        'tls-pubkey-sha256',
-    );
-    result.appendIfPresent(
-        `,skip-cert-verify=${proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-
-    if (proxy['obfs-password'] && proxy.obfs == 'salamander') {
-        result.append(`,salamander-password=${proxy['obfs-password']}`);
-    }
-
-    // tfo
-    result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
-
-    // block-quic
-    if (proxy['block-quic'] === 'on') {
-        result.append(',block-quic=true');
-    } else if (proxy['block-quic'] === 'off') {
-        result.append(',block-quic=false');
-    }
-
-    // udp
-    if (proxy.udp) {
-        result.append(`,udp=true`);
-    }
-
-    // download-bandwidth
-    result.appendIfPresent(
-        `,download-bandwidth=${`${proxy['down']}`.match(/\d+/)?.[0] || 0}`,
-        'down',
-    );
-
-    result.appendIfPresent(`,ecn=${proxy.ecn}`, 'ecn');
-    const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
-    result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
-
+    result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
     return result.toString();
 }

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

@@ -3,8 +3,7 @@ import { isPresent, Result } from './utils';
 const targetPlatform = 'QX';
 
 export default function QX_Producer() {
-    // eslint-disable-next-line no-unused-vars
-    const produce = (proxy, type, opts = {}) => {
+    const produce = (proxy) => {
         switch (proxy.type) {
             case 'ss':
                 return shadowsocks(proxy);
@@ -18,8 +17,6 @@ export default function QX_Producer() {
                 return http(proxy);
             case 'socks5':
                 return socks5(proxy);
-            case 'vless':
-                return vless(proxy);
         }
         throw new Error(
             `Platform ${targetPlatform} does not support proxy type: ${proxy.type}`,
@@ -32,38 +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',
-            '2022-blake3-aes-128-gcm',
-            '2022-blake3-aes-256-gcm',
-        ].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}`);
@@ -96,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');
@@ -130,26 +81,6 @@ function shadowsocks(proxy) {
     // udp
     appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
 
-    // udp over tcp
-    if (proxy['_ssr_python_uot']) {
-        append(`,udp-over-tcp=true`);
-    } else if (proxy['udp-over-tcp']) {
-        if (
-            !proxy['udp-over-tcp-version'] ||
-            proxy['udp-over-tcp-version'] === 1
-        ) {
-            append(`,udp-over-tcp=sp.v1`);
-        } else if (proxy['udp-over-tcp-version'] === 2) {
-            append(`,udp-over-tcp=sp.v2`);
-        }
-    }
-
-    // server_check_url
-    result.appendIfPresent(
-        `,server_check_url=${proxy['test-url']}`,
-        'test-url',
-    );
-
     // tag
     append(`,tag=${proxy.name}`);
 
@@ -182,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}`);
 
@@ -208,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 {
@@ -225,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');
@@ -259,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}`);
 
@@ -302,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 {
@@ -321,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')) {
@@ -362,113 +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)) {
-            if (proxy.tls) append(`,obfs=over-tls`);
-        } 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}`);
 
@@ -490,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');
@@ -524,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}`);
 
@@ -551,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');
@@ -585,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}`);
 
@@ -598,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,244 +0,0 @@
-import { isPresent } from '@/core/proxy-utils/producers/utils';
-import $ from '@/core/app';
-
-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' && proxy.version >= 4) {
-                    return false;
-                } else if (['mieru'].includes(proxy.type)) {
-                    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',
-                            'none',
-                            'zero',
-                            'aes-128-gcm',
-                            'chacha20-poly1305',
-                        ].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 === 'snell' && proxy.version < 3) {
-                    delete proxy.udp;
-                } 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'],
-                        };
-                        delete proxy['shadow-tls-password'];
-                        delete proxy['shadow-tls-sni'];
-                        delete 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.network === 'ws') {
-                    const wsPath = proxy['ws-opts']?.path;
-                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
-                    // eslint-disable-next-line no-unused-vars
-                    const [_, path = '', ed = ''] = reg.exec(wsPath);
-                    proxy['ws-opts'].path = path;
-                    if (ed !== '') {
-                        proxy['ws-opts']['early-data-header-name'] =
-                            'Sec-WebSocket-Protocol';
-                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
-                    }
-                }
-                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',
-                        'juicity',
-                        'anytls',
-                    ].includes(proxy.type)
-                ) {
-                    delete proxy.tls;
-                }
-
-                if (proxy['tls-fingerprint']) {
-                    proxy.fingerprint = proxy['tls-fingerprint'];
-                }
-                delete proxy['tls-fingerprint'];
-
-                if (proxy['underlying-proxy']) {
-                    proxy['dialer-proxy'] = proxy['underlying-proxy'];
-                }
-                delete proxy['underlying-proxy'];
-
-                if (isPresent(proxy, 'tls') && typeof proxy.tls !== 'boolean') {
-                    delete proxy.tls;
-                }
-                delete proxy.subName;
-                delete proxy.collectionName;
-                delete proxy.id;
-                delete proxy.resolved;
-                delete proxy['no-resolve'];
-                if (type !== 'internal') {
-                    for (const key in proxy) {
-                        if (proxy[key] == null || /^_/i.test(key)) {
-                            delete proxy[key];
-                        }
-                    }
-                }
-                if (
-                    ['grpc'].includes(proxy.network) &&
-                    proxy[`${proxy.network}-opts`]
-                ) {
-                    delete proxy[`${proxy.network}-opts`]['_grpc-type'];
-                    delete proxy[`${proxy.network}-opts`]['_grpc-authority'];
-                }
-                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,950 +0,0 @@
-import ClashMeta_Producer from './clashmeta';
-import $ from '@/core/app';
-import { isIPv4, isIPv6 } from '@/utils';
-
-const ipVersions = {
-    ipv4: 'ipv4_only',
-    ipv6: 'ipv6_only',
-    'v4-only': 'ipv4_only',
-    'v6-only': 'ipv6_only',
-    'ipv4-prefer': 'prefer_ipv4',
-    'ipv6-prefer': 'prefer_ipv6',
-    'prefer-v4': 'prefer_ipv4',
-    'prefer-v6': 'prefer_ipv6',
-};
-
-const ipVersionParser = (proxy, parsedProxy) => {
-    const strategy = ipVersions[proxy['ip-version']];
-    if (proxy._dns_server && strategy) {
-        parsedProxy.domain_resolver = {
-            server: proxy._dns_server,
-            strategy,
-        };
-    }
-};
-const detourParser = (proxy, parsedProxy) => {
-    parsedProxy.detour = proxy['dialer-proxy'] || proxy.detour;
-};
-const networkParser = (proxy, parsedProxy) => {
-    if (['tcp', 'udp'].includes(proxy._network))
-        parsedProxy.network = proxy._network;
-};
-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;
-    if (smux['brutal-opts']?.up || smux['brutal-opts']?.down) {
-        proxy.multiplex.brutal = {
-            enabled: true,
-        };
-        if (smux['brutal-opts']?.up)
-            proxy.multiplex.brutal.up_mbps = parseInt(
-                `${smux['brutal-opts']?.up}`,
-                10,
-            );
-        if (smux['brutal-opts']?.down)
-            proxy.multiplex.brutal.down_mbps = parseInt(
-                `${smux['brutal-opts']?.down}`,
-                10,
-            );
-    }
-};
-
-const wsParser = (proxy, parsedProxy) => {
-    const transport = { type: 'ws', headers: {} };
-    if (proxy['ws-opts']) {
-        const {
-            path: wsPath = '',
-            headers: wsHeaders = {},
-            'max-early-data': max_early_data,
-            'early-data-header-name': early_data_header_name,
-        } = proxy['ws-opts'];
-        transport.early_data_header_name = early_data_header_name;
-        transport.max_early_data = parseInt(max_early_data, 10);
-        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 != null && 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_str];
-    if (proxy['ca-str']) parsedProxy.tls.certificate = [proxy['ca-str']];
-    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'];
-        parsedProxy.tls.utls = { enabled: true };
-    }
-    if (
-        !['hysteria', 'hysteria2', 'tuic'].includes(proxy.type) &&
-        proxy['client-fingerprint'] &&
-        proxy['client-fingerprint'] !== ''
-    )
-        parsedProxy.tls.utls = {
-            enabled: true,
-            fingerprint: proxy['client-fingerprint'],
-        };
-    if (!parsedProxy.tls.enabled) delete parsedProxy.tls;
-};
-
-const sshParser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'ssh',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-    };
-    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy.username) parsedProxy.user = proxy.username;
-    if (proxy.password) parsedProxy.password = proxy.password;
-    // https://wiki.metacubex.one/config/proxies/ssh
-    // https://sing-box.sagernet.org/zh/configuration/outbound/ssh
-    if (proxy['privateKey']) parsedProxy.private_key_path = proxy['privateKey'];
-    if (proxy['private-key'])
-        parsedProxy.private_key_path = proxy['private-key'];
-    if (proxy['private-key-passphrase'])
-        parsedProxy.private_key_passphrase = proxy['private-key-passphrase'];
-    if (proxy['server-fingerprint']) {
-        parsedProxy.host_key = [proxy['server-fingerprint']];
-        // https://manual.nssurge.com/policy/ssh.html
-        // Surge only supports curve25519-sha256 as the kex algorithm and aes128-gcm as the encryption algorithm. It means that the SSH server must use OpenSSH v7.3 or above. (It should not be a problem since OpenSSH 7.3 was released on 2016-08-01.)
-        // TODO: ?
-        parsedProxy.host_key_algorithms = [
-            proxy['server-fingerprint'].split(' ')[0],
-        ];
-    }
-    if (proxy['host-key']) parsedProxy.host_key = proxy['host-key'];
-    if (proxy['host-key-algorithms'])
-        parsedProxy.host_key_algorithms = proxy['host-key-algorithms'];
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
-    return parsedProxy;
-};
-
-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 < 0 || 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);
-    detourParser(proxy, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    ipVersionParser(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 < 0 || 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;
-    networkParser(proxy, parsedProxy);
-    tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
-    return parsedProxy;
-};
-
-const shadowTLSParser = (proxy = {}) => {
-    const ssPart = {
-        tag: proxy.name,
-        type: 'shadowsocks',
-        method: proxy.cipher,
-        password: proxy.password,
-        detour: `${proxy.name}_shadowtls`,
-    };
-    if (proxy.uot) ssPart.udp_over_tcp = true;
-    if (proxy['udp-over-tcp']) {
-        ssPart.udp_over_tcp = {
-            enabled: true,
-            version:
-                !proxy['udp-over-tcp-version'] ||
-                proxy['udp-over-tcp-version'] === 1
-                    ? 1
-                    : 2,
-        };
-    }
-    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 < 0 || stPart.server_port > 65535)
-        throw '端口值非法';
-    if (proxy['fast-open'] === true) stPart.udp_fragment = true;
-    tfoParser(proxy, stPart);
-    detourParser(proxy, stPart);
-    smuxParser(proxy.smux, ssPart);
-    ipVersionParser(proxy, stPart);
-    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 < 0 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy.uot) parsedProxy.udp_over_tcp = true;
-    if (proxy['udp-over-tcp']) {
-        parsedProxy.udp_over_tcp = {
-            enabled: true,
-            version:
-                !proxy['udp-over-tcp-version'] ||
-                proxy['udp-over-tcp-version'] === 1
-                    ? 1
-                    : 2,
-        };
-    }
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    networkParser(proxy, parsedProxy);
-    tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, 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 < 0 || 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);
-    detourParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, 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 < 0 || 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);
-    networkParser(proxy, parsedProxy);
-    tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, 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 < 0 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy.xudp) parsedProxy.packet_encoding = 'xudp';
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    // if (['xtls-rprx-vision', ''].includes(proxy.flow)) parsedProxy.flow = proxy.flow;
-    if (proxy.flow != null) parsedProxy.flow = proxy.flow;
-    if (proxy.network === 'ws') wsParser(proxy, parsedProxy);
-    if (proxy.network === 'grpc') grpcParser(proxy, parsedProxy);
-    networkParser(proxy, parsedProxy);
-    tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    ipVersionParser(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 < 0 || 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);
-    networkParser(proxy, parsedProxy);
-    tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, 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 < 0 || 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$');
-    // sing-box 跟文档不一致, 但是懒得全转, 只处理最常见的 Mbps
-    if (reg.test(`${proxy.up}`) && !`${proxy.up}`.endsWith('Mbps')) {
-        parsedProxy.up = `${proxy.up}`;
-    } else {
-        parsedProxy.up_mbps = parseInt(`${proxy.up}`, 10);
-    }
-    if (reg.test(`${proxy.down}`) && !`${proxy.down}`.endsWith('Mbps')) {
-        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;
-        }
-    }
-    networkParser(proxy, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
-    tfoParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, 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 < 0 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy['hop-interval'])
-        parsedProxy.hop_interval = /^\d+$/.test(proxy['hop-interval'])
-            ? `${proxy['hop-interval']}s`
-            : proxy['hop-interval'];
-    if (proxy['ports'])
-        parsedProxy.server_ports = proxy['ports']
-            .split(/\s*,\s*/)
-            .map((p) => p.replace(/\s*-\s*/g, ':'));
-    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;
-    networkParser(proxy, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, 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 < 0 || 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`;
-    networkParser(proxy, parsedProxy);
-    tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
-    return parsedProxy;
-};
-const anytlsParser = (proxy = {}) => {
-    const parsedProxy = {
-        tag: proxy.name,
-        type: 'anytls',
-        server: proxy.server,
-        server_port: parseInt(`${proxy.port}`, 10),
-        password: proxy.password,
-        tls: { enabled: true, server_name: proxy.server, insecure: false },
-    };
-    if (/^\d+$/.test(proxy['idle-session-check-interval']))
-        parsedProxy.idle_session_check_interval = `${proxy['idle-session-check-interval']}s`;
-    if (/^\d+$/.test(proxy['idle-session-timeout']))
-        parsedProxy.idle_session_timeout = `${proxy['idle-session-timeout']}s`;
-    if (/^\d+$/.test(proxy['min-idle-session']))
-        parsedProxy.min_idle_session = parseInt(
-            `${proxy['min-idle-session']}`,
-            10,
-        );
-    detourParser(proxy, parsedProxy);
-    tlsParser(proxy, parsedProxy);
-    ipVersionParser(proxy, parsedProxy);
-    return parsedProxy;
-};
-
-const wireguardParser = (proxy = {}) => {
-    const local_address = ['ip', 'ipv6']
-        .map((i) => proxy[i])
-        .map((i) => {
-            if (isIPv4(i)) return `${i}/32`;
-            if (isIPv6(i)) return `${i}/128`;
-        })
-        .filter((i) => i);
-    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 < 0 || parsedProxy.server_port > 65535)
-        throw 'invalid port';
-    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    if (typeof proxy.reserved === 'string') {
-        parsedProxy.reserved = proxy.reserved;
-    } else if (Array.isArray(proxy.reserved)) {
-        for (const r of proxy.reserved) parsedProxy.reserved.push(r);
-    } else {
-        delete parsedProxy.reserved;
-    }
-    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 if (Array.isArray(p.reserved)) {
-                for (const r of p.reserved) peer.reserved.push(r);
-            } else {
-                delete peer.reserved;
-            }
-            if (p['pre-shared-key']) peer.pre_shared_key = p['pre-shared-key'];
-            parsedProxy.peers.push(peer);
-        }
-    }
-    networkParser(proxy, parsedProxy);
-    tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
-    smuxParser(proxy.smux, parsedProxy);
-    ipVersionParser(proxy, 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 'ssh':
-                            list.push(sshParser(proxy));
-                            break;
-                        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.cipher) {
-                            //     proxy.cipher = 'none';
-                            // }
-                            // if (
-                            //     ![
-                            //         '2022-blake3-aes-128-gcm',
-                            //         '2022-blake3-aes-256-gcm',
-                            //         '2022-blake3-chacha20-poly1305',
-                            //         'aes-128-cfb',
-                            //         'aes-128-ctr',
-                            //         'aes-128-gcm',
-                            //         'aes-192-cfb',
-                            //         'aes-192-ctr',
-                            //         'aes-192-gcm',
-                            //         'aes-256-cfb',
-                            //         'aes-256-ctr',
-                            //         'aes-256-gcm',
-                            //         'chacha20-ietf',
-                            //         'chacha20-ietf-poly1305',
-                            //         'none',
-                            //         'rc4-md5',
-                            //         'xchacha20',
-                            //         'xchacha20-ietf-poly1305',
-                            //     ].includes(proxy.cipher)
-                            // ) {
-                            //     throw new Error(
-                            //         `cipher ${proxy.cipher} is not supported`,
-                            //     );
-                            // }
-                            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,
-                                    opts['include-unsupported-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;
-                        case 'anytls':
-                            list.push(anytlsParser(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({ outbounds: list }, null, 2);
-    };
-    return { type, produce };
-}

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

@@ -1,318 +1,31 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
-import $ from '@/core/app';
 
 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 (
-                    ![
-                        'ss',
-                        'ssr',
-                        'vmess',
-                        'socks5',
-                        'http',
-                        'snell',
-                        'trojan',
-                        'tuic',
-                        'vless',
-                        'wireguard',
-                        'hysteria',
-                        'hysteria2',
-                        'ssh',
-                        'juicity',
-                    ].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',
-                            '2022-blake3-aes-128-gcm',
-                            '2022-blake3-aes-256-gcm',
-                        ].includes(proxy.cipher)) ||
-                    (proxy.type === 'snell' && proxy.version >= 4) ||
-                    (proxy.type === 'vless' &&
-                        proxy['reality-opts'] &&
-                        !['xtls-rprx-vision'].includes(proxy.flow))
-                ) {
-                    return false;
-                } else if (proxy['underlying-proxy'] || proxy['dialer-proxy']) {
-                    $.error(
-                        `Stash 暂不支持前置代理字段. 已过滤节点 ${proxy.name}. 请使用 代理的转发链 https://stash.wiki/proxy-protocols/proxy-groups#relay`,
-                    );
-                    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;
                         }
-                        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 === 'snell' && proxy.version < 3) {
-                    delete proxy.udp;
-                } 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.network === 'ws') {
-                    const wsPath = proxy['ws-opts']?.path;
-                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
-                    // eslint-disable-next-line no-unused-vars
-                    const [_, path = '', ed = ''] = reg.exec(wsPath);
-                    proxy['ws-opts'].path = path;
-                    if (ed !== '') {
-                        proxy['ws-opts']['early-data-header-name'] =
-                            'Sec-WebSocket-Protocol';
-                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
-                    }
-                }
-                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',
-                        'juicity',
-                        'anytls',
-                    ].includes(proxy.type)
-                ) {
-                    delete proxy.tls;
-                }
-                if (proxy['tls-fingerprint']) {
-                    proxy['server-cert-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'];
-                }
-                if (proxy['test-timeout']) {
-                    proxy['benchmark-timeout'] = proxy['test-timeout'];
-                    delete proxy['test-timeout'];
-                }
-
-                delete proxy.subName;
-                delete proxy.collectionName;
-                delete proxy.id;
-                delete proxy.resolved;
-                delete proxy['no-resolve'];
-                if (type !== 'internal') {
-                    for (const key in proxy) {
-                        if (proxy[key] == null || /^_/i.test(key)) {
-                            delete proxy[key];
+                        if (isPresent(proxy, 'sni')) {
+                            proxy.servername = proxy.sni;
+                            delete proxy.sni;
                         }
                     }
-                }
-                if (
-                    ['grpc'].includes(proxy.network) &&
-                    proxy[`${proxy.network}-opts`]
-                ) {
-                    delete proxy[`${proxy.network}-opts`]['_grpc-type'];
-                    delete proxy[`${proxy.network}-opts`]['_grpc-authority'];
-                }
-                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/surgemac.js

@@ -1,192 +0,0 @@
-import { Base64 } from 'js-base64';
-import { Result, isPresent } from './utils';
-import Surge_Producer from './surge';
-import ClashMeta_Producer from './clashmeta';
-import { isIPv4, isIPv6 } from '@/utils';
-import $ from '@/core/app';
-
-const targetPlatform = 'SurgeMac';
-
-const surge_Producer = Surge_Producer();
-
-export default function SurgeMac_Producer() {
-    const produce = (proxy, type, opts = {}) => {
-        switch (proxy.type) {
-            case 'external':
-                return external(proxy);
-            // case 'ssr':
-            //     return shadowsocksr(proxy);
-            default: {
-                try {
-                    return surge_Producer.produce(proxy, type, opts);
-                } catch (e) {
-                    if (opts.useMihomoExternal) {
-                        $.log(
-                            `${proxy.name} is not supported on ${targetPlatform}, try to use Mihomo(SurgeMac - External Proxy Program) instead`,
-                        );
-                        return mihomo(proxy, type, opts);
-                    } else {
-                        throw new Error(
-                            `Surge for macOS 可手动指定链接参数 target=SurgeMac 或在 同步配置 中指定 SurgeMac 来启用 mihomo 支援 Surge 本身不支持的协议`,
-                        );
-                    }
-                }
-            }
-        }
-    };
-    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();
-}
-// eslint-disable-next-line no-unused-vars
-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',
-        'obfs-param': '-g',
-        password: '-k',
-        port: '-p',
-        protocol: '-O',
-        'protocol-param': '-G',
-        server: '-s',
-        'local-port': '-l',
-        'local-address': '-b',
-    })) {
-        if (external_proxy[key] != null) {
-            external_proxy.args.push(value);
-            external_proxy.args.push(external_proxy[key]);
-        }
-    }
-
-    return external(external_proxy);
-}
-// eslint-disable-next-line no-unused-vars
-function mihomo(proxy, type, opts) {
-    const clashProxy = ClashMeta_Producer().produce([proxy], 'internal')?.[0];
-    if (clashProxy) {
-        const localPort = opts?.localPort || proxy._localPort || 65535;
-        const ipv6 = ['ipv4', 'v4-only'].includes(proxy['ip-version'])
-            ? false
-            : true;
-        const external_proxy = {
-            name: proxy.name,
-            type: 'external',
-            exec: proxy._exec || '/usr/local/bin/mihomo',
-            'local-port': localPort,
-            args: [
-                '-config',
-                Base64.encode(
-                    JSON.stringify({
-                        'mixed-port': localPort,
-                        ipv6,
-                        mode: 'global',
-                        dns: {
-                            enable: true,
-                            ipv6,
-                            'default-nameserver': opts?.defaultNameserver ||
-                                proxy._defaultNameserver || [
-                                    '180.76.76.76',
-                                    '52.80.52.52',
-                                    '119.28.28.28',
-                                    '223.6.6.6',
-                                ],
-                            nameserver: opts?.nameserver ||
-                                proxy._nameserver || [
-                                    'https://doh.pub/dns-query',
-                                    'https://dns.alidns.com/dns-query',
-                                    'https://doh-pure.onedns.net/dns-query',
-                                ],
-                        },
-                        proxies: [
-                            {
-                                ...clashProxy,
-                                name: 'proxy',
-                            },
-                        ],
-                        'proxy-groups': [
-                            {
-                                name: 'GLOBAL',
-                                type: 'select',
-                                proxies: ['proxy'],
-                            },
-                        ],
-                    }),
-                ),
-            ],
-            addresses: [],
-        };
-
-        // 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}`,
-            );
-        }
-        opts.localPort = localPort - 1;
-        return external(external_proxy);
-    }
-}
-
-function isIP(ip) {
-    return isIPv4(ip) || isIPv6(ip);
-}

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

@@ -1,52 +1,16 @@
 /* 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 = '';
-        delete proxy.subName;
-        delete proxy.collectionName;
-        delete proxy.id;
-        delete proxy.resolved;
-        delete proxy['no-resolve'];
-        for (const key in proxy) {
-            if (proxy[key] == null) {
-                delete proxy[key];
-            }
-        }
-        if (
-            ['trojan', 'tuic', 'hysteria', 'hysteria2', 'juicity'].includes(
-                proxy.type,
-            )
-        ) {
-            delete proxy.tls;
-        }
-        if (
-            !['vmess'].includes(proxy.type) &&
-            proxy.server &&
-            isIPv6(proxy.server)
-        ) {
-            proxy.server = `[${proxy.server}]`;
-        }
         switch (proxy.type) {
-            case 'socks5':
-                result = `socks://${encodeURIComponent(
-                    Base64.encode(
-                        `${proxy.username ?? ''}:${proxy.password ?? ''}`,
-                    ),
-                )}@${proxy.server}:${proxy.port}#${proxy.name}`;
-                break;
             case 'ss':
                 const userinfo = `${proxy.cipher}:${proxy.password}`;
-                result = `ss://${
-                    proxy.cipher?.startsWith('2022-blake3-')
-                        ? `${encodeURIComponent(
-                              proxy.cipher,
-                          )}:${encodeURIComponent(proxy.password)}`
-                        : Base64.encode(userinfo)
-                }@${proxy.server}:${proxy.port}${proxy.plugin ? '/' : ''}`;
+                result = `ss://${Base64.encode(userinfo)}@${proxy.server}:${
+                    proxy.port
+                }/`;
                 if (proxy.plugin) {
                     result += '?plugin=';
                     const opts = proxy['plugin-opts'];
@@ -65,25 +29,12 @@ export default function URI_Producer() {
                                 }${opts.tls ? ';tls' : ''}`,
                             );
                             break;
-                        case 'shadow-tls':
-                            result += encodeURIComponent(
-                                `shadow-tls;host=${opts.host};password=${opts.password};version=${opts.version}`,
-                            );
-                            break;
                         default:
                             throw new Error(
                                 `Unsupported plugin option: ${proxy.plugin}`,
                             );
                     }
                 }
-                if (proxy['udp-over-tcp']) {
-                    result = `${result}${proxy.plugin ? '&' : '?'}uot=1`;
-                }
-                if (proxy.tfo) {
-                    result = `${result}${
-                        proxy.plugin || proxy['udp-over-tcp'] ? '&' : '?'
-                    }tfo=1`;
-                }
                 result += `#${encodeURIComponent(proxy.name)}`;
                 break;
             case 'ssr':
@@ -104,576 +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';
-                } else if (
-                    proxy.network === 'ws' &&
-                    proxy['ws-opts']?.['v2ray-http-upgrade']
-                ) {
-                    net = 'httpupgrade';
-                }
                 result = {
-                    v: '2',
                     ps: proxy.name,
                     add: proxy.server,
-                    port: `${proxy.port}`,
+                    port: proxy.port,
                     id: proxy.uuid,
-                    aid: `${proxy.alterId || 0}`,
-                    scy: proxy.cipher,
-                    net,
-                    type,
+                    type: '',
+                    aid: 0,
+                    net: proxy.network || 'tcp',
                     tls: proxy.tls ? 'tls' : '',
-                    alpn: Array.isArray(proxy.alpn)
-                        ? proxy.alpn.join(',')
-                        : proxy.alpn,
-                    fp: proxy['client-fingerprint'],
                 };
-                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 (['grpc'].includes(proxy.network)) {
-                        result.path =
-                            proxy[`${proxy.network}-opts`]?.[
-                                'grpc-service-name'
-                            ];
-                        // https://github.com/XTLS/Xray-core/issues/91
-                        result.type =
-                            proxy[`${proxy.network}-opts`]?.['_grpc-type'] ||
-                            'gun';
-                        result.host =
-                            proxy[`${proxy.network}-opts`]?.['_grpc-authority'];
-                    } else if (['kcp', 'quic'].includes(proxy.network)) {
-                        // https://github.com/XTLS/Xray-core/issues/91
-                        result.type =
-                            proxy[`${proxy.network}-opts`]?.[
-                                `_${proxy.network}-type`
-                            ] || 'none';
-                        result.host =
-                            proxy[`${proxy.network}-opts`]?.[
-                                `_${proxy.network}-host`
-                            ];
-                        result.path =
-                            proxy[`${proxy.network}-opts`]?.[
-                                `_${proxy.network}-path`
-                            ];
-                    } else {
-                        if (vmessTransportPath) {
-                            result.path = Array.isArray(vmessTransportPath)
-                                ? vmessTransportPath[0]
-                                : vmessTransportPath;
-                        }
-                        if (vmessTransportHost) {
-                            result.host = Array.isArray(vmessTransportHost)
-                                ? vmessTransportHost[0]
-                                : vmessTransportHost;
-                        }
-                    }
+                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 = '';
-                let spx = '';
-                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)}`;
-                    }
-                    const spiderX = proxy['reality-opts']?.['_spider-x'];
-                    if (spiderX) {
-                        spx = `&spx=${encodeURIComponent(spiderX)}`;
-                    }
-                } 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 extra = '';
-                if (proxy._extra) {
-                    extra = `&extra=${encodeURIComponent(proxy._extra)}`;
-                }
-                let mode = '';
-                if (proxy._mode) {
-                    mode = `&mode=${encodeURIComponent(proxy._mode)}`;
-                }
-                let vlessType = proxy.network;
-                if (
-                    proxy.network === 'ws' &&
-                    proxy['ws-opts']?.['v2ray-http-upgrade']
-                ) {
-                    vlessType = 'httpupgrade';
-                }
-
-                let vlessTransport = `&type=${encodeURIComponent(vlessType)}`;
-                if (['grpc'].includes(proxy.network)) {
-                    // https://github.com/XTLS/Xray-core/issues/91
-                    vlessTransport += `&mode=${encodeURIComponent(
-                        proxy[`${proxy.network}-opts`]?.['_grpc-type'] || 'gun',
-                    )}`;
-                    const authority =
-                        proxy[`${proxy.network}-opts`]?.['_grpc-authority'];
-                    if (authority) {
-                        vlessTransport += `&authority=${encodeURIComponent(
-                            authority,
-                        )}`;
-                    }
-                }
-
-                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,
-                    )}`;
-                }
-                if (proxy.network === 'kcp') {
-                    if (proxy.seed) {
-                        vlessTransport += `&seed=${encodeURIComponent(
-                            proxy.seed,
-                        )}`;
-                    }
-                    if (proxy.headerType) {
-                        vlessTransport += `&headerType=${encodeURIComponent(
-                            proxy.headerType,
-                        )}`;
-                    }
-                }
-
-                result = `vless://${proxy.uuid}@${proxy.server}:${
-                    proxy.port
-                }?security=${encodeURIComponent(
-                    security,
-                )}${vlessTransport}${alpn}${allowInsecure}${sni}${fp}${flow}${sid}${spx}${pbk}${mode}${extra}#${encodeURIComponent(
-                    proxy.name,
-                )}`;
-                break;
             case 'trojan':
-                let trojanTransport = '';
-                if (proxy.network) {
-                    let trojanType = proxy.network;
-                    if (
-                        proxy.network === 'ws' &&
-                        proxy['ws-opts']?.['v2ray-http-upgrade']
-                    ) {
-                        trojanType = 'httpupgrade';
-                    }
-                    trojanTransport = `&type=${encodeURIComponent(trojanType)}`;
-                    if (['grpc'].includes(proxy.network)) {
-                        let trojanTransportServiceName =
-                            proxy[`${proxy.network}-opts`]?.[
-                                `${proxy.network}-service-name`
-                            ];
-                        let trojanTransportAuthority =
-                            proxy[`${proxy.network}-opts`]?.['_grpc-authority'];
-                        if (trojanTransportServiceName) {
-                            trojanTransport += `&serviceName=${encodeURIComponent(
-                                trojanTransportServiceName,
-                            )}`;
-                        }
-                        if (trojanTransportAuthority) {
-                            trojanTransport += `&authority=${encodeURIComponent(
-                                trojanTransportAuthority,
-                            )}`;
-                        }
-                        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,
-                        )}`;
-                    }
-                }
-                let trojanFp = '';
-                if (proxy['client-fingerprint']) {
-                    trojanFp = `&fp=${encodeURIComponent(
-                        proxy['client-fingerprint'],
-                    )}`;
-                }
-                let trojanAlpn = '';
-                if (proxy.alpn) {
-                    trojanAlpn = `&alpn=${encodeURIComponent(
-                        Array.isArray(proxy.alpn)
-                            ? proxy.alpn
-                            : proxy.alpn.join(','),
-                    )}`;
-                }
-                const trojanIsReality = proxy['reality-opts'];
-                let trojanSid = '';
-                let trojanPbk = '';
-                let trojanSpx = '';
-                let trojanSecurity = '';
-                let trojanMode = '';
-                let trojanExtra = '';
-                if (trojanIsReality) {
-                    trojanSecurity = `&security=reality`;
-                    const publicKey = proxy['reality-opts']?.['public-key'];
-                    if (publicKey) {
-                        trojanPbk = `&pbk=${encodeURIComponent(publicKey)}`;
-                    }
-                    const shortId = proxy['reality-opts']?.['short-id'];
-                    if (shortId) {
-                        trojanSid = `&sid=${encodeURIComponent(shortId)}`;
-                    }
-                    const spiderX = proxy['reality-opts']?.['_spider-x'];
-                    if (spiderX) {
-                        trojanSpx = `&spx=${encodeURIComponent(spiderX)}`;
-                    }
-                    if (proxy._extra) {
-                        trojanExtra = `&extra=${encodeURIComponent(
-                            proxy._extra,
-                        )}`;
-                    }
-                    if (proxy._mode) {
-                        trojanMode = `&mode=${encodeURIComponent(proxy._mode)}`;
-                    }
-                }
                 result = `trojan://${proxy.password}@${proxy.server}:${
                     proxy.port
-                }?sni=${encodeURIComponent(proxy.sni || proxy.server)}${
-                    proxy['skip-cert-verify'] ? '&allowInsecure=1' : ''
-                }${trojanTransport}${trojanAlpn}${trojanFp}${trojanSecurity}${trojanSid}${trojanPbk}${trojanSpx}${trojanMode}${trojanExtra}#${encodeURIComponent(
-                    proxy.name,
-                )}`;
-                break;
-            case 'hysteria2':
-                let hysteria2params = [];
-                if (proxy['hop-interval']) {
-                    hysteria2params.push(
-                        `hop-interval=${proxy['hop-interval']}`,
-                    );
-                }
-                if (proxy['keepalive']) {
-                    hysteria2params.push(`keepalive=${proxy['keepalive']}`);
-                }
-                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.ports) {
-                    hysteria2params.push(`mport=${proxy.ports}`);
-                }
-                if (proxy['tls-fingerprint']) {
-                    hysteria2params.push(
-                        `pinSHA256=${encodeURIComponent(
-                            proxy['tls-fingerprint'],
-                        )}`,
-                    );
-                }
-                if (proxy.tfo) {
-                    hysteria2params.push(`fastopen=1`);
-                }
-                result = `hysteria2://${encodeURIComponent(proxy.password)}@${
-                    proxy.server
-                }:${proxy.port}?${hysteria2params.join(
-                    '&',
-                )}#${encodeURIComponent(proxy.name)}`;
-                break;
-            case 'hysteria':
-                let hysteriaParams = [];
-                Object.keys(proxy).forEach((key) => {
-                    if (!['name', 'type', 'server', 'port'].includes(key)) {
-                        const i = key.replace(/-/, '_');
-                        if (['alpn'].includes(key)) {
-                            if (proxy[key]) {
-                                hysteriaParams.push(
-                                    `${i}=${encodeURIComponent(
-                                        Array.isArray(proxy[key])
-                                            ? proxy[key][0]
-                                            : proxy[key],
-                                    )}`,
-                                );
-                            }
-                        } else if (['skip-cert-verify'].includes(key)) {
-                            if (proxy[key]) {
-                                hysteriaParams.push(`insecure=1`);
-                            }
-                        } else if (['tfo', 'fast-open'].includes(key)) {
-                            if (
-                                proxy[key] &&
-                                !hysteriaParams.includes('fastopen=1')
-                            ) {
-                                hysteriaParams.push(`fastopen=1`);
-                            }
-                        } else if (['ports'].includes(key)) {
-                            hysteriaParams.push(`mport=${proxy[key]}`);
-                        } else if (['auth-str'].includes(key)) {
-                            hysteriaParams.push(`auth=${proxy[key]}`);
-                        } else if (['up'].includes(key)) {
-                            hysteriaParams.push(`upmbps=${proxy[key]}`);
-                        } else if (['down'].includes(key)) {
-                            hysteriaParams.push(`downmbps=${proxy[key]}`);
-                        } else if (['_obfs'].includes(key)) {
-                            hysteriaParams.push(`obfs=${proxy[key]}`);
-                        } else if (['obfs'].includes(key)) {
-                            hysteriaParams.push(`obfsParam=${proxy[key]}`);
-                        } else if (['sni'].includes(key)) {
-                            hysteriaParams.push(`peer=${proxy[key]}`);
-                        } else if (proxy[key] && !/^_/i.test(key)) {
-                            hysteriaParams.push(
-                                `${i}=${encodeURIComponent(proxy[key])}`,
-                            );
-                        }
-                    }
-                });
-
-                result = `hysteria://${proxy.server}:${
-                    proxy.port
-                }?${hysteriaParams.join('&')}#${encodeURIComponent(
-                    proxy.name,
-                )}`;
-                break;
-
-            case 'tuic':
-                if (!proxy.token || proxy.token.length === 0) {
-                    let tuicParams = [];
-                    Object.keys(proxy).forEach((key) => {
-                        if (
-                            ![
-                                'name',
-                                'type',
-                                'uuid',
-                                'password',
-                                'server',
-                                'port',
-                                'tls',
-                            ].includes(key)
-                        ) {
-                            const i = key.replace(/-/, '_');
-                            if (['alpn'].includes(key)) {
-                                if (proxy[key]) {
-                                    tuicParams.push(
-                                        `${i}=${encodeURIComponent(
-                                            Array.isArray(proxy[key])
-                                                ? proxy[key][0]
-                                                : proxy[key],
-                                        )}`,
-                                    );
-                                }
-                            } else if (['skip-cert-verify'].includes(key)) {
-                                if (proxy[key]) {
-                                    tuicParams.push(`allow_insecure=1`);
-                                }
-                            } else if (['tfo', 'fast-open'].includes(key)) {
-                                if (
-                                    proxy[key] &&
-                                    !tuicParams.includes('fast_open=1')
-                                ) {
-                                    tuicParams.push(`fast_open=1`);
-                                }
-                            } else if (
-                                ['disable-sni', 'reduce-rtt'].includes(key) &&
-                                proxy[key]
-                            ) {
-                                tuicParams.push(`${i.replace(/-/g, '_')}=1`);
-                            } else if (
-                                ['congestion-controller'].includes(key)
-                            ) {
-                                tuicParams.push(
-                                    `congestion_control=${proxy[key]}`,
-                                );
-                            } else if (proxy[key] && !/^_/i.test(key)) {
-                                tuicParams.push(
-                                    `${i.replace(
-                                        /-/g,
-                                        '_',
-                                    )}=${encodeURIComponent(proxy[key])}`,
-                                );
-                            }
-                        }
-                    });
-
-                    result = `tuic://${encodeURIComponent(
-                        proxy.uuid,
-                    )}:${encodeURIComponent(proxy.password)}@${proxy.server}:${
-                        proxy.port
-                    }?${tuicParams.join('&')}#${encodeURIComponent(
-                        proxy.name,
-                    )}`;
-                }
-                break;
-            case 'anytls':
-                let anytlsParams = [];
-                Object.keys(proxy).forEach((key) => {
-                    if (
-                        ![
-                            'name',
-                            'type',
-                            'password',
-                            'server',
-                            'port',
-                            'tls',
-                        ].includes(key)
-                    ) {
-                        const i = key.replace(/-/, '_');
-                        if (['alpn'].includes(key)) {
-                            if (proxy[key]) {
-                                anytlsParams.push(
-                                    `${i}=${encodeURIComponent(
-                                        Array.isArray(proxy[key])
-                                            ? proxy[key][0]
-                                            : proxy[key],
-                                    )}`,
-                                );
-                            }
-                        } else if (['skip-cert-verify'].includes(key)) {
-                            if (proxy[key]) {
-                                anytlsParams.push(`insecure=1`);
-                            }
-                        } else if (['udp'].includes(key)) {
-                            if (proxy[key]) {
-                                anytlsParams.push(`udp=1`);
-                            }
-                        } else if (proxy[key] && !/^_/i.test(key)) {
-                            anytlsParams.push(
-                                `${i.replace(/-/g, '_')}=${encodeURIComponent(
-                                    proxy[key],
-                                )}`,
-                            );
-                        }
-                    }
-                });
-
-                result = `anytls://${encodeURIComponent(proxy.password)}@${
-                    proxy.server
-                }:${proxy.port}/?${anytlsParams.join('&')}#${encodeURIComponent(
-                    proxy.name,
-                )}`;
-                break;
-            case 'wireguard':
-                let wireguardParams = [];
-
-                Object.keys(proxy).forEach((key) => {
-                    if (
-                        ![
-                            'name',
-                            'type',
-                            'server',
-                            'port',
-                            'ip',
-                            'ipv6',
-                            'private-key',
-                        ].includes(key)
-                    ) {
-                        if (['public-key'].includes(key)) {
-                            wireguardParams.push(`publickey=${proxy[key]}`);
-                        } else if (['udp'].includes(key)) {
-                            if (proxy[key]) {
-                                wireguardParams.push(`${key}=1`);
-                            }
-                        } else if (proxy[key] && !/^_/i.test(key)) {
-                            wireguardParams.push(
-                                `${key}=${encodeURIComponent(proxy[key])}`,
-                            );
-                        }
-                    }
-                });
-                if (proxy.ip && proxy.ipv6) {
-                    wireguardParams.push(
-                        `address=${proxy.ip}/32,${proxy.ipv6}/128`,
-                    );
-                } else if (proxy.ip) {
-                    wireguardParams.push(`address=${proxy.ip}/32`);
-                } else if (proxy.ipv6) {
-                    wireguardParams.push(`address=${proxy.ipv6}/128`);
-                }
-                result = `wireguard://${encodeURIComponent(
-                    proxy['private-key'],
-                )}@${proxy.server}:${proxy.port}/?${wireguardParams.join(
-                    '&',
-                )}#${encodeURIComponent(proxy.name)}`;
+                }#${encodeURIComponent(proxy.name)}`;
                 break;
         }
         return result;

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

@@ -1,30 +0,0 @@
-/* eslint-disable no-case-declarations */
-import { Base64 } from 'js-base64';
-import URI_Producer from './uri';
-import $ from '@/core/app';
-
-const URI = URI_Producer();
-
-export default function V2Ray_Producer() {
-    const type = 'ALL';
-    const produce = (proxies) => {
-        let result = [];
-        proxies.map((proxy) => {
-            try {
-                result.push(URI.produce(proxy));
-            } catch (err) {
-                $.error(
-                    `Cannot produce proxy: ${JSON.stringify(
-                        proxy,
-                        null,
-                        2,
-                    )}\nReason: ${err}`,
-                );
-            }
-        });
-
-        return Base64.encode(result.join('\n'));
-    };
-
-    return { type, produce };
-}

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

@@ -9,9 +9,7 @@ const RULE_TYPES_MAPPING = [
     [/^(IN|SRC)-PORT$/, 'IN-PORT'],
     [/^PROTOCOL$/, 'PROTOCOL'],
     [/^IP-CIDR$/i, 'IP-CIDR'],
-    [/^(IP-CIDR6|ip6-cidr|IP6-CIDR)$/, 'IP-CIDR6'],
-    [/^GEOIP$/i, 'GEOIP'],
-    [/^GEOSITE$/i, 'GEOSITE'],
+    [/^(IP-CIDR6|ip6-cidr|IP6-CIDR)$/],
 ];
 
 function AllRuleParser() {
@@ -39,7 +37,8 @@ function AllRuleParser() {
                             content: params[1],
                         };
                         if (
-                            ['IP-CIDR', 'IP-CIDR6', 'GEOIP'].includes(rule.type)
+                            rule.type === 'IP-CIDR' ||
+                            rule.type === 'IP-CIDR6'
                         ) {
                             rule.options = params.slice(2);
                         }
@@ -48,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';
@@ -10,8 +10,6 @@ function QXFilter() {
             'SRC-IP',
             'IN-PORT',
             'PROTOCOL',
-            'GEOSITE',
-            'GEOIP',
         ];
         if (UNSUPPORTED.indexOf(rule.type) !== -1) return null;
 
@@ -31,12 +29,9 @@ function QXFilter() {
 function SurgeRuleSet() {
     const type = 'SINGLE';
     const func = (rule) => {
-        const UNSUPPORTED = ['GEOSITE', 'GEOIP'];
-        if (UNSUPPORTED.indexOf(rule.type) !== -1) return null;
         let output = `${rule.type},${rule.content}`;
-        if (['IP-CIDR', 'IP-CIDR6'].includes(rule.type)) {
-            output +=
-                rule.options?.length > 0 ? `,${rule.options.join(',')}` : '';
+        if (rule.type === 'IP-CIDR' || rule.type === 'IP-CIDR6') {
+            output += rule.options ? `,${rule.options[0]}` : '';
         }
         return output;
     };
@@ -47,14 +42,8 @@ function LoonRules() {
     const type = 'SINGLE';
     const func = (rule) => {
         // skip unsupported rules
-        const UNSUPPORTED = ['SRC-IP', 'GEOSITE', 'GEOIP'];
+        const UNSUPPORTED = ['DEST-PORT', 'SRC-IP', 'IN-PORT', 'PROTOCOL'];
         if (UNSUPPORTED.indexOf(rule.type) !== -1) return null;
-        if (['IP-CIDR', 'IP-CIDR6'].includes(rule.type) && rule.options) {
-            // Loon only supports the no-resolve option
-            rule.options = rule.options.filter((option) =>
-                ['no-resolve'].includes(option),
-            );
-        }
         return SurgeRuleSet().func(rule);
     };
     return { type, func };
@@ -73,17 +62,8 @@ function ClashRuleProvider() {
                 let output = `${TRANSFORM[rule.type] || rule.type},${
                     rule.content
                 }`;
-                if (['IP-CIDR', 'IP-CIDR6', 'GEOIP'].includes(rule.type)) {
-                    if (rule.options) {
-                        // Clash only supports the no-resolve option
-                        rule.options = rule.options.filter((option) =>
-                            ['no-resolve'].includes(option),
-                        );
-                    }
-                    output +=
-                        rule.options?.length > 0
-                            ? `,${rule.options.join(',')}`
-                            : '';
+                if (rule.type === 'IP-CIDR' || rule.type === 'IP-CIDR6') {
+                    output += rule.options ? `,${rule.options[0]}` : '';
                 }
                 return output;
             }),

backend/src/main.js

@@ -7,11 +7,10 @@
  *  ╚══════╝ ╚═════╝ ╚═════╝       ╚══════╝   ╚═╝    ╚═════╝ ╚═╝  ╚═╝╚══════╝
  * 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';
-import $ from '@/core/app';
 console.log(
     `
 ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
@@ -19,6 +18,7 @@ console.log(
 ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
 `,
 );
+
 import migrate from '@/utils/migration';
 import serve from '@/restful';
 

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

@@ -1,75 +1,21 @@
 import { version } from '../../package.json';
-import {
-    SETTINGS_KEY,
-    ARTIFACTS_KEY,
-    SUBS_KEY,
-    COLLECTIONS_KEY,
-} from '@/constants';
+import { SETTINGS_KEY, ARTIFACTS_KEY } from '@/constants';
 import $ from '@/core/app';
 import { produceArtifact } from '@/restful/sync';
 import { syncToGist } from '@/restful/artifacts';
-import { findByName } from '@/utils/database';
 
 !(async function () {
-    let arg;
-    if (typeof $argument != 'undefined') {
-        arg = Object.fromEntries(
-            // eslint-disable-next-line no-undef
-            $argument.split('&').map((item) => item.split('=')),
-        );
-    } else {
-        arg = {};
-    }
-    let sub_names = (arg?.subscription ?? arg?.sub ?? '')
-        .split(/,|，/g)
-        .map((i) => i.trim())
-        .filter((i) => i.length > 0)
-        .map((i) => decodeURIComponent(i));
-    let col_names = (arg?.collection ?? arg?.col ?? '')
-        .split(/,|，/g)
-        .map((i) => i.trim())
-        .filter((i) => i.length > 0)
-        .map((i) => decodeURIComponent(i));
-    if (sub_names.length > 0 || col_names.length > 0) {
-        if (sub_names.length > 0)
-            await produceArtifacts(sub_names, 'subscription');
-        if (col_names.length > 0)
-            await produceArtifacts(col_names, 'collection');
-    } else {
-        const settings = $.read(SETTINGS_KEY);
-        // if GitHub token is not configured
-        if (!settings.githubUser || !settings.gistToken) return;
+    const settings = $.read(SETTINGS_KEY);
+    // if GitHub token is not configured
+    if (!settings.githubUser || !settings.gistToken) return;
 
-        const artifacts = $.read(ARTIFACTS_KEY);
-        if (!artifacts || artifacts.length === 0) return;
+    const artifacts = $.read(ARTIFACTS_KEY);
+    if (!artifacts || artifacts.length === 0) return;
 
-        const shouldSync = artifacts.some((artifact) => artifact.sync);
-        if (shouldSync) await doSync();
-    }
+    const shouldSync = artifacts.some((artifact) => artifact.sync);
+    if (shouldSync) await doSync();
 })().finally(() => $.done());
 
-async function produceArtifacts(names, type) {
-    try {
-        if (names.length > 0) {
-            $.info(`produceArtifacts ${type} 开始: ${names.join(', ')}`);
-            await Promise.all(
-                names.map(async (name) => {
-                    try {
-                        await produceArtifact({
-                            type,
-                            name,
-                        });
-                    } catch (e) {
-                        $.error(`${type} ${name} error: ${e.message ?? e}`);
-                    }
-                }),
-            );
-            $.info(`produceArtifacts ${type} 完成: ${names.join(', ')}`);
-        }
-    } catch (e) {
-        $.error(`produceArtifacts error: ${e.message ?? e}`);
-    }
-}
 async function doSync() {
     console.log(
         `
@@ -84,167 +30,41 @@ async function doSync() {
     const files = {};
 
     try {
-        const valid = [];
-        const invalid = [];
-        const allSubs = $.read(SUBS_KEY);
-        const allCols = $.read(COLLECTIONS_KEY);
-        const subNames = [];
-        let enabledCount = 0;
-        allArtifacts.map((artifact) => {
-            if (artifact.sync && artifact.source) {
-                enabledCount++;
-                if (artifact.type === 'subscription') {
-                    const subName = artifact.source;
-                    const sub = findByName(allSubs, subName);
-                    if (sub && sub.url && !subNames.includes(subName)) {
-                        subNames.push(subName);
-                    }
-                } else if (artifact.type === 'collection') {
-                    const collection = findByName(allCols, artifact.source);
-                    if (collection && Array.isArray(collection.subscriptions)) {
-                        collection.subscriptions.map((subName) => {
-                            const sub = findByName(allSubs, subName);
-                            if (sub && sub.url && !subNames.includes(subName)) {
-                                subNames.push(subName);
-                            }
-                        });
-                    }
-                }
-            }
-        });
-
-        if (enabledCount === 0) {
-            $.info(
-                `需同步的配置: ${enabledCount}, 总数: ${allArtifacts.length}`,
-            );
-            return;
-        }
-
-        if (subNames.length > 0) {
-            await Promise.all(
-                subNames.map(async (subName) => {
-                    try {
-                        await produceArtifact({
-                            type: 'subscription',
-                            name: subName,
-                            awaitCustomCache: true,
-                        });
-                    } catch (e) {
-                        // $.error(`${e.message ?? e}`);
-                    }
-                }),
-            );
-        }
         await Promise.all(
             allArtifacts.map(async (artifact) => {
-                try {
-                    if (artifact.sync && artifact.source) {
-                        $.info(`正在同步云配置：${artifact.name}...`);
+                if (artifact.sync) {
+                    $.info(`正在同步云配置：${artifact.name}...`);
+                    const output = await produceArtifact({
+                        type: artifact.type,
+                        name: artifact.source,
+                        platform: artifact.platform,
+                    });
 
-                        const useMihomoExternal =
-                            artifact.platform === 'SurgeMac';
-
-                        if (useMihomoExternal) {
-                            $.info(
-                                `手动指定了 target 为 SurgeMac, 将使用 Mihomo External`,
-                            );
-                        }
-                        const output = await produceArtifact({
-                            type: artifact.type,
-                            name: artifact.source,
-                            platform: artifact.platform,
-                            produceOpts: {
-                                'include-unsupported-proxy':
-                                    artifact.includeUnsupportedProxy,
-                                useMihomoExternal,
-                            },
-                        });
-
-                        // if (!output || output.length === 0)
-                        //     throw new Error('该配置的结果为空 不进行上传');
-
-                        files[encodeURIComponent(artifact.name)] = {
-                            content: output,
-                        };
-
-                        valid.push(artifact.name);
-                    }
-                } catch (e) {
-                    $.error(
-                        `生成同步配置 ${artifact.name} 发生错误: ${
-                            e.message ?? e
-                        }`,
-                    );
-                    invalid.push(artifact.name);
+                    files[artifact.name] = {
+                        content: output,
+                    };
                 }
             }),
         );
 
-        $.info(`${valid.length} 个同步配置生成成功: ${valid.join(', ')}`);
-        $.info(`${invalid.length} 个同步配置生成失败: ${invalid.join(', ')}`);
-
-        if (valid.length === 0) {
-            throw new Error(
-                `同步配置 ${invalid.join(', ')} 生成失败 详情请查看日志`,
-            );
-        }
-
         const resp = await syncToGist(files);
         const body = JSON.parse(resp.body);
-        delete body.history;
-        delete body.forks;
-        delete body.owner;
-        Object.values(body.files).forEach((file) => {
-            delete file.content;
-        });
-        $.info('上传配置响应:');
-        $.info(JSON.stringify(body, null, 2));
 
         for (const artifact of allArtifacts) {
-            if (
-                artifact.sync &&
-                artifact.source &&
-                valid.includes(artifact.name)
-            ) {
+            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 raw_url =
-                    files[encodeURIComponent(artifact.name)]?.raw_url;
-                const new_url = isGitLab
-                    ? raw_url
-                    : raw_url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
-                $.info(
-                    `上传配置完成\n文件列表: ${Object.keys(files).join(
-                        ', ',
-                    )}\n当前文件: ${encodeURIComponent(
-                        artifact.name,
-                    )}\n响应返回的原始链接: ${raw_url}\n处理完的新链接: ${new_url}`,
+                artifact.url = body.files[artifact.name].raw_url.replace(
+                    /\/raw\/[^/]*\/(.*)/,
+                    '/raw/$1',
                 );
-                artifact.url = new_url;
             }
         }
 
         $.write(allArtifacts, ARTIFACTS_KEY);
-        $.info('上传配置成功');
-
-        if (invalid.length > 0) {
-            $.notify(
-                '🌍 Sub-Store',
-                `同步配置成功 ${valid.length} 个, 失败 ${invalid.length} 个, 详情请查看日志`,
-            );
-        } else {
-            $.notify('🌍 Sub-Store', '同步配置完成');
-        }
-    } catch (e) {
-        $.notify('🌍 Sub-Store', '同步配置失败', `原因：${e.message ?? e}`);
-        $.error(`无法同步配置到 Gist，原因：${e}`);
+        $.notify('🌍 Sub-Store', '全部订阅同步成功！');
+    } catch (err) {
+        $.notify('🌍 Sub-Store', '同步订阅失败', `原因：${err}`);
+        $.error(`无法同步订阅配置到 Gist，原因：${err}`);
     }
 }

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

@@ -2,102 +2,28 @@
 import { ProxyUtils } from '@/core/proxy-utils';
 import { RuleUtils } from '@/core/rule-utils';
 import { version } from '../../package.json';
-import download from '@/utils/download';
 
-let result = '';
-let resource = typeof $resource !== 'undefined' ? $resource : '';
-let resourceType = typeof $resourceType !== 'undefined' ? $resourceType : '';
-let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
+console.log(
+    `
+┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
+     Sub-Store -- v${version}
+┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
+`,
+);
 
-!(async () => {
-    console.log(
-        `
-    ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
-         Sub-Store -- v${version}
-         Loon -- ${$loon}
-    ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
-    `,
-    );
+const RESOURCE_TYPE = {
+    PROXY: 1,
+    RULE: 2,
+};
 
-    const build = $loon.match(/\((\d+)\)$/)?.[1];
-    let arg;
-    if (typeof $argument != 'undefined') {
-        arg = Object.fromEntries(
-            $argument.split('&').map((item) => item.split('=')),
-        );
-    } else {
-        arg = {};
-    }
-    console.log(`arg: ${JSON.stringify(arg)}`);
+let result = $resource;
 
-    const RESOURCE_TYPE = {
-        PROXY: 1,
-        RULE: 2,
-    };
-    if (!arg.resourceUrlOnly) {
-        result = resource;
-    }
+if ($resourceType === RESOURCE_TYPE.PROXY) {
+    const proxies = ProxyUtils.parse($resource);
+    result = ProxyUtils.produce(proxies, 'Loon');
+} else if ($resourceType === RESOURCE_TYPE.RULE) {
+    const rules = RuleUtils.parse($resource);
+    result = RuleUtils.produce(rules, 'Loon');
+}
 
-    if (resourceType === RESOURCE_TYPE.PROXY) {
-        if (!arg.resourceUrlOnly) {
-            try {
-                let proxies = ProxyUtils.parse(resource);
-                result = ProxyUtils.produce(proxies, 'Loon', undefined, {
-                    'include-unsupported-proxy':
-                        arg?.includeUnsupportedProxy || build >= 842,
-                });
-            } catch (e) {
-                console.log('解析器: 使用 resource 出现错误');
-                console.log(e.message ?? e);
-            }
-        }
-        if ((!result || /^\s*$/.test(result)) && resourceUrl) {
-            console.log(`解析器: 尝试从 ${resourceUrl} 获取订阅`);
-            try {
-                let raw = await download(
-                    resourceUrl,
-                    arg?.ua,
-                    arg?.timeout,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    true,
-                );
-                let proxies = ProxyUtils.parse(raw);
-                result = ProxyUtils.produce(proxies, 'Loon', undefined, {
-                    'include-unsupported-proxy':
-                        arg?.includeUnsupportedProxy || build >= 842,
-                });
-            } catch (e) {
-                console.log(e.message ?? e);
-            }
-        }
-    } else if (resourceType === RESOURCE_TYPE.RULE) {
-        if (!arg.resourceUrlOnly) {
-            try {
-                const rules = RuleUtils.parse(resource);
-                result = RuleUtils.produce(rules, 'Loon');
-            } catch (e) {
-                console.log(e.message ?? e);
-            }
-        }
-        if ((!result || /^\s*$/.test(result)) && resourceUrl) {
-            console.log(`解析器: 尝试从 ${resourceUrl} 获取规则`);
-            try {
-                let raw = await download(resourceUrl, arg?.ua, arg?.timeout);
-                let rules = RuleUtils.parse(raw);
-                result = RuleUtils.produce(rules, 'Loon');
-            } catch (e) {
-                console.log(e.message ?? e);
-            }
-        }
-    }
-})()
-    .catch(async (e) => {
-        console.log('解析器: 出现错误');
-        console.log(e.message ?? e);
-    })
-    .finally(() => {
-        $done(result || '');
-    });
+$done(result);

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

@@ -20,9 +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 registerTokenRoutes from '@/restful/token';
-import registerModuleRoutes from '@/restful/module';
 
 migrate();
 serve();
@@ -33,9 +30,6 @@ function serve() {
     // register routes
     registerCollectionRoutes($app);
     registerSubscriptionRoutes($app);
-    registerTokenRoutes($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,34 +155,15 @@ 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,
     });
-    const res = await manager.upload(files);
-    let body = {};
-    try {
-        body = JSON.parse(res.body);
-        // eslint-disable-next-line no-empty
-    } catch (e) {}
-
-    const url = body?.html_url ?? body?.web_url;
-    const settings = $.read(SETTINGS_KEY);
-    if (url) {
-        $.log(`同步 Gist 后, 找到 Sub-Store Gist: ${url}`);
-        settings.artifactStore = url;
-        settings.artifactStoreStatus = 'VALID';
-    } else {
-        $.error(`同步 Gist 后, 找不到 Sub-Store Gist`);
-        settings.artifactStoreStatus = 'NOT FOUND';
-    }
-    $.write(settings, SETTINGS_KEY);
-    return res;
+    return manager.upload(files);
 }
 
 export { syncToGist };

backend/src/restful/collections.js

@@ -1,9 +1,8 @@
 import { deleteByName, findByName, updateByName } from '@/utils/database';
-import { COLLECTIONS_KEY, ARTIFACTS_KEY, FILES_KEY } from '@/constants';
+import { COLLECTIONS_KEY, ARTIFACTS_KEY } from '@/constants';
 import { failed, success } from '@/restful/response';
 import $ from '@/core/app';
 import { RequestInvalidError, ResourceNotFoundError } from '@/restful/errors';
-import { formatDateTime } from '@/utils';
 
 export default function register($app) {
     if (!$.read(COLLECTIONS_KEY)) $.write({}, COLLECTIONS_KEY);
@@ -15,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(
@@ -42,7 +30,6 @@ function createCollection(req, res) {
                 `Collection ${collection.name} already exists.`,
             ),
         );
-        return;
     }
     allCols.push(collection);
     $.write(allCols, COLLECTIONS_KEY);
@@ -51,25 +38,11 @@ function createCollection(req, res) {
 
 function getCollection(req, res) {
     let { name } = req.params;
-    let { raw } = req.query;
     name = decodeURIComponent(name);
     const allCols = $.read(COLLECTIONS_KEY);
     const collection = findByName(allCols, name);
     if (collection) {
-        if (raw) {
-            res.set('content-type', 'application/json')
-                .set(
-                    'content-disposition',
-                    `attachment; filename="${encodeURIComponent(
-                        `sub-store_collection_${name}_${formatDateTime(
-                            new Date(),
-                        )}.json`,
-                    )}"`,
-                )
-                .send(JSON.stringify(collection));
-        } else {
-            success(res, collection);
-        }
+        success(res, collection);
     } else {
         failed(
             res,
@@ -106,18 +79,7 @@ function updateCollection(req, res) {
                     artifact.source = newCol.name;
                 }
             }
-            // update all files referring this collection
-            const allFiles = $.read(FILES_KEY) || [];
-            for (const file of allFiles) {
-                if (
-                    file.sourceType === 'collection' &&
-                    file.sourceName === oldCol.name
-                ) {
-                    file.sourceName = newCol.name;
-                }
-            }
             $.write(allArtifacts, ARTIFACTS_KEY);
-            $.write(allFiles, FILES_KEY);
         }
 
         updateByName(allCols, name, newCol);
@@ -149,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

@@ -1,330 +1,45 @@
-import {
-    getPlatformFromHeaders,
-    shouldIncludeUnsupportedProxy,
-} from '@/utils/user-agent';
-import { ProxyUtils } from '@/core/proxy-utils';
+import { getPlatformFromHeaders } from '@/utils/platform';
 import { COLLECTIONS_KEY, SUBS_KEY } from '@/constants';
 import { findByName } from '@/utils/database';
-import { getFlowHeaders, normalizeFlowHeader } from '@/utils/flow';
+import { getFlowHeaders } from '@/utils/flow';
 import $ from '@/core/app';
 import { failed } from '@/restful/response';
 import { InternalServerError, ResourceNotFoundError } from '@/restful/errors';
 import { produceArtifact } from '@/restful/sync';
-// eslint-disable-next-line no-unused-vars
-import { isIPv4, isIPv6 } from '@/utils';
-import { getISO } from '@/utils/geo';
-import env from '@/utils/env';
 
 export default function register($app) {
-    $app.get('/share/col/:name/:target', async (req, res) => {
-        const { target } = req.params;
-        if (target) {
-            req.query.target = target;
-            $.info(`使用路由指定目标: ${target}`);
-        }
-        await downloadCollection(req, res);
-    });
-    $app.get('/share/col/:name', downloadCollection);
-    $app.get('/share/sub/:name/:target', async (req, res) => {
-        const { target } = req.params;
-        if (target) {
-            req.query.target = target;
-            $.info(`使用路由指定目标: ${target}`);
-        }
-        await downloadSubscription(req, res);
-    });
-    $app.get('/share/sub/:name', downloadSubscription);
-
-    $app.get('/download/collection/:name/:target', async (req, res) => {
-        const { target } = req.params;
-        if (target) {
-            req.query.target = target;
-            $.info(`使用路由指定目标: ${target}`);
-        }
-        await downloadCollection(req, res);
-    });
     $app.get('/download/collection/:name', downloadCollection);
-    $app.get('/download/:name/:target', async (req, res) => {
-        const { target } = req.params;
-        if (target) {
-            req.query.target = target;
-            $.info(`使用路由指定目标: ${target}`);
-        }
-        await downloadSubscription(req, res);
-    });
     $app.get('/download/:name', downloadSubscription);
-
-    $app.get(
-        '/download/collection/:name/api/v1/server/details',
-        async (req, res) => {
-            req.query.platform = 'JSON';
-            req.query.produceType = 'internal';
-            req.query.resultFormat = 'nezha';
-            await downloadCollection(req, res);
-        },
-    );
-    $app.get('/download/:name/api/v1/server/details', async (req, res) => {
-        req.query.platform = 'JSON';
-        req.query.produceType = 'internal';
-        req.query.resultFormat = 'nezha';
-        await downloadSubscription(req, res);
-    });
-    $app.get(
-        '/download/collection/:name/api/v1/monitor/:nezhaIndex',
-        async (req, res) => {
-            req.query.platform = 'JSON';
-            req.query.produceType = 'internal';
-            req.query.resultFormat = 'nezha-monitor';
-            await downloadCollection(req, res);
-        },
-    );
-    $app.get('/download/:name/api/v1/monitor/:nezhaIndex', async (req, res) => {
-        req.query.platform = 'JSON';
-        req.query.produceType = 'internal';
-        req.query.resultFormat = 'nezha-monitor';
-        await downloadSubscription(req, res);
-    });
 }
 
 async function downloadSubscription(req, res) {
-    let { name, nezhaIndex } = req.params;
+    let { name } = req.params;
     name = decodeURIComponent(name);
-    nezhaIndex = decodeURIComponent(nezhaIndex);
-
-    const useMihomoExternal = req.query.target === 'SurgeMac';
 
     const platform =
         req.query.target || getPlatformFromHeaders(req.headers) || 'JSON';
-    const reqUA = req.headers['user-agent'] || req.headers['User-Agent'];
-    $.info(
-        `正在下载订阅：${name}\n请求 User-Agent: ${reqUA}\n请求 target: ${req.query.target}\n实际输出: ${platform}`,
-    );
-    let {
-        url,
-        ua,
-        content,
-        mergeSources,
-        ignoreFailedRemoteSub,
-        produceType,
-        includeUnsupportedProxy,
-        resultFormat,
-        proxy,
-        noCache,
-    } = req.query;
-    let $options = {
-        _req: {
-            method: req.method,
-            url: req.url,
-            path: req.path,
-            query: req.query,
-            params: req.params,
-            headers: req.headers,
-            body: req.body,
-        },
-    };
-    if (req.query.$options) {
-        try {
-            // 支持 `#${encodeURIComponent(JSON.stringify({arg1: "1"}))}`
-            $options = JSON.parse(decodeURIComponent(req.query.$options));
-        } catch (e) {
-            for (const pair of req.query.$options.split('&')) {
-                const key = pair.split('=')[0];
-                const value = pair.split('=')[1];
-                // 部分兼容之前的逻辑 const value = pair.split('=')[1] || true;
-                $options[key] =
-                    value == null || value === ''
-                        ? true
-                        : decodeURIComponent(value);
-            }
-        }
-        $.info(`传入 $options: ${JSON.stringify($options)}`);
-    }
-    if (url) {
-        url = decodeURIComponent(url);
-        $.info(`指定远程订阅 URL: ${url}`);
-        if (!/^https?:\/\//.test(url)) {
-            content = url;
-            $.info(`URL 不是链接，视为本地订阅`);
-        }
-    }
-    if (content) {
-        content = decodeURIComponent(content);
-        $.info(`指定本地订阅: ${content}`);
-    }
-    if (proxy) {
-        proxy = decodeURIComponent(proxy);
-        $.info(`指定远程订阅使用代理/策略 proxy: ${proxy}`);
-    }
-    if (ua) {
-        ua = decodeURIComponent(ua);
-        $.info(`指定远程订阅 User-Agent: ${ua}`);
-    }
 
-    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}`,
-        );
-    }
-
-    if (
-        !includeUnsupportedProxy &&
-        shouldIncludeUnsupportedProxy(platform, reqUA)
-    ) {
-        includeUnsupportedProxy = true;
-        $.info(
-            `当前客户端可包含官方/商店版/未续费订阅不支持的协议: ${includeUnsupportedProxy}`,
-        );
-    }
-
-    if (useMihomoExternal) {
-        $.info(`手动指定了 target 为 SurgeMac, 将使用 Mihomo External`);
-    }
-
-    if (noCache) {
-        $.info(`指定不使用缓存: ${noCache}`);
-    }
+    $.info(`正在下载订阅：${name}`);
 
     const allSubs = $.read(SUBS_KEY);
     const sub = findByName(allSubs, name);
     if (sub) {
         try {
-            const passThroughUA = sub.passThroughUA;
-            if (passThroughUA) {
-                $.info(
-                    `订阅开启了透传 User-Agent, 使用请求的 User-Agent: ${reqUA}`,
-                );
-                ua = reqUA;
-            }
-            let output = await produceArtifact({
+            const output = await produceArtifact({
                 type: 'subscription',
                 name,
                 platform,
-                url,
-                ua,
-                content,
-                mergeSources,
-                ignoreFailedRemoteSub,
-                produceType,
-                produceOpts: {
-                    'include-unsupported-proxy': includeUnsupportedProxy,
-                    useMihomoExternal,
-                },
-                $options,
-                proxy,
-                noCache,
             });
-            let flowInfo;
-            if (
-                sub.source !== 'local' ||
-                ['localFirst', 'remoteFirst'].includes(sub.mergeSources)
-            ) {
-                try {
-                    url =
-                        `${url || sub.url}`
-                            .split(/[\r\n]+/)
-                            .map((i) => i.trim())
-                            .filter((i) => i.length)?.[0] || '';
 
-                    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 && /^https?/.test(url)) {
-                        // forward flow headers
-                        flowInfo = await getFlowHeaders(
-                            $arguments?.insecure ? `${url}#insecure` : url,
-                            $arguments.flowUserAgent,
-                            undefined,
-                            proxy || sub.proxy,
-                            $arguments.flowUrl,
-                        );
-                        if (flowInfo) {
-                            res.set(
-                                'subscription-userinfo',
-                                normalizeFlowHeader(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);
                 }
             }
-            if (sub.subUserinfo) {
-                let subUserInfo;
-                if (/^https?:\/\//.test(sub.subUserinfo)) {
-                    try {
-                        subUserInfo = await getFlowHeaders(
-                            undefined,
-                            undefined,
-                            undefined,
-                            proxy || sub.proxy,
-                            sub.subUserinfo,
-                        );
-                    } catch (e) {
-                        $.error(
-                            `订阅 ${name} 使用自定义流量链接 ${
-                                sub.subUserinfo
-                            } 获取流量信息时发生错误: ${JSON.stringify(e)}`,
-                        );
-                    }
-                } else {
-                    subUserInfo = sub.subUserinfo;
-                }
-                res.set(
-                    'subscription-userinfo',
-                    normalizeFlowHeader(
-                        [subUserInfo, flowInfo].filter((i) => i).join(';'),
-                    ),
-                );
-            }
 
             if (platform === 'JSON') {
-                if (resultFormat === 'nezha') {
-                    output = nezhaTransform(output);
-                } else if (resultFormat === 'nezha-monitor') {
-                    nezhaIndex = /^\d+$/.test(nezhaIndex)
-                        ? parseInt(nezhaIndex, 10)
-                        : output.findIndex((i) => i.name === nezhaIndex);
-                    output = await nezhaMonitor(
-                        output[nezhaIndex],
-                        nezhaIndex,
-                        req.query,
-                    );
-                }
                 res.set('Content-Type', 'application/json;charset=utf-8').send(
                     output,
                 );
@@ -335,20 +50,20 @@ 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)}`,
                 ),
             );
         }
     } else {
-        $.error(`🌍 Sub-Store 下载订阅失败\n❌ 未找到订阅：${name}！`);
+        $.notify(`🌍 Sub-Store 下载订阅失败`, `❌ 未找到订阅：${name}！`);
         failed(
             res,
             new ResourceNotFoundError(
@@ -361,239 +76,39 @@ async function downloadSubscription(req, res) {
 }
 
 async function downloadCollection(req, res) {
-    let { name, nezhaIndex } = req.params;
+    let { name } = req.params;
     name = decodeURIComponent(name);
-    nezhaIndex = decodeURIComponent(nezhaIndex);
-
-    const useMihomoExternal = req.query.target === 'SurgeMac';
 
     const platform =
         req.query.target || getPlatformFromHeaders(req.headers) || 'JSON';
 
     const allCols = $.read(COLLECTIONS_KEY);
     const collection = findByName(allCols, name);
-    const reqUA = req.headers['user-agent'] || req.headers['User-Agent'];
-    $.info(
-        `正在下载组合订阅：${name}\n请求 User-Agent: ${reqUA}\n请求 target: ${req.query.target}\n实际输出: ${platform}`,
-    );
 
-    let {
-        ignoreFailedRemoteSub,
-        produceType,
-        includeUnsupportedProxy,
-        resultFormat,
-        proxy,
-        noCache,
-    } = req.query;
-
-    let $options = {
-        _req: {
-            method: req.method,
-            url: req.url,
-            path: req.path,
-            query: req.query,
-            params: req.params,
-            headers: req.headers,
-            body: req.body,
-        },
-    };
-    if (req.query.$options) {
-        try {
-            // 支持 `#${encodeURIComponent(JSON.stringify({arg1: "1"}))}`
-            $options = JSON.parse(decodeURIComponent(req.query.$options));
-        } catch (e) {
-            for (const pair of req.query.$options.split('&')) {
-                const key = pair.split('=')[0];
-                const value = pair.split('=')[1];
-                // 部分兼容之前的逻辑 const value = pair.split('=')[1] || true;
-                $options[key] =
-                    value == null || value === ''
-                        ? true
-                        : decodeURIComponent(value);
-            }
-        }
-        $.info(`传入 $options: ${JSON.stringify($options)}`);
-    }
-
-    if (proxy) {
-        proxy = decodeURIComponent(proxy);
-        $.info(`指定远程订阅使用代理/策略 proxy: ${proxy}`);
-    }
-
-    if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
-        ignoreFailedRemoteSub = decodeURIComponent(ignoreFailedRemoteSub);
-        $.info(`指定忽略失败的远程订阅: ${ignoreFailedRemoteSub}`);
-    }
-    if (produceType) {
-        produceType = decodeURIComponent(produceType);
-        $.info(`指定生产类型: ${produceType}`);
-    }
-
-    if (includeUnsupportedProxy) {
-        includeUnsupportedProxy = decodeURIComponent(includeUnsupportedProxy);
-        $.info(
-            `包含官方/商店版/未续费订阅不支持的协议: ${includeUnsupportedProxy}`,
-        );
-    }
-    if (
-        !includeUnsupportedProxy &&
-        shouldIncludeUnsupportedProxy(platform, reqUA)
-    ) {
-        includeUnsupportedProxy = true;
-        $.info(
-            `当前客户端可包含官方/商店版/未续费订阅不支持的协议: ${includeUnsupportedProxy}`,
-        );
-    }
-    if (useMihomoExternal) {
-        $.info(`手动指定了 target 为 SurgeMac, 将使用 Mihomo External`);
-    }
-    if (noCache) {
-        $.info(`指定不使用缓存: ${noCache}`);
-    }
+    $.info(`正在下载组合订阅：${name}`);
 
     if (collection) {
         try {
-            let output = await produceArtifact({
+            const output = await produceArtifact({
                 type: 'collection',
                 name,
                 platform,
-                ignoreFailedRemoteSub,
-                produceType,
-                produceOpts: {
-                    'include-unsupported-proxy': includeUnsupportedProxy,
-                    useMihomoExternal,
-                },
-                $options,
-                proxy,
-                noCache,
-                ua: reqUA,
             });
-            let subUserInfoOfSub;
+
             // forward flow header from the first subscription in this collection
             const allSubs = $.read(SUBS_KEY);
             const subnames = collection.subscriptions;
             if (subnames.length > 0) {
                 const sub = findByName(allSubs, subnames[0]);
-                if (
-                    sub.source !== 'local' ||
-                    ['localFirst', 'remoteFirst'].includes(sub.mergeSources)
-                ) {
-                    try {
-                        let url =
-                            `${sub.url}`
-                                .split(/[\r\n]+/)
-                                .map((i) => i.trim())
-                                .filter((i) => i.length)?.[0] || '';
-
-                        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 && /^https?:/.test(url)) {
-                            subUserInfoOfSub = await getFlowHeaders(
-                                $arguments?.insecure ? `${url}#insecure` : url,
-                                $arguments.flowUserAgent,
-                                undefined,
-                                proxy || sub.proxy || collection.proxy,
-                                $arguments.flowUrl,
-                            );
-                        }
-                    } catch (err) {
-                        $.error(
-                            `组合订阅 ${name} 中的子订阅 ${
-                                sub.name
-                            } 获取流量信息时发生错误: ${err.message ?? err}`,
-                        );
+                if (sub.source !== 'local') {
+                    const flowInfo = await getFlowHeaders(sub.url);
+                    if (flowInfo) {
+                        res.set('subscription-userinfo', flowInfo);
                     }
                 }
-                if (sub.subUserinfo) {
-                    let subUserInfo;
-                    if (/^https?:\/\//.test(sub.subUserinfo)) {
-                        try {
-                            subUserInfo = await getFlowHeaders(
-                                undefined,
-                                undefined,
-                                undefined,
-                                proxy || sub.proxy,
-                                sub.subUserinfo,
-                            );
-                        } catch (e) {
-                            $.error(
-                                `组合订阅 ${name} 使用自定义流量链接 ${
-                                    sub.subUserinfo
-                                } 获取流量信息时发生错误: ${JSON.stringify(e)}`,
-                            );
-                        }
-                    } else {
-                        subUserInfo = sub.subUserinfo;
-                    }
-                    subUserInfoOfSub = [subUserInfo, subUserInfoOfSub]
-                        .filter((i) => i)
-                        .join('; ');
-                }
             }
 
-            $.info(`组合订阅 ${name} 透传的的流量信息: ${subUserInfoOfSub}`);
-
-            let subUserInfoOfCol;
-            if (/^https?:\/\//.test(collection.subUserinfo)) {
-                try {
-                    subUserInfoOfCol = await getFlowHeaders(
-                        undefined,
-                        undefined,
-                        undefined,
-                        proxy || collection.proxy,
-                        collection.subUserinfo,
-                    );
-                } catch (e) {
-                    $.error(
-                        `组合订阅 ${name} 使用自定义流量链接 ${
-                            collection.subUserinfo
-                        } 获取流量信息时发生错误: ${JSON.stringify(e)}`,
-                    );
-                }
-            } else {
-                subUserInfoOfCol = collection.subUserinfo;
-            }
-            const subUserInfo = [subUserInfoOfCol, subUserInfoOfSub]
-                .filter((i) => i)
-                .join('; ');
-            if (subUserInfo) {
-                res.set(
-                    'subscription-userinfo',
-                    normalizeFlowHeader(subUserInfo),
-                );
-            }
             if (platform === 'JSON') {
-                if (resultFormat === 'nezha') {
-                    output = nezhaTransform(output);
-                } else if (resultFormat === 'nezha-monitor') {
-                    nezhaIndex = /^\d+$/.test(nezhaIndex)
-                        ? parseInt(nezhaIndex, 10)
-                        : output.findIndex((i) => i.name === nezhaIndex);
-                    output = await nezhaMonitor(
-                        output[nezhaIndex],
-                        nezhaIndex,
-                        req.query,
-                    );
-                }
                 res.set('Content-Type', 'application/json;charset=utf-8').send(
                     output,
                 );
@@ -611,12 +126,12 @@ async function downloadCollection(req, res) {
                 new InternalServerError(
                     'INTERNAL_SERVER_ERROR',
                     `Failed to download collection: ${name}`,
-                    `Reason: ${err.message ?? err}`,
+                    `Reason: ${JSON.stringify(err)}`,
                 ),
             );
         }
     } else {
-        $.error(
+        $.notify(
             `🌍 Sub-Store 下载组合订阅失败`,
             `❌ 未找到组合订阅：${name}！`,
         );
@@ -630,149 +145,3 @@ async function downloadCollection(req, res) {
         );
     }
 }
-
-async function nezhaMonitor(proxy, index, query) {
-    const result = {
-        code: 0,
-        message: 'success',
-        result: [],
-    };
-
-    try {
-        const { isLoon, isSurge } = $.env;
-        if (!isLoon && !isSurge)
-            throw new Error('仅支持 Loon 和 Surge(ability=http-client-policy)');
-        const node = ProxyUtils.produce([proxy], isLoon ? 'Loon' : 'Surge');
-        if (!node) throw new Error('当前客户端不兼容此节点');
-        const monitors = proxy._monitors || [
-            {
-                name: 'Cloudflare',
-                url: 'http://cp.cloudflare.com/generate_204',
-                method: 'HEAD',
-                number: 3,
-                timeout: 2000,
-            },
-            {
-                name: 'Google',
-                url: 'http://www.google.com/generate_204',
-                method: 'HEAD',
-                number: 3,
-                timeout: 2000,
-            },
-        ];
-        const number =
-            query.number || Math.max(...monitors.map((i) => i.number)) || 3;
-        for (const monitor of monitors) {
-            const interval = 10 * 60 * 1000;
-            const data = {
-                monitor_id: monitors.indexOf(monitor),
-                server_id: index,
-                monitor_name: monitor.name,
-                server_name: proxy.name,
-                created_at: [],
-                avg_delay: [],
-            };
-            for (let index = 0; index < number; index++) {
-                const startedAt = Date.now();
-                try {
-                    await $.http[(monitor.method || 'HEAD').toLowerCase()]({
-                        timeout: monitor.timeout || 2000,
-                        url: monitor.url,
-                        'policy-descriptor': node,
-                        node,
-                    });
-                    const latency = Date.now() - startedAt;
-                    $.info(`${monitor.name} latency: ${latency}`);
-                    data.avg_delay.push(latency);
-                } catch (e) {
-                    $.error(e);
-                    data.avg_delay.push(0);
-                }
-
-                data.created_at.push(
-                    Date.now() - interval * (monitor.number - index - 1),
-                );
-            }
-
-            result.result.push(data);
-        }
-    } catch (e) {
-        $.error(e);
-        result.result.push({
-            monitor_id: 0,
-            server_id: 0,
-            monitor_name: `❌ ${e.message ?? e}`,
-            server_name: proxy.name,
-            created_at: [Date.now()],
-            avg_delay: [0],
-        });
-    }
-
-    return JSON.stringify(result, null, 2);
-}
-function nezhaTransform(output) {
-    const result = {
-        code: 0,
-        message: 'success',
-        result: [],
-    };
-    output.map((proxy, index) => {
-        // 如果节点上有数据 就取节点上的数据
-        let CountryCode = proxy._geo?.countryCode || proxy._geo?.country;
-        // 简单判断下
-        if (!/^[a-z]{2}$/i.test(CountryCode)) {
-            CountryCode = getISO(proxy.name);
-        }
-        // 简单判断下
-        if (/^[a-z]{2}$/i.test(CountryCode)) {
-            // 如果节点上有数据 就取节点上的数据
-            let now = Math.round(new Date().getTime() / 1000);
-            let time = proxy._unavailable ? 0 : now;
-
-            const uptime = parseInt(proxy._uptime || 0, 10);
-
-            result.result.push({
-                id: index,
-                name: proxy.name,
-                tag: `${proxy._tag ?? ''}`,
-                last_active: time,
-                // 暂时不用处理 现在 VPings App 端的接口支持域名查询
-                // 其他场景使用 自己在 Sub-Store 加一步域名解析
-                valid_ip: proxy._IP || proxy.server,
-                ipv4: proxy._IPv4 || proxy.server,
-                ipv6: proxy._IPv6 || (isIPv6(proxy.server) ? proxy.server : ''),
-                host: {
-                    Platform: 'Sub-Store',
-                    PlatformVersion: env.version,
-                    CPU: [],
-                    MemTotal: 1024,
-                    DiskTotal: 1024,
-                    SwapTotal: 1024,
-                    Arch: '',
-                    Virtualization: '',
-                    BootTime: now - uptime,
-                    CountryCode, // 目前需要
-                    Version: '0.0.1',
-                },
-                status: {
-                    CPU: 0,
-                    MemUsed: 0,
-                    SwapUsed: 0,
-                    DiskUsed: 0,
-                    NetInTransfer: 0,
-                    NetOutTransfer: 0,
-                    NetInSpeed: 0,
-                    NetOutSpeed: 0,
-                    Uptime: uptime,
-                    Load1: 0,
-                    Load5: 0,
-                    Load15: 0,
-                    TcpConnCount: 0,
-                    UdpConnCount: 0,
-                    ProcessCount: 0,
-                },
-            });
-        }
-    });
-    return JSON.stringify(result, null, 2);
-}

backend/src/restful/file.js

@@ -1,327 +0,0 @@
-import { deleteByName, findByName, updateByName } from '@/utils/database';
-import { getFlowHeaders, normalizeFlowHeader } from '@/utils/flow';
-import { FILES_KEY, ARTIFACTS_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';
-import { formatDateTime } from '@/utils';
-
-export default function register($app) {
-    if (!$.read(FILES_KEY)) $.write([], FILES_KEY);
-
-    $app.get('/share/file/:name', getFile);
-
-    $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);
-    const reqUA = req.headers['user-agent'] || req.headers['User-Agent'];
-    $.info(`正在下载文件：${name}\n请求 User-Agent: ${reqUA}`);
-    let {
-        url,
-        subInfoUrl,
-        subInfoUserAgent,
-        ua,
-        content,
-        mergeSources,
-        ignoreFailedRemoteFile,
-        proxy,
-        noCache,
-        produceType,
-    } = req.query;
-    let $options = {
-        _req: {
-            method: req.method,
-            url: req.url,
-            path: req.path,
-            query: req.query,
-            params: req.params,
-            headers: req.headers,
-            body: req.body,
-        },
-    };
-    if (req.query.$options) {
-        try {
-            // 支持 `#${encodeURIComponent(JSON.stringify({arg1: "1"}))}`
-            $options = JSON.parse(decodeURIComponent(req.query.$options));
-        } catch (e) {
-            for (const pair of req.query.$options.split('&')) {
-                const key = pair.split('=')[0];
-                const value = pair.split('=')[1];
-                // 部分兼容之前的逻辑 const value = pair.split('=')[1] || true;
-                $options[key] =
-                    value == null || value === ''
-                        ? true
-                        : decodeURIComponent(value);
-            }
-        }
-        $.info(`传入 $options: ${JSON.stringify($options)}`);
-    }
-    if (url) {
-        url = decodeURIComponent(url);
-        $.info(`指定远程文件 URL: ${url}`);
-    }
-    if (proxy) {
-        proxy = decodeURIComponent(proxy);
-        $.info(`指定远程订阅使用代理/策略 proxy: ${proxy}`);
-    }
-    if (ua) {
-        ua = decodeURIComponent(ua);
-        $.info(`指定远程文件 User-Agent: ${ua}`);
-    }
-    if (subInfoUrl) {
-        subInfoUrl = decodeURIComponent(subInfoUrl);
-        $.info(`指定获取流量的 subInfoUrl: ${subInfoUrl}`);
-    }
-    if (subInfoUserAgent) {
-        subInfoUserAgent = decodeURIComponent(subInfoUserAgent);
-        $.info(`指定获取流量的 subInfoUserAgent: ${subInfoUserAgent}`);
-    }
-    if (content) {
-        content = decodeURIComponent(content);
-        $.info(`指定本地文件: ${content}`);
-    }
-    if (mergeSources) {
-        mergeSources = decodeURIComponent(mergeSources);
-        $.info(`指定合并来源: ${mergeSources}`);
-    }
-    if (ignoreFailedRemoteFile != null && ignoreFailedRemoteFile !== '') {
-        ignoreFailedRemoteFile = decodeURIComponent(ignoreFailedRemoteFile);
-        $.info(`指定忽略失败的远程文件: ${ignoreFailedRemoteFile}`);
-    }
-    if (noCache) {
-        $.info(`指定不使用缓存: ${noCache}`);
-    }
-    if (produceType) {
-        produceType = decodeURIComponent(produceType);
-        $.info(`指定生产类型: ${produceType}`);
-    }
-
-    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,
-                $options,
-                proxy,
-                noCache,
-                produceType,
-                all: true,
-            });
-
-            try {
-                subInfoUrl = subInfoUrl || file.subInfoUrl;
-                if (subInfoUrl) {
-                    // forward flow headers
-                    const flowInfo = await getFlowHeaders(
-                        subInfoUrl,
-                        subInfoUserAgent || file.subInfoUserAgent,
-                        undefined,
-                        proxy || file.proxy,
-                    );
-                    if (flowInfo) {
-                        res.set(
-                            'subscription-userinfo',
-                            normalizeFlowHeader(flowInfo),
-                        );
-                    }
-                }
-            } catch (err) {
-                $.error(
-                    `文件 ${name} 获取流量信息时发生错误: ${JSON.stringify(
-                        err,
-                    )}`,
-                );
-            }
-            if (file.download) {
-                res.set(
-                    'Content-Disposition',
-                    `attachment; filename*=UTF-8''${encodeURIComponent(
-                        file.displayName || file.name,
-                    )}`,
-                );
-            }
-            res.set('Content-Type', 'text/plain; charset=utf-8');
-            if (output?.$options?._res?.headers) {
-                Object.entries(output.$options._res.headers).forEach(
-                    ([key, value]) => {
-                        res.set(key, value);
-                    },
-                );
-            }
-            res.send(output?.$content ?? '');
-        } 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 {
-        $.error(`🌍 Sub-Store 下载文件失败\n❌ 未找到文件：${name}！`);
-        failed(
-            res,
-            new ResourceNotFoundError(
-                'RESOURCE_NOT_FOUND',
-                `File ${name} does not exist!`,
-            ),
-            404,
-        );
-    }
-}
-function getWholeFile(req, res) {
-    let { name } = req.params;
-    let { raw } = req.query;
-    name = decodeURIComponent(name);
-    const allFiles = $.read(FILES_KEY);
-    const file = findByName(allFiles, name);
-    if (file) {
-        if (raw) {
-            res.set('content-type', 'application/json')
-                .set(
-                    'content-disposition',
-                    `attachment; filename="${encodeURIComponent(
-                        `sub-store_file_${name}_${formatDateTime(
-                            new Date(),
-                        )}.json`,
-                    )}"`,
-                )
-                .send(JSON.stringify(file));
-        } else {
-            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}...`);
-
-        if (name !== newFile.name) {
-            // update all artifacts referring this collection
-            const allArtifacts = $.read(ARTIFACTS_KEY) || [];
-            for (const artifact of allArtifacts) {
-                if (
-                    artifact.type === 'file' &&
-                    artifact.source === oldFile.name
-                ) {
-                    artifact.source = newFile.name;
-                }
-            }
-            $.write(allArtifacts, ARTIFACTS_KEY);
-        }
-
-        updateByName(allFiles, name, newFile);
-        $.write(allFiles, FILES_KEY);
-        success(res, newFile);
-    } 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,19 +1,9 @@
-import { Base64 } from 'js-base64';
-import _ from 'lodash';
 import express from '@/vendor/express';
 import $ from '@/core/app';
-import migrate from '@/utils/migration';
-import download, { downloadFile } from '@/utils/download';
-import { syncArtifacts, produceArtifact } from '@/restful/sync';
-import { gistBackupAction } from '@/restful/miscs';
-import { TOKENS_KEY } from '@/constants';
 
 import registerSubscriptionRoutes from './subscriptions';
 import registerCollectionRoutes from './collections';
 import registerArtifactRoutes from './artifacts';
-import registerFileRoutes from './file';
-import registerTokenRoutes from './token';
-import registerModuleRoutes from './module';
 import registerSyncRoutes from './sync';
 import registerDownloadRoutes from './download';
 import registerSettingRoutes from './settings';
@@ -21,87 +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 });
-    if ($.env.isNode) {
-        const be_merge = eval('process.env.SUB_STORE_BACKEND_MERGE');
-        const be_prefix = eval('process.env.SUB_STORE_BACKEND_PREFIX');
-        const fe_be_path = eval('process.env.SUB_STORE_FRONTEND_BACKEND_PATH');
-        const fe_path = eval('process.env.SUB_STORE_FRONTEND_PATH');
-        if (be_prefix || be_merge) {
-            if (!fe_be_path.startsWith('/')) {
-                throw new Error(
-                    'SUB_STORE_FRONTEND_BACKEND_PATH should start with /',
-                );
-            }
-            if (be_merge) {
-                $.info(`[BACKEND] MERGE mode is [ON].`);
-                $.info(`[BACKEND && FRONTEND] ${host}:${port}`);
-            }
-            $.info(`[BACKEND PREFIX] ${host}:${port}${fe_be_path}`);
-            $app.use((req, res, next) => {
-                if (req.path.startsWith(fe_be_path)) {
-                    req.url = req.url.replace(fe_be_path, '') || '/';
-                    if (be_merge && req.url.startsWith('/api/')) {
-                        req.query['share'] = 'true';
-                    }
-                    next();
-                    return;
-                }
-                const pathname =
-                    decodeURIComponent(req._parsedUrl.pathname) || '/';
-                if (
-                    be_merge &&
-                    req.path.startsWith('/share/') &&
-                    req.query.token
-                ) {
-                    if (req.method.toLowerCase() !== 'get') {
-                        res.status(405).send('Method not allowed');
-                        return;
-                    }
-                    const tokens = $.read(TOKENS_KEY) || [];
-                    const token = tokens.find(
-                        (t) =>
-                            t.token === req.query.token &&
-                            `/share/${t.type}/${t.name}` === pathname &&
-                            (t.exp == null || t.exp > Date.now()),
-                    );
-                    if (token) {
-                        next();
-                        return;
-                    }
-                }
-                if (be_merge && fe_path && req.path.indexOf('/', 1) == -1) {
-                    if (req.path.indexOf('.') == -1) {
-                        req.url = '/index.html';
-                    }
-                    const express_ = eval(`require("express")`);
-                    const mime_ = eval(`require("mime-types")`);
-                    const path_ = eval(`require("path")`);
-                    const staticFileMiddleware = express_.static(fe_path, {
-                        setHeaders: (res, path) => {
-                            const type = mime_.contentType(path_.extname(path));
-                            if (type) {
-                                res.set('Content-Type', type);
-                            }
-                        },
-                    });
-                    staticFileMiddleware(req, res, next);
-                    return;
-                }
-                res.status(403).end('Forbbiden');
-                return;
-            });
-        }
-    }
+    const $app = express({ substore: $ });
+
     // register routes
     registerCollectionRoutes($app);
     registerSubscriptionRoutes($app);
@@ -110,366 +23,9 @@ export default function serve() {
     registerSortingRoutes($app);
     registerSettingRoutes($app);
     registerArtifactRoutes($app);
-    registerFileRoutes($app);
-    registerTokenRoutes($app);
-    registerModuleRoutes($app);
     registerSyncRoutes($app);
     registerNodeInfoRoutes($app);
     registerMiscRoutes($app);
-    registerParserRoutes($app);
 
     $app.start();
-
-    if ($.env.isNode) {
-        // Deprecated: SUB_STORE_BACKEND_CRON, SUB_STORE_CRON
-        const backend_sync_cron = eval(
-            'process.env.SUB_STORE_BACKEND_SYNC_CRON',
-        );
-
-        if (backend_sync_cron) {
-            $.info(`[SYNC CRON] ${backend_sync_cron} enabled`);
-            const { CronJob } = eval(`require("cron")`);
-            new CronJob(
-                backend_sync_cron,
-                async function () {
-                    try {
-                        $.info(`[SYNC CRON] ${backend_sync_cron} started`);
-                        await syncArtifacts();
-                        $.info(`[SYNC CRON] ${backend_sync_cron} finished`);
-                    } catch (e) {
-                        $.error(
-                            `[SYNC CRON] ${backend_sync_cron} error: ${
-                                e.message ?? e
-                            }`,
-                        );
-                    }
-                }, // onTick
-                null, // onComplete
-                true, // start
-                // 'Asia/Shanghai' // timeZone
-            );
-        } else {
-            if (eval('process.env.SUB_STORE_BACKEND_CRON')) {
-                $.error(
-                    `[SYNC CRON] SUB_STORE_BACKEND_CRON 已弃用, 请使用 SUB_STORE_BACKEND_SYNC_CRON`,
-                );
-            }
-            if (eval('process.env.SUB_STORE_CRON')) {
-                $.error(
-                    `[SYNC CRON] SUB_STORE_CRON 已弃用, 请使用 SUB_STORE_BACKEND_SYNC_CRON`,
-                );
-            }
-        }
-        // 格式: 0 */2 * * *,sub,a;0 */3 * * *,col,b
-        // 每 2 小时处理一次单条订阅 a, 每 3 小时处理一次组合订阅 b
-        const produce_cron = eval('process.env.SUB_STORE_PRODUCE_CRON');
-        if (produce_cron) {
-            $.info(`[PRODUCE CRON] ${produce_cron} enabled`);
-            const { CronJob } = eval(`require("cron")`);
-            produce_cron.split(/\s*;\s*/).map((item) => {
-                const [cron, type, name] = item.split(/\s*,\s*/);
-                new CronJob(
-                    cron.trim(),
-                    async function () {
-                        try {
-                            $.info(
-                                `[PRODUCE CRON] ${type} ${name} ${cron} started`,
-                            );
-                            await produceArtifact({ type, name });
-                            $.info(
-                                `[PRODUCE CRON] ${type} ${name} ${cron} finished`,
-                            );
-                        } catch (e) {
-                            $.error(
-                                `[PRODUCE CRON] ${type} ${name} ${cron} error: ${
-                                    e.message ?? e
-                                }`,
-                            );
-                        }
-                    }, // onTick
-                    null, // onComplete
-                    true, // start
-                    // 'Asia/Shanghai' // timeZone
-                );
-            });
-        }
-        const backend_download_cron = eval(
-            'process.env.SUB_STORE_BACKEND_DOWNLOAD_CRON',
-        );
-        if (backend_download_cron) {
-            $.info(`[DOWNLOAD CRON] ${backend_download_cron} enabled`);
-            const { CronJob } = eval(`require("cron")`);
-            new CronJob(
-                backend_download_cron,
-                async function () {
-                    try {
-                        $.info(
-                            `[DOWNLOAD CRON] ${backend_download_cron} started`,
-                        );
-                        await gistBackupAction('download');
-                        $.info(
-                            `[DOWNLOAD CRON] ${backend_download_cron} finished`,
-                        );
-                    } catch (e) {
-                        $.error(
-                            `[DOWNLOAD CRON] ${backend_download_cron} error: ${
-                                e.message ?? e
-                            }`,
-                        );
-                    }
-                }, // onTick
-                null, // onComplete
-                true, // start
-                // 'Asia/Shanghai' // timeZone
-            );
-        }
-        const backend_upload_cron = eval(
-            'process.env.SUB_STORE_BACKEND_UPLOAD_CRON',
-        );
-        if (backend_upload_cron) {
-            $.info(`[UPLOAD CRON] ${backend_upload_cron} enabled`);
-            const { CronJob } = eval(`require("cron")`);
-            new CronJob(
-                backend_upload_cron,
-                async function () {
-                    try {
-                        $.info(`[UPLOAD CRON] ${backend_upload_cron} started`);
-                        await gistBackupAction('upload');
-                        $.info(`[UPLOAD CRON] ${backend_upload_cron} finished`);
-                    } catch (e) {
-                        $.error(
-                            `[UPLOAD CRON] ${backend_upload_cron} error: ${
-                                e.message ?? e
-                            }`,
-                        );
-                    }
-                }, // onTick
-                null, // onComplete
-                true, // start
-                // 'Asia/Shanghai' // timeZone
-            );
-        }
-        const mmdb_cron = eval('process.env.SUB_STORE_MMDB_CRON');
-        const countryFile = eval('process.env.SUB_STORE_MMDB_COUNTRY_PATH');
-        const countryUrl = eval('process.env.SUB_STORE_MMDB_COUNTRY_URL');
-        const asnFile = eval('process.env.SUB_STORE_MMDB_ASN_PATH');
-        const asnUrl = eval('process.env.SUB_STORE_MMDB_ASN_URL');
-        if (mmdb_cron && ((countryFile && countryUrl) || (asnFile && asnUrl))) {
-            $.info(`[MMDB CRON] ${mmdb_cron} enabled`);
-            const { CronJob } = eval(`require("cron")`);
-            new CronJob(
-                mmdb_cron,
-                async function () {
-                    try {
-                        $.info(`[MMDB CRON] ${mmdb_cron} started`);
-                        if (countryFile && countryUrl) {
-                            try {
-                                $.info(
-                                    `[MMDB CRON] downloading ${countryUrl} to ${countryFile}`,
-                                );
-                                await downloadFile(countryUrl, countryFile);
-                            } catch (e) {
-                                $.error(
-                                    `[MMDB CRON] ${countryUrl} download failed: ${
-                                        e.message ?? e
-                                    }`,
-                                );
-                            }
-                        }
-                        if (asnFile && asnUrl) {
-                            try {
-                                $.info(
-                                    `[MMDB CRON] downloading ${asnUrl} to ${asnFile}`,
-                                );
-                                await downloadFile(asnUrl, asnFile);
-                            } catch (e) {
-                                $.error(
-                                    `[MMDB CRON] ${asnUrl} download failed: ${
-                                        e.message ?? e
-                                    }`,
-                                );
-                            }
-                        }
-
-                        $.info(`[MMDB CRON] ${mmdb_cron} finished`);
-                    } catch (e) {
-                        $.error(
-                            `[MMDB CRON] ${mmdb_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 data_url_post = eval('process.env.SUB_STORE_DATA_URL_POST');
-        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'),
-        );
-        const be_merge = eval('process.env.SUB_STORE_BACKEND_MERGE');
-        if (fe_path && !be_merge) {
-            try {
-                fs.accessSync(path.join(fe_abs_path, 'index.html'));
-            } catch (e) {
-                $.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 = '/api/';
-            let be_download = '/download/';
-            let be_share = '/share/';
-            let be_download_rewrite = '';
-            let be_api_rewrite = '';
-            let be_share_rewrite = `${be_share}:type/:name`;
-            let prefix = eval('process.env.SUB_STORE_BACKEND_PREFIX')
-                ? fe_be_path
-                : '';
-            if (fe_be_path) {
-                if (!fe_be_path.startsWith('/')) {
-                    throw new Error(
-                        '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_share_rewrite,
-                    createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}${prefix}`,
-                        changeOrigin: true,
-                        pathRewrite: async (path, req) => {
-                            if (req.method.toLowerCase() !== 'get')
-                                throw new Error('Method not allowed');
-                            const tokens = $.read(TOKENS_KEY) || [];
-                            const token = tokens.find(
-                                (t) =>
-                                    t.token === req.query.token &&
-                                    t.type === req.params.type &&
-                                    t.name === req.params.name &&
-                                    (t.exp == null || t.exp > Date.now()),
-                            );
-                            if (!token) throw new Error('Forbbiden');
-                            return req.originalUrl;
-                        },
-                    }),
-                );
-                app.use(
-                    be_api_rewrite,
-                    createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}${prefix}${be_api}`,
-                        pathRewrite: async (path) => {
-                            return path.includes('?')
-                                ? `${path}&share=true`
-                                : `${path}?share=true`;
-                        },
-                    }),
-                );
-                app.use(
-                    be_download_rewrite,
-                    createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}${prefix}${be_download}`,
-                        changeOrigin: true,
-                    }),
-                );
-            }
-
-            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} -> ${host}:${port}${prefix}${be_api}`,
-                    );
-                    $.info(
-                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_download_rewrite} -> ${host}:${port}${prefix}${be_download}`,
-                    );
-                    $.info(
-                        `[SHARE BACKEND] ${fe_address}:${fe_port}${be_share_rewrite}`,
-                    );
-                }
-            });
-        }
-        if (data_url) {
-            $.info(`[BACKEND] downloading data from ${data_url}`);
-            download(data_url)
-                .then(async (content) => {
-                    try {
-                        content = JSON.parse(Base64.decode(content));
-                        if (Object.keys(content.settings).length === 0) {
-                            throw new Error(
-                                '备份文件应该至少包含 settings 字段',
-                            );
-                        }
-                    } catch (err) {
-                        try {
-                            content = JSON.parse(content);
-                            if (Object.keys(content.settings).length === 0) {
-                                throw new Error(
-                                    '备份文件应该至少包含 settings 字段',
-                                );
-                            }
-                        } catch (err) {
-                            $.error(
-                                `Gist 备份文件校验失败, 无法还原\nReason: ${
-                                    err.message ?? err
-                                }`,
-                            );
-                            throw new Error('Gist 备份文件校验失败, 无法还原');
-                        }
-                    }
-                    if (data_url_post) {
-                        $.info('[BACKEND] executing post-processing script');
-                        eval(data_url_post);
-                    }
-
-                    $.write(JSON.stringify(content, null, `  `), '#sub-store');
-
-                    $.cache = 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,12 +1,9 @@
-import { Base64 } from 'js-base64';
-import _ from 'lodash';
 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 scriptResourceCache from '@/utils/script-resource-cache';
-import headersResourceCache from '@/utils/headers-resource-cache';
 import {
     GIST_BACKUP_FILE_NAME,
     GIST_BACKUP_KEY,
@@ -15,8 +12,6 @@ import {
 import { InternalServerError, RequestInvalidError } from '@/restful/errors';
 import Gist from '@/utils/gist';
 import migrate from '@/utils/migration';
-import env from '@/utils/env';
-import { formatDateTime } from '@/utils';
 
 export default function register($app) {
     // utils
@@ -27,61 +22,19 @@ 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="${encodeURIComponent(
-                        `sub-store_data_${formatDateTime(new Date())}.json`,
-                    )}"`,
-                )
-                .send(
-                    $.env.isNode
-                        ? JSON.stringify($.cache)
-                        : $.read('#sub-store'),
-                );
+            res.json($.read('#sub-store'));
         })
         .post((req, res) => {
-            let { content } = req.body;
-            try {
-                content = JSON.parse(Base64.decode(content));
-                if (Object.keys(content.settings).length === 0) {
-                    throw new Error('备份文件应该至少包含 settings 字段');
-                }
-            } catch (err) {
-                try {
-                    content = JSON.parse(content);
-                    if (Object.keys(content.settings).length === 0) {
-                        throw new Error('备份文件应该至少包含 settings 字段');
-                    }
-                } catch (err) {
-                    $.error(
-                        `备份文件校验失败, 无法还原\nReason: ${
-                            err.message ?? err
-                        }`,
-                    );
-                    throw new Error('备份文件校验失败, 无法还原');
-                }
-            }
-            $.write(JSON.stringify(content, null, `  `), '#sub-store');
-            if ($.env.isNode) {
-                $.cache = content;
-                $.persistCache();
-            }
-            migrate();
-            success(res);
+            const data = req.body;
+            $.write(JSON.stringify(data), '#sub-store');
+            res.end();
         });
 
-    if (ENV().isNode) {
-        $app.get('/', getEnv);
-    } else {
-        // Redirect sub.store to vercel webpage
-        $app.get('/', async (req, res) => {
-            // 302 redirect
-            res.set('location', 'https://sub-store.vercel.app/')
-                .status(302)
-                .end();
-        });
-    }
+    // Redirect sub.store to vercel webpage
+    $app.get('/', async (req, res) => {
+        // 302 redirect
+        res.set('location', 'https://sub-store.vercel.app/').status(302).end();
+    });
 
     // handle preflight request for QX
     if (ENV().isQX) {
@@ -96,149 +49,33 @@ export default function register($app) {
 }
 
 function getEnv(req, res) {
-    if (req.query.share) {
-        env.feature.share = true;
-    }
-    res.set('Content-Type', 'application/json;charset=UTF-8').send(
-        JSON.stringify(
-            {
-                status: 'success',
-                data: {
-                    guide: '⚠️⚠️⚠️ 您当前看到的是后端的响应. 若想配合前端使用, 可访问官方前端 https://sub-store.vercel.app 后自行配置后端地址, 或一键配置后端 https://sub-store.vercel.app?api=https://a.com/xxx (假设 https://a.com 是你后端的域名, /xxx 是自定义路径). 需注意 HTTPS 前端无法请求非本地的 HTTP 后端(部分浏览器上也无法访问本地 HTTP 后端). 请配置反代或在局域网自建 HTTP 前端. 如果还有问题, 可查看此排查说明: https://t.me/zhetengsha/1068',
-                    ...env,
-                },
-            },
-            null,
-            2,
-        ),
-    );
+    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
     resourceCache.revokeAll();
-    scriptResourceCache.revokeAll();
-    headersResourceCache.revokeAll();
     success(res);
 }
 
-async function gistBackupAction(action, keep, encode) {
-    // read token
-    const { gistToken, syncPlatform } = $.read(SETTINGS_KEY);
-    if (!gistToken) throw new Error('GitHub Token is required for backup!');
-
-    const gist = new Gist({
-        token: gistToken,
-        key: GIST_BACKUP_KEY,
-        syncPlatform,
-    });
-    let currentContent = $.read('#sub-store');
-    currentContent = currentContent ? JSON.parse(currentContent) : {};
-    if ($.env.isNode) currentContent = JSON.parse(JSON.stringify($.cache));
-    let content;
-    const settings = $.read(SETTINGS_KEY);
-    const updated = settings.syncTime;
-    switch (action) {
-        case 'upload':
-            try {
-                content = $.read('#sub-store');
-                content = content ? JSON.parse(content) : {};
-                if ($.env.isNode) content = JSON.parse(JSON.stringify($.cache));
-                if (encode === 'plaintext') {
-                    content.settings.gistToken =
-                        '恢复后请重新设置 GitHub Token';
-                    content = JSON.stringify(content, null, `  `);
-                } else {
-                    content = Base64.encode(
-                        JSON.stringify(content, null, `  `),
-                    );
-                }
-
-                $.info(`下载备份, 与本地内容对比...`);
-                const onlineContent = await gist.download(
-                    GIST_BACKUP_FILE_NAME,
-                );
-                if (onlineContent === content) {
-                    $.info(`内容一致, 无需上传备份`);
-                    return;
-                }
-            } catch (error) {
-                $.error(`${error.message ?? error}`);
-            }
-
-            // update syncTime
-            settings.syncTime = new Date().getTime();
-            $.write(settings, SETTINGS_KEY);
-            content = $.read('#sub-store');
-            content = content ? JSON.parse(content) : {};
-            if ($.env.isNode) content = JSON.parse(JSON.stringify($.cache));
-            if (encode === 'plaintext') {
-                content.settings.gistToken = '恢复后请重新设置 GitHub Token';
-                content = JSON.stringify(content, null, `  `);
-            } else {
-                content = Base64.encode(JSON.stringify(content, null, `  `));
-            }
-            $.info(`上传备份中...`);
-            try {
-                await gist.upload({
-                    [GIST_BACKUP_FILE_NAME]: { content },
-                });
-                $.info(`上传备份完成`);
-            } catch (err) {
-                // restore syncTime if upload failed
-                settings.syncTime = updated;
-                $.write(settings, SETTINGS_KEY);
-                throw err;
-            }
-            break;
-        case 'download':
-            $.info(`还原备份中...`);
-            content = await gist.download(GIST_BACKUP_FILE_NAME);
-            try {
-                content = JSON.parse(Base64.decode(content));
-                if (Object.keys(content.settings).length === 0) {
-                    throw new Error('备份文件应该至少包含 settings 字段');
-                }
-            } catch (err) {
-                try {
-                    content = JSON.parse(content);
-                    if (Object.keys(content.settings).length === 0) {
-                        throw new Error('备份文件应该至少包含 settings 字段');
-                    }
-                } catch (err) {
-                    $.error(
-                        `Gist 备份文件校验失败, 无法还原\nReason: ${
-                            err.message ?? err
-                        }`,
-                    );
-                    throw new Error('Gist 备份文件校验失败, 无法还原');
-                }
-            }
-            if (keep) {
-                $.info(`保留原有设置 ${keep}`);
-                keep.split(',').forEach((path) => {
-                    _.set(content, path, _.get(currentContent, path));
-                });
-            }
-            // restore settings
-            $.write(JSON.stringify(content, null, `  `), '#sub-store');
-            if ($.env.isNode) {
-                $.cache = content;
-                $.persistCache();
-            }
-            $.info(`perform migration after restoring from gist...`);
-            migrate();
-            $.info(`migration completed`);
-            $.info(`还原备份完成`);
-            break;
-    }
-}
 async function gistBackup(req, res) {
-    const { action, keep, encode } = req.query;
+    const { action } = req.query;
     // read token
     const { gistToken } = $.read(SETTINGS_KEY);
     if (!gistToken) {
@@ -250,23 +87,58 @@ async function gistBackup(req, res) {
             ),
         );
     } else {
+        const gist = new Gist({
+            token: gistToken,
+            key: GIST_BACKUP_KEY,
+        });
         try {
-            await gistBackupAction(action, keep, encode);
+            let content;
+            const settings = $.read(SETTINGS_KEY);
+            const updated = settings.syncTime;
+            switch (action) {
+                case 'upload':
+                    // update syncTime
+                    settings.syncTime = new Date().getTime();
+                    $.write(settings, SETTINGS_KEY);
+                    content = $.read('#sub-store');
+                    if ($.env.isNode)
+                        content = JSON.stringify($.cache, null, `  `);
+                    $.info(`上传备份中...`);
+                    try {
+                        await gist.upload({
+                            [GIST_BACKUP_FILE_NAME]: { content },
+                        });
+                    } catch (err) {
+                        // restore syncTime if upload failed
+                        settings.syncTime = updated;
+                        $.write(settings, SETTINGS_KEY);
+                        throw err;
+                    }
+                    break;
+                case 'download':
+                    $.info(`还原备份中...`);
+                    content = await gist.download(GIST_BACKUP_FILE_NAME);
+                    // restore settings
+                    $.write(content, '#sub-store');
+                    if ($.env.isNode) {
+                        content = JSON.parse(content);
+                        $.cache = content;
+                        $.persistCache();
+                    }
+                    // perform migration after restoring from gist
+                    migrate();
+                    break;
+            }
             success(res);
         } catch (err) {
-            $.error(
-                `Failed to ${action} gist data.\nReason: ${err.message ?? err}`,
-            );
             failed(
                 res,
                 new InternalServerError(
                     'BACKUP_FAILED',
-                    `Failed to ${action} gist data!`,
-                    `Reason: ${err.message ?? err}`,
+                    `Failed to ${action} data to gist!`,
+                    `Reason: ${JSON.stringify(err)}`,
                 ),
             );
         }
     }
 }
-
-export { gistBackupAction };

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,360 +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.type !== 'mihomoProfile') {
-            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,
-                                    undefined,
-                                    file.proxy,
-                                );
-                            } catch (err) {
-                                errors[url] = err;
-                                $.error(
-                                    `文件 ${file.name} 的远程文件 ${url} 发生错误: ${err}`,
-                                );
-                                return '';
-                            }
-                        }),
-                );
-
-                if (Object.keys(errors).length > 0) {
-                    if (!file.ignoreFailedRemoteFile) {
-                        throw new Error(
-                            `文件 ${file.name} 的远程文件 ${Object.keys(
-                                errors,
-                            ).join(', ')} 发生错误, 请查看日志`,
-                        );
-                    } else if (file.ignoreFailedRemoteFile === 'enabled') {
-                        $.notify(
-                            `🌍 Sub-Store 预览文件失败`,
-                            `❌ ${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: file },
-                      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,
-                                undefined,
-                                sub.proxy,
-                                undefined,
-                                undefined,
-                                undefined,
-                                true,
-                            );
-                        } 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 (Object.keys(errors).length > 0) {
-                if (!sub.ignoreFailedRemoteSub) {
-                    throw new Error(
-                        `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
-                            ', ',
-                        )} 发生错误, 请查看日志`,
-                    );
-                } else if (sub.ignoreFailedRemoteSub === 'enabled') {
-                    $.notify(
-                        `🌍 Sub-Store 预览订阅失败`,
-                        `❌ ${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;
-            proxy._subDisplayName = sub.displayName;
-        });
-
-        // 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];
-        let subscriptionTags = collection.subscriptionTags;
-        if (Array.isArray(subscriptionTags) && subscriptionTags.length > 0) {
-            allSubs.forEach((sub) => {
-                if (
-                    Array.isArray(sub.tag) &&
-                    sub.tag.length > 0 &&
-                    !subnames.includes(sub.name) &&
-                    sub.tag.some((tag) => subscriptionTags.includes(tag))
-                ) {
-                    subnames.push(sub.name);
+    const allSubs = $.read(SUBS_KEY);
+    const collection = req.body;
+    const subnames = collection.subscriptions;
+    const results = {};
+
+    await Promise.all(
+        subnames.map(async (name) => {
+            const sub = findByName(allSubs, name);
+            try {
+                let raw;
+                if (sub.source === 'local') {
+                    raw = sub.content;
+                } else {
+                    raw = await download(sub.url, sub.ua);
                 }
-            });
-        }
-        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,
-                                            undefined,
-                                            sub.proxy,
-                                            undefined,
-                                            undefined,
-                                            undefined,
-                                            true,
-                                        );
-                                    } catch (err) {
-                                        errors[url] = err;
-                                        $.error(
-                                            `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
-                                        );
-                                        return '';
-                                    }
-                                }),
-                        );
-
-                        if (Object.keys(errors).length > 0) {
-                            if (!sub.ignoreFailedRemoteSub) {
-                                throw new Error(
-                                    `订阅 ${sub.name} 的远程订阅 ${Object.keys(
-                                        errors,
-                                    ).join(', ')} 发生错误, 请查看日志`,
-                                );
-                            } else if (
-                                sub.ignoreFailedRemoteSub === 'enabled'
-                            ) {
-                                $.notify(
-                                    `🌍 Sub-Store 预览订阅失败`,
-                                    `❌ ${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();
-
-                    currentProxies.forEach((proxy) => {
-                        proxy._subName = sub.name;
-                        proxy._subDisplayName = sub.displayName;
-                        proxy._collectionName = collection.name;
-                        proxy._collectionDisplayName = collection.displayName;
-                    });
-
-                    // apply processors
-                    currentProxies = await ProxyUtils.process(
-                        currentProxies,
-                        sub.process || [],
-                        'JSON',
-                        { [sub.name]: sub, _collection: collection },
-                    );
-                    results[name] = currentProxies;
-                } catch (err) {
-                    errors[name] = err;
-
-                    $.error(
-                        `❌ 处理组合订阅 ${collection.name} 中的子订阅: ${sub.name} 时出现错误：${err}！`,
-                    );
-                }
-            }),
-        );
-
-        if (Object.keys(errors).length > 0) {
-            if (!collection.ignoreFailedRemoteSub) {
-                throw new Error(
-                    `组合订阅 ${collection.name} 的子订阅 ${Object.keys(
-                        errors,
-                    ).join(', ')} 发生错误, 请查看日志`,
+                // parse proxies
+                let currentProxies = ProxyUtils.parse(raw);
+                // apply processors
+                currentProxies = await ProxyUtils.process(
+                    currentProxies,
+                    sub.process || [],
+                    'JSON',
                 );
-            } else if (collection.ignoreFailedRemoteSub === 'enabled') {
-                $.notify(
-                    `🌍 Sub-Store 预览组合订阅失败`,
-                    `❌ ${collection.name}`,
-                    `子订阅 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
+                results[name] = currentProxies;
+            } catch (err) {
+                failed(
+                    res,
+                    new InternalServerError(
+                        'PROCESS_FAILED',
+                        `处理子订阅 ${name} 失败`,
+                        `Reason: ${err}`,
+                    ),
                 );
             }
-        }
-        // merge proxies with the original order
-        const original = Array.prototype.concat.apply(
-            [],
-            subnames.map((name) => results[name] || []),
-        );
+        }),
+    );
 
-        original.forEach((proxy, i) => {
-            proxy.id = i;
-            proxy._collectionName = collection.name;
-            proxy._collectionDisplayName = collection.displayName;
-        });
+    // 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,34 +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 (${ARTIFACT_REPOSITORY_KEY})`);
-                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 (${ARTIFACT_REPOSITORY_KEY}) 时发生错误: ${
-                    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

@@ -5,20 +5,10 @@ import {
     RequestInvalidError,
 } from './errors';
 import { deleteByName, findByName, updateByName } from '@/utils/database';
-import {
-    SUBS_KEY,
-    COLLECTIONS_KEY,
-    ARTIFACTS_KEY,
-    FILES_KEY,
-} from '@/constants';
-import {
-    getFlowHeaders,
-    parseFlowHeaders,
-    getRmainingDays,
-} from '@/utils/flow';
+import { SUBS_KEY, COLLECTIONS_KEY, ARTIFACTS_KEY } from '@/constants';
+import { getFlowHeaders } from '@/utils/flow';
 import { success, failed } from './response';
 import $ from '@/core/app';
-import { formatDateTime } from '@/utils';
 
 if (!$.read(SUBS_KEY)) $.write({}, SUBS_KEY);
 
@@ -30,21 +20,13 @@ 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
 async function getFlowInfo(req, res) {
     let { name } = req.params;
     name = decodeURIComponent(name);
-    let { url } = req.query;
-    if (url) {
-        url = decodeURIComponent(url);
-        $.info(`指定远程订阅 URL: ${url}`);
-    }
     const allSubs = $.read(SUBS_KEY);
     const sub = findByName(allSubs, name);
     if (!sub) {
@@ -58,107 +40,20 @@ async function getFlowInfo(req, res) {
         );
         return;
     }
-    if (
-        sub.source === 'local' &&
-        !['localFirst', 'remoteFirst'].includes(sub.mergeSources)
-    ) {
-        if (sub.subUserinfo) {
-            let subUserInfo;
-            if (/^https?:\/\//.test(sub.subUserinfo)) {
-                try {
-                    subUserInfo = await getFlowHeaders(
-                        undefined,
-                        undefined,
-                        undefined,
-                        sub.proxy,
-                        sub.subUserinfo,
-                    );
-                } catch (e) {
-                    $.error(
-                        `订阅 ${name} 使用自定义流量链接 ${
-                            sub.subUserinfo
-                        } 获取流量信息时发生错误: ${JSON.stringify(e)}`,
-                    );
-                }
-            } else {
-                subUserInfo = sub.subUserinfo;
-            }
-            try {
-                success(res, {
-                    ...parseFlowHeaders(subUserInfo),
-                });
-            } catch (e) {
-                $.error(
-                    `Failed to parse flow info for local subscription ${name}: ${
-                        e.message ?? e
-                    }`,
-                );
-                failed(
-                    res,
-                    new RequestInvalidError(
-                        'NO_FLOW_INFO',
-                        'N/A',
-                        `Failed to parse flow info`,
-                    ),
-                );
-            }
-        } else {
-            failed(
-                res,
-                new RequestInvalidError(
-                    'NO_FLOW_INFO',
-                    'N/A',
-                    `Local subscription ${name} has no flow information!`,
-                ),
-            );
-        }
+    if (sub.source === 'local') {
+        failed(
+            res,
+            new RequestInvalidError(
+                'NO_FLOW_INFO',
+                'N/A',
+                `Local subscription ${name} has no flow information!`,
+            ),
+        );
         return;
     }
     try {
-        url =
-            `${url || sub.url}`
-                .split(/[\r\n]+/)
-                .map((i) => i.trim())
-                .filter((i) => i.length)?.[0] || '';
-
-        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 || !/^https?/.test(url)) {
-            failed(
-                res,
-                new RequestInvalidError(
-                    'NO_FLOW_INFO',
-                    'N/A',
-                    `Subscription ${name}: noFlow`,
-                ),
-            );
-            return;
-        }
-        const flowHeaders = await getFlowHeaders(
-            $arguments?.insecure ? `${url}#insecure` : url,
-            $arguments.flowUserAgent,
-            undefined,
-            sub.proxy,
-            $arguments.flowUrl,
-        );
-        if (!flowHeaders && !sub.subUserinfo) {
+        const flowHeaders = await getFlowHeaders(sub.url);
+        if (!flowHeaders) {
             failed(
                 res,
                 new InternalServerError(
@@ -169,56 +64,21 @@ async function getFlowInfo(req, res) {
             );
             return;
         }
-        try {
-            const remainingDays = getRmainingDays({
-                resetDay: $arguments.resetDay,
-                startDate: $arguments.startDate,
-                cycleDays: $arguments.cycleDays,
-            });
-            let subUserInfo;
-            if (/^https?:\/\//.test(sub.subUserinfo)) {
-                try {
-                    subUserInfo = await getFlowHeaders(
-                        undefined,
-                        undefined,
-                        undefined,
-                        sub.proxy,
-                        sub.subUserinfo,
-                    );
-                } catch (e) {
-                    $.error(
-                        `订阅 ${name} 使用自定义流量链接 ${
-                            sub.subUserinfo
-                        } 获取流量信息时发生错误: ${JSON.stringify(e)}`,
-                    );
-                }
-            } else {
-                subUserInfo = sub.subUserinfo;
-            }
-            const result = {
-                ...parseFlowHeaders(
-                    [subUserInfo, flowHeaders].filter((i) => i).join('; '),
-                ),
-            };
-            if (remainingDays != null) {
-                result.remainingDays = remainingDays;
-            }
-            success(res, result);
-        } catch (e) {
-            $.error(
-                `Failed to parse flow info for local subscription ${name}: ${
-                    e.message ?? e
-                }`,
-            );
-            failed(
-                res,
-                new RequestInvalidError(
-                    'NO_FLOW_INFO',
-                    'N/A',
-                    `Failed to parse flow info`,
-                ),
-            );
-        }
+
+        // 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,
@@ -233,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(
@@ -252,7 +102,6 @@ function createSubscription(req, res) {
                 `Subscription ${sub.name} already exists.`,
             ),
         );
-        return;
     }
     allSubs.push(sub);
     $.write(allSubs, SUBS_KEY);
@@ -261,25 +110,11 @@ function createSubscription(req, res) {
 
 function getSubscription(req, res) {
     let { name } = req.params;
-    let { raw } = req.query;
     name = decodeURIComponent(name);
     const allSubs = $.read(SUBS_KEY);
     const sub = findByName(allSubs, name);
     if (sub) {
-        if (raw) {
-            res.set('content-type', 'application/json')
-                .set(
-                    'content-disposition',
-                    `attachment; filename="${encodeURIComponent(
-                        `sub-store_subscription_${name}_${formatDateTime(
-                            new Date(),
-                        )}.json`,
-                    )}"`,
-                )
-                .send(JSON.stringify(sub));
-        } else {
-            success(res, sub);
-        }
+        success(res, sub);
     } else {
         failed(
             res,
@@ -325,20 +160,9 @@ function updateSubscription(req, res) {
                     artifact.source = sub.name;
                 }
             }
-            // update all files referring this subscription
-            const allFiles = $.read(FILES_KEY) || [];
-            for (const file of allFiles) {
-                if (
-                    file.sourceType === 'subscription' &&
-                    file.sourceName == name
-                ) {
-                    file.sourceName = sub.name;
-                }
-            }
 
             $.write(allCols, COLLECTIONS_KEY);
             $.write(allArtifacts, ARTIFACTS_KEY);
-            $.write(allFiles, FILES_KEY);
         }
         updateByName(allSubs, name, newSub);
         $.write(allSubs, SUBS_KEY);
@@ -378,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,187 +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 = {},
-    subscription,
-    awaitCustomCache,
-    $options,
-    proxy,
-    noCache,
-    all,
-}) {
+async function produceArtifact({ type, name, platform }) {
     platform = platform || 'JSON';
 
-    if (['subscription', 'sub'].includes(type)) {
-        let sub;
-        if (name) {
-            const allSubs = $.read(SUBS_KEY);
-            sub = findByName(allSubs, name);
-            if (!sub) throw new Error(`找不到订阅 ${name}`);
-        } else if (subscription) {
-            sub = subscription;
-        } else {
-            throw new Error('未提供订阅名称或订阅数据');
-        }
-        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,
-                                undefined,
-                                proxy || sub.proxy,
-                                undefined,
-                                awaitCustomCache,
-                                noCache || sub.noCache,
-                                true,
-                            );
-                        } catch (err) {
-                            errors[url] = err;
-                            $.error(
-                                `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
-                            );
-                            return '';
-                        }
-                    }),
-            );
-            let subIgnoreFailedRemoteSub = sub.ignoreFailedRemoteSub;
-            if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
-                subIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
-            }
+    // produce Clash node format for ShadowRocket
+    if (platform === 'ShadowRocket') platform = 'Clash';
 
-            if (Object.keys(errors).length > 0) {
-                if (!subIgnoreFailedRemoteSub) {
-                    throw new Error(
-                        `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
-                            ', ',
-                        )} 发生错误, 请查看日志`,
-                    );
-                } else if (subIgnoreFailedRemoteSub === 'enabled') {
-                    $.notify(
-                        `🌍 Sub-Store 处理订阅失败`,
-                        `❌ ${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 (type === 'subscription') {
+        const allSubs = $.read(SUBS_KEY);
+        const sub = findByName(allSubs, name);
+        let raw;
+        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,
-                                undefined,
-                                proxy || sub.proxy,
-                                undefined,
-                                awaitCustomCache,
-                                noCache || sub.noCache,
-                                true,
-                            );
-                        } catch (err) {
-                            errors[url] = err;
-                            $.error(
-                                `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
-                            );
-                            return '';
-                        }
-                    }),
-            );
-            let subIgnoreFailedRemoteSub = sub.ignoreFailedRemoteSub;
-            if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
-                subIgnoreFailedRemoteSub = ignoreFailedRemoteSub;
-            }
-
-            if (Object.keys(errors).length > 0) {
-                if (!subIgnoreFailedRemoteSub) {
-                    throw new Error(
-                        `订阅 ${sub.name} 的远程订阅 ${Object.keys(errors).join(
-                            ', ',
-                        )} 发生错误, 请查看日志`,
-                    );
-                } else if (subIgnoreFailedRemoteSub === 'enabled') {
-                    $.notify(
-                        `🌍 Sub-Store 处理订阅失败`,
-                        `❌ ${sub.name}`,
-                        `远程订阅 ${Object.keys(errors).join(
-                            ', ',
-                        )} 发生错误, 请查看日志`,
-                    );
-                }
-            }
-            if (sub.mergeSources === 'localFirst') {
-                raw.unshift(sub.content);
-            } else if (sub.mergeSources === 'remoteFirst') {
-                raw.push(sub.content);
-            }
-        }
-        if (produceType === 'raw') {
-            return JSON.stringify((Array.isArray(raw) ? raw : [raw]).flat());
+            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;
-            proxy._subDisplayName = sub.displayName;
-        });
+        let proxies = ProxyUtils.parse(raw);
         // apply processors
         proxies = await ProxyUtils.process(
             proxies,
             sub.process || [],
             platform,
-            { [sub.name]: sub },
-            $options,
         );
-        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':
@@ -215,129 +63,33 @@ async function produceArtifact({
             exist[proxy.name] = true;
         }
         // produce
-        return ProxyUtils.produce(proxies, platform, produceType, produceOpts);
-    } else if (['collection', 'col'].includes(type)) {
+        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];
-        let subscriptionTags = collection.subscriptionTags;
-        if (Array.isArray(subscriptionTags) && subscriptionTags.length > 0) {
-            allSubs.forEach((sub) => {
-                if (
-                    Array.isArray(sub.tag) &&
-                    sub.tag.length > 0 &&
-                    !subnames.includes(sub.name) &&
-                    sub.tag.some((tag) => subscriptionTags.includes(tag))
-                ) {
-                    subnames.push(sub.name);
-                }
-            });
-        }
+        const subnames = collection.subscriptions;
         const results = {};
-        const errors = {};
         let processed = 0;
 
         await Promise.all(
             subnames.map(async (name) => {
                 const sub = findByName(allSubs, name);
-                const passThroughUA = sub.passThroughUA;
-                let reqUA = sub.ua;
-                if (passThroughUA) {
-                    $.info(
-                        `订阅开启了透传 User-Agent, 使用请求的 User-Agent: ${ua}`,
-                    );
-                    reqUA = ua;
-                }
                 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,
-                                            reqUA,
-                                            undefined,
-                                            proxy ||
-                                                sub.proxy ||
-                                                collection.proxy,
-                                            undefined,
-                                            undefined,
-                                            noCache || sub.noCache,
-                                            true,
-                                        );
-                                    } catch (err) {
-                                        errors[url] = err;
-                                        $.error(
-                                            `订阅 ${sub.name} 的远程订阅 ${url} 发生错误: ${err}`,
-                                        );
-                                        return '';
-                                    }
-                                }),
-                        );
-
-                        if (Object.keys(errors).length > 0) {
-                            if (!sub.ignoreFailedRemoteSub) {
-                                throw new Error(
-                                    `订阅 ${sub.name} 的远程订阅 ${Object.keys(
-                                        errors,
-                                    ).join(', ')} 发生错误, 请查看日志`,
-                                );
-                            } else if (
-                                sub.ignoreFailedRemoteSub === 'enabled'
-                            ) {
-                                $.notify(
-                                    `🌍 Sub-Store 处理订阅失败`,
-                                    `❌ ${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._subDisplayName = sub.displayName;
-                        proxy._collectionName = collection.name;
-                        proxy._collectionDisplayName = collection.displayName;
-                    });
-
+                    let currentProxies = ProxyUtils.parse(raw);
                     // apply processors
                     currentProxies = await ProxyUtils.process(
                         currentProxies,
                         sub.process || [],
                         platform,
-                        {
-                            [sub.name]: sub,
-                            _collection: collection,
-                            $options,
-                        },
                     );
                     results[name] = currentProxies;
                     processed++;
@@ -348,61 +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 (Object.keys(errors).length > 0) {
-            if (!collectionIgnoreFailedRemoteSub) {
-                throw new Error(
-                    `组合订阅 ${collection.name} 的子订阅 ${Object.keys(
-                        errors,
-                    ).join(', ')} 发生错误, 请查看日志`,
-                );
-            } else if (collectionIgnoreFailedRemoteSub === 'enabled') {
-                $.notify(
-                    `🌍 Sub-Store 处理组合订阅失败`,
-                    `❌ ${collection.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;
-            proxy._collectionDisplayName = collection.displayName;
-        });
-
         // apply own processors
         proxies = await ProxyUtils.process(
             proxies,
             collection.process || [],
             platform,
-            { _collection: collection },
-            $options,
         );
         if (proxies.length === 0) {
-            throw new Error(`组合订阅 ${name} 中不含有效节点`);
+            throw new Error(`组合订阅中不含有效节点！`);
         }
         // check duplicate
         const exist = {};
@@ -410,7 +132,7 @@ async function produceArtifact({
             if (exist[proxy.name]) {
                 $.notify(
                     '🌍 Sub-Store',
-                    `⚠️ 组合订阅 ${name} 包含重复节点 ${proxy.name}！`,
+                    '⚠️ 订阅包含重复节点！',
                     '请仔细检测配置！',
                     {
                         'media-url':
@@ -421,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];
@@ -450,404 +171,94 @@ 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 (file.type !== 'mihomoProfile') {
-            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,
-                                    undefined,
-                                    file.proxy || proxy,
-                                    undefined,
-                                    undefined,
-                                    noCache,
-                                );
-                            } 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,
-                                    undefined,
-                                    file.proxy || proxy,
-                                    undefined,
-                                    undefined,
-                                    noCache,
-                                );
-                            } catch (err) {
-                                errors[url] = err;
-                                $.error(
-                                    `文件 ${file.name} 的远程文件 ${url} 发生错误: ${err}`,
-                                );
-                                return '';
-                            }
-                        }),
-                );
-                let fileIgnoreFailedRemoteFile = file.ignoreFailedRemoteFile;
-                if (
-                    ignoreFailedRemoteFile != null &&
-                    ignoreFailedRemoteFile !== ''
-                ) {
-                    fileIgnoreFailedRemoteFile = ignoreFailedRemoteFile;
-                }
-
-                if (Object.keys(errors).length > 0) {
-                    if (!fileIgnoreFailedRemoteFile) {
-                        throw new Error(
-                            `文件 ${file.name} 的远程文件 ${Object.keys(
-                                errors,
-                            ).join(', ')} 发生错误, 请查看日志`,
-                        );
-                    } else if (fileIgnoreFailedRemoteFile === 'enabled') {
-                        $.notify(
-                            `🌍 Sub-Store 处理文件失败`,
-                            `❌ ${file.name}`,
-                            `远程文件 ${Object.keys(errors).join(
-                                ', ',
-                            )} 发生错误, 请查看日志`,
-                        );
-                    }
-                }
-                if (file.mergeSources === 'localFirst') {
-                    raw.unshift(file.content);
-                } else if (file.mergeSources === 'remoteFirst') {
-                    raw.push(file.content);
-                }
-            }
-        }
-        if (produceType === 'raw') {
-            return JSON.stringify((Array.isArray(raw) ? raw : [raw]).flat());
-        }
-        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,
-                          $options,
-                          $file: file,
-                      },
-                      file.process,
-                  )
-                : { $content: filesContent, $files: files, $options };
-
-        return (all ? processed : processed?.$content) ?? '';
     }
 }
 
-async function syncArtifacts() {
+async function syncAllArtifacts(_, res) {
     $.info('开始同步所有远程配置...');
     const allArtifacts = $.read(ARTIFACTS_KEY);
     const files = {};
 
     try {
-        const valid = [];
-        const invalid = [];
-        const allSubs = $.read(SUBS_KEY);
-        const allCols = $.read(COLLECTIONS_KEY);
-        const subNames = [];
-        let enabledCount = 0;
-        allArtifacts.map((artifact) => {
-            if (artifact.sync && artifact.source) {
-                enabledCount++;
-                if (artifact.type === 'subscription') {
-                    const subName = artifact.source;
-                    const sub = findByName(allSubs, subName);
-                    if (sub && sub.url && !subNames.includes(subName)) {
-                        subNames.push(subName);
-                    }
-                } else if (artifact.type === 'collection') {
-                    const collection = findByName(allCols, artifact.source);
-                    if (collection && Array.isArray(collection.subscriptions)) {
-                        collection.subscriptions.map((subName) => {
-                            const sub = findByName(allSubs, subName);
-                            if (sub && sub.url && !subNames.includes(subName)) {
-                                subNames.push(subName);
-                            }
-                        });
-                    }
-                }
-            }
-        });
-
-        if (enabledCount === 0) {
-            $.info(
-                `需同步的配置: ${enabledCount}, 总数: ${allArtifacts.length}`,
-            );
-            return;
-        }
-
-        if (subNames.length > 0) {
-            await Promise.all(
-                subNames.map(async (subName) => {
-                    try {
-                        await produceArtifact({
-                            type: 'subscription',
-                            name: subName,
-                            awaitCustomCache: true,
-                        });
-                    } catch (e) {
-                        // $.error(`${e.message ?? e}`);
-                    }
-                }),
-            );
-        }
-
         await Promise.all(
             allArtifacts.map(async (artifact) => {
-                try {
-                    if (artifact.sync && artifact.source) {
-                        $.info(`正在同步云配置：${artifact.name}...`);
+                if (artifact.sync) {
+                    $.info(`正在同步云配置：${artifact.name}...`);
+                    const output = await produceArtifact({
+                        type: artifact.type,
+                        name: artifact.source,
+                        platform: artifact.platform,
+                    });
 
-                        const useMihomoExternal =
-                            artifact.platform === 'SurgeMac';
-
-                        if (useMihomoExternal) {
-                            $.info(
-                                `手动指定了 target 为 SurgeMac, 将使用 Mihomo External`,
-                            );
-                        }
-
-                        const output = await produceArtifact({
-                            type: artifact.type,
-                            name: artifact.source,
-                            platform: artifact.platform,
-                            produceOpts: {
-                                'include-unsupported-proxy':
-                                    artifact.includeUnsupportedProxy,
-                                useMihomoExternal,
-                            },
-                        });
-
-                        // if (!output || output.length === 0)
-                        //     throw new Error('该配置的结果为空 不进行上传');
-
-                        files[encodeURIComponent(artifact.name)] = {
-                            content: output,
-                        };
-
-                        valid.push(artifact.name);
-                    }
-                } catch (e) {
-                    $.error(
-                        `生成同步配置 ${artifact.name} 发生错误: ${
-                            e.message ?? e
-                        }`,
-                    );
-                    invalid.push(artifact.name);
+                    files[artifact.name] = {
+                        content: output,
+                    };
                 }
             }),
         );
 
-        $.info(`${valid.length} 个同步配置生成成功: ${valid.join(', ')}`);
-        $.info(`${invalid.length} 个同步配置生成失败: ${invalid.join(', ')}`);
-
-        if (valid.length === 0) {
-            throw new Error(
-                `同步配置 ${invalid.join(', ')} 生成失败 详情请查看日志`,
-            );
-        }
-
         const resp = await syncToGist(files);
         const body = JSON.parse(resp.body);
 
-        delete body.history;
-        delete body.forks;
-        delete body.owner;
-        Object.values(body.files).forEach((file) => {
-            delete file.content;
-        });
-        $.info('上传配置响应:');
-        $.info(JSON.stringify(body, null, 2));
-
         for (const artifact of allArtifacts) {
-            if (
-                artifact.sync &&
-                artifact.source &&
-                valid.includes(artifact.name)
-            ) {
+            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 raw_url =
-                    files[encodeURIComponent(artifact.name)]?.raw_url;
-                const new_url = isGitLab
-                    ? raw_url
-                    : raw_url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
-                $.info(
-                    `上传配置完成\n文件列表: ${Object.keys(files).join(
-                        ', ',
-                    )}\n当前文件: ${encodeURIComponent(
-                        artifact.name,
-                    )}\n响应返回的原始链接: ${raw_url}\n处理完的新链接: ${new_url}`,
+                artifact.url = body.files[artifact.name].raw_url.replace(
+                    /\/raw\/[^/]*\/(.*)/,
+                    '/raw/$1',
                 );
-                artifact.url = new_url;
             }
         }
 
         $.write(allArtifacts, ARTIFACTS_KEY);
-        $.info('上传配置成功');
-
-        if (invalid.length > 0) {
-            throw new Error(
-                `同步配置成功 ${valid.length} 个, 失败 ${invalid.length} 个, 详情请查看日志`,
-            );
-        } else {
-            $.info(`同步配置成功 ${valid.length} 个`);
-        }
-    } catch (e) {
-        $.error(`同步配置失败，原因：${e.message ?? e}`);
-        throw e;
-    }
-}
-async function syncAllArtifacts(_, res) {
-    $.info('开始同步所有远程配置...');
-    try {
-        await syncArtifacts();
+        $.info('全部订阅同步成功！');
         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 useMihomoExternal = artifact.platform === 'SurgeMac';
-
-        if (useMihomoExternal) {
-            $.info(`手动指定了 target 为 SurgeMac, 将使用 Mihomo External`);
-        }
-        const output = await produceArtifact({
-            type: artifact.type,
-            name: artifact.source,
-            platform: artifact.platform,
-            produceOpts: {
-                'include-unsupported-proxy': artifact.includeUnsupportedProxy,
-                useMihomoExternal,
-            },
-        });
-
-        $.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,
@@ -855,38 +266,12 @@ async function syncArtifact(req, res) {
         });
         artifact.updated = new Date().getTime();
         const body = JSON.parse(resp.body);
-
-        delete body.history;
-        delete body.forks;
-        delete body.owner;
-        Object.values(body.files).forEach((file) => {
-            delete file.content;
-        });
-        $.info('上传配置响应:');
-        $.info(JSON.stringify(body, null, 2));
-
-        let files = body.files;
-        let isGitLab;
-        if (Array.isArray(files)) {
-            isGitLab = true;
-            files = Object.fromEntries(files.map((item) => [item.path, item]));
-        }
-        const raw_url = files[encodeURIComponent(artifact.name)]?.raw_url;
-        const new_url = isGitLab
-            ? raw_url
-            : raw_url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
-        $.info(
-            `上传配置完成\n文件列表: ${Object.keys(files).join(
-                ', ',
-            )}\n当前文件: ${encodeURIComponent(
-                artifact.name,
-            )}\n响应返回的原始链接: ${raw_url}\n处理完的新链接: ${new_url}`,
-        );
-        artifact.url = new_url;
+        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(
@@ -898,4 +283,4 @@ async function syncArtifact(req, res) {
     }
 }
 
-export { produceArtifact, syncArtifacts };
+export { produceArtifact };

backend/src/restful/token.js

@@ -1,192 +0,0 @@
-import { deleteByName } from '@/utils/database';
-import { ENV } from '@/vendor/open-api';
-import { TOKENS_KEY, SUBS_KEY, FILES_KEY, COLLECTIONS_KEY } from '@/constants';
-import { failed, success } from '@/restful/response';
-import $ from '@/core/app';
-import { RequestInvalidError, InternalServerError } from '@/restful/errors';
-
-export default function register($app) {
-    if (!$.read(TOKENS_KEY)) $.write([], TOKENS_KEY);
-
-    $app.post('/api/token', signToken);
-
-    $app.route('/api/token/:token').delete(deleteToken);
-
-    $app.route('/api/tokens').get(getAllTokens);
-}
-
-function deleteToken(req, res) {
-    let { token } = req.params;
-    token = decodeURIComponent(token);
-    $.info(`正在删除：${token}`);
-    let allTokens = $.read(TOKENS_KEY);
-    deleteByName(allTokens, token, 'token');
-    $.write(allTokens, TOKENS_KEY);
-    success(res);
-}
-
-function getAllTokens(req, res) {
-    const { type, name } = req.query;
-    const allTokens = $.read(TOKENS_KEY) || [];
-    success(
-        res,
-        type || name
-            ? allTokens.filter(
-                  (item) =>
-                      (type ? item.type === type : true) &&
-                      (name ? item.name === name : true),
-              )
-            : allTokens,
-    );
-}
-
-async function signToken(req, res) {
-    if (!ENV().isNode) {
-        return failed(
-            res,
-            new RequestInvalidError(
-                'INVALID_ENV',
-                `This endpoint is only available in Node.js environment`,
-            ),
-        );
-    }
-    try {
-        const { payload, options } = req.body;
-        const ms = eval(`require("ms")`);
-        const type = payload?.type;
-        const name = payload?.name;
-        if (!type || !name)
-            return failed(
-                res,
-                new RequestInvalidError(
-                    'INVALID_PAYLOAD',
-                    `payload type and name are required`,
-                ),
-            );
-        let token = payload?.token;
-        if (token != null) {
-            if (typeof token !== 'string' || token.length < 1) {
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'INVALID_CUSTOM_TOKEN',
-                        `Invalid custom token: ${token}`,
-                    ),
-                );
-            }
-            const tokens = $.read(TOKENS_KEY) || [];
-            if (
-                tokens.find(
-                    (t) =>
-                        t.token === token && t.type === type && t.name === name,
-                )
-            ) {
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'DUPLICATE_TOKEN',
-                        `Token ${token} already exists`,
-                    ),
-                );
-            }
-        }
-
-        if (type === 'col') {
-            const collections = $.read(COLLECTIONS_KEY) || [];
-            const collection = collections.find((c) => c.name === name);
-            if (!collection)
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'INVALID_COLLECTION',
-                        `collection ${name} not found`,
-                    ),
-                );
-        } else if (type === 'file') {
-            const files = $.read(FILES_KEY) || [];
-            const file = files.find((f) => f.name === name);
-            if (!file)
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'INVALID_FILE',
-                        `file ${name} not found`,
-                    ),
-                );
-        } else if (type === 'sub') {
-            const subs = $.read(SUBS_KEY) || [];
-            const sub = subs.find((s) => s.name === name);
-            if (!sub)
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'INVALID_SUB',
-                        `sub ${name} not found`,
-                    ),
-                );
-        } else {
-            return failed(
-                res,
-                new RequestInvalidError(
-                    'INVALID_TYPE',
-                    `type ${name} not supported`,
-                ),
-            );
-        }
-        let expiresIn = options?.expiresIn;
-        if (options?.expiresIn != null) {
-            expiresIn = ms(options.expiresIn);
-            if (expiresIn == null || isNaN(expiresIn) || expiresIn <= 0) {
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'INVALID_EXPIRES_IN',
-                        `Invalid expiresIn option: ${options.expiresIn}`,
-                    ),
-                );
-            }
-        }
-        // const secret = eval('process.env.SUB_STORE_FRONTEND_BACKEND_PATH');
-        const nanoid = eval(`require("nanoid")`);
-        const tokens = $.read(TOKENS_KEY) || [];
-        // const now = Date.now();
-        // for (const key in tokens) {
-        //     const token = tokens[key];
-        //     if (token.exp != null || token.exp < now) {
-        //         delete tokens[key];
-        //     }
-        // }
-        if (!token) {
-            do {
-                token = nanoid.customAlphabet(nanoid.urlAlphabet)();
-            } while (
-                tokens.find(
-                    (t) =>
-                        t.token === token && t.type === type && t.name === name,
-                )
-            );
-        }
-        tokens.push({
-            ...payload,
-            token,
-            createdAt: Date.now(),
-            expiresIn: expiresIn > 0 ? options?.expiresIn : undefined,
-            exp: expiresIn > 0 ? Date.now() + expiresIn : undefined,
-        });
-
-        $.write(tokens, TOKENS_KEY);
-        return success(res, {
-            token,
-            // secret,
-        });
-    } catch (e) {
-        return failed(
-            res,
-            new InternalServerError(
-                'TOKEN_SIGN_FAILED',
-                `Failed to sign token`,
-                `Reason: ${e.message ?? e}`,
-            ),
-        );
-    }
-}

backend/src/utils/database.js

@@ -1,17 +1,17 @@
-export function findByName(list, name, field = 'name') {
-    return list.find((item) => item[field] === name);
+export function findByName(list, name) {
+    return list.find((item) => item.name === name);
 }
 
-export function findIndexByName(list, name, field = 'name') {
-    return list.findIndex((item) => item[field] === name);
+export function findIndexByName(list, name) {
+    return list.findIndex((item) => item.name === name);
 }
 
-export function deleteByName(list, name, field = 'name') {
-    const idx = findIndexByName(list, name, field);
+export function deleteByName(list, name) {
+    const idx = findIndexByName(list, name);
     list.splice(idx, 1);
 }
 
-export function updateByName(list, name, newItem, field = 'name') {
-    const idx = findIndexByName(list, name, field);
+export function updateByName(list, name, newItem) {
+    const idx = findIndexByName(list, name);
     list[idx] = newItem;
 }

backend/src/utils/dns.js

@@ -1,50 +0,0 @@
-import $ from '@/core/app';
-import dnsPacket from 'dns-packet';
-import { Buffer } from 'buffer';
-import { isIPv4 } from '@/utils';
-
-export async function doh({ url, domain, type = 'A', timeout, edns }) {
-    const buf = dnsPacket.encode({
-        type: 'query',
-        id: 0,
-        flags: dnsPacket.RECURSION_DESIRED,
-        questions: [
-            {
-                type,
-                name: domain,
-            },
-        ],
-        additionals: [
-            {
-                type: 'OPT',
-                name: '.',
-                udpPayloadSize: 4096,
-                flags: 0,
-                options: [
-                    {
-                        code: 'CLIENT_SUBNET',
-                        ip: edns,
-                        sourcePrefixLength: isIPv4(edns) ? 24 : 56,
-                        scopePrefixLength: 0,
-                    },
-                ],
-            },
-        ],
-    });
-    const res = await $.http.get({
-        url: `${url}?dns=${buf
-            .toString('base64')
-            .toString('utf-8')
-            .replace(/=/g, '')}`,
-        headers: {
-            Accept: 'application/dns-message',
-            // 'Content-Type': 'application/dns-message',
-        },
-        // body: buf,
-        'binary-mode': true,
-        encoding: null, // 使用 null 编码以确保响应是原始二进制数据
-        timeout,
-    });
-
-    return dnsPacket.decode(Buffer.from($.env.isQX ? res.bodyBytes : res.body));
-}

backend/src/utils/download.js

@@ -1,356 +1,44 @@
-import { SETTINGS_KEY, FILES_KEY, MODULES_KEY } from '@/constants';
-import { HTTP, ENV } from '@/vendor/open-api';
+import { HTTP } from '@/vendor/open-api';
 import { hex_md5 } from '@/vendor/md5';
-import { getPolicyDescriptor } from '@/utils';
 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';
-import { findByName } from '@/utils/database';
-import { produceArtifact } from '@/restful/sync';
-import PROXY_PREPROCESSORS from '@/core/proxy-utils/preprocessors';
-import { ProxyUtils } from '@/core/proxy-utils';
-
-const clashPreprocessor = PROXY_PREPROCESSORS.find(
-    (processor) => processor.name === 'Clash Pre-processor',
-);
 
 const tasks = new Map();
 
-export default async function download(
-    rawUrl = '',
-    ua,
-    timeout,
-    customProxy,
-    skipCustomCache,
-    awaitCustomCache,
-    noCache,
-    preprocess,
-) {
-    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 { isNode, isStash, isLoon, isShadowRocket, isQX } = ENV();
-    const {
-        defaultProxy,
-        defaultUserAgent,
-        defaultTimeout,
-        cacheThreshold: defaultCacheThreshold,
-    } = $.read(SETTINGS_KEY);
-    const cacheThreshold = defaultCacheThreshold || 1024;
-    let proxy = customProxy || defaultProxy;
-    if ($.env.isNode) {
-        proxy = proxy || eval('process.env.SUB_STORE_BACKEND_DEFAULT_PROXY');
-    }
-    const userAgent = ua || defaultUserAgent || 'clash.meta';
-    const requestTimeout = timeout || defaultTimeout || 8000;
-    const id = hex_md5(userAgent + url);
-
-    if ($arguments?.cacheKey === true) {
-        $.error(`使用自定义缓存时 cacheKey 的值不能为空`);
-        $arguments.cacheKey = undefined;
-    }
-
-    const customCacheKey = $arguments?.cacheKey
-        ? `#sub-store-cached-custom-${$arguments?.cacheKey}`
-        : undefined;
-
-    if (customCacheKey && !skipCustomCache) {
-        const customCached = $.read(customCacheKey);
-        const cached = resourceCache.get(id);
-        if (!noCache && !$arguments?.noCache && cached) {
-            $.info(
-                `乐观缓存: URL ${url}\n存在有效的常规缓存\n使用常规缓存以避免重复请求`,
-            );
-            return cached;
-        }
-        if (customCached) {
-            if (awaitCustomCache) {
-                $.info(`乐观缓存: URL ${url}\n本次进行请求 尝试更新缓存`);
-                try {
-                    await download(
-                        rawUrl.replace(/(\?|&)cacheKey=.*?(&|$)/, ''),
-                        ua,
-                        timeout,
-                        proxy,
-                        true,
-                        undefined,
-                        undefined,
-                        preprocess,
-                    );
-                } catch (e) {
-                    $.error(
-                        `乐观缓存: URL ${url} 更新缓存发生错误 ${
-                            e.message ?? e
-                        }`,
-                    );
-                    $.info('使用乐观缓存的数据刷新缓存, 防止后续请求');
-                    resourceCache.set(id, customCached);
-                }
-            } else {
-                $.info(
-                    `乐观缓存: URL ${url}\n本次返回自定义缓存 ${$arguments?.cacheKey}\n并进行请求 尝试异步更新缓存`,
-                );
-                download(
-                    rawUrl.replace(/(\?|&)cacheKey=.*?(&|$)/, ''),
-                    ua,
-                    timeout,
-                    proxy,
-                    true,
-                    undefined,
-                    undefined,
-                    preprocess,
-                ).catch((e) => {
-                    $.error(
-                        `乐观缓存: URL ${url} 异步更新缓存发生错误 ${
-                            e.message ?? e
-                        }`,
-                    );
-                });
-            }
-            return customCached;
-        }
-    }
-
-    const downloadUrlMatch = url
-        .split('#')[0]
-        .match(/^\/api\/(file|module)\/(.+)/);
-    if (downloadUrlMatch) {
-        let type = '';
-        try {
-            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}`);
-            }
-
-            if (type === 'module') {
-                return item.content;
-            } else {
-                return await produceArtifact({
-                    type: 'file',
-                    name,
-                });
-            }
-        } catch (err) {
-            $.error(
-                `Error when loading ${type}: ${
-                    url.split('#')[0]
-                }.\n Reason: ${err}`,
-            );
-            throw new Error(`无法加载 ${type}: ${url}`);
-        }
-    } else if (url?.startsWith('/')) {
-        try {
-            const fs = eval(`require("fs")`);
-            return fs.readFileSync(url.split('#')[0], 'utf8');
-        } catch (err) {
-            $.error(
-                `Error when reading local file: ${
-                    url.split('#')[0]
-                }.\n Reason: ${err}`,
-            );
-            throw new Error(`无法从该路径读取文本内容: ${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,
-            ...(isStash && proxy
-                ? { 'X-Stash-Selected-Proxy': encodeURIComponent(proxy) }
-                : {}),
-            ...(isShadowRocket && proxy ? { 'X-Surge-Policy': proxy } : {}),
+            'User-Agent': ua,
         },
-        timeout: requestTimeout,
     });
 
-    let result;
-
-    // try to find in app cache
-    const cached = resourceCache.get(id);
-    if (!noCache && !$arguments?.noCache && cached) {
-        $.info(`使用缓存: ${url}, ${userAgent}`);
-        result = cached;
-        if (customCacheKey) {
-            $.info(`URL ${url}\n写入自定义缓存 ${$arguments?.cacheKey}`);
-            $.write(cached, customCacheKey);
+    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}`));
+                });
         }
-    } else {
-        const insecure = $arguments?.insecure
-            ? isNode
-                ? { strictSSL: false }
-                : { insecure: true }
-            : undefined;
-        $.info(
-            `Downloading...\nUser-Agent: ${userAgent}\nTimeout: ${requestTimeout}\nProxy: ${proxy}\nInsecure: ${!!insecure}\nPreprocess: ${preprocess}\nURL: ${url}`,
-        );
-        try {
-            let { body, headers, statusCode } = await http.get({
-                url,
-                ...(proxy ? { proxy } : {}),
-                ...(isLoon && proxy ? { node: proxy } : {}),
-                ...(isQX && proxy ? { opts: { policy: proxy } } : {}),
-                ...(proxy ? getPolicyDescriptor(proxy) : {}),
-                ...(insecure ? insecure : {}),
-            });
-            $.info(`statusCode: ${statusCode}`);
-            if (statusCode < 200 || statusCode >= 400) {
-                throw new Error(`statusCode: ${statusCode}`);
-            }
+    });
 
-            if (headers) {
-                const flowInfo = getFlowField(headers);
-                if (flowInfo) {
-                    headersResourceCache.set(id, flowInfo);
-                }
-            }
-            if (body.replace(/\s/g, '').length === 0)
-                throw new Error(new Error('远程资源内容为空'));
-            if (preprocess) {
-                try {
-                    if (clashPreprocessor.test(body)) {
-                        body = clashPreprocessor.parse(body, true);
-                    }
-                } catch (e) {
-                    $.error(`Clash Pre-processor error: ${e}`);
-                }
-            }
-            let shouldCache = true;
-            if (cacheThreshold) {
-                const size = body.length / 1024;
-                if (size > cacheThreshold) {
-                    $.info(
-                        `资源大小 ${size.toFixed(
-                            2,
-                        )} KB 超过了 ${cacheThreshold} KB, 不缓存`,
-                    );
-                    shouldCache = false;
-                }
-            }
-            if (shouldCache) {
-                resourceCache.set(id, body);
-                if (customCacheKey) {
-                    let shouldWriteCustomCacheKey = true;
-                    if (preprocess) {
-                        try {
-                            const proxies = ProxyUtils.parse(body);
-                            if (
-                                !Array.isArray(proxies) ||
-                                proxies.length === 0
-                            ) {
-                                $.error(
-                                    `URL ${url} 不包含有效节点\n不写入自定义缓存 ${$arguments?.cacheKey}`,
-                                );
-                                shouldWriteCustomCacheKey = false;
-                            }
-                        } catch (e) {
-                            $.error(
-                                `URL ${url} 尝试解析节点失败 ${
-                                    e.message ?? e
-                                }\n不写入自定义缓存 ${$arguments?.cacheKey}`,
-                            );
-                            shouldWriteCustomCacheKey = false;
-                        }
-                    }
-                    if (shouldWriteCustomCacheKey) {
-                        $.info(
-                            `URL ${url}\n写入自定义缓存 ${$arguments?.cacheKey}`,
-                        );
-                        $.write(body, customCacheKey);
-                    }
-                }
-            }
-
-            result = body;
-        } catch (e) {
-            if (customCacheKey) {
-                const cached = $.read(customCacheKey);
-                if (cached) {
-                    $.info(
-                        `无法下载 URL ${url}: ${
-                            e.message ?? e
-                        }\n使用自定义缓存 ${$arguments?.cacheKey}`,
-                    );
-                    return cached;
-                }
-            }
-            throw new Error(`无法下载 URL ${url}: ${e.message ?? e}`);
-        }
-    }
-
-    // 检查订阅有效性
-
-    if ($arguments?.validCheck) {
-        await validCheck(
-            parseFlowHeaders(
-                await getFlowHeaders(
-                    url,
-                    $arguments.flowUserAgent,
-                    undefined,
-                    proxy,
-                    $arguments.flowUrl,
-                ),
-            ),
-        );
-    }
-
-    if (!isNode) {
-        tasks.set(id, result);
-    }
+    tasks.set(id, result);
     return result;
 }
-
-export async function downloadFile(url, file) {
-    const undici = eval("require('undici')");
-    const fs = eval("require('fs')");
-    const { pipeline } = eval("require('stream/promises')");
-    const { Agent, interceptors, request } = undici;
-    $.info(`Downloading file...\nURL: ${url}\nFile: ${file}`);
-    const { body, statusCode } = await request(url, {
-        dispatcher: new Agent().compose(
-            interceptors.redirect({
-                maxRedirections: 3,
-                throwOnRedirect: true,
-            }),
-        ),
-    });
-    if (statusCode !== 200)
-        throw new Error(`Failed to download file from ${url}`);
-    const fileStream = fs.createWriteStream(file);
-    await pipeline(body, fileStream);
-    $.info(`File downloaded from ${url} to ${file}`);
-    return file;
-}

backend/src/utils/env.js

@@ -1,69 +0,0 @@
-import { version as substoreVersion } from '../../package.json';
-import { ENV } from '@/vendor/open-api';
-
-const {
-    isNode,
-    isQX,
-    isLoon,
-    isSurge,
-    isStash,
-    isShadowRocket,
-    isLanceX,
-    isEgern,
-    isGUIforCores,
-} = 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';
-if (isEgern) backend = 'Egern';
-if (isLanceX) backend = 'LanceX';
-if (isGUIforCores) backend = 'GUI.for.Cores';
-
-let meta = {};
-let feature = {};
-
-try {
-    if (typeof $environment !== 'undefined') {
-        // eslint-disable-next-line no-undef
-        meta.env = $environment;
-    }
-    if (typeof $loon !== 'undefined') {
-        // eslint-disable-next-line no-undef
-        meta.loon = $loon;
-    }
-    if (typeof $script !== 'undefined') {
-        // eslint-disable-next-line no-undef
-        meta.script = $script;
-    }
-    if (typeof $Plugin !== 'undefined') {
-        // eslint-disable-next-line no-undef
-        meta.plugin = $Plugin;
-    }
-    if (isNode) {
-        meta.node = {
-            version: eval('process.version'),
-            argv: eval('process.argv'),
-            filename: eval('__filename'),
-            dirname: eval('__dirname'),
-            env: {},
-        };
-        const env = eval('process.env');
-        for (const key in env) {
-            if (/^SUB_STORE_/.test(key)) {
-                meta.node.env[key] = env[key];
-            }
-        }
-    }
-    // eslint-disable-next-line no-empty
-} catch (e) {}
-
-export default {
-    backend,
-    version: substoreVersion,
-    feature,
-    meta,
-};

backend/src/utils/flow.js

@@ -1,368 +1,15 @@
-import { SETTINGS_KEY } from '@/constants';
-import { HTTP, ENV } from '@/vendor/open-api';
-import { hex_md5 } from '@/vendor/md5';
-import { getPolicyDescriptor } from '@/utils';
-import $ from '@/core/app';
-import headersResourceCache from '@/utils/headers-resource-cache';
+import { HTTP } from '@/vendor/open-api';
 
-export function getFlowField(headers) {
-    const keys = Object.keys(headers);
-    let sub = '';
-    let webPage = '';
-    for (let k of keys) {
-        const lower = k.toLowerCase();
-        if (lower === 'subscription-userinfo') {
-            sub = headers[k];
-        } else if (lower === 'profile-web-page-url') {
-            webPage = headers[k];
-        }
-    }
-
-    return `${sub || ''}${
-        webPage ? `; app_url=${encodeURIComponent(webPage)}` : ''
-    }`;
-}
-export async function getFlowHeaders(
-    rawUrl,
-    ua,
-    timeout,
-    customProxy,
-    flowUrl,
-) {
-    let url = flowUrl || 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 || !/^https?/.test(url)) {
-        return;
-    }
-    const { isStash, isLoon, isShadowRocket, isQX } = ENV();
-    const insecure = $arguments?.insecure
-        ? $.env.isNode
-            ? { strictSSL: false }
-            : { insecure: true }
-        : undefined;
-    const { defaultProxy, defaultFlowUserAgent, defaultTimeout } =
-        $.read(SETTINGS_KEY);
-    let proxy = customProxy || defaultProxy;
-    if ($.env.isNode) {
-        proxy = proxy || eval('process.env.SUB_STORE_BACKEND_DEFAULT_PROXY');
-    }
-    const userAgent = ua || defaultFlowUserAgent || 'clash';
-    const requestTimeout = timeout || defaultTimeout || 8000;
-    const id = hex_md5(userAgent + url);
-    const cached = headersResourceCache.get(id);
-    let flowInfo;
-    if (!$arguments?.noCache && cached) {
-        $.info(`使用缓存的流量信息: ${url}, ${userAgent}`);
-        flowInfo = cached;
-    } else {
-        const http = HTTP();
-        if (flowUrl) {
-            $.info(
-                `使用 GET 方法从响应体获取流量信息: ${flowUrl}, User-Agent: ${
-                    userAgent || ''
-                }, Insecure: ${!!insecure}, Proxy: ${proxy}`,
-            );
-            const { body } = await http.get({
-                url: flowUrl,
-                headers: {
-                    'User-Agent': userAgent,
-                },
-                timeout: requestTimeout,
-                ...(proxy ? { proxy } : {}),
-                ...(isLoon && proxy ? { node: proxy } : {}),
-                ...(isQX && proxy ? { opts: { policy: proxy } } : {}),
-                ...(proxy ? getPolicyDescriptor(proxy) : {}),
-                ...(insecure ? insecure : {}),
-            });
-            flowInfo = body;
-        } else {
-            try {
-                $.info(
-                    `使用 HEAD 方法从响应头获取流量信息: ${url}, User-Agent: ${
-                        userAgent || ''
-                    }, Insecure: ${!!insecure}, Proxy: ${proxy}`,
-                );
-                const { headers } = await http.head({
-                    url: url
-                        .split(/[\r\n]+/)
-                        .map((i) => i.trim())
-                        .filter((i) => i.length)[0],
-                    headers: {
-                        'User-Agent': userAgent,
-                        ...(isStash && proxy
-                            ? {
-                                  'X-Stash-Selected-Proxy':
-                                      encodeURIComponent(proxy),
-                              }
-                            : {}),
-                        ...(isShadowRocket && proxy
-                            ? { 'X-Surge-Policy': proxy }
-                            : {}),
-                    },
-                    timeout: requestTimeout,
-                    ...(proxy ? { proxy } : {}),
-                    ...(isLoon && proxy ? { node: proxy } : {}),
-                    ...(isQX && proxy ? { opts: { policy: proxy } } : {}),
-                    ...(proxy ? getPolicyDescriptor(proxy) : {}),
-                    ...(insecure ? insecure : {}),
-                });
-                flowInfo = getFlowField(headers);
-            } catch (e) {
-                $.error(
-                    `使用 HEAD 方法从响应头获取流量信息失败: ${url}, User-Agent: ${
-                        userAgent || ''
-                    }, Insecure: ${!!insecure}, Proxy: ${proxy}: ${
-                        e.message ?? e
-                    }`,
-                );
-            }
-            if (!flowInfo) {
-                $.info(
-                    `使用 GET 方法获取流量信息: ${url}, User-Agent: ${
-                        userAgent || ''
-                    }, Insecure: ${!!insecure}, Proxy: ${proxy}`,
-                );
-                const { headers } = await http.get({
-                    url: url
-                        .split(/[\r\n]+/)
-                        .map((i) => i.trim())
-                        .filter((i) => i.length)[0],
-                    headers: {
-                        'User-Agent': userAgent,
-                        ...(isStash && proxy
-                            ? {
-                                  'X-Stash-Selected-Proxy':
-                                      encodeURIComponent(proxy),
-                              }
-                            : {}),
-                        ...(isShadowRocket && proxy
-                            ? { 'X-Surge-Policy': proxy }
-                            : {}),
-                    },
-                    timeout: requestTimeout,
-                    ...(proxy ? { proxy } : {}),
-                    ...(isLoon && proxy ? { node: proxy } : {}),
-                    ...(isQX && proxy ? { opts: { policy: proxy } } : {}),
-                    ...(proxy ? getPolicyDescriptor(proxy) : {}),
-                    ...(insecure ? insecure : {}),
-                });
-                flowInfo = getFlowField(headers);
-            }
-        }
-        if (flowInfo) {
-            flowInfo = flowInfo.trim();
-        }
-        if (flowInfo) {
-            headersResourceCache.set(id, 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;
-
-    const remainingDaysMatch = flowHeaders.match(/reset_day=([0-9]+)/);
-    const remainingDays = remainingDaysMatch
-        ? Number(remainingDaysMatch[1])
-        : undefined;
-
-    const appUrlMatch = flowHeaders.match(/app_url=(.*?)\s*?(;|$)/);
-    const appUrl = appUrlMatch ? decodeURIComponent(appUrlMatch[1]) : undefined;
-
-    const planNameMatch = flowHeaders.match(/plan_name=(.*?)\s*?(;|$)/);
-    const planName = planNameMatch
-        ? decodeURIComponent(planNameMatch[1])
-        : undefined;
-
-    return {
-        expires,
-        total,
-        usage: { upload, download },
-        remainingDays,
-        appUrl,
-        planName,
-    };
-}
-
-export function flowTransfer(flow, unit = 'B') {
-    const unitList = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-    let unitIndex = unitList.indexOf(unit);
-
-    return flow < 1024 || unitIndex === unitList.length - 1
-        ? { 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}`,
-            );
-        }
-    }
-}
-
-export function getRmainingDays(opt = {}) {
-    try {
-        let { resetDay, startDate, cycleDays } = opt;
-        if (['string', 'number'].includes(typeof opt)) {
-            resetDay = opt;
-        }
-
-        if (startDate && cycleDays) {
-            cycleDays = parseInt(cycleDays);
-            if (isNaN(cycleDays) || cycleDays <= 0)
-                throw new Error('重置周期应为正整数');
-            if (!startDate || !Date.parse(startDate))
-                throw new Error('开始日期不合法');
-
-            const start = new Date(startDate);
-            const today = new Date();
-            start.setHours(0, 0, 0, 0);
-            today.setHours(0, 0, 0, 0);
-            if (start.getTime() > today.getTime())
-                throw new Error('开始日期应早于现在');
-
-            let resetDate = new Date(startDate);
-            resetDate.setDate(resetDate.getDate() + cycleDays);
-
-            while (resetDate < today) {
-                resetDate.setDate(resetDate.getDate() + cycleDays);
-            }
-
-            resetDate.setHours(0, 0, 0, 0);
-            const timeDiff = resetDate.getTime() - today.getTime();
-            const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
-
-            return daysDiff;
-        } else {
-            if (!resetDay) return;
-            resetDay = parseInt(resetDay);
-            if (isNaN(resetDay) || resetDay <= 0 || resetDay > 31)
-                throw new Error('月重置日应为 1-31 之间的整数');
-            let now = new Date();
-            let today = now.getDate();
-            let month = now.getMonth();
-            let year = now.getFullYear();
-            let daysInMonth;
-
-            if (resetDay > today) {
-                daysInMonth = 0;
-            } else {
-                daysInMonth = new Date(year, month + 1, 0).getDate();
-            }
-
-            return daysInMonth - today + resetDay;
-        }
-    } catch (e) {
-        $.error(`getRmainingDays failed: ${e.message ?? e}`);
-    }
-}
-
-export function normalizeFlowHeader(flowHeaders) {
-    try {
-        // 使用 Map 保持顺序并处理重复键
-        const kvMap = new Map();
-
-        flowHeaders
-            .split(';')
-            .map((p) => p.trim())
-            .filter(Boolean)
-            .forEach((pair) => {
-                const eqIndex = pair.indexOf('=');
-                if (eqIndex === -1) return;
-
-                const key = pair.slice(0, eqIndex).trim();
-                const encodedValue = pair.slice(eqIndex + 1).trim();
-
-                // 只保留第一个出现的 key
-                if (!kvMap.has(key)) {
-                    try {
-                        // 解码 URI 组件并保留原始值作为 fallback
-                        let decodedValue = decodeURIComponent(encodedValue);
-                        if (
-                            ['upload', 'download', 'total', 'expire'].includes(
-                                key,
-                            )
-                        ) {
-                            try {
-                                decodedValue = Number(decodedValue).toFixed(0);
-                            } catch (e) {
-                                $.error(
-                                    `Failed to convert value for key "${key}=${encodedValue}": ${
-                                        e.message ?? e
-                                    }`,
-                                );
-                            }
-                        }
-                        kvMap.set(key, decodedValue);
-                    } catch (e) {
-                        kvMap.set(key, encodedValue);
-                    }
-                }
-            });
-
-        // 拼接标准化字符串
-        return Array.from(kvMap.entries())
-            .map(([k, v]) => `${k}=${encodeURIComponent(v)}`) // 重新编码保持兼容性
-            .join('; ');
-    } catch (e) {
-        $.error(`normalizeFlowHeader failed: ${e.message ?? e}`);
-        return flowHeaders;
-    }
+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];
 }

backend/src/utils/geo.js

@@ -1,116 +1,3 @@
-import $ from '@/core/app';
-
-const ISOFlags = {
-    '🏳️‍🌈': ['EXP', 'BAND'],
-    '🇸🇱': ['TEST', 'SOS'],
-    '🇦🇩': ['AD', 'AND'],
-    '🇦🇪': ['AE', 'ARE'],
-    '🇦🇫': ['AF', 'AFG'],
-    '🇦🇱': ['AL', 'ALB'],
-    '🇦🇲': ['AM', 'ARM'],
-    '🇦🇷': ['AR', 'ARG'],
-    '🇦🇹': ['AT', 'AUT'],
-    '🇦🇺': ['AU', 'AUS'],
-    '🇦🇿': ['AZ', 'AZE'],
-    '🇧🇦': ['BA', 'BIH'],
-    '🇧🇩': ['BD', 'BGD'],
-    '🇧🇪': ['BE', 'BEL'],
-    '🇧🇬': ['BG', 'BGR'],
-    '🇧🇭': ['BH', 'BHR'],
-    '🇧🇴': ['BO', 'BOL'],
-    '🇧🇳': ['BN', 'BRN'],
-    '🇧🇷': ['BR', 'BRA'],
-    '🇧🇹': ['BT', 'BTN'],
-    '🇧🇾': ['BY', 'BLR'],
-    '🇨🇦': ['CA', 'CAN'],
-    '🇨🇭': ['CH', 'CHE'],
-    '🇨🇱': ['CL', 'CHL'],
-    '🇨🇴': ['CO', 'COL'],
-    '🇨🇷': ['CR', 'CRI'],
-    '🇨🇾': ['CY', 'CYP'],
-    '🇨🇿': ['CZ', 'CZE'],
-    '🇩🇪': ['DE', 'DEU'],
-    '🇩🇰': ['DK', 'DNK'],
-    '🇪🇨': ['EC', 'ECU'],
-    '🇪🇪': ['EE', 'EST'],
-    '🇪🇬': ['EG', 'EGY'],
-    '🇪🇸': ['ES', 'ESP'],
-    '🇪🇺': ['EU'],
-    '🇫🇮': ['FI', 'FIN'],
-    '🇫🇷': ['FR', 'FRA'],
-    '🇬🇧': ['GB', 'GBR', 'UK'],
-    '🇬🇪': ['GE', 'GEO'],
-    '🇬🇷': ['GR', 'GRC'],
-    '🇬🇹': ['GT', 'GTM'],
-    '🇬🇺': ['GU', 'GUM'],
-    '🇭🇰': ['HK', 'HKG', 'HKT', 'HKBN', 'HGC', 'WTT', 'CMI'],
-    '🇭🇷': ['HR', 'HRV'],
-    '🇭🇺': ['HU', 'HUN'],
-    '🇯🇴': ['JO', 'JOR'],
-    '🇯🇵': ['JP', 'JPN', 'TYO'],
-    '🇰🇪': ['KE', 'KEN'],
-    '🇰🇬': ['KG', 'KGZ'],
-    '🇰🇭': ['KH', 'KGZ'],
-    '🇰🇵': ['KP', 'PRK'],
-    '🇰🇷': ['KR', 'KOR', 'SEL'],
-    '🇰🇿': ['KZ', 'KAZ'],
-    '🇮🇩': ['ID', 'IDN'],
-    '🇮🇪': ['IE', 'IRL'],
-    '🇮🇱': ['IL', 'ISR'],
-    '🇮🇲': ['IM', 'IMN'],
-    '🇮🇳': ['IN', 'IND'],
-    '🇮🇷': ['IR', 'IRN'],
-    '🇮🇸': ['IS', 'ISL'],
-    '🇮🇹': ['IT', 'ITA'],
-    '🇱🇦': ['LA', 'LAO'],
-    '🇱🇰': ['LK', 'LKA'],
-    '🇱🇹': ['LT', 'LTU'],
-    '🇱🇺': ['LU', 'LUX'],
-    '🇱🇻': ['LV', 'LVA'],
-    '🇲🇦': ['MA', 'MAR'],
-    '🇲🇩': ['MD', 'MDA'],
-    '🇳🇬': ['NG', 'NGA'],
-    '🇲🇲': ['MM', 'MMR'],
-    '🇲🇰': ['MK', 'MKD'],
-    '🇲🇳': ['MN', 'MNG'],
-    '🇲🇴': ['MO', 'MAC', 'CTM'],
-    '🇲🇹': ['MT', 'MLT'],
-    '🇲🇽': ['MX', 'MEX'],
-    '🇲🇾': ['MY', 'MYS'],
-    '🇳🇱': ['NL', 'NLD', 'AMS'],
-    '🇳🇴': ['NO', 'NOR'],
-    '🇳🇵': ['NP', 'NPL'],
-    '🇳🇿': ['NZ', 'NZL'],
-    '🇵🇦': ['PA', 'PAN'],
-    '🇵🇪': ['PE', 'PER'],
-    '🇵🇭': ['PH', 'PHL'],
-    '🇵🇰': ['PK', 'PAK'],
-    '🇵🇱': ['PL', 'POL'],
-    '🇵🇷': ['PR', 'PRI'],
-    '🇵🇹': ['PT', 'PRT'],
-    '🇵🇾': ['PY', 'PRY'],
-    '🇵🇬': ['PG', 'PNG'],
-    '🇷🇴': ['RO', 'ROU'],
-    '🇷🇸': ['RS', 'SRB'],
-    '🇷🇪': ['RE', 'REU'],
-    '🇷🇺': ['RU', 'RUS'],
-    '🇸🇦': ['SA', 'SAU'],
-    '🇸🇪': ['SE', 'SWE'],
-    '🇸🇬': ['SG', 'SGP'],
-    '🇸🇮': ['SI', 'SVN'],
-    '🇸🇰': ['SK', 'SVK'],
-    '🇹🇭': ['TH', 'THA'],
-    '🇹🇳': ['TN', 'TUN'],
-    '🇹🇷': ['TR', 'TUR'],
-    '🇹🇼': ['TW', 'TWN', 'CHT', 'HINET', 'ROC'],
-    '🇺🇦': ['UA', 'UKR'],
-    '🇺🇸': ['US', 'USA', 'LAX', 'SFO', 'SJC'],
-    '🇺🇾': ['UY', 'URY'],
-    '🇻🇪': ['VE', 'VEN'],
-    '🇻🇳': ['VN', 'VNM'],
-    '🇿🇦': ['ZA', 'ZAF', 'JNB'],
-    '🇨🇳': ['CN', 'CHN', 'BACK'],
-};
 // get proxy flag according to its name
 export function getFlag(name) {
     // flags from @KOP-XIAO: https://github.com/KOP-XIAO/QuantumultX/blob/master/Scripts/resource-parser.js
@@ -149,10 +36,7 @@ export function getFlag(name) {
         '🇧🇬': ['Bulgaria', '保加利亚', '保加利亞'],
         '🇧🇭': ['Bahrain', '巴林'],
         '🇧🇷': ['Brazil', '巴西', '圣保罗'],
-        '🇧🇳': ['Brunei', '文莱', '汶萊'],
         '🇧🇾': ['Belarus', '白俄罗斯', '白俄'],
-        '🇧🇴': ['Bolivia', '玻利维亚'],
-        '🇧🇹': ['Bhutan', '不丹', '不丹王国'],
         '🇨🇦': [
             'Canada',
             '加拿大',
@@ -163,7 +47,6 @@ export function getFlag(name) {
             '滑铁卢',
             '多伦多',
             'Waterloo',
-            'Toronto',
         ],
         '🇨🇭': ['Switzerland', '瑞士', '苏黎世', 'Zurich'],
         '🇨🇱': ['Chile', '智利'],
@@ -182,7 +65,6 @@ export function getFlag(name) {
             '广德',
             '法兰克福',
             'Frankfurt',
-            '德意志',
         ],
         '🇩🇰': ['Denmark', '丹麦', '丹麥'],
         '🇪🇨': ['Ecuador', '厄瓜多尔'],
@@ -203,8 +85,6 @@ export function getFlag(name) {
         ],
         '🇬🇪': ['Georgia', '格鲁吉亚', '格魯吉亞'],
         '🇬🇷': ['Greece', '希腊', '希臘'],
-        '🇬🇺': ['Guam', '关岛', '關島'],
-        '🇬🇹': ['Guatemala', '危地马拉'],
         '🇭🇰': [
             'Hongkong',
             '香港',
@@ -260,33 +140,23 @@ export function getFlag(name) {
         '🇮🇪': ['Ireland', '爱尔兰', '愛爾蘭', '都柏林'],
         '🇮🇱': ['Israel', '以色列'],
         '🇮🇲': ['Isle of Man', '马恩岛', '馬恩島'],
-        '🇮🇳': ['India', '印度', '孟买', 'MFumbai', 'Mumbai'],
+        '🇮🇳': ['India', '印度', '孟买', 'MFumbai'],
         '🇮🇷': ['Iran', '伊朗'],
         '🇮🇸': ['Iceland', '冰岛', '冰島'],
         '🇮🇹': ['Italy', '意大利', '義大利', '米兰', 'Nachash'],
-        '🇱🇰': ['Sri Lanka', '斯里兰卡', '斯里蘭卡'],
-        '🇱🇦': ['Laos', '老挝', '老撾'],
         '🇱🇹': ['Lithuania', '立陶宛'],
         '🇱🇺': ['Luxembourg', '卢森堡'],
         '🇱🇻': ['Latvia', '拉脱维亚', 'Latvija'],
         '🇲🇦': ['Morocco', '摩洛哥'],
         '🇲🇩': ['Moldova', '摩尔多瓦', '摩爾多瓦'],
-        '🇲🇲': ['Myanmar', '缅甸', '緬甸'],
         '🇳🇬': ['Nigeria', '尼日利亚', '尼日利亞'],
         '🇲🇰': ['Macedonia', '马其顿', '馬其頓'],
         '🇲🇳': ['Mongolia', '蒙古'],
         '🇲🇴': ['Macao', '澳门', '澳門', 'CTM'],
         '🇲🇹': ['Malta', '马耳他'],
         '🇲🇽': ['Mexico', '墨西哥'],
-        '🇲🇾': ['Malaysia', '马来', '馬來', '吉隆坡', '大馬'],
-        '🇳🇱': [
-            'Netherlands',
-            '荷兰',
-            '荷蘭',
-            '尼德蘭',
-            '阿姆斯特丹',
-            'Amsterdam',
-        ],
+        '🇲🇾': ['Malaysia', '马来西亚', '馬來西亞', '吉隆坡', '大馬'],
+        '🇳🇱': ['Netherlands', '荷兰', '荷蘭', '尼德蘭', '阿姆斯特丹'],
         '🇳🇴': ['Norway', '挪威'],
         '🇳🇵': ['Nepal', '尼泊尔'],
         '🇳🇿': ['New Zealand', '新西兰', '新西蘭'],
@@ -294,10 +164,9 @@ export function getFlag(name) {
         '🇵🇪': ['Peru', '秘鲁', '祕魯'],
         '🇵🇭': ['Philippines', '菲律宾', '菲律賓'],
         '🇵🇰': ['Pakistan', '巴基斯坦'],
-        '🇵🇱': ['Poland', '波兰', '波蘭', '华沙', 'Warsaw'],
+        '🇵🇱': ['Poland', '波兰', '波蘭'],
         '🇵🇷': ['Puerto Rico', '波多黎各'],
         '🇵🇹': ['Portugal', '葡萄牙'],
-        '🇵🇬': ['Papua New Guinea', '巴布亚新几内亚'],
         '🇵🇾': ['Paraguay', '巴拉圭'],
         '🇷🇴': ['Romania', '罗马尼亚'],
         '🇷🇸': ['Serbia', '塞尔维亚'],
@@ -319,8 +188,8 @@ export function getFlag(name) {
             '沪俄',
             'Moscow',
         ],
-        '🇸🇦': ['Saudi', '沙特阿拉伯', '沙特', 'Riyadh', '利雅得'],
-        '🇸🇪': ['Sweden', '瑞典', '斯德哥尔摩', 'Stockholm'],
+        '🇸🇦': ['Saudi', '沙特阿拉伯', '沙特'],
+        '🇸🇪': ['Sweden', '瑞典'],
         '🇸🇬': [
             'Singapore',
             '新加坡',
@@ -340,22 +209,16 @@ export function getFlag(name) {
         '🇸🇰': ['Slovakia', '斯洛伐克'],
         '🇹🇭': ['Thailand', '泰国', '泰國', '曼谷'],
         '🇹🇳': ['Tunisia', '突尼斯'],
-        '🇹🇷': ['Turkey', '土耳其', '伊斯坦布尔', 'Istanbul'],
+        '🇹🇷': ['Turkey', '土耳其', '伊斯坦布尔'],
         '🇹🇼': [
             'Taiwan',
             '台湾',
-            '臺灣',
-            '台灣',
-            '中華民國',
-            '中华民国',
             '台北',
             '台中',
             '新北',
             '彰化',
             '台',
-            '臺',
             'Taipei',
-            'Tai Wan',
         ],
         '🇺🇦': ['Ukraine', '乌克兰', '烏克蘭'],
         '🇺🇸': [
@@ -367,7 +230,6 @@ export function getFlag(name) {
             '波特兰',
             '达拉斯',
             '俄勒冈',
-            'Oregon',
             '凤凰城',
             '费利蒙',
             '硅谷',
@@ -381,17 +243,10 @@ export function getFlag(name) {
             '沪美',
             '哥伦布',
             '纽约',
-            'New York',
             'Los Angeles',
             'San Jose',
             'Sillicon Valley',
             'Michigan',
-            '俄亥俄',
-            'Ohio',
-            '马纳萨斯',
-            'Manassas',
-            '弗吉尼亚',
-            'Virginia',
         ],
         '🇺🇾': ['Uruguay', '乌拉圭'],
         '🇻🇪': ['Venezuela', '委内瑞拉'],
@@ -423,6 +278,108 @@ export function getFlag(name) {
         ],
     };
 
+    const ISOFlags = {
+        '🏳️‍🌈': ['EXP', 'BAND'],
+        '🇸🇱': ['TEST', 'SOS'],
+        '🇦🇩': ['AD', 'AND'],
+        '🇦🇪': ['AE', 'ARE'],
+        '🇦🇫': ['AF', 'AFG'],
+        '🇦🇱': ['AL', 'ALB'],
+        '🇦🇲': ['AM', 'ARM'],
+        '🇦🇷': ['AR', 'ARG'],
+        '🇦🇹': ['AT', 'AUT'],
+        '🇦🇺': ['AU', 'AUS'],
+        '🇦🇿': ['AZ', 'AZE'],
+        '🇧🇦': ['BA', 'BIH'],
+        '🇧🇩': ['BD', 'BGD'],
+        '🇧🇪': ['BE', 'BEL'],
+        '🇧🇬': ['BG', 'BGR'],
+        '🇧🇭': ['BH', 'BHR'],
+        '🇧🇷': ['BR', 'BRA'],
+        '🇧🇾': ['BY', 'BLR'],
+        '🇨🇦': ['CA', 'CAN'],
+        '🇨🇭': ['CH', 'CHE'],
+        '🇨🇱': ['CL', 'CHL'],
+        '🇨🇴': ['CO', 'COL'],
+        '🇨🇷': ['CR', 'CRI'],
+        '🇨🇾': ['CY', 'CYP'],
+        '🇨🇿': ['CZ', 'CZE'],
+        '🇩🇪': ['DE', 'DEU'],
+        '🇩🇰': ['DK', 'DNK'],
+        '🇪🇨': ['EC', 'ECU'],
+        '🇪🇪': ['EE', 'EST'],
+        '🇪🇬': ['EG', 'EGY'],
+        '🇪🇸': ['ES', 'ESP'],
+        '🇪🇺': ['EU'],
+        '🇫🇮': ['FI', 'FIN'],
+        '🇫🇷': ['FR', 'FRA'],
+        '🇬🇧': ['GB', 'GBR', 'UK'],
+        '🇬🇪': ['GE', 'GEO'],
+        '🇬🇷': ['GR', 'GRC'],
+        '🇭🇰': ['HK', 'HKG', 'HKT', 'HKBN', 'HGC', 'WTT', 'CMI'],
+        '🇭🇷': ['HR', 'HRV'],
+        '🇭🇺': ['HU', 'HUN'],
+        '🇯🇴': ['JO', 'JOR'],
+        '🇯🇵': ['JP', 'JPN'],
+        '🇰🇪': ['KE', 'KEN'],
+        '🇰🇬': ['KG', 'KGZ'],
+        '🇰🇭': ['KH', 'KGZ'],
+        '🇰🇵': ['KP', 'PRK'],
+        '🇰🇷': ['KR', 'KOR'],
+        '🇰🇿': ['KZ', 'KAZ'],
+        '🇮🇩': ['ID', 'IDN'],
+        '🇮🇪': ['IE', 'IRL'],
+        '🇮🇱': ['IL', 'ISR'],
+        '🇮🇲': ['IM', 'IMN'],
+        '🇮🇳': ['IN', 'IND'],
+        '🇮🇷': ['IR', 'IRN'],
+        '🇮🇸': ['IS', 'ISL'],
+        '🇮🇹': ['IT', 'ITA'],
+        '🇱🇹': ['LT', 'LTU'],
+        '🇱🇺': ['LU', 'LUX'],
+        '🇱🇻': ['LV', 'LVA'],
+        '🇲🇦': ['MA', 'MAR'],
+        '🇲🇩': ['MD', 'MDA'],
+        '🇳🇬': ['NG', 'NGA'],
+        '🇲🇰': ['MK', 'MKD'],
+        '🇲🇳': ['MN', 'MNG'],
+        '🇲🇴': ['MO', 'MAC', 'CTM'],
+        '🇲🇹': ['MT', 'MLT'],
+        '🇲🇽': ['MX', 'MEX'],
+        '🇲🇾': ['MY', 'MYS'],
+        '🇳🇱': ['NL', 'NLD'],
+        '🇳🇴': ['NO', 'NOR'],
+        '🇳🇵': ['NP', 'NPL'],
+        '🇳🇿': ['NZ', 'NZL'],
+        '🇵🇦': ['PA', 'PAN'],
+        '🇵🇪': ['PE', 'PER'],
+        '🇵🇭': ['PH', 'PHL'],
+        '🇵🇰': ['PK', 'PAK'],
+        '🇵🇱': ['PL', 'POL'],
+        '🇵🇷': ['PR', 'PRI'],
+        '🇵🇹': ['PT', 'PRT'],
+        '🇵🇾': ['PY', 'PRY'],
+        '🇷🇴': ['RO', 'ROU'],
+        '🇷🇸': ['RS', 'SRB'],
+        '🇷🇪': ['RE', 'REU'],
+        '🇷🇺': ['RU', 'RUS'],
+        '🇸🇦': ['SA', 'SAU'],
+        '🇸🇪': ['SE', 'SWE'],
+        '🇸🇬': ['SG', 'SGP'],
+        '🇸🇮': ['SI', 'SVN'],
+        '🇸🇰': ['SK', 'SVK'],
+        '🇹🇭': ['TH', 'THA'],
+        '🇹🇳': ['TN', 'TUN'],
+        '🇹🇷': ['TR', 'TUR'],
+        '🇹🇼': ['TW', 'TWN', 'CHT', 'HINET'],
+        '🇺🇦': ['UA', 'UKR'],
+        '🇺🇸': ['US', 'USA', 'LAX', 'SFO'],
+        '🇺🇾': ['UY', 'URY'],
+        '🇻🇪': ['VE', 'VEN'],
+        '🇻🇳': ['VN', 'VNM'],
+        '🇿🇦': ['ZA', 'ZAF'],
+        '🇨🇳': ['CN', 'CHN', 'BACK'],
+    };
     // 原旗帜或空
     let Flag =
         name.match(/[\uD83C][\uDDE6-\uDDFF][\uD83C][\uDDE6-\uDDFF]/)?.[0] ||
@@ -436,9 +393,7 @@ export function getFlag(name) {
             // 不精确匹配（只要包含就算,忽略大小写)
             keywords.some((keyword) => RegExp(`${keyword}`, 'i').test(name))
         ) {
-            if (/内蒙古/.test(name) && ['🇲🇳'].includes(flag)) {
-                return (Flag = '🇨🇳');
-            }
+            //console.log(`newFlag = ${flag}`)
             return (Flag = flag);
         }
     }
@@ -452,67 +407,10 @@ export function getFlag(name) {
                 RegExp(`(^|[^a-zA-Z])${keyword}([^a-zA-Z]|$)`).test(name),
             )
         ) {
-            const isCN2 =
-                flag == '🇨🇳' &&
-                RegExp(`(^|[^a-zA-Z])CN2([^a-zA-Z]|$)`).test(name);
-            if (!isCN2) {
-                return (Flag = flag);
-            }
+            //console.log(`ISOFlag = ${flag}`)
+            return (Flag = flag);
         }
     }
-
     //console.log(`Final Flag = ${Flag}`)
     return Flag;
 }
-
-export function getISO(name) {
-    return ISOFlags[getFlag(name)]?.[0];
-}
-
-// remove flag
-export function removeFlag(str) {
-    return str
-        .replace(/[\uD83C][\uDDE6-\uDDFF][\uD83C][\uDDE6-\uDDFF]|🏴‍☠️|🏳️‍🌈/g, '')
-        .trim();
-}
-
-export class MMDB {
-    constructor({ country, asn } = {}) {
-        if ($.env.isNode) {
-            const Reader = eval(`require("@maxmind/geoip2-node")`).Reader;
-            const fs = eval("require('fs')");
-            const countryFile =
-                country || eval('process.env.SUB_STORE_MMDB_COUNTRY_PATH');
-            const asnFile = asn || eval('process.env.SUB_STORE_MMDB_ASN_PATH');
-            // $.info(
-            //     `GeoLite2 Country MMDB: ${countryFile}, exists: ${fs.existsSync(
-            //         countryFile,
-            //     )}`,
-            // );
-            if (countryFile) {
-                this.countryReader = Reader.openBuffer(
-                    fs.readFileSync(countryFile),
-                );
-            }
-            // $.info(
-            //     `GeoLite2 ASN MMDB: ${asnFile}, exists: ${fs.existsSync(
-            //         asnFile,
-            //     )}`,
-            // );
-            if (asnFile) {
-                if (!fs.existsSync(asnFile))
-                    throw new Error('GeoLite2 ASN MMDB does not exist');
-                this.asnReader = Reader.openBuffer(fs.readFileSync(asnFile));
-            }
-        }
-    }
-    geoip(ip) {
-        return this.countryReader?.country(ip)?.country?.isoCode;
-    }
-    ipaso(ip) {
-        return this.asnReader?.asn(ip)?.autonomousSystemOrganization;
-    }
-    ipasn(ip) {
-        return this.asnReader?.asn(ip)?.autonomousSystemNumber;
-    }
-}

backend/src/utils/gist.js

@@ -1,286 +1,80 @@
-import { HTTP, ENV } from '@/vendor/open-api';
-import { getPolicyDescriptor } from '@/utils';
-import $ from '@/core/app';
-import { SETTINGS_KEY } from '@/constants';
+import { HTTP } from '@/vendor/open-api';
 
 /**
  * Gist backup
  */
 export default class Gist {
-    constructor({ token, key, syncPlatform }) {
-        const { isStash, isLoon, isShadowRocket, isQX } = ENV();
-        const { defaultProxy, defaultTimeout: timeout } = $.read(SETTINGS_KEY);
-        let proxy = defaultProxy;
-        if ($.env.isNode) {
-            proxy =
-                proxy || eval('process.env.SUB_STORE_BACKEND_DEFAULT_PROXY');
-        }
-
-        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,
-                    ...(isStash && proxy
-                        ? {
-                              'X-Stash-Selected-Proxy':
-                                  encodeURIComponent(proxy),
-                          }
-                        : {}),
-                    ...(isShadowRocket && proxy
-                        ? { 'X-Surge-Policy': proxy }
-                        : {}),
-                },
-
-                ...(proxy ? { proxy } : {}),
-                ...(isLoon && proxy ? { node: proxy } : {}),
-                ...(isQX && proxy ? { opts: { policy: proxy } } : {}),
-                ...(proxy ? getPolicyDescriptor(proxy) : {}),
-                timeout: timeout || 8000,
-
-                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,
-                    ...(isStash && proxy
-                        ? {
-                              'X-Stash-Selected-Proxy':
-                                  encodeURIComponent(proxy),
-                          }
-                        : {}),
-                    ...(isShadowRocket && proxy
-                        ? { 'X-Surge-Policy': proxy }
-                        : {}),
+            },
+            events: {
+                onResponse: (resp) => {
+                    if (/^[45]/.test(String(resp.statusCode))) {
+                        return Promise.reject(
+                            `ERROR: ${JSON.parse(resp.body).message}`,
+                        );
+                    } else {
+                        return resp;
+                    }
                 },
-
-                ...(proxy ? { proxy } : {}),
-                ...(isLoon && proxy ? { node: proxy } : {}),
-                ...(isQX && proxy ? { opts: { policy: proxy } } : {}),
-                ...(proxy ? getPolicyDescriptor(proxy) : {}),
-                timeout: timeout || 8000,
-
-                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?per_page=100&page=1')
-                .then((response) => {
-                    const gists = JSON.parse(response.body);
-                    $.info(`获取到当前 GitHub 用户的 gist: ${gists.length} 个`);
-                    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 (${this.key})`);
         }
     }
 }

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

@@ -1,117 +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);
-        }
-        try {
-            this.resourceCache = JSON.parse($.read(HEADERS_RESOURCE_CACHE_KEY));
-        } catch (e) {
-            $.error(
-                `解析持久化缓存中的 ${HEADERS_RESOURCE_CACHE_KEY} 失败, 重置为 {}, 错误: ${
-                    e?.message ?? e
-                }`,
-            );
-            this.resourceCache = {};
-            $.write('{}', 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

@@ -1,4 +1,3 @@
-import * as ipAddress from 'ip-address';
 // source: https://stackoverflow.com/a/36760050
 const IPV4_REGEX = /^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)(\.(?!$)|$)){4}$/;
 
@@ -14,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;
 }
@@ -36,133 +29,4 @@ function getIfPresent(obj, defaultValue) {
     return isPresent(obj) ? obj : defaultValue;
 }
 
-function getPolicyDescriptor(str) {
-    if (!str) return {};
-    return /^.+?\s*?=\s*?.+?\s*?,.+?/.test(str)
-        ? {
-              'policy-descriptor': str,
-          }
-        : {
-              policy: str,
-          };
-}
-
-// const utf8ArrayToStr =
-//     typeof TextDecoder !== 'undefined'
-//         ? (v) => new TextDecoder().decode(new Uint8Array(v))
-//         : (function () {
-//               var charCache = new Array(128); // Preallocate the cache for the common single byte chars
-//               var charFromCodePt = String.fromCodePoint || String.fromCharCode;
-//               var result = [];
-
-//               return function (array) {
-//                   var codePt, byte1;
-//                   var buffLen = array.length;
-
-//                   result.length = 0;
-
-//                   for (var i = 0; i < buffLen; ) {
-//                       byte1 = array[i++];
-
-//                       if (byte1 <= 0x7f) {
-//                           codePt = byte1;
-//                       } else if (byte1 <= 0xdf) {
-//                           codePt = ((byte1 & 0x1f) << 6) | (array[i++] & 0x3f);
-//                       } else if (byte1 <= 0xef) {
-//                           codePt =
-//                               ((byte1 & 0x0f) << 12) |
-//                               ((array[i++] & 0x3f) << 6) |
-//                               (array[i++] & 0x3f);
-//                       } else if (String.fromCodePoint) {
-//                           codePt =
-//                               ((byte1 & 0x07) << 18) |
-//                               ((array[i++] & 0x3f) << 12) |
-//                               ((array[i++] & 0x3f) << 6) |
-//                               (array[i++] & 0x3f);
-//                       } else {
-//                           codePt = 63; // Cannot convert four byte code points, so use "?" instead
-//                           i += 3;
-//                       }
-
-//                       result.push(
-//                           charCache[codePt] ||
-//                               (charCache[codePt] = charFromCodePt(codePt)),
-//                       );
-//                   }
-
-//                   return result.join('');
-//               };
-//           })();
-
-function getRandomInt(min, max) {
-    min = Math.ceil(min);
-    max = Math.floor(max);
-    return Math.floor(Math.random() * (max - min + 1)) + min;
-}
-
-function getRandomPort(portString) {
-    let portParts = portString.split(/,|\//);
-    let randomPart = portParts[Math.floor(Math.random() * portParts.length)];
-    if (randomPart.includes('-')) {
-        let [min, max] = randomPart.split('-').map(Number);
-        return getRandomInt(min, max);
-    } else {
-        return Number(randomPart);
-    }
-}
-
-function numberToString(value) {
-    return Number.isSafeInteger(value)
-        ? String(value)
-        : BigInt(value).toString();
-}
-
-function isValidUUID(uuid) {
-    return (
-        typeof uuid === 'string' &&
-        /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(
-            uuid,
-        )
-    );
-}
-
-function formatDateTime(date, format = 'YYYY-MM-DD_HH-mm-ss') {
-    const d = date instanceof Date ? date : new Date(date);
-
-    if (isNaN(d.getTime())) {
-        return '';
-    }
-
-    const pad = (num) => String(num).padStart(2, '0');
-
-    const replacements = {
-        YYYY: d.getFullYear(),
-        MM: pad(d.getMonth() + 1),
-        DD: pad(d.getDate()),
-        HH: pad(d.getHours()),
-        mm: pad(d.getMinutes()),
-        ss: pad(d.getSeconds()),
-    };
-
-    return format.replace(
-        /YYYY|MM|DD|HH|mm|ss/g,
-        (match) => replacements[match],
-    );
-}
-
-export {
-    formatDateTime,
-    isValidUUID,
-    ipAddress,
-    isIPv4,
-    isIPv6,
-    isValidPortNumber,
-    isNotBlank,
-    getIfNotBlank,
-    isPresent,
-    getIfPresent,
-    // utf8ArrayToStr,
-    getPolicyDescriptor,
-    getRandomPort,
-    numberToString,
-};
+export { isIPv4, isIPv6, isNotBlank, getIfNotBlank, isPresent, getIfPresent };

backend/src/utils/migration.js

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

backend/src/utils/platform.js

@@ -0,0 +1,23 @@
+export function getPlatformFromHeaders(headers) {
+    const keys = Object.keys(headers);
+    let UA = '';
+    for (let k of keys) {
+        if (/USER-AGENT/i.test(k)) {
+            UA = headers[k];
+            break;
+        }
+    }
+    if (UA.indexOf('Quantumult%20X') !== -1) {
+        return 'QX';
+    } 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';
+    } else if (UA.indexOf('Stash') !== -1) {
+        return 'Stash';
+    } else {
+        return 'JSON';
+    }
+}

backend/src/utils/resource-cache.js

@@ -7,17 +7,7 @@ class ResourceCache {
         if (!$.read(RESOURCE_CACHE_KEY)) {
             $.write('{}', RESOURCE_CACHE_KEY);
         }
-        try {
-            this.resourceCache = JSON.parse($.read(RESOURCE_CACHE_KEY));
-        } catch (e) {
-            $.error(
-                `解析持久化缓存中的 ${RESOURCE_CACHE_KEY} 失败, 重置为 {}, 错误: ${
-                    e?.message ?? e
-                }`,
-            );
-            this.resourceCache = {};
-            $.write('{}', RESOURCE_CACHE_KEY);
-        }
+        this.resourceCache = JSON.parse($.read(RESOURCE_CACHE_KEY));
         this._cleanup();
     }
 
@@ -26,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;
             }
@@ -41,6 +26,9 @@ class ResourceCache {
     }
 
     revokeAll() {
+        Object.keys(this.resourceCache).forEach((id) => {
+            $.delete(`#${id}`);
+        });
         this.resourceCache = {};
         this._persist();
     }
@@ -50,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/rs.js

@@ -1,11 +0,0 @@
-import rs from 'jsrsasign';
-
-export function generateFingerprint(caStr) {
-    const hex = rs.pemtohex(caStr);
-    const fingerPrint = rs.KJUR.crypto.Util.hashHex(hex, 'sha256');
-    return fingerPrint.match(/.{2}/g).join(':').toUpperCase();
-}
-
-export default {
-    generateFingerprint,
-};

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

@@ -1,124 +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);
-        }
-        try {
-            this.resourceCache = JSON.parse($.read(SCRIPT_RESOURCE_CACHE_KEY));
-        } catch (e) {
-            $.error(
-                `解析持久化缓存中的 ${SCRIPT_RESOURCE_CACHE_KEY} 失败, 重置为 {}, 错误: ${
-                    e?.message ?? e
-                }`,
-            );
-            this.resourceCache = {};
-            $.write('{}', SCRIPT_RESOURCE_CACHE_KEY);
-        }
-        this._cleanup();
-    }
-
-    _cleanup(prefix, expires) {
-        // 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 >
-                    (expires ?? this.expires) ||
-                (prefix && id.startsWith(prefix))
-            ) {
-                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, expires, remove) {
-        const updated = this.resourceCache[id] && this.resourceCache[id].time;
-        if (updated) {
-            if (new Date().getTime() - updated <= (expires ?? this.expires))
-                return this.resourceCache[id].data;
-            if (remove) {
-                delete this.resourceCache[id];
-                this._persist();
-            }
-        }
-        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/user-agent.js

@@ -1,101 +0,0 @@
-import gte from 'semver/functions/gte';
-import coerce from 'semver/functions/coerce';
-import $ from '@/core/app';
-
-export function getUserAgentFromHeaders(headers) {
-    const keys = Object.keys(headers);
-    let UA = '';
-    let ua = '';
-    let accept = '';
-    for (let k of keys) {
-        const lower = k.toLowerCase();
-        if (lower === 'user-agent') {
-            UA = headers[k];
-            ua = UA.toLowerCase();
-        } else if (lower === 'accept') {
-            accept = headers[k];
-        }
-    }
-    return { UA, ua, accept };
-}
-
-export function getPlatformFromUserAgent({ ua, UA, accept }) {
-    if (UA.indexOf('Quantumult%20X') !== -1) {
-        return 'QX';
-    } else if (ua.indexOf('egern') !== -1) {
-        return 'Egern';
-    } 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';
-    } else if (UA.indexOf('Stash') !== -1) {
-        return 'Stash';
-    } else if (
-        ua === 'meta' ||
-        (ua.indexOf('clash') !== -1 && ua.indexOf('meta') !== -1) ||
-        ua.indexOf('clash-verge') !== -1 ||
-        ua.indexOf('flclash') !== -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 || ua.indexOf('singbox') !== -1) {
-        return 'sing-box';
-    } else if (accept.indexOf('application/json') === 0) {
-        return 'JSON';
-    } else {
-        return 'V2Ray';
-    }
-}
-
-export function getPlatformFromHeaders(headers) {
-    const { UA, ua, accept } = getUserAgentFromHeaders(headers);
-    return getPlatformFromUserAgent({ ua, UA, accept });
-}
-export function shouldIncludeUnsupportedProxy(platform, ua) {
-    // try {
-    //     const target = getPlatformFromUserAgent({
-    //         UA: ua,
-    //         ua: ua.toLowerCase(),
-    //     });
-    //     if (!['Stash', 'Egern', 'Loon'].includes(target)) {
-    //         return false;
-    //     }
-    //     const coerceVersion = coerce(ua);
-    //     $.log(JSON.stringify(coerceVersion, null, 2));
-    //     const { version } = coerceVersion;
-    //     if (
-    //         platform === 'Stash' &&
-    //         target === 'Stash' &&
-    //         gte(version, '3.1.0')
-    //     ) {
-    //         return true;
-    //     }
-    //     if (
-    //         platform === 'Egern' &&
-    //         target === 'Egern' &&
-    //         gte(version, '1.29.0')
-    //     ) {
-    //         return true;
-    //     }
-    //     // Loon 的 UA 不规范, version 取出来是 build
-    //     if (
-    //         platform === 'Loon' &&
-    //         target === 'Loon' &&
-    //         gte(version, '842.0.0')
-    //     ) {
-    //         return true;
-    //     }
-    // } catch (e) {
-    //     $.error(`获取版本号失败: ${e}`);
-    // }
-    return false;
-}

backend/src/utils/yaml.js

@@ -1,39 +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, JSON.parse(JSON.stringify(content)), ...args);
-}
-export function load(content, ...args) {
-    return retry(YAML.load, JSON.parse(JSON.stringify(content)), ...args);
-}
-export function safeDump(content, ...args) {
-    return YAML.safeDump(JSON.parse(JSON.stringify(content)), ...args);
-}
-export function dump(content, ...args) {
-    return YAML.dump(JSON.parse(JSON.stringify(content)), ...args);
-}
-
-export default {
-    safeLoad,
-    load,
-    safeDump,
-    dump,
-    parse: safeLoad,
-    stringify: safeDump,
-};

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',
@@ -9,7 +10,6 @@ export default function express({ substore: $, port, host }) {
         'Access-Control-Allow-Methods': 'POST,GET,OPTIONS,PATCH,PUT,DELETE',
         'Access-Control-Allow-Headers':
             'Origin, X-Requested-With, Content-Type, Accept',
-        'X-Powered-By': 'Sub-Store',
     };
 
     // node support
@@ -17,14 +17,7 @@ export default function express({ substore: $, port, host }) {
         const express_ = eval(`require("express")`);
         const bodyParser = eval(`require("body-parser")`);
         const app = express_();
-        const limit = eval('process.env.SUB_STORE_BODY_JSON_LIMIT') || '1mb';
-        $.info(`[BACKEND] body JSON limit: ${limit}`);
-        app.use(
-            bodyParser.json({
-                verify: rawBodySaver,
-                limit,
-            }),
-        );
+        app.use(bodyParser.json({ verify: rawBodySaver }));
         app.use(
             bodyParser.urlencoded({ verify: rawBodySaver, extended: true }),
         );
@@ -36,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] listening on ${address}:${port}`);
+            app.listen(port, () => {
+                $.info(`Express started on port: ${port}`);
             });
         };
         return app;
@@ -169,7 +161,7 @@ export default function express({ substore: $, port, host }) {
 
     function Response() {
         let statusCode = 200;
-        const { isQX, isLoon, isSurge, isGUIforCores } = ENV();
+        const { isQX, isLoon, isSurge } = ENV();
         const headers = DEFAULT_HEADERS;
         const STATUS_CODE_MAP = {
             200: 'HTTP/1.1 200 OK',
@@ -192,7 +184,7 @@ export default function express({ substore: $, port, host }) {
                     body,
                     headers,
                 };
-                if (isQX || isGUIforCores) {
+                if (isQX) {
                     $done(response);
                 } else if (isLoon || isSurge) {
                     $done({

backend/src/vendor/open-api.js

@@ -6,39 +6,7 @@ const isNode = eval(`typeof process !== "undefined"`); // eval is needed in orde
 const isStash =
     'undefined' !== typeof $environment && $environment['stash-version'];
 const isShadowRocket = 'undefined' !== typeof $rocket;
-const isEgern = 'object' == typeof egern;
-const isLanceX = 'undefined' != typeof $native;
-const isGUIforCores = typeof $Plugins !== 'undefined';
-import { Base64 } from 'js-base64';
 
-function isPlainObject(obj) {
-    return (
-        obj !== null &&
-        typeof obj === 'object' &&
-        [null, Object.prototype].includes(Object.getPrototypeOf(obj))
-    );
-}
-
-function parseSocks5Uri(uri) {
-    // eslint-disable-next-line no-unused-vars
-    let [__, username, password, server, port, query, name] = uri.match(
-        /^socks5:\/\/(?:(.*?):(.*?)@)?(.*?)(?::(\d+?))?(\?.*?)?(?:#(.*?))?$/,
-    );
-    if (port) {
-        port = parseInt(port, 10);
-    } else {
-        $.error(`port is not present in line: ${uri}`);
-        throw new Error(`port is not present in line: ${uri}`);
-    }
-    return {
-        type: 5,
-        host: server,
-        port,
-
-        userId: username != null ? decodeURIComponent(username) : undefined,
-        password: password != null ? decodeURIComponent(password) : undefined,
-    };
-}
 export class OpenAPI {
     constructor(name = 'untitled', debug = false) {
         this.name = name;
@@ -47,10 +15,6 @@ export class OpenAPI {
         this.http = HTTP();
         this.env = ENV();
 
-        if (isNode) {
-            const dotenv = eval(`require("dotenv")`);
-            dotenv.config();
-        }
         this.node = (() => {
             if (isNode) {
                 const fs = eval("require('fs')");
@@ -82,69 +46,30 @@ export class OpenAPI {
             this.cache = JSON.parse($prefs.valueForKey(this.name) || '{}');
         if (isLoon || isSurge)
             this.cache = JSON.parse($persistentStore.read(this.name) || '{}');
-        if (isGUIforCores)
-            this.cache = JSON.parse(
-                $Plugins.SubStoreCache.get(this.name) || '{}',
-            );
+
         if (isNode) {
             // create a json for root cache
-            const basePath =
-                eval('process.env.SUB_STORE_DATA_BASE_PATH') || '.';
-            let rootPath = `${basePath}/root.json`;
-            const backupRootPath = `${basePath}/root_${Date.now()}.json`;
-
-            this.log(`Root path: ${rootPath}`);
-            if (this.node.fs.existsSync(rootPath)) {
-                try {
-                    this.root = JSON.parse(
-                        this.node.fs.readFileSync(`${rootPath}`),
-                    );
-                } catch (e) {
-                    this.node.fs.copyFileSync(rootPath, backupRootPath);
-                    this.error(
-                        `Failed to parse ${rootPath}: ${e.message}. Backup created at ${backupRootPath}`,
-                    );
-                }
-            }
-            if (!isPlainObject(this.root)) {
-                this.node.fs.writeFileSync(rootPath, JSON.stringify({}), {
-                    flag: 'w',
+            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(`${fpath}`));
             }
 
             // create a json file with the given name if not exists
-            let fpath = `${basePath}/${this.name}.json`;
-            const backupPath = `${basePath}/${this.name}_${Date.now()}.json`;
-
-            this.log(`Data path: ${fpath}`);
-            if (this.node.fs.existsSync(fpath)) {
-                try {
-                    this.cache = JSON.parse(
-                        this.node.fs.readFileSync(`${fpath}`, 'utf-8'),
-                    );
-                } catch (e) {
-                    try {
-                        const str = Base64.decode(
-                            this.node.fs.readFileSync(`${fpath}`, 'utf-8'),
-                        );
-                        this.cache = JSON.parse(str);
-                        this.node.fs.writeFileSync(fpath, str, {
-                            flag: 'w',
-                        });
-                    } catch (e) {
-                        this.node.fs.copyFileSync(fpath, backupPath);
-                        this.error(
-                            `Failed to parse ${fpath}: ${e.message}. Backup created at ${backupPath}`,
-                        );
-                    }
-                }
-            }
-            if (!isPlainObject(this.cache)) {
+            fpath = `${this.name}.json`;
+            if (!this.node.fs.existsSync(fpath)) {
                 this.node.fs.writeFileSync(fpath, JSON.stringify({}), {
-                    flag: 'w',
+                    flag: 'wx',
                 });
                 this.cache = {};
+            } else {
+                this.cache = JSON.parse(
+                    this.node.fs.readFileSync(`${this.name}.json`),
+                );
             }
         }
     }
@@ -154,19 +79,15 @@ export class OpenAPI {
         const data = JSON.stringify(this.cache, null, 2);
         if (isQX) $prefs.setValueForKey(data, this.name);
         if (isLoon || isSurge) $persistentStore.write(data, this.name);
-        if (isGUIforCores) $Plugins.SubStoreCache.set(this.name, data);
         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),
@@ -187,9 +108,6 @@ export class OpenAPI {
             if (isNode) {
                 this.root[key] = data;
             }
-            if (isGUIforCores) {
-                return $Plugins.SubStoreCache.set(key, data);
-            }
         } else {
             this.cache[key] = data;
         }
@@ -209,9 +127,6 @@ export class OpenAPI {
             if (isNode) {
                 return this.root[key];
             }
-            if (isGUIforCores) {
-                return $Plugins.SubStoreCache.get(key);
-            }
         } else {
             return this.cache[key];
         }
@@ -230,9 +145,6 @@ export class OpenAPI {
             if (isNode) {
                 delete this.root[key];
             }
-            if (isGUIforCores) {
-                return $Plugins.SubStoreCache.remove(key);
-            }
         } else {
             delete this.cache[key];
         }
@@ -271,35 +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}`);
-                    });
-            }
-        }
-        if (isGUIforCores) {
-            $Plugins.Notify(title, subtitle + '\n' + content);
         }
     }
 
@@ -321,7 +204,7 @@ export class OpenAPI {
     }
 
     done(value = {}) {
-        if (isQX || isLoon || isSurge || isGUIforCores) {
+        if (isQX || isLoon || isSurge) {
             $done(value);
         } else if (isNode) {
             if (typeof $context !== 'undefined') {
@@ -334,21 +217,11 @@ export class OpenAPI {
 }
 
 export function ENV() {
-    return {
-        isQX,
-        isLoon,
-        isSurge,
-        isNode,
-        isStash,
-        isShadowRocket,
-        isEgern,
-        isLanceX,
-        isGUIforCores,
-    };
+    return { isQX, isLoon, isSurge, isNode, isStash, isShadowRocket };
 }
 
 export function HTTP(defaultOptions = { baseURL: '' }) {
-    const { isQX, isLoon, isSurge, isNode, isGUIforCores } = ENV();
+    const { isQX, isLoon, isSurge, isNode } = ENV();
     const methods = [
         'GET',
         'POST',
@@ -398,166 +271,31 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                 url: options.url,
                 headers: options.headers,
                 body: options.body,
-                opts: options.opts,
             });
         } else if (isLoon || isSurge || isNode) {
-            worker = new Promise(async (resolve, reject) => {
-                const body = options.body;
-                const opts = JSON.parse(JSON.stringify(options));
-                opts.body = body;
-                opts.timeout = opts.timeout || 8000;
-                if (opts.timeout) {
-                    opts.timeout++;
-                    if (isNaN(opts.timeout)) {
-                        opts.timeout = 8000;
-                    }
-                    if (!isNode) {
-                        let unit = 'ms';
-                        // 这些客户端单位为 s
-                        if (isSurge || isStash || isShadowRocket) {
-                            opts.timeout = Math.ceil(opts.timeout / 1000);
-                            unit = 's';
-                        }
-                        // Loon 为 ms
-                        // console.log(`[httpClient timeout] ${opts.timeout}${unit}`);
-                    }
-                }
-                if (isNode) {
-                    const undici = eval("require('undici')");
-                    const { socksDispatcher } = eval("require('fetch-socks')");
-                    const {
-                        ProxyAgent,
-                        EnvHttpProxyAgent,
-                        request,
-                        interceptors,
-                    } = undici;
-                    const agentOpts = {
-                        connect: {
-                            rejectUnauthorized:
-                                opts.strictSSL === false ||
-                                opts.insecure === true
-                                    ? false
-                                    : true,
-                        },
-                        bodyTimeout: opts.timeout,
-                        headersTimeout: opts.timeout,
-                    };
-                    try {
-                        const url = new URL(opts.url);
-                        if (url.username || url.password) {
-                            opts.headers = {
-                                ...(opts.headers || {}),
-                                Authorization: `Basic ${Buffer.from(
-                                    `${url.username || ''}:${
-                                        url.password || ''
-                                    }`,
-                                ).toString('base64')}`,
-                            };
-                        }
-                        let dispatcher;
-                        if (!opts.proxy) {
-                            const allProxy =
-                                eval('process.env.all_proxy') ||
-                                eval('process.env.ALL_PROXY');
-                            if (allProxy && /^socks5:\/\//.test(allProxy)) {
-                                opts.proxy = allProxy;
-                            }
-                        }
-                        if (opts.proxy) {
-                            if (/^socks5:\/\//.test(opts.proxy)) {
-                                dispatcher = socksDispatcher(
-                                    parseSocks5Uri(opts.proxy),
-                                    agentOpts,
-                                );
-                            } else {
-                                dispatcher = new ProxyAgent({
-                                    ...agentOpts,
-                                    uri: opts.proxy,
-                                });
-                            }
-                        } else {
-                            dispatcher = new EnvHttpProxyAgent(agentOpts);
-                        }
-                        const response = await request(opts.url, {
-                            ...opts,
-                            method: method.toUpperCase(),
-                            dispatcher: dispatcher.compose(
-                                interceptors.redirect({
-                                    maxRedirections: 3,
-                                    throwOnMaxRedirects: true,
-                                }),
-                            ),
-                        });
-                        resolve({
-                            statusCode: response.statusCode,
-                            headers: response.headers,
-                            body:
-                                opts.encoding === null
-                                    ? await response.body.arrayBuffer()
-                                    : await response.body.text(),
-                        });
-                    } catch (e) {
-                        reject(e);
-                    }
-                } else {
-                    $httpClient[method.toLowerCase()](
-                        opts,
-                        (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({
-                                    statusCode:
-                                        response.status || response.statusCode,
-                                    headers: response.headers,
-                                    body,
-                                });
-                        },
-                    );
-                }
-            });
-        } else if (isGUIforCores) {
-            worker = new Promise(async (resolve, reject) => {
-                try {
-                    const response = await $Plugins.Requests({
-                        method,
-                        url: options.url,
-                        headers: options.headers,
-                        body: options.body,
-                        autoTransformBody: false,
-                        options: {
-                            Proxy: options.proxy,
-                            Timeout: options.timeout
-                                ? options.timeout / 1000
-                                : 15,
-                        },
-                    });
-                    resolve({
-                        statusCode: response.status,
-                        headers: response.headers,
-                        body: response.body,
-                    });
-                } catch (error) {
-                    reject(error);
-                }
+            worker = new Promise((resolve, reject) => {
+                const request = isNode
+                    ? eval("require('request')")
+                    : $httpClient;
+                request[method.toLowerCase()](
+                    options,
+                    (err, response, body) => {
+                        if (err) reject(err);
+                        else
+                            resolve({
+                                statusCode:
+                                    response.status || response.statusCode,
+                                headers: response.headers,
+                                body,
+                            });
+                    },
+                );
             });
         }
 
         let timeoutid;
-
         const timer = timeout
             ? new Promise((_, reject) => {
-                  //   console.log(`[request timeout] ${timeout}ms`);
                   timeoutid = setTimeout(() => {
                       events.onTimeout();
                       return reject(
@@ -570,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/Egern.yaml

@@ -1,38 +0,0 @@
-name: Sub-Store
-description: '支持 Surge 正式版的参数设置功能. 测落地功能 ability: http-client-policy, 同步配置的定时 cronexp: 55 23 * * *'
-compat_arguments:
-  ability: http-client-policy
-  cronexp: 55 23 * * *
-  sync: '"Sub-Store Sync"'
-  timeout: '120'
-  engine: auto
-  produce: '"# Sub-Store Produce"'
-  produce_cronexp: 50 */6 * * *
-  produce_sub: '"sub1,sub2"'
-  produce_col: '"col1,col2"'
-compat_arguments_desc: '\n1️⃣ ability\n\n默认已开启测落地能力\n需要配合脚本操作\n如 https://raw.githubusercontent.com/Keywos/rule/main/cname.js\n填写任意其他值关闭\n\n2️⃣ cronexp\n\n同步配置定时任务\n默认为每天 23 点 55 分\n\n定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 ''同步'' 或 ''同步配置''\n\n3️⃣ sync\n\n自定义定时任务名\n便于在脚本编辑器中选择\n若设为 # 可取消定时任务\n\n4️⃣ timeout\n\n脚本超时, 单位为秒\n\n5️⃣ engine\n\n默认为自动使用 webview 引擎, 可设为指定 jsc, 但 jsc 容易爆内存\n\n6️⃣ produce\n\n自定义处理订阅的定时任务名\n一般用于定时处理耗时较长的订阅, 以更新缓存\n这样 Surge 中拉取的时候就能用到缓存, 不至于总是超时\n若设为 # 可取消此定时任务\n默认不开启\n\n7️⃣ produce_cronexp\n\n配置处理订阅的定时任务\n\n默认为每 6 小时\n\n9️⃣ produce_sub\n\n自定义需定时处理的单条订阅名\n多个用 , 连接\n\n🔟 produce_col\n\n自定义需定时处理的组合订阅名\n多个用 , 连接\n\n⚠️ 注意: 是 名称(name) 不是 显示名称(displayName)\n如果名称需要编码, 请编码后再用 , 连接\n顺序: 并发执行单条订阅, 然后并发执行组合订阅'
-scriptings:
-- http_request:
-    name: Sub-Store Core
-    match: ^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info)))
-    script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-1.min.js
-    body_required: true
-- http_request:
-    name: Sub-Store Simple
-    match: ^https?:\/\/sub\.store
-    script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-0.min.js
-    body_required: true
-- schedule:
-    name: '{{{sync}}}'
-    cron: '{{{cronexp}}}'
-    script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js
-- schedule:
-    name: '{{{produce}}}'
-    cron: '{{{produce_cronexp}}}'
-    script_url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js
-    arguments:
-      _compat.$argument: '"sub={{{produce_sub}}}&col={{{produce_col}}}"'
-mitm:
-  hostnames:
-    includes:
-    - sub.store

config/Loon.plugin

@@ -1,20 +1,15 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具. 定时任务默认为每天 23 点 55 分. 定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'
+#!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://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-1.min.js, requires-body=true, timeout=120, tag=Sub-Store Core
-http-request ^https?:\/\/sub\.store script-path=https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-0.min.js, requires-body=true, timeout=120, tag=Sub-Store Simple
+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
 
-cron "55 23 * * *" script-path=https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js, timeout=120, tag=Sub-Store Sync
+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": "定时任务默认为每天 23 点 55 分. 定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'",
-  "task": [
-    "55 23 * * * https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js, tag=Sub-Store Sync, img-url=https://raw.githubusercontent.com/58xinian/icon/master/Sub-Store1.png"
-  ]
-}

config/QX.snippet

@@ -1,4 +1,4 @@
 hostname=sub.store
 
-^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))) url script-analyze-echo-response https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-1.min.js
-^https?:\/\/sub\.store url script-analyze-echo-response https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-0.min.js
+^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))) url script-analyze-echo-response https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js
+^https?:\/\/sub\.store url script-analyze-echo-response https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js

config/README.md

@@ -1,62 +1,22 @@
 # 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)
-
-## 服务器/云平台/Docker/Android 版
-
-https://xream.notion.site/Sub-Store-abe6a96944724dc6a36833d5c9ab7c87
-
-## App 版
+## 脚本配置：
 
 ### 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
-
-#### 关于 Surge 的格外说明
-
-Surge Mac 版如何支持 SSR, 如何去除 HTTP 传输层以支持 类似 VMess HTTP 节点等 请查看 [链接参数说明](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)
-
-定时处理订阅 功能, 避免 App 内拉取超时, 请查看 [定时处理订阅](https://t.me/zhetengsha/1449)
-
-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. 官方默认版模块(支持 App 内使用编辑参数): [`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)
-
-> 最新版 Surge 已删除 `ability: http-client-policy` 参数, 模块暂不做修改, 对测落地功能无影响
-
-2. 经典版, 不支持编辑参数, 固定带 ability 参数版本, 使用 jsc 引擎时, 可能会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者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-Noability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Noability.sgmodule) 即可。
-
-### 6. Egern
-安装使用 模块 [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Egern.yaml`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Egern.yaml) 即可。
+安装使用[模块](https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/config/Surge.sgmodule)即可。
 
 ## 使用 Sub-Store
 1. 使用 Safari 打开这个 https://sub.store 如网页正常打开并且未弹出任何错误提示，说明 Sub-Store 已经配置成功。
 2. 可以把 Sub-Store 添加到主屏幕，即可获得类似于 APP 的使用体验。
 3. 更详细的使用指南请参考[文档](https://www.notion.so/Sub-Store-6259586994d34c11a4ced5c406264b46)。
-
-## 链接参数说明
-
-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
-
-## 脚本使用说明
-
-https://github.com/sub-store-org/Sub-Store/wiki/%E8%84%9A%E6%9C%AC%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E

config/Stash.stoverride

@@ -1,6 +1,5 @@
 name: Sub-Store
-desc: 高级订阅管理工具 @Peng-YM. 定时任务默认为每天  23 点 55 分. 定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'
-icon: https://raw.githubusercontent.com/cc63/ICON/main/Sub-Store.png
+desc: 高级订阅管理工具 @Peng-YM
 
 http:
   mitm:
@@ -20,18 +19,18 @@ http:
 cron:
   script:
     - name: cron-sync-artifacts
-      cron: "55 23 * * *"
+      cron: "0 0 * * *"
       timeout: 120
 
 script-providers:
   sub-store-0:
-    url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-0.min.js
+    url: https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js
     interval: 86400
 
   sub-store-1:
-    url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-1.min.js
+    url: https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js
     interval: 86400
 
   cron-sync-artifacts:
-    url: https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js
-    interval: 86400
+    url: https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js
+    interval: 86400

config/Surge-Beta.sgmodule

@@ -1,17 +0,0 @@
-#!name=Sub-Store(β)
-#!desc=支持 Surge 正式版的参数设置功能. 测落地功能 ability: http-client-policy, 同步配置的定时 cronexp: 55 23 * * *
-#!category=订阅管理
-#!arguments=ability:http-client-policy,cronexp:55 23 * * *,sync:"Sub-Store Sync",timeout:120,engine:auto,produce:"# Sub-Store Produce",produce_cronexp:50 */6 * * *,produce_sub:"sub1,sub2",produce_col:"col1,col2"
-#!arguments-desc=\n1️⃣ ability\n\n默认已开启测落地能力\n需要配合脚本操作\n如 https://raw.githubusercontent.com/Keywos/rule/main/cname.js\n填写任意其他值关闭\n\n2️⃣ cronexp\n\n同步配置定时任务\n默认为每天 23 点 55 分\n\n定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'\n\n3️⃣ sync\n\n自定义定时任务名\n便于在脚本编辑器中选择\n若设为 # 可取消定时任务\n\n4️⃣ timeout\n\n脚本超时, 单位为秒\n\n5️⃣ engine\n\n默认为自动使用 webview 引擎, 可设为指定 jsc, 但 jsc 容易爆内存\n\n6️⃣ produce\n\n自定义处理订阅的定时任务名\n一般用于定时处理耗时较长的订阅, 以更新缓存\n这样 Surge 中拉取的时候就能用到缓存, 不至于总是超时\n若设为 # 可取消此定时任务\n默认不开启\n\n7️⃣ produce_cronexp\n\n配置处理订阅的定时任务\n\n默认为每 6 小时\n\n9️⃣ produce_sub\n\n自定义需定时处理的单条订阅名\n多个用 , 连接\n\n🔟 produce_col\n\n自定义需定时处理的组合订阅名\n多个用 , 连接\n\n⚠️ 注意: 是 名称(name) 不是 显示名称(displayName)\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://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-1.min.js,requires-body=true,timeout={{{timeout}}},ability="{{{ability}}}",engine={{{engine}}}
-
-Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-0.min.js,requires-body=true,timeout={{{timeout}}},engine={{{engine}}}
-
-{{{sync}}}=type=cron,cronexp="{{{cronexp}}}",wake-system=1,timeout={{{timeout}}},script-path=https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js,engine={{{engine}}}
-
-{{{produce}}}=type=cron,cronexp="{{{produce_cronexp}}}",wake-system=1,timeout={{{timeout}}},script-path=https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js,engine={{{engine}}},argument="sub={{{produce_sub}}}&col={{{produce_col}}}"

config/Surge-Noability.sgmodule

@@ -1,13 +0,0 @@
-#!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用带 ability 参数. 定时任务默认为每天  23 点 55 分. 定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'
-#!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://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-1.min.js,requires-body=true,timeout=120
-Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-0.min.js,requires-body=true,timeout=120
-
-Sub-Store Sync=type=cron,cronexp=55 23 * * *,wake-system=1,timeout=120,script-path=https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js

config/Surge-ability.sgmodule

@@ -1,12 +0,0 @@
-#!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  带 ability 参数版本, 使用 jsc 引擎时, 可能会爆内存, 如果不需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用不带 ability 参数版本. 定时任务默认为每天 23 点 55 分. 定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'
-#!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://raw.githubusercontent.com/sub-store-org/Sub-Store/release/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://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-0.min.js,requires-body=true,timeout=120
-
-Sub-Store Sync=type=cron,cronexp=55 23 * * *,wake-system=1,timeout=120,script-path=https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js

config/Surge.sgmodule

@@ -1,17 +1,10 @@
 #!name=Sub-Store
-#!desc=支持 Surge 正式版的参数设置功能. 测落地功能 ability: http-client-policy, 同步配置的定时 cronexp: 55 23 * * *
-#!category=订阅管理
-#!arguments=ability:http-client-policy,cronexp:55 23 * * *,sync:"Sub-Store Sync",timeout:120,engine:auto,produce:"# Sub-Store Produce",produce_cronexp:50 */6 * * *,produce_sub:"sub1,sub2",produce_col:"col1,col2"
-#!arguments-desc=\n1️⃣ ability\n\n默认已开启测落地能力\n需要配合脚本操作\n如 https://raw.githubusercontent.com/Keywos/rule/main/cname.js\n填写任意其他值关闭\n\n2️⃣ cronexp\n\n同步配置定时任务\n默认为每天 23 点 55 分\n\n定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'\n\n3️⃣ sync\n\n自定义定时任务名\n便于在脚本编辑器中选择\n若设为 # 可取消定时任务\n\n4️⃣ timeout\n\n脚本超时, 单位为秒\n\n5️⃣ engine\n\n默认为自动使用 webview 引擎, 可设为指定 jsc, 但 jsc 容易爆内存\n\n6️⃣ produce\n\n自定义处理订阅的定时任务名\n一般用于定时处理耗时较长的订阅, 以更新缓存\n这样 Surge 中拉取的时候就能用到缓存, 不至于总是超时\n若设为 # 可取消此定时任务\n默认不开启\n\n7️⃣ produce_cronexp\n\n配置处理订阅的定时任务\n\n默认为每 6 小时\n\n9️⃣ produce_sub\n\n自定义需定时处理的单条订阅名\n多个用 , 连接\n\n🔟 produce_col\n\n自定义需定时处理的组合订阅名\n多个用 , 连接\n\n⚠️ 注意: 是 名称(name) 不是 显示名称(displayName)\n如果名称需要编码, 请编码后再用 , 连接\n顺序: 并发执行单条订阅, 然后并发执行组合订阅
-
+#!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://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-1.min.js,requires-body=true,timeout={{{timeout}}},ability="{{{ability}}}",engine={{{engine}}}
+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 Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/sub-store-0.min.js,requires-body=true,timeout={{{timeout}}},engine={{{engine}}}
-
-{{{sync}}}=type=cron,cronexp="{{{cronexp}}}",wake-system=1,timeout={{{timeout}}},script-path=https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js,engine={{{engine}}}
-
-{{{produce}}}=type=cron,cronexp="{{{produce_cronexp}}}",wake-system=1,timeout={{{timeout}}},script-path=https://raw.githubusercontent.com/sub-store-org/Sub-Store/release/cron-sync-artifacts.min.js,engine={{{engine}}},argument="sub={{{produce_sub}}}&col={{{produce_col}}}"
+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

nginx/front.conf

@@ -0,0 +1,40 @@
+upstream api {
+  server 0.0.0.0:3000;
+}
+
+server {
+  listen 6080;  
+#   allow 127.0.0.1;
+#   allow 0.0.0.0;               
+#   deny all; 
+
+  gzip on;
+  gzip_static on;
+  gzip_types text/plain application/json application/javascript application/x-javascript text/css application/xml text/javascript;
+  gzip_proxied  any;
+  gzip_vary on;
+  gzip_comp_level 6;
+  gzip_buffers 16 8k;
+  gzip_http_version 1.0;
+
+  location / {
+    root /Sub-Store/web/dist;
+    index  index.html index.htm;
+    try_files $uri $uri/ /index.html;
+  }
+ 
+  location /api {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass http://api;
+  }
+
+  location /download {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass http://api;
+  }
+
+}

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