feat: 处理 sni off 的情况. 若出现问题, 麻烦大家及时反馈

.github/workflows/main.yml

@@ -21,11 +21,11 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "20"
+          node-version: "16"
       - name: Install dependencies
         run: |
           npm install -g pnpm
-          cd backend && pnpm i --no-frozen-lockfile
+          cd backend && pnpm i
       - name: Test
         run: |
           cd backend
@@ -44,20 +44,14 @@ jobs:
           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
       - 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
+          generate_release_notes: true
           files: |
             ./backend/sub-store.min.js
             ./backend/dist/sub-store-0.min.js

README.md

@@ -11,7 +11,7 @@ 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>
+
 [!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/PengYM)
    
 Core functionalities:
@@ -26,11 +26,11 @@ Core functionalities:
 
 ### Supported Input Formats
 
-- [x] URI(SS, SSR, VMess, VLESS, Trojan, Hysteria, Hysteria 2, TUIC v5, WireGuard)
+- [x] URI(SS, SSR, VMess, VLESS, Trojan, Hysteria, Hysteria 2, TUIC v5)
 - [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] Loon (SS, SSR, VMess, Trojan, HTTP, SOCKS5, WireGuard, VLESS, Hysteria 2)
 - [x] Surge (SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, TUIC, Snell, Hysteria 2, SSH(Password authentication only), SSR(external, only for macOS), External Proxy Program(only for macOS), WireGuard(Surge to Surge))
 - [x] Surfboard (SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard(Surfboard to Surfboard))
 - [x] Shadowrocket (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC)

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.333",
+  "version": "2.14.269",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
@@ -11,13 +11,11 @@
     "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": "node bundle.js"
-    "changelog": "conventional-changelog -p cli -i CHANGELOG.md -s"
   },
   "author": "Peng-YM",
   "license": "GPL-3.0",
   "dependencies": {
-    "@maxmind/geoip2-node": "^5.0.0",
     "automerge": "1.0.1-preview.7",
     "body-parser": "^1.19.0",
     "connect-history-api-fallback": "^2.0.0",

backend/pnpm-lock.yaml

@@ -5,9 +5,6 @@ settings:
   excludeLinksFromLockfile: false
 
 dependencies:
-  '@maxmind/geoip2-node':
-    specifier: ^5.0.0
-    version: registry.npmmirror.com/@maxmind/geoip2-node@5.0.0
   automerge:
     specifier: 1.0.1-preview.7
     version: registry.npmmirror.com/automerge@1.0.1-preview.7
@@ -1970,15 +1967,6 @@ packages:
       '@jridgewell/sourcemap-codec': registry.npmmirror.com/@jridgewell/sourcemap-codec@1.4.13
     dev: true
 
-  registry.npmmirror.com/@maxmind/geoip2-node@5.0.0:
-    resolution: {integrity: sha512-ki+q5//oU4tZ3BAhegZJcB5czoZyic5JSTEKbrUAQB/BzAoAiGyLW0immEmQvVVyy2SMlvBTJ3zqyRj8K9BbwQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@maxmind/geoip2-node/-/geoip2-node-5.0.0.tgz}
-    name: '@maxmind/geoip2-node'
-    version: 5.0.0
-    dependencies:
-      ip6addr: registry.npmmirror.com/ip6addr@0.2.5
-      maxmind: registry.npmmirror.com/maxmind@4.3.19
-    dev: false
-
   registry.npmmirror.com/@sindresorhus/is@0.14.0:
     resolution: {integrity: sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@sindresorhus/is/-/is-0.14.0.tgz}
     name: '@sindresorhus/is'
@@ -6000,15 +5988,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  registry.npmmirror.com/ip6addr@0.2.5:
-    resolution: {integrity: sha512-9RGGSB6Zc9Ox5DpDGFnJdIeF0AsqXzdH+FspCfPPaU/L/4tI6P+5lIoFUFm9JXs9IrJv1boqAaNCQmoDADTSKQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ip6addr/-/ip6addr-0.2.5.tgz}
-    name: ip6addr
-    version: 0.2.5
-    dependencies:
-      assert-plus: registry.npmmirror.com/assert-plus@1.0.0
-      jsprim: registry.npmmirror.com/jsprim@2.0.2
-    dev: false
-
   registry.npmmirror.com/ipaddr.js@1.9.1:
     resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz}
     name: ipaddr.js
@@ -6577,12 +6556,6 @@ packages:
     version: 0.2.3
     dev: false
 
-  registry.npmmirror.com/json-schema@0.4.0:
-    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-schema/-/json-schema-0.4.0.tgz}
-    name: json-schema
-    version: 0.4.0
-    dev: false
-
   registry.npmmirror.com/json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz}
     name: json-stable-stringify-without-jsonify
@@ -6622,18 +6595,6 @@ packages:
       verror: registry.npmmirror.com/verror@1.10.0
     dev: false
 
-  registry.npmmirror.com/jsprim@2.0.2:
-    resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsprim/-/jsprim-2.0.2.tgz}
-    name: jsprim
-    version: 2.0.2
-    engines: {'0': node >=0.6.0}
-    dependencies:
-      assert-plus: registry.npmmirror.com/assert-plus@1.0.0
-      extsprintf: registry.npmmirror.com/extsprintf@1.3.0
-      json-schema: registry.npmmirror.com/json-schema@0.4.0
-      verror: registry.npmmirror.com/verror@1.10.0
-    dev: false
-
   registry.npmmirror.com/just-debounce@1.1.0:
     resolution: {integrity: sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/just-debounce/-/just-debounce-1.1.0.tgz}
     name: just-debounce
@@ -6982,16 +6943,6 @@ packages:
       - supports-color
     dev: true
 
-  registry.npmmirror.com/maxmind@4.3.19:
-    resolution: {integrity: sha512-Bu/VEN7ZWAOCjifdZaXJQuN6/yO7+OK35pnJsqmz8sOndK3KQFvJoY+6HX09/MmLLqtCfa+sMK0iaQOaTejGNA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/maxmind/-/maxmind-4.3.19.tgz}
-    name: maxmind
-    version: 4.3.19
-    engines: {node: '>=12', npm: '>=6'}
-    dependencies:
-      mmdb-lib: registry.npmmirror.com/mmdb-lib@2.1.0
-      tiny-lru: registry.npmmirror.com/tiny-lru@11.2.6
-    dev: false
-
   registry.npmmirror.com/md5.js@1.3.5:
     resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/md5.js/-/md5.js-1.3.5.tgz}
     name: md5.js
@@ -7181,13 +7132,6 @@ packages:
     version: 0.5.3
     dev: true
 
-  registry.npmmirror.com/mmdb-lib@2.1.0:
-    resolution: {integrity: sha512-tdDTZmnI5G4UoSctv2KxM/3VQt2XRj4CmR5R4VsAWsOUcS3LysHR34wtixWm/pXxXdkBDuN92auxkC0T2+qd1Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mmdb-lib/-/mmdb-lib-2.1.0.tgz}
-    name: mmdb-lib
-    version: 2.1.0
-    engines: {node: '>=10', npm: '>=6'}
-    dev: false
-
   registry.npmmirror.com/mocha@10.0.0:
     resolution: {integrity: sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mocha/-/mocha-10.0.0.tgz}
     name: mocha
@@ -9480,13 +9424,6 @@ packages:
       process: registry.npmmirror.com/process@0.11.10
     dev: true
 
-  registry.npmmirror.com/tiny-lru@11.2.6:
-    resolution: {integrity: sha512-0PU3c9PjMnltZaFo2sGYv/nnJsMjG0Cxx8X6FXHPPGjFyoo1SJDxvUXW1207rdiSxYizf31roo+GrkIByQeZoA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tiny-lru/-/tiny-lru-11.2.6.tgz}
-    name: tiny-lru
-    version: 11.2.6
-    engines: {node: '>=12'}
-    dev: false
-
   registry.npmmirror.com/tinyify@3.0.0:
     resolution: {integrity: sha512-RtjVjC1xwwxt8AMVfxEmo+FzRJB6p5sAOtFaJj8vMrkWShtArsM4dLVRWhx2Vc07Me3NWgmP7pi9UPm/a2XNNA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tinyify/-/tinyify-3.0.0.tgz}
     name: tinyify

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

@@ -15,8 +15,6 @@ 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';
 
 function preprocess(raw) {
     for (const processor of PROXY_PREPROCESSORS) {
@@ -199,10 +197,6 @@ function produce(proxies, targetPlatform, type, opts = {}) {
     );
 
     proxies = proxies.map((proxy) => {
-        proxy._subName = proxy.subName;
-        proxy._collectionName = proxy.collectionName;
-        proxy._resolved = proxy.resolved;
-
         if (!isNotBlank(proxy.name)) {
             proxy.name = `${proxy.type} ${proxy.server}:${proxy.port}`;
         }
@@ -211,9 +205,9 @@ function produce(proxies, targetPlatform, type, opts = {}) {
                 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.`,
+                    `Target platform ${targetPlatform} does not support sni off. Proxy's fields (tls-fingerprint and skip-cert-verify) will be modified.`,
                 );
-                proxy.sni = '';
+                delete proxy.sni;
                 proxy['skip-cert-verify'] = true;
                 delete proxy['tls-fingerprint'];
             }
@@ -224,7 +218,7 @@ function produce(proxies, targetPlatform, type, opts = {}) {
     $.log(`Producing proxies for target: ${targetPlatform}`);
     if (typeof producer.type === 'undefined' || producer.type === 'SINGLE') {
         let localPort = 10000;
-        let list = proxies
+        const list = proxies
             .map((proxy) => {
                 try {
                     let line = producer.produce(proxy, type, opts);
@@ -250,18 +244,7 @@ function produce(proxies, targetPlatform, type, opts = {}) {
                 }
             })
             .filter((line) => line.length > 0);
-        list = type === 'internal' ? list : list.join('\n');
+        return 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;
     } else if (producer.type === 'ALL') {
         return producer.produce(proxies, type, opts);
     }
@@ -275,11 +258,6 @@ export const ProxyUtils = {
     isIPv6,
     isIP,
     yaml: YAML,
-    getFlag,
-    removeFlag,
-    getISO,
-    MMDB,
-    Gist,
 };
 
 function tryParse(parser, line) {
@@ -423,42 +401,17 @@ function lastParse(proxy) {
         }
     }
     if (typeof proxy.name !== 'string') {
-        if (/^\d+$/.test(proxy.name)) {
+        try {
-            proxy.name = `${proxy.name}`;
+            if (proxy.name?.data) {
-        } else {
+                proxy.name = Buffer.from(proxy.name.data).toString('utf8');
-            try {
+            } else {
-                if (proxy.name?.data) {
+                proxy.name = utf8ArrayToStr(proxy.name);
-                    proxy.name = Buffer.from(proxy.name.data).toString('utf8');
-                } else {
-                    proxy.name = utf8ArrayToStr(proxy.name);
-                }
-            } catch (e) {
-                $.error(`proxy.name decode failed\nReason: ${e}`);
-                proxy.name = `${proxy.type} ${proxy.server}:${proxy.port}`;
             }
+        } 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;
-    }
     return proxy;
 }
 

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

@@ -16,7 +16,6 @@ import { Base64 } from 'js-base64';
 // Parse SS URI format (only supports new SIP002, legacy format is depreciated).
 // reference: https://github.com/shadowsocks/shadowsocks-org/wiki/SIP002-URI-Scheme
 function URI_SS() {
-    // TODO: 暂不支持 httpupgrade
     const name = 'URI SS Parser';
     const test = (line) => {
         return /^ss:\/\//.test(line);
@@ -64,9 +63,9 @@ function URI_SS() {
             /\d+/,
         )?.[0];
 
-        const userInfo = userInfoStr.match(/(^.*?):(.*$)/);
+        const userInfo = userInfoStr.split(':');
-        proxy.cipher = userInfo[1];
+        proxy.cipher = userInfo[0];
-        proxy.password = userInfo[2];
+        proxy.password = userInfo[1];
 
         // handle obfs
         const idx = content.indexOf('?plugin=');
@@ -300,26 +299,16 @@ function URI_VMess() {
             if (proxy.tls && proxy.sni) {
                 proxy.sni = params.sni;
             }
-            let httpupgrade = false;
             // handle obfs
             if (params.net === 'ws' || params.obfs === 'websocket') {
                 proxy.network = 'ws';
             } else if (
-                ['http'].includes(params.net) ||
+                ['tcp', 'http'].includes(params.net) ||
-                ['http'].includes(params.obfs) ||
+                params.obfs === 'http'
-                ['http'].includes(params.type)
             ) {
                 proxy.network = 'http';
             } else if (['grpc'].includes(params.net)) {
                 proxy.network = 'grpc';
-            } else if (
-                params.net === 'httpupgrade' ||
-                proxy.network === 'httpupgrade'
-            ) {
-                proxy.network = 'ws';
-                httpupgrade = true;
-            } else if (params.net === 'h2' || proxy.network === 'h2') {
-                proxy.network = 'h2';
             }
             if (proxy.network) {
                 let transportHost = params.host ?? params.obfsParam;
@@ -335,10 +324,6 @@ function URI_VMess() {
 
                 if (proxy.network === 'http') {
                     if (transportHost) {
-                        // 1)http(tcp)->host中间逗号(,)隔开
-                        transportHost = transportHost
-                            .split(',')
-                            .map((i) => i.trim());
                         transportHost = Array.isArray(transportHost)
                             ? transportHost[0]
                             : transportHost;
@@ -347,8 +332,6 @@ function URI_VMess() {
                         transportPath = Array.isArray(transportPath)
                             ? transportPath[0]
                             : transportPath;
-                    } else {
-                        transportPath = '/';
                     }
                 }
                 if (transportPath || transportHost) {
@@ -358,15 +341,10 @@ function URI_VMess() {
                             '_grpc-type': getIfNotBlank(params.type),
                         };
                     } else {
-                        const opts = {
+                        proxy[`${proxy.network}-opts`] = {
                             path: getIfNotBlank(transportPath),
                             headers: { Host: getIfNotBlank(transportHost) },
                         };
-                        if (httpupgrade) {
-                            opts['v2ray-http-upgrade'] = true;
-                            opts['v2ray-http-upgrade-fast-open'] = true;
-                        }
-                        proxy[`${proxy.network}-opts`] = opts;
                     }
                 } else {
                     delete proxy.network;
@@ -466,13 +444,10 @@ function URI_VLESS() {
                 proxy[`${params.security}-opts`] = opts;
             }
         }
-        let httpupgrade = false;
+
         proxy.network = params.type;
         if (proxy.network === 'tcp' && params.headerType === 'http') {
             proxy.network = 'http';
-        } else if (proxy.network === 'httpupgrade') {
-            proxy.network = 'ws';
-            httpupgrade = true;
         }
         if (!proxy.network && isShadowrocket && params.obfs) {
             proxy.network = params.obfs;
@@ -510,10 +485,6 @@ function URI_VLESS() {
             if (['grpc'].includes(proxy.network)) {
                 opts['_grpc-type'] = params.mode || 'gun';
             }
-            if (httpupgrade) {
-                opts['v2ray-http-upgrade'] = true;
-                opts['v2ray-http-upgrade-fast-open'] = true;
-            }
             if (Object.keys(opts).length > 0) {
                 proxy[`${proxy.network}-opts`] = opts;
             }
@@ -703,89 +674,6 @@ function URI_TUIC() {
     };
     return { name, test, parse };
 }
-function URI_WireGuard() {
-    const name = 'URI WireGuard Parser';
-    const test = (line) => {
-        return /^(wireguard|wg):\/\//.test(line);
-    };
-    const parse = (line) => {
-        line = line.split(/(wireguard|wg):\/\//)[2];
-        /* eslint-disable no-unused-vars */
-        let [
-            __,
-            ___,
-            privateKey,
-            server,
-            ____,
-            port,
-            _____,
-            addons = '',
-            name,
-        ] = /^((.*?)@)?(.*?)(:(\d+))?\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
-        /* eslint-enable no-unused-vars */
-
-        port = parseInt(`${port}`, 10);
-        if (isNaN(port)) {
-            port = 51820;
-        }
-        privateKey = decodeURIComponent(privateKey);
-        if (name != null) {
-            name = decodeURIComponent(name);
-        }
-        name = name ?? `WireGuard ${server}:${port}`;
-        const proxy = {
-            type: 'wireguard',
-            name,
-            server,
-            port,
-            'private-key': privateKey,
-            udp: true,
-        };
-        for (const addon of addons.split('&')) {
-            let [key, value] = addon.split('=');
-            key = key.replace(/_/, '-');
-            value = decodeURIComponent(value);
-            if (['reserved'].includes(key)) {
-                const parsed = value
-                    .split(',')
-                    .map((i) => parseInt(i.trim(), 10))
-                    .filter((i) => Number.isInteger(i));
-                if (parsed.length === 3) {
-                    proxy[key] = parsed;
-                }
-            } else if (['address', 'ip'].includes(key)) {
-                value.split(',').map((i) => {
-                    const ip = i
-                        .trim()
-                        .replace(/\/\d+$/, '')
-                        .replace(/^\[/, '')
-                        .replace(/\]$/, '');
-                    if (isIPv4(ip)) {
-                        proxy.ip = ip;
-                    } else if (isIPv6(ip)) {
-                        proxy.ipv6 = ip;
-                    }
-                });
-            } else if (['mtu'].includes(key)) {
-                const parsed = parseInt(value.trim(), 10);
-                if (Number.isInteger(parsed)) {
-                    proxy[key] = parsed;
-                }
-            } else if (/publickey/i.test(key)) {
-                proxy['public-key'] = value;
-            } else if (/privatekey/i.test(key)) {
-                proxy['private-key'] = value;
-            } else if (['udp'].includes(key)) {
-                proxy[key] = /(TRUE)|1/i.test(value);
-            } else if (!['flag'].includes(key)) {
-                proxy[key] = value;
-            }
-        }
-
-        return proxy;
-    };
-    return { name, test, parse };
-}
 
 // Trojan URI format
 function URI_Trojan() {
@@ -860,15 +748,9 @@ function Clash_All() {
             }
         }
 
-        if (proxy['server-cert-fingerprint']) {
-            proxy['tls-fingerprint'] = proxy['server-cert-fingerprint'];
-        }
         if (proxy.fingerprint) {
             proxy['tls-fingerprint'] = proxy.fingerprint;
         }
-        if (proxy['dialer-proxy']) {
-            proxy['underlying-proxy'] = proxy['dialer-proxy'];
-        }
 
         if (proxy['benchmark-url']) {
             proxy['test-url'] = proxy['benchmark-url'];
@@ -1028,15 +910,6 @@ function Loon_Http() {
     const parse = (line) => getLoonParser().parse(line);
     return { name, test, parse };
 }
-function Loon_Socks5() {
-    const name = 'Loon SOCKS5 Parser';
-    const test = (line) => {
-        return /^.*=\s*socks5/i.test(line.split(',')[0]);
-    };
-
-    const parse = (line) => getLoonParser().parse(line);
-    return { name, test, parse };
-}
 
 function Loon_WireGuard() {
     const name = 'Loon WireGuard Parser';
@@ -1320,7 +1193,6 @@ export default [
     URI_VMess(),
     URI_VLESS(),
     URI_TUIC(),
-    URI_WireGuard(),
     URI_Hysteria(),
     URI_Hysteria2(),
     URI_Trojan(),
@@ -1343,7 +1215,6 @@ export default [
     Loon_Hysteria2(),
     Loon_Trojan(),
     Loon_Http(),
-    Loon_Socks5(),
     Loon_WireGuard(),
     QX_SS(),
     QX_SSR(),

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

@@ -35,7 +35,7 @@ const grammars = String.raw`
     }
 }
 
-start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/socks5/hysteria2) {
+start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/hysteria2) {
     return proxy;
 }
 
@@ -78,9 +78,6 @@ https = tag equals "https"i address (username password)? (tls_host/tls_verificat
 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/fast_open/udp_relay/others)* {
-    proxy.type = "socks5";
-}
 
 address = comma server:server comma port:port {
     proxy.server = server;
@@ -170,7 +167,7 @@ ssr_protocol_param = comma "protocol-param" equals param:$[^=,]+ { proxy["protoc
 vmess_alterId = comma "alterId" equals alterId:$[0-9]+ { proxy.alterId = parseInt(alterId); } 
 
 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; }
 
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }

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

@@ -33,7 +33,7 @@
     }
 }
 
-start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/socks5/hysteria2) {
+start = (shadowsocksr/shadowsocks/vmess/vless/trojan/https/http/hysteria2) {
     return proxy;
 }
 
@@ -76,9 +76,6 @@ https = tag equals "https"i address (username password)? (tls_host/tls_verificat
 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/fast_open/udp_relay/others)* {
-    proxy.type = "socks5";
-}
 
 address = comma server:server comma port:port {
     proxy.server = server;
@@ -168,7 +165,7 @@ ssr_protocol_param = comma "protocol-param" equals param:$[^=,]+ { proxy["protoc
 vmess_alterId = comma "alterId" equals alterId:$[0-9]+ { proxy.alterId = parseInt(alterId); } 
 
 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; }
 
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }

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

@@ -50,11 +50,8 @@ trojan = "trojan" equals address
 
 shadowsocks = "shadowsocks" equals address
     (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp/fast_open/tag/server_check_url/others)* {
-    if (proxy.protocol || proxy.type === "ssr") {
+    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;
@@ -175,7 +172,7 @@ tls_no_session_reuse = comma "tls-no-session-reuse" equals flag:bool {
 }
 
 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; }

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

@@ -48,11 +48,8 @@ trojan = "trojan" equals address
 
 shadowsocks = "shadowsocks" equals address
     (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp/fast_open/tag/server_check_url/others)* {
-    if (proxy.protocol || proxy.type === "ssr") {
+    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;
@@ -173,7 +170,7 @@ tls_no_session_reuse = comma "tls-no-session-reuse" equals flag:bool {
 }
 
 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; }

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

@@ -89,12 +89,7 @@ params = "?" head:param tail:("&"@param)* {
   }
   
   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"],
@@ -107,10 +102,6 @@ params = "?" head:param tail:("&"@param)* {
       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); 
-      }
     }
   }
 

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

@@ -87,12 +87,7 @@ params = "?" head:param tail:("&"@param)* {
   }
   
   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"],
@@ -105,10 +100,6 @@ params = "?" head:param tail:("&"@param)* {
       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); 
-      }
     }
   }
 

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

@@ -22,10 +22,6 @@ function Base64Encoded() {
         'aHR0c', // htt
         'dmxlc3M=', // vless
         'aHlzdGVyaWEy', // hysteria2
-        'aHkyOi8v', // hy2://
-        'd2lyZWd1YXJkOi8v', // wireguard://
-        'd2c6Ly8=', // wg://
-        'dHVpYzovLw==', // tuic://
     ];
 
     const test = function (raw) {

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

@@ -2,7 +2,7 @@ import resourceCache from '@/utils/resource-cache';
 import scriptResourceCache from '@/utils/script-resource-cache';
 import { isIPv4, isIPv6 } from '@/utils';
 import { FULL } from '@/utils/logical';
-import { getFlag, removeFlag } from '@/utils/geo';
+import { getFlag } from '@/utils/geo';
 import lodash from 'lodash';
 import $ from '@/core/app';
 import { hex_md5 } from '@/vendor/md5';
@@ -462,7 +462,7 @@ const DOMAIN_RESOLVERS = {
         const cached = resourceCache.get(id);
         if (!noCache && cached) return cached;
         const resp = await $.http.get({
-            url: `http://223.6.6.6/resolve?edns_client_subnet=223.6.6.6/24&name=${encodeURIComponent(
+            url: `http://223.6.6.6/resolve?name=${encodeURIComponent(
                 domain,
             )}&type=${type === 'IPv6' ? 'AAAA' : 'A'}&short=1`,
             headers: {
@@ -482,7 +482,7 @@ const DOMAIN_RESOLVERS = {
         const cached = resourceCache.get(id);
         if (!noCache && cached) return cached;
         const resp = await $.http.get({
-            url: `http://119.28.28.28/d?ip=119.28.28.28&type=${
+            url: `http://119.28.28.28/d?type=${
                 type === 'IPv6' ? 'AAAA' : 'A'
             }&dn=${encodeURIComponent(domain)}`,
             headers: {
@@ -490,7 +490,7 @@ const DOMAIN_RESOLVERS = {
             },
         });
         const answers = resp.body.split(';').map((i) => i.split(',')[0]);
-        if (answers.length === 0 || String(answers) === '0') {
+        if (answers.length === 0) {
             throw new Error('No answers');
         }
         const result = answers[answers.length - 1];
@@ -512,17 +512,12 @@ function ResolveDomainOperator({ provider, type: _type, filter, cache }) {
     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'])
+                        .filter((p) => !isIP(p.server) && !p['no-resolve'])
                         .map((c) => c.server),
                 ),
             ];
@@ -548,32 +543,20 @@ function ResolveDomainOperator({ provider, type: _type, filter, cache }) {
                 await Promise.all(currentBatch);
             }
             proxies.forEach((p) => {
-                if (!p['_no-resolve']) {
+                if (!p['no-resolve']) {
                     if (results[p.server]) {
                         if (_type === 'IP4P') {
                             const { server, port } = parseIP4P(
                                 results[p.server],
                             );
                             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 {
-                                p.resolved = false;
                             }
                         } else {
-                            p._domain = p.server;
                             p.server = results[p.server];
                             p.resolved = true;
-                            p[`_${type}`] = p.server;
-                            if (!isIP(p._IP)) {
-                                p._IP = p.server;
-                            }
                         }
                     } else {
                         p.resolved = false;
@@ -583,7 +566,7 @@ function ResolveDomainOperator({ provider, type: _type, filter, cache }) {
 
             return proxies.filter((p) => {
                 if (filter === 'removeFailed') {
-                    return isIP(p.server) || p['_no-resolve'] || p.resolved;
+                    return isIP(p.server) || p['no-resolve'] || p.resolved;
                 } else if (filter === 'IPOnly') {
                     return isIP(p.server);
                 } else if (filter === 'IPv4Only') {
@@ -634,8 +617,6 @@ function RegionFilter(regions) {
         SG: '🇸🇬',
         JP: '🇯🇵',
         UK: '🇬🇧',
-        DE: '🇩🇪',
-        KR: '🇰🇷',
     };
     return {
         name: 'Region Filter',
@@ -869,6 +850,13 @@ function clone(object) {
     return JSON.parse(JSON.stringify(object));
 }
 
+// remove flag
+function removeFlag(str) {
+    return str
+        .replace(/[\uD83C][\uDDE6-\uDDFF][\uD83C][\uDDE6-\uDDFF]/g, '')
+        .trim();
+}
+
 function createDynamicFunction(name, script, $arguments) {
     const flowUtils = {
         getFlowField,

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

@@ -144,26 +144,12 @@ export default function Clash_Producer() {
                     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'];
-                for (const key in proxy) {
-                    if (proxy[key] == null || /^_/i.test(key)) {
-                        delete proxy[key];
-                    }
-                }
                 if (
                     ['grpc'].includes(proxy.network) &&
                     proxy[`${proxy.network}-opts`]

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

@@ -160,25 +160,11 @@ export default function ClashMeta_Producer() {
                     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'];
-                for (const key in proxy) {
-                    if (proxy[key] == null || /^_/i.test(key)) {
-                        delete proxy[key];
-                    }
-                }
                 if (
                     ['grpc'].includes(proxy.network) &&
                     proxy[`${proxy.network}-opts`]

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

@@ -13,8 +13,7 @@ import singbox_Producer from './sing-box';
 
 function JSON_Producer() {
     const type = 'ALL';
-    const produce = (proxies, type) =>
+    const produce = (proxies) => JSON.stringify(proxies, null, 2);
-        type === 'internal' ? proxies : JSON.stringify(proxies, null, 2);
     return { type, produce };
 }
 

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

@@ -18,8 +18,6 @@ export default function Loon_Producer() {
                 return vless(proxy);
             case 'http':
                 return http(proxy);
-            case 'socks5':
-                return socks5(proxy);
             case 'wireguard':
                 return wireguard(proxy);
             case 'hysteria2':
@@ -318,29 +316,6 @@ function http(proxy) {
 
     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');
-
-    return result.toString();
-}
 
 function wireguard(proxy) {
     if (Array.isArray(proxy.peers) && proxy.peers.length > 0) {

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

@@ -3,7 +3,6 @@ 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 = {}) => {
         switch (proxy.type) {
             case 'ss':
@@ -19,7 +18,13 @@ export default function QX_Producer() {
             case 'socks5':
                 return socks5(proxy);
             case 'vless':
-                return vless(proxy);
+                if (opts['include-unsupported-proxy']) {
+                    return vless(proxy);
+                } else {
+                    throw new Error(
+                        `Platform ${targetPlatform}(App Store Release) does not support proxy type: ${proxy.type}`,
+                    );
+                }
         }
         throw new Error(
             `Platform ${targetPlatform} does not support proxy type: ${proxy.type}`,

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

@@ -163,25 +163,11 @@ export default function ShadowRocket_Producer() {
                     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'];
-                for (const key in proxy) {
-                    if (proxy[key] == null || /^_/i.test(key)) {
-                        delete proxy[key];
-                    }
-                }
                 if (
                     ['grpc'].includes(proxy.network) &&
                     proxy[`${proxy.network}-opts`]

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

@@ -1,10 +1,6 @@
 import ClashMeta_Producer from './clashmeta';
 import $ from '@/core/app';
-import { isIPv4, isIPv6 } from '@/utils';
 
-const detourParser = (proxy, parsedProxy) => {
-    if (proxy['dialer-proxy']) parsedProxy.detour = proxy['dialer-proxy'];
-};
 const tfoParser = (proxy, parsedProxy) => {
     parsedProxy.tcp_fast_open = false;
     if (proxy.tfo) parsedProxy.tcp_fast_open = true;
@@ -253,7 +249,6 @@ const sshParser = (proxy = {}) => {
         parsedProxy.host_key_algorithms = proxy['host-key-algorithms'];
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     return parsedProxy;
 };
 
@@ -279,7 +274,6 @@ const httpParser = (proxy = {}) => {
     }
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     tlsParser(proxy, parsedProxy);
     return parsedProxy;
 };
@@ -301,7 +295,6 @@ const socks5Parser = (proxy = {}) => {
     if (proxy['udp-over-tcp']) parsedProxy.udp_over_tcp = true;
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     return parsedProxy;
 };
 
@@ -333,7 +326,6 @@ const shadowTLSParser = (proxy = {}) => {
         throw '端口值非法';
     if (proxy['fast-open'] === true) stPart.udp_fragment = true;
     tfoParser(proxy, stPart);
-    detourParser(proxy, stPart);
     smuxParser(proxy.smux, ssPart);
     return { type: 'ss-with-st', ssPart, stPart };
 };
@@ -352,7 +344,6 @@ const ssParser = (proxy = {}) => {
     if (proxy['udp-over-tcp']) parsedProxy.udp_over_tcp = true;
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
     if (proxy.plugin) {
         const optArr = [];
@@ -430,7 +421,6 @@ const ssrParser = (proxy = {}) => {
         parsedProxy.protocol_param = proxy['protocol-param'];
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
 };
@@ -467,7 +457,6 @@ const vmessParser = (proxy = {}) => {
     if (proxy.network === 'grpc') grpcParser(proxy, parsedProxy);
 
     tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     tlsParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
@@ -490,7 +479,6 @@ const vlessParser = (proxy = {}) => {
     if (proxy.network === 'grpc') grpcParser(proxy, parsedProxy);
 
     tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
     tlsParser(proxy, parsedProxy);
     return parsedProxy;
@@ -511,7 +499,6 @@ const trojanParser = (proxy = {}) => {
     if (proxy.network === 'ws') wsParser(proxy, parsedProxy);
 
     tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     tlsParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
@@ -558,7 +545,6 @@ const hysteriaParser = (proxy = {}) => {
         }
     }
     tlsParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     tfoParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
@@ -583,7 +569,6 @@ const hysteria2Parser = (proxy = {}) => {
     if (!parsedProxy.obfs.type) delete parsedProxy.obfs;
     tlsParser(proxy, parsedProxy);
     tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
 };
@@ -612,7 +597,6 @@ const tuic5Parser = (proxy = {}) => {
     if (proxy['heartbeat-interval'])
         parsedProxy.heartbeat = `${proxy['heartbeat-interval']}ms`;
     tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     tlsParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
@@ -621,11 +605,8 @@ const tuic5Parser = (proxy = {}) => {
 const wireguardParser = (proxy = {}) => {
     const local_address = ['ip', 'ipv6']
         .map((i) => proxy[i])
-        .map((i) => {
+        .filter((i) => i)
-            if (isIPv4(i)) return `${i}/32`;
+        .map((i) => (/\\/.test(i) ? i : `${i}/32`));
-            if (isIPv6(i)) return `${i}/128`;
-        })
-        .filter((i) => i);
     const parsedProxy = {
         tag: proxy.name,
         type: 'wireguard',
@@ -641,7 +622,7 @@ const wireguardParser = (proxy = {}) => {
         throw 'invalid port';
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     if (typeof proxy.reserved === 'string') {
-        parsedProxy.reserved = proxy.reserved;
+        parsedProxy.reserved.push(proxy.reserved);
     } else if (Array.isArray(proxy.reserved)) {
         for (const r of proxy.reserved) parsedProxy.reserved.push(r);
     } else {
@@ -669,7 +650,6 @@ const wireguardParser = (proxy = {}) => {
         }
     }
     tfoParser(proxy, parsedProxy);
-    detourParser(proxy, parsedProxy);
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
 };
@@ -809,10 +789,7 @@ export default function singbox_Producer() {
                     $.error(e.message ?? e);
                 }
             });
-
+        return type === 'internal' ? list : JSON.stringify(list, null, 2);
-        return type === 'internal'
-            ? list
-            : JSON.stringify({ outbounds: list }, null, 2);
     };
     return { type, produce };
 }

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

@@ -239,15 +239,9 @@ export default function Stash_Producer() {
                     delete proxy.tls;
                 }
                 if (proxy['tls-fingerprint']) {
-                    proxy['server-cert-fingerprint'] = 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;
                 }
@@ -263,14 +257,6 @@ export default function Stash_Producer() {
 
                 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 || /^_/i.test(key)) {
-                        delete proxy[key];
-                    }
-                }
                 if (
                     ['grpc'].includes(proxy.network) &&
                     proxy[`${proxy.network}-opts`]

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

@@ -6,7 +6,7 @@ const targetPlatform = 'Surfboard';
 
 export default function Surfboard_Producer() {
     const produce = (proxy) => {
-        proxy.name = proxy.name.replace(/=|,/g, '');
+        proxy.name = proxy.name.replace(/=/g, '');
         switch (proxy.type) {
             case 'ss':
                 return shadowsocks(proxy);

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

@@ -14,14 +14,13 @@ const ipVersions = {
 
 export default function Surge_Producer() {
     const produce = (proxy, type, opts = {}) => {
-        proxy.name = proxy.name.replace(/=|,/g, '');
         switch (proxy.type) {
             case 'ss':
                 return shadowsocks(proxy);
             case 'trojan':
                 return trojan(proxy);
             case 'vmess':
-                return vmess(proxy, opts['include-unsupported-proxy']);
+                return vmess(proxy);
             case 'http':
                 return http(proxy);
             case 'socks5':
@@ -264,7 +263,7 @@ function trojan(proxy) {
     return result.toString();
 }
 
-function vmess(proxy, includeUnsupportedProxy) {
+function vmess(proxy) {
     const result = new Result(proxy);
     result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
     result.appendIfPresent(`,username=${proxy.uuid}`, 'uuid');
@@ -278,7 +277,7 @@ function vmess(proxy, includeUnsupportedProxy) {
     );
 
     // transport
-    handleTransport(result, proxy, includeUnsupportedProxy);
+    handleTransport(result, proxy);
 
     // AEAD
     if (isPresent(proxy, 'aead')) {
@@ -763,8 +762,8 @@ function wireguard(proxy) {
     }
     const result = new Result(proxy);
 
-    result.append(`# > WireGuard Proxy ${proxy.name}
+    result.append(`# WireGuard Proxy ${proxy.name}
-# ${proxy.name}=wireguard`);
+${proxy.name}=wireguard`);
 
     proxy['section-name'] = getIfNotBlank(proxy['section-name'], proxy.name);
 
@@ -822,7 +821,7 @@ function wireguard(proxy) {
     );
 
     result.append(`
-# > WireGuard Section ${proxy.name}
+# WireGuard Section ${proxy.name}
 [WireGuard ${proxy['section-name']}]
 private-key = ${proxy['private-key']}`);
 
@@ -1013,7 +1012,7 @@ function hysteria2(proxy) {
     return result.toString();
 }
 
-function handleTransport(result, proxy, includeUnsupportedProxy) {
+function handleTransport(result, proxy) {
     if (isPresent(proxy, 'network')) {
         if (proxy.network === 'ws') {
             result.append(`,ws=true`);
@@ -1039,13 +1038,7 @@ function handleTransport(result, proxy, includeUnsupportedProxy) {
                 }
             }
         } else {
-            if (includeUnsupportedProxy && ['http'].includes(proxy.network)) {
+            throw new Error(`network ${proxy.network} is unsupported`);
-                $.info(
-                    `Include Unsupported Proxy: nework ${proxy.network} -> tcp`,
-                );
-            } else {
-                throw new Error(`network ${proxy.network} is unsupported`);
-            }
         }
     }
 }

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

@@ -8,14 +8,6 @@ export default function URI_Producer() {
         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 || /^_/i.test(key)) {
-                delete proxy[key];
-            }
-        }
         if (['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(proxy.type)) {
             delete proxy.tls;
         }
@@ -27,7 +19,7 @@ export default function URI_Producer() {
                 const userinfo = `${proxy.cipher}:${proxy.password}`;
                 result = `ss://${Base64.encode(userinfo)}@${proxy.server}:${
                     proxy.port
-                }${proxy.plugin ? '/' : ''}`;
+                }/`;
                 if (proxy.plugin) {
                     result += '?plugin=';
                     const opts = proxy['plugin-opts'];
@@ -56,9 +48,7 @@ export default function URI_Producer() {
                     result = `${result}${proxy.plugin ? '&' : '?'}uot=1`;
                 }
                 if (proxy.tfo) {
-                    result = `${result}${
+                    result = `${result}${proxy.plugin ? '&' : '?'}tfo=1`;
-                        proxy.plugin || proxy['udp-over-tcp'] ? '&' : '?'
-                    }tfo=1`;
                 }
                 result += `#${encodeURIComponent(proxy.name)}`;
                 break;
@@ -85,11 +75,6 @@ export default function URI_Producer() {
                 if (proxy.network === 'http') {
                     net = 'tcp';
                     type = 'http';
-                } else if (
-                    proxy.network === 'ws' &&
-                    proxy['ws-opts']?.['v2ray-http-upgrade']
-                ) {
-                    net = 'httpupgrade';
                 }
                 result = {
                     v: '2',
@@ -178,15 +163,9 @@ export default function URI_Producer() {
                 if (proxy.flow) {
                     flow = `&flow=${encodeURIComponent(proxy.flow)}`;
                 }
-                let vlessType = proxy.network;
+                let vlessTransport = `&type=${encodeURIComponent(
-                if (
+                    proxy.network,
-                    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(
@@ -232,14 +211,7 @@ export default function URI_Producer() {
             case 'trojan':
                 let trojanTransport = '';
                 if (proxy.network) {
-                    let trojanType = proxy.network;
+                    trojanTransport = `&type=${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`]?.[
@@ -432,51 +404,8 @@ export default function URI_Producer() {
                     }?${tuicParams.join('&')}#${encodeURIComponent(
                         proxy.name,
                     )}`;
+                    break;
                 }
-                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]) {
-                            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)}`;
-                break;
         }
         return result;
     };

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

@@ -11,65 +11,17 @@ import { syncToGist } from '@/restful/artifacts';
 import { findByName } from '@/utils/database';
 
 !(async function () {
-    let arg;
+    const settings = $.read(SETTINGS_KEY);
-    if (typeof $argument != 'undefined') {
+    // if GitHub token is not configured
-        arg = Object.fromEntries(
+    if (!settings.githubUser || !settings.gistToken) return;
-            // 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 artifacts = $.read(ARTIFACTS_KEY);
+    const artifacts = $.read(ARTIFACTS_KEY);
-        if (!artifacts || artifacts.length === 0) return;
+    if (!artifacts || artifacts.length === 0) return;
 
-        const shouldSync = artifacts.some((artifact) => artifact.sync);
+    const shouldSync = artifacts.some((artifact) => artifact.sync);
-        if (shouldSync) await doSync();
+    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(
         `
@@ -117,7 +69,6 @@ async function doSync() {
                         await produceArtifact({
                             type: 'subscription',
                             name: subName,
-                            awaitCustomCache: true,
                         });
                     } catch (e) {
                         // $.error(`${e.message ?? e}`);

backend/src/restful/artifacts.js

@@ -253,25 +253,7 @@ async function syncToGist(files) {
         key: ARTIFACT_REPOSITORY_KEY,
         syncPlatform,
     });
-    const res = await manager.upload(files);
+    return 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;
 }
 
 export { syncToGist };

backend/src/restful/download.js

@@ -1,5 +1,4 @@
-import { getPlatformFromHeaders } from '@/utils/user-agent';
+import { getPlatformFromHeaders } from '@/utils/platform';
-import { ProxyUtils } from '@/core/proxy-utils';
 import { COLLECTIONS_KEY, SUBS_KEY } from '@/constants';
 import { findByName } from '@/utils/database';
 import { getFlowHeaders } from '@/utils/flow';
@@ -7,59 +6,20 @@ 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('/download/collection/:name', downloadCollection);
     $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 platform =
         req.query.target || getPlatformFromHeaders(req.headers) || 'JSON';
 
-    $.info(
+    $.info(`正在下载订阅：${name}`);
-        `正在下载订阅：${name}\n请求 User-Agent: ${
-            req.headers['user-agent'] || req.headers['User-Agent']
-        }`,
-    );
     let {
         url,
         ua,
@@ -68,7 +28,6 @@ async function downloadSubscription(req, res) {
         ignoreFailedRemoteSub,
         produceType,
         includeUnsupportedProxy,
-        resultFormat,
     } = req.query;
     if (url) {
         url = decodeURIComponent(url);
@@ -103,7 +62,7 @@ async function downloadSubscription(req, res) {
     const sub = findByName(allSubs, name);
     if (sub) {
         try {
-            let output = await produceArtifact({
+            const output = await produceArtifact({
                 type: 'subscription',
                 name,
                 platform,
@@ -156,7 +115,6 @@ async function downloadSubscription(req, res) {
                             $arguments.flowUserAgent,
                             undefined,
                             sub.proxy,
-                            $arguments.flowUrl,
                         );
                         if (flowInfo) {
                             res.set('subscription-userinfo', flowInfo);
@@ -175,18 +133,6 @@ async function downloadSubscription(req, res) {
             }
 
             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,
                 );
@@ -223,9 +169,8 @@ 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 platform =
         req.query.target || getPlatformFromHeaders(req.headers) || 'JSON';
@@ -233,18 +178,10 @@ async function downloadCollection(req, res) {
     const allCols = $.read(COLLECTIONS_KEY);
     const collection = findByName(allCols, name);
 
-    $.info(
+    $.info(`正在下载组合订阅：${name}`);
-        `正在下载组合订阅：${name}\n请求 User-Agent: ${
-            req.headers['user-agent'] || req.headers['User-Agent']
-        }`,
-    );
 
-    let {
+    let { ignoreFailedRemoteSub, produceType, includeUnsupportedProxy } =
-        ignoreFailedRemoteSub,
+        req.query;
-        produceType,
-        includeUnsupportedProxy,
-        resultFormat,
-    } = req.query;
 
     if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
         ignoreFailedRemoteSub = decodeURIComponent(ignoreFailedRemoteSub);
@@ -262,7 +199,7 @@ async function downloadCollection(req, res) {
 
     if (collection) {
         try {
-            let output = await produceArtifact({
+            const output = await produceArtifact({
                 type: 'collection',
                 name,
                 platform,
@@ -315,7 +252,6 @@ async function downloadCollection(req, res) {
                                 $arguments.flowUserAgent,
                                 undefined,
                                 sub.proxy,
-                                $arguments.flowUrl,
                             );
                             if (flowInfo) {
                                 res.set('subscription-userinfo', flowInfo);
@@ -335,18 +271,6 @@ async function downloadCollection(req, res) {
             }
 
             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,
                 );
@@ -383,149 +307,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/subscriptions.js

@@ -118,7 +118,6 @@ async function getFlowInfo(req, res) {
                 $arguments.flowUserAgent,
                 undefined,
                 sub.proxy,
-                $arguments.flowUrl,
             );
             if (!flowHeaders) {
                 failed(
@@ -182,21 +181,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) {
+        success(res, sub);
-            res.set('content-type', 'application/json')
-                .set(
-                    'content-disposition',
-                    `attachment; filename="${encodeURIComponent(name)}.json"`,
-                )
-                .send(JSON.stringify(sub));
-        } else {
-            success(res, sub);
-        }
     } else {
         failed(
             res,

backend/src/restful/sync.js

@@ -36,7 +36,6 @@ async function produceArtifact({
     produceType,
     produceOpts = {},
     subscription,
-    awaitCustomCache,
 }) {
     platform = platform || 'JSON';
 
@@ -68,8 +67,6 @@ async function produceArtifact({
                                 ua || sub.ua,
                                 undefined,
                                 sub.proxy,
-                                undefined,
-                                awaitCustomCache,
                             );
                         } catch (err) {
                             errors[url] = err;
@@ -115,8 +112,6 @@ async function produceArtifact({
                                 ua || sub.ua,
                                 undefined,
                                 sub.proxy,
-                                undefined,
-                                awaitCustomCache,
                             );
                         } catch (err) {
                             errors[url] = err;
@@ -508,7 +503,6 @@ async function syncArtifacts() {
                         await produceArtifact({
                             type: 'subscription',
                             name: subName,
-                            awaitCustomCache: true,
                         });
                     } catch (e) {
                         // $.error(`${e.message ?? e}`);

backend/src/utils/download.js

@@ -14,14 +14,7 @@ import $ from '@/core/app';
 
 const tasks = new Map();
 
-export default async function download(
+export default async function download(rawUrl, ua, timeout, proxy) {
-    rawUrl,
-    ua,
-    timeout,
-    proxy,
-    skipCustomCache,
-    awaitCustomCache,
-) {
     let $arguments = {};
     let url = rawUrl.replace(/#noFlow$/, '');
     const rawArgs = url.split('#');
@@ -42,67 +35,6 @@ export default async function download(
             }
         }
     }
-    const { isNode, isStash, isLoon, isShadowRocket, isQX } = ENV();
-    const { defaultUserAgent, defaultTimeout, cacheThreshold } =
-        $.read(SETTINGS_KEY);
-    const userAgent = ua || defaultUserAgent || 'clash.meta';
-    const requestTimeout = timeout || defaultTimeout;
-    const id = hex_md5(userAgent + url);
-
-    const customCacheKey = $arguments?.cacheKey
-        ? `#sub-store-cached-custom-${$arguments?.cacheKey}`
-        : undefined;
-
-    if (customCacheKey && !skipCustomCache) {
-        const customCached = $.read(customCacheKey);
-        const cached = resourceCache.get(id);
-        if (!$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,
-                    );
-                } 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,
-                ).catch((e) => {
-                    $.error(
-                        `乐观缓存: URL ${url} 异步更新缓存发生错误 ${
-                            e.message ?? e
-                        }`,
-                    );
-                });
-            }
-            return customCached;
-        }
-    }
 
     // const downloadUrlMatch = url.match(/^\/api\/(file|module)\/(.+)/);
     // if (downloadUrlMatch) {
@@ -121,6 +53,12 @@ export default async function download(
     //     return item.content;
     // }
 
+    const { isNode, isStash, isLoon, isShadowRocket, isQX } = ENV();
+    const { defaultUserAgent, defaultTimeout, cacheThreshold } =
+        $.read(SETTINGS_KEY);
+    const userAgent = ua || defaultUserAgent || 'clash.meta';
+    const requestTimeout = timeout || defaultTimeout;
+    const id = hex_md5(userAgent + url);
     if (!isNode && tasks.has(id)) {
         return tasks.get(id);
     }
@@ -143,10 +81,6 @@ export default async function download(
     if (!$arguments?.noCache && cached) {
         $.info(`使用缓存: ${url}`);
         result = cached;
-        if (customCacheKey) {
-            $.info(`URL ${url}\n写入自定义缓存 ${$arguments?.cacheKey}`);
-            $.write(cached, customCacheKey);
-        }
     } else {
         $.info(
             `Downloading...\nUser-Agent: ${userAgent}\nTimeout: ${requestTimeout}\nProxy: ${proxy}\nURL: ${url}`,
@@ -182,27 +116,10 @@ export default async function download(
             }
             if (shouldCache) {
                 resourceCache.set(id, body);
-                if (customCacheKey) {
-                    $.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}`);
         }
     }
@@ -217,7 +134,6 @@ export default async function download(
                     $arguments.flowUserAgent,
                     undefined,
                     proxy,
-                    $arguments.flowUrl,
                 ),
             ),
         );

backend/src/utils/env.js

@@ -10,7 +10,6 @@ const {
     isShadowRocket,
     isLanceX,
     isEgern,
-    isGUIforCores,
 } = ENV();
 let backend = 'Node';
 if (isNode) backend = 'Node';
@@ -21,7 +20,6 @@ if (isStash) backend = 'Stash';
 if (isShadowRocket) backend = 'ShadowRocket';
 if (isEgern) backend = 'Egern';
 if (isLanceX) backend = 'LanceX';
-if (isGUIforCores) backend = 'GUI.for.Cores';
 
 let meta = {};
 
@@ -38,10 +36,6 @@ try {
         // 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'),

backend/src/utils/flow.js

@@ -10,8 +10,8 @@ export function getFlowField(headers) {
     )[0];
     return headers[subkey];
 }
-export async function getFlowHeaders(rawUrl, ua, timeout, proxy, flowUrl) {
+export async function getFlowHeaders(rawUrl, ua, timeout, proxy) {
-    let url = flowUrl || rawUrl;
+    let url = rawUrl;
     let $arguments = {};
     const rawArgs = url.split('#');
     url = url.split('#')[0];
@@ -48,76 +48,60 @@ export async function getFlowHeaders(rawUrl, ua, timeout, proxy, flowUrl) {
             'Quantumult%20X/1.0.30 (iPhone14,2; iOS 15.6)';
         const requestTimeout = timeout || defaultTimeout;
         const http = HTTP();
-        if (flowUrl) {
+        try {
             $.info(
-                `使用 GET 方法从响应体获取流量信息: ${flowUrl}, User-Agent: ${
+                `使用 HEAD 方法获取流量信息: ${url}, User-Agent: ${
                     userAgent || ''
                 }`,
             );
-            const { body } = await http.get({
+            const { headers } = await http.head({
-                url: flowUrl,
+                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) : {}),
+            });
+            flowInfo = getFlowField(headers);
+        } catch (e) {
+            $.error(
+                `使用 HEAD 方法获取流量信息失败: ${url}, User-Agent: ${
+                    userAgent || ''
+                }: ${e.message ?? e}`,
+            );
+        }
+        if (!flowInfo) {
+            $.info(
+                `使用 GET 方法获取流量信息: ${url}, User-Agent: ${
+                    userAgent || ''
+                }`,
+            );
+            const { headers } = await http.get({
+                url: url
+                    .split(/[\r\n]+/)
+                    .map((i) => i.trim())
+                    .filter((i) => i.length)[0],
                 headers: {
                     'User-Agent': userAgent,
                 },
                 timeout: requestTimeout,
             });
-            flowInfo = body;
+            flowInfo = getFlowField(headers);
-        } else {
-            try {
-                $.info(
-                    `使用 HEAD 方法从响应头获取流量信息: ${url}, User-Agent: ${
-                        userAgent || ''
-                    }`,
-                );
-                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) : {}),
-                });
-                flowInfo = getFlowField(headers);
-            } catch (e) {
-                $.error(
-                    `使用 HEAD 方法从响应头获取流量信息失败: ${url}, User-Agent: ${
-                        userAgent || ''
-                    }: ${e.message ?? e}`,
-                );
-            }
-            if (!flowInfo) {
-                $.info(
-                    `使用 GET 方法获取流量信息: ${url}, User-Agent: ${
-                        userAgent || ''
-                    }`,
-                );
-                const { headers } = await http.get({
-                    url: url
-                        .split(/[\r\n]+/)
-                        .map((i) => i.trim())
-                        .filter((i) => i.length)[0],
-                    headers: {
-                        'User-Agent': userAgent,
-                    },
-                    timeout: requestTimeout,
-                });
-                flowInfo = getFlowField(headers);
-            }
         }
         if (flowInfo) {
             headersResourceCache.set(url, flowInfo);

backend/src/utils/geo.js

@@ -1,107 +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'],
-    '🇧🇷': ['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', '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'],
-    '🇱🇹': ['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', 'AMS'],
-    '🇳🇴': ['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', '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
@@ -169,7 +65,6 @@ export function getFlag(name) {
             '广德',
             '法兰克福',
             'Frankfurt',
-            '德意志',
         ],
         '🇩🇰': ['Denmark', '丹麦', '丹麥'],
         '🇪🇨': ['Ecuador', '厄瓜多尔'],
@@ -388,6 +283,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', 'ROC'],
+        '🇺🇦': ['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] ||
@@ -401,9 +398,7 @@ export function getFlag(name) {
             // 不精确匹配（只要包含就算,忽略大小写)
             keywords.some((keyword) => RegExp(`${keyword}`, 'i').test(name))
         ) {
-            if (/内蒙古/.test(name) && ['🇲🇳'].includes(flag)) {
+            //console.log(`newFlag = ${flag}`)
-                return (Flag = '🇨🇳');
-            }
             return (Flag = flag);
         }
     }
@@ -421,56 +416,6 @@ export function getFlag(name) {
             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;
-    }
-}

backend/src/utils/gist.js

@@ -135,9 +135,9 @@ export default class Gist {
                     }
                 }
             });
-            // console.log(`result`, result);
+            console.log(`result`, result);
-            // console.log(`files`, files);
+            console.log(`files`, files);
-            // console.log(`actions`, actions);
+            console.log(`actions`, actions);
 
             if (this.syncPlatform === 'gitlab') {
                 if (Object.keys(result).length === 0) {

backend/src/utils/platform.js

@@ -1,4 +1,4 @@
-export function getUserAgentFromHeaders(headers) {
+export function getPlatformFromHeaders(headers) {
     const keys = Object.keys(headers);
     let UA = '';
     let ua = '';
@@ -9,9 +9,6 @@ export function getUserAgentFromHeaders(headers) {
             break;
         }
     }
-    return { UA, ua };
-}
-export function getPlatformFromUserAgent({ ua, UA }) {
     if (UA.indexOf('Quantumult%20X') !== -1) {
         return 'QX';
     } else if (UA.indexOf('Surfboard') !== -1) {
@@ -41,7 +38,3 @@ export function getPlatformFromUserAgent({ ua, UA }) {
         return 'JSON';
     }
 }
-export function getPlatformFromHeaders(headers) {
-    const { UA, ua } = getUserAgentFromHeaders(headers);
-    return getPlatformFromUserAgent({ ua, UA });
-}

backend/src/vendor/express.js

@@ -161,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',
@@ -184,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

@@ -8,7 +8,6 @@ const isStash =
 const isShadowRocket = 'undefined' !== typeof $rocket;
 const isEgern = 'object' == typeof egern;
 const isLanceX = 'undefined' != typeof $native;
-const isGUIforCores = typeof $Plugins !== 'undefined';
 
 export class OpenAPI {
     constructor(name = 'untitled', debug = false) {
@@ -49,10 +48,7 @@ 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 =
@@ -90,7 +86,6 @@ 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') || '.';
@@ -123,9 +118,6 @@ export class OpenAPI {
             if (isNode) {
                 this.root[key] = data;
             }
-            if (isGUIforCores) {
-                return $Plugins.SubStoreCache.set(key, data);
-            }
         } else {
             this.cache[key] = data;
         }
@@ -145,9 +137,6 @@ export class OpenAPI {
             if (isNode) {
                 return this.root[key];
             }
-            if (isGUIforCores) {
-                return $Plugins.SubStoreCache.get(key);
-            }
         } else {
             return this.cache[key];
         }
@@ -166,9 +155,6 @@ export class OpenAPI {
             if (isNode) {
                 delete this.root[key];
             }
-            if (isGUIforCores) {
-                return $Plugins.SubStoreCache.remove(key);
-            }
         } else {
             delete this.cache[key];
         }
@@ -234,9 +220,6 @@ export class OpenAPI {
                     });
             }
         }
-        if (isGUIforCores) {
-            $Plugins.Notify(title, subtitle + '\n' + content);
-        }
     }
 
     // other helper functions
@@ -257,7 +240,7 @@ export class OpenAPI {
     }
 
     done(value = {}) {
-        if (isQX || isLoon || isSurge || isGUIforCores) {
+        if (isQX || isLoon || isSurge) {
             $done(value);
         } else if (isNode) {
             if (typeof $context !== 'undefined') {
@@ -279,12 +262,11 @@ export function ENV() {
         isShadowRocket,
         isEgern,
         isLanceX,
-        isGUIforCores,
     };
 }
 
 export function HTTP(defaultOptions = { baseURL: '' }) {
-    const { isQX, isLoon, isSurge, isNode, isGUIforCores } = ENV();
+    const { isQX, isLoon, isSurge, isNode } = ENV();
     const methods = [
         'GET',
         'POST',
@@ -374,30 +356,6 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                         });
                 });
             });
-        } 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,
-                        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);
-                }
-            });
         }
 
         let timeoutid;

config/Loon.plugin

@@ -1,5 +1,5 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具. 定时任务默认为每天 23 点 55 分. 定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'
+#!desc=高级订阅管理工具. 定时任务默认为每天 23 点 55 分
 #!openUrl=https://sub.store
 #!author=Peng-YM
 #!homepage=https://github.com/sub-store-org/Sub-Store

config/QX-Task.json

@@ -1,6 +1,6 @@
 {
   "name": "Sub-Store",
-  "description": "定时任务默认为每天 23 点 55 分. 定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'",
+  "description": "定时任务默认为每天 23 点 55 分",
   "task": [
     "55 23 * * * https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js, tag=Sub-Store Sync, img-url=https://raw.githubusercontent.com/58xinian/icon/master/Sub-Store1.png"
   ]

config/README.md

@@ -6,32 +6,22 @@ Sub-Store Releases: [`https://github.com/sub-store-org/Sub-Store/releases`](http
 
 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) 即可。
 
 ### 2. Surge
 
-#### 关于 Surge 的格外说明
+0. 最新 Surge iOS TestFlight 版本 可使用 Beta 版(支持最新 Surge iOS TestFlight 版本的分类和参数设置): [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Beta.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Beta.sgmodule)
 
-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)
+1. 官方默认版模块(目前不带 ability 参数, 不保证以后不会改动): [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule)
 
-定时处理订阅 功能, 避免 App 内拉取超时, 请查看 [定时处理订阅](https://t.me/zhetengsha/1449)
+2. 固定带 ability 参数版本,可能会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 请使用此带 ability 参数版本: [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule)
 
-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)
+> 最新 Surge iOS TestFlight 版本应该没有内存问题了 可以大胆尝试带 ability 参数版本
 
-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)
+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)
-
-> 最新版 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)
 
 
 ### 3. QX
@@ -43,17 +33,9 @@ Surge Mac 版如何支持 SSR, 如何去除 HTTP 传输层以支持 类似 VMess
 安装使用 覆写 [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Stash.stoverride`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Stash.stoverride) 即可。
 
 ### 5. Shadowrocket
-安装使用 模块 [`https://raw.githubusercontent.com/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/sub-store-org/Sub-Store/master/config/Surge.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule) 即可。
 
 ## 使用 Sub-Store
 1. 使用 Safari 打开这个 https://sub.store 如网页正常打开并且未弹出任何错误提示，说明 Sub-Store 已经配置成功。
 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,5 +1,5 @@
 name: Sub-Store
-desc: 高级订阅管理工具 @Peng-YM. 定时任务默认为每天  23 点 55 分. 定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'
+desc: 高级订阅管理工具 @Peng-YM. 定时任务默认为每天  23 点 55 分
 icon: https://raw.githubusercontent.com/cc63/ICON/main/Sub-Store.png
 
 http:

config/Surge-Beta.sgmodule

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

config/Surge-Noability.sgmodule

@@ -1,5 +1,5 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用带 ability 参数. 定时任务默认为每天  23 点 55 分. 定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'
+#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用带 ability 参数. 定时任务默认为每天  23 点 55 分
 #!category=订阅管理
 
 [MITM]

config/Surge-ability.sgmodule

@@ -1,5 +1,5 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  带 ability 参数版本, 使用 jsc 引擎时, 可能会爆内存, 如果不需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用不带 ability 参数版本. 定时任务默认为每天 23 点 55 分. 定时任务指定时将订阅/文件上传到私有 Gist. 在前端, 叫做 '同步' 或 '同步配置'
+#!desc=高级订阅管理工具 @Peng-YM  带 ability 参数版本, 可能会爆内存, 如果不需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用不带 ability 参数版本. 定时任务默认为每天 23 点 55 分
 #!category=订阅管理
 
 [MITM]

config/Surge.sgmodule

@@ -1,17 +1,12 @@
 #!name=Sub-Store
-#!desc=支持 Surge 正式版的参数设置功能. 测落地功能 ability: http-client-policy, 同步配置的定时 cronexp: 55 23 * * *
+#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用带 ability 参数. 定时任务默认为每天 23 点 55 分
 #!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://github.com/sub-store-org/Sub-Store/releases/latest/download/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
+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,timeout=120
 
-Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true,timeout={{{timeout}}},engine={{{engine}}}
+Sub-Store Sync=type=cron,cronexp=55 23 * * *,wake-system=1,timeout=120,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js
-
-{{{sync}}}=type=cron,cronexp="{{{cronexp}}}",wake-system=1,timeout={{{timeout}}},script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js,engine={{{engine}}}
-
-{{{produce}}}=type=cron,cronexp="{{{produce_cronexp}}}",wake-system=1,timeout={{{timeout}}},script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js,engine={{{engine}}},argument="sub={{{produce_sub}}}&col={{{produce_col}}}"

scripts/demo.js

@@ -7,12 +7,9 @@ function operator(proxies = [], targetPlatform, context) {
   // proxies 为传入的内部节点数组
   // 结构大致参考了 Clash.Meta(mihomo) 有私货
   // 可在预览界面点击节点查看 JSON 结构 或查看 `target=JSON` 的通用订阅
-  // 1. `_no-resolve` 为不解析域名
+  // 1. `no-resolve` 为不解析域名
-  // 2. 域名解析后 会多一个 `_resolved` 字段
+  // 2. 域名解析后 会多一个 `resolved` 字段
-  // 3. 域名解析后会有`_IPv4`, `_IPv6`, `_IP`(若有多个步骤, 只取第一次成功的 v4 或 v6 数据), `_domain` 字段
+  // 3. 节点字段 `exec` 为 `ssr-local` 路径, 默认 `/usr/local/bin/ssr-local`; 端口从 10000 开始递增(暂不支持配置)
-  // 4. 节点字段 `exec` 为 `ssr-local` 路径, 默认 `/usr/local/bin/ssr-local`; 端口从 10000 开始递增(暂不支持配置)
-  // 5. `_subName` 为单条订阅名
-  // 6. `_collectionName` 为组合订阅名
 
   // $arguments 为传入的脚本参数
 
@@ -39,17 +36,8 @@ function operator(proxies = [], targetPlatform, context) {
   //     isIPv6,
   //     isIP,
   //     yaml, // yaml 解析和生成
-  //     getFlag, // 获取 emoji 旗帜
-  //     removeFlag, // 移除 emoji 旗帜
-  //     getISO, // 获取 ISO 3166-1 alpha-2 代码
-  //     Gist, // Gist 类
   // }
 
-  // 示例: 给节点名添加前缀
-  // $server.name = `[${ProxyUtils.getISO($server.name)}] ${$server.name}`
-  // 示例: 给节点名添加旗帜
-  // $server.name = `[${ProxyUtils.getFlag($server.name).replace(/🇹🇼/g, '🇼🇸')}] ${ProxyUtils.removeFlag($server.name)}`
-
   // 示例: 从 sni 文件中读取内容并进行节点操作
   // const sni = await produceArtifact({
   //     type: 'file',
@@ -100,11 +88,6 @@ function operator(proxies = [], targetPlatform, context) {
   //     produceType: 'internal' // 'internal' produces an Array, otherwise produces a String( ProxyUtils.yaml.safeLoad('YAML String').proxies )
   // })
 
-  // 4. 一个比较折腾的方案: 在脚本操作中, 把内容同步到另一个 gist
-  // 见 https://t.me/zhetengsha/1428
-  // 
-  // const content = ProxyUtils.produce(proxies, platform)
-
   // // YAML
   // ProxyUtils.yaml.load('YAML String')
   // ProxyUtils.yaml.safeLoad('YAML String')

scripts/fancy-characters.js

@@ -3,7 +3,7 @@
  *
  * 【字体】
  * 可参考：https://www.dute.org/weird-fonts
- * serif-bold, serif-italic, serif-bold-italic, sans-serif-regular, sans-serif-bold-italic, script-regular, script-bold, fraktur-regular, fraktur-bold, monospace-regular, double-struck-bold, circle-regular, square-regular, modifier-letter(小写没有 q, 用 ᵠ 替代. 大写缺的太多, 用小写替代)
+ * serif-bold, serif-italic, serif-bold-italic, sans-serif-regular, sans-serif-bold-italic, script-regular, script-bold, fraktur-regular, fraktur-bold, monospace-regular, double-struck-bold, circle-regular, square-regular
  *
  * 【示例】
  * 1️⃣ 设置所有格式为 "serif-bold"
@@ -31,7 +31,6 @@ function operator(proxies) {
         "double-struck-bold": ["𝟘","𝟙","𝟚","𝟛","𝟜","𝟝","𝟞","𝟟","𝟠","𝟡","𝕒","𝕓","𝕔","𝕕","𝕖","𝕗","𝕘","𝕙","𝕚","𝕛","𝕜","𝕝","𝕞","𝕟","𝕠","𝕡","𝕢","𝕣","𝕤","𝕥","𝕦","𝕧","𝕨","𝕩","𝕪","𝕫","𝔸","𝔹","ℂ","𝔻","𝔼","𝔽","𝔾","ℍ","𝕀","𝕁","𝕂","𝕃","𝕄","ℕ","𝕆","ℙ","ℚ","ℝ","𝕊","𝕋","𝕌","𝕍","𝕎","𝕏","𝕐","ℤ"],
         "circle-regular": ["⓪","①","②","③","④","⑤","⑥","⑦","⑧","⑨","ⓐ","ⓑ","ⓒ","ⓓ","ⓔ","ⓕ","ⓖ","ⓗ","ⓘ","ⓙ","ⓚ","ⓛ","ⓜ","ⓝ","ⓞ","ⓟ","ⓠ","ⓡ","ⓢ","ⓣ","ⓤ","ⓥ","ⓦ","ⓧ","ⓨ","ⓩ","Ⓐ","Ⓑ","Ⓒ","Ⓓ","Ⓔ","Ⓕ","Ⓖ","Ⓗ","Ⓘ","Ⓙ","Ⓚ","Ⓛ","Ⓜ","Ⓝ","Ⓞ","Ⓟ","Ⓠ","Ⓡ","Ⓢ","Ⓣ","Ⓤ","Ⓥ","Ⓦ","Ⓧ","Ⓨ","Ⓩ"],
         "square-regular": ["0","1","2","3","4","5","6","7","8","9","🄰","🄱","🄲","🄳","🄴","🄵","🄶","🄷","🄸","🄹","🄺","🄻","🄼","🄽","🄾","🄿","🅀","🅁","🅂","🅃","🅄","🅅","🅆","🅇","🅈","🅉","🄰","🄱","🄲","🄳","🄴","🄵","🄶","🄷","🄸","🄹","🄺","🄻","🄼","🄽","🄾","🄿","🅀","🅁","🅂","🅃","🅄","🅅","🅆","🅇","🅈","🅉"],
-        "modifier-letter": ["⁰", "¹", "²", "³", "⁴", "⁵", "⁶", "⁷", "⁸", "⁹", "ᵃ", "ᵇ", "ᶜ", "ᵈ", "ᵉ", "ᶠ", "ᵍ", "ʰ", "ⁱ", "ʲ", "ᵏ", "ˡ", "ᵐ", "ⁿ", "ᵒ", "ᵖ", "ᵠ", "ʳ", "ˢ", "ᵗ", "ᵘ", "ᵛ", "ʷ", "ˣ", "ʸ", "ᶻ", "ᴬ", "ᴮ", "ᶜ", "ᴰ", "ᴱ", "ᶠ", "ᴳ", "ʰ", "ᴵ", "ᴶ", "ᴷ", "ᴸ", "ᴹ", "ᴺ", "ᴼ", "ᴾ", "ᵠ", "ᴿ", "ˢ", "ᵀ", "ᵁ", "ᵛ", "ᵂ", "ˣ", "ʸ", "ᶻ"],
     };
 
     // charCode => index in `TABLE`

scripts/ip-flag-node.js

@@ -1,79 +0,0 @@
-const $ = $substore;
-
-const {onlyFlagIP = true} = $arguments
-
-async function operator(proxies) {
-    const BATCH_SIZE = 10;
-
-    let i = 0;
-    while (i < proxies.length) {
-        const batch = proxies.slice(i, i + BATCH_SIZE);
-        await Promise.all(batch.map(async proxy => {
-            if (onlyFlagIP && !ProxyUtils.isIP(proxy.server)) return;
-            try {
-                // remove the original flag
-                let proxyName = removeFlag(proxy.name);
-
-                // query ip-api
-                const countryCode = await queryIpApi(proxy);
-
-                proxyName = getFlagEmoji(countryCode) + ' ' + proxyName;
-                proxy.name = proxyName;
-            } catch (err) {
-                // TODO:
-            }
-        }));
-
-        await sleep(1000);
-        i += BATCH_SIZE;
-    }
-    return proxies;
-}
-
-
-async function queryIpApi(proxy) {
-    const ua = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:78.0) Gecko/20100101 Firefox/78.0";
-    const headers = {
-        "User-Agent": ua
-    };
-    const result = new Promise((resolve, reject) => {
-        const url =
-            `http://ip-api.com/json/${encodeURIComponent(proxy.server)}?lang=zh-CN`;
-        $.http.get({
-            url,
-            headers,
-        }).then(resp => {
-            const data = JSON.parse(resp.body);
-            if (data.status === "success") {
-                resolve(data.countryCode);
-            } else {
-                reject(new Error(data.message));
-            }
-        }).catch(err => {
-            console.log(err);
-            reject(err);
-        });
-    });
-    return result;
-}
-
-function getFlagEmoji(countryCode) {
-    const codePoints = countryCode
-        .toUpperCase()
-        .split('')
-        .map(char => 127397 + char.charCodeAt());
-    return String
-        .fromCodePoint(...codePoints)
-        .replace(/🇹🇼/g, '🇨🇳');
-}
-
-function removeFlag(str) {
-    return str
-        .replace(/[\uD83C][\uDDE6-\uDDFF][\uD83C][\uDDE6-\uDDFF]/g, '')
-        .trim();
-}
-
-function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
-