feat: Hysteria2 URI 输入支持 hy2://

```
const port = Number($server.port)

return [80, 443].includes(port)
```

.github/workflows/main.yml

@@ -44,19 +44,15 @@ jobs:
         run: |
           cd backend
           SUBSTORE_RELEASE=`node --eval="process.stdout.write(require('./package.json').version)"`
-          echo "::set-output name=release_tag::$SUBSTORE_RELEASE"
-      - name: Prepare release
-        run: |
-          cd backend
-          pnpm i -D conventional-changelog-cli
-          pnpm run changelog
+          echo "release_tag=$SUBSTORE_RELEASE" >> $GITHUB_OUTPUT
       - name: Release
         uses: softprops/action-gh-release@v1
+        if: ${{ success() }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          body_path: ./backend/CHANGELOG.md
           tag_name: ${{ steps.tag.outputs.release_tag }}
+          generate_release_notes: true
           files: |
             ./backend/sub-store.min.js
             ./backend/dist/sub-store-0.min.js

backend/bundle.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 const fs = require('fs');
-
 const path = require('path');
+const { build } = require('esbuild');
 
 let content = fs.readFileSync(path.join(__dirname, 'sub-store.min.js'), {
     encoding: 'utf8',
@@ -14,10 +14,12 @@ fs.writeFileSync(path.join(__dirname, 'dist/sub-store.no-bundle.js'), content, {
     encoding: 'utf8',
 });
 
-const { build } = require('estrella');
 build({
-    entry: 'dist/sub-store.no-bundle.js',
-    outfile: 'dist/sub-store.bundle.js',
+    entryPoints: ['dist/sub-store.no-bundle.js'],
     bundle: true,
+    minify: true,
+    sourcemap: true,
     platform: 'node',
+    format: 'cjs',
+    outfile: 'dist/sub-store.bundle.js',
 });

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.92",
+  "version": "2.14.129",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
@@ -9,15 +9,16 @@
     "serve": "node sub-store.min.js",
     "start": "nodemon -w src -w package.json --exec babel-node src/main.js",
     "build": "gulp",
-    "bundle": "node bundle.js",
-    "changelog": "conventional-changelog -p cli -i CHANGELOG.md -s"
+    "bundle": "node bundle.js"
   },
   "author": "Peng-YM",
   "license": "GPL-3.0",
   "dependencies": {
     "automerge": "1.0.1-preview.7",
     "body-parser": "^1.19.0",
+    "connect-history-api-fallback": "^2.0.0",
     "express": "^4.17.1",
+    "http-proxy-middleware": "^2.0.6",
     "js-base64": "^3.7.2",
     "lodash": "^4.17.21",
     "request": "^2.88.2",
@@ -38,6 +39,7 @@
     "browser-pack-flat": "^3.4.2",
     "browserify": "^17.0.0",
     "chai": "^4.3.6",
+    "esbuild": "^0.19.8",
     "eslint": "^8.16.0",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",

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

@@ -139,7 +139,7 @@ async function process(proxies, operators = [], targetPlatform, source) {
     return proxies;
 }
 
-function produce(proxies, targetPlatform) {
+function produce(proxies, targetPlatform, type) {
     const producer = PROXY_PRODUCERS[targetPlatform];
     if (!producer) {
         throw new Error(`Target platform: ${targetPlatform} is not supported!`);
@@ -157,7 +157,7 @@ function produce(proxies, targetPlatform) {
         return proxies
             .map((proxy) => {
                 try {
-                    let line = producer.produce(proxy);
+                    let line = producer.produce(proxy, type);
                     if (
                         line.length > 0 &&
                         line.includes('__SubStoreLocalPort__')
@@ -182,7 +182,7 @@ function produce(proxies, targetPlatform) {
             .filter((line) => line.length > 0)
             .join('\n');
     } else if (producer.type === 'ALL') {
-        return producer.produce(proxies);
+        return producer.produce(proxies, type);
     }
 }
 
@@ -214,6 +214,12 @@ function safeMatch(parser, line) {
 }
 
 function lastParse(proxy) {
+    if (proxy.server) {
+        proxy.server = proxy.server
+            .trim()
+            .replace(/^\[/, '')
+            .replace(/\]$/, '');
+    }
     if (proxy.type === 'trojan') {
         if (proxy.network === 'tcp') {
             delete proxy.network;

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

@@ -33,7 +33,9 @@ function URI_SS() {
         const serverAndPort = serverAndPortArray[1];
         const portIdx = serverAndPort.lastIndexOf(':');
         proxy.server = serverAndPort.substring(0, portIdx);
-        proxy.port = serverAndPort.substring(portIdx + 1);
+        proxy.port = `${serverAndPort.substring(portIdx + 1)}`.match(
+            /\d+/,
+        )?.[0];
 
         const userInfo = userInfoStr.split(':');
         proxy.cipher = userInfo[0];
@@ -407,10 +409,10 @@ function URI_VLESS() {
 function URI_Hysteria2() {
     const name = 'URI Hysteria2 Parser';
     const test = (line) => {
-        return /^hysteria2:\/\//.test(line);
+        return /^(hysteria2|hy2):\/\//.test(line);
     };
     const parse = (line) => {
-        line = line.split('hysteria2://')[1];
+        line = line.split(/(hysteria2|hy2):\/\//)[2];
         // eslint-disable-next-line no-unused-vars
         let [__, password, server, ___, port, addons, name] =
             /^(.*?)@(.*?)(:(\d+))?\/?\?(.*?)(?:#(.*?))$/.exec(line);

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

@@ -44,7 +44,7 @@ shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/
     // handle ssr obfs
     proxy.obfs = obfs.type;
 }
-shadowsocks = tag equals "shadowsocks"i address method password (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
     proxy.type = "ss";
     // handle ss obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -145,6 +145,9 @@ username = & {
 password = comma '"' match:[^"]* '"' { proxy.password = match.join(""); }
 uuid = comma '"' match:[^"]+ '"' { proxy.uuid = match.join(""); }
 
+obfs_typev = comma type:("http"/"tls") { obfs.type = type; }
+obfs_hostv = comma match:[^,]+ { obfs.host = match.join(""); }
+
 obfs_ss = comma "obfs-name" equals type:("http"/"tls") { obfs.type = type; }
 
 obfs_ssr = comma "obfs" equals type:("plain"/"http_simple"/"http_post"/"random_head"/"tls1.2_ticket_auth"/"tls1.2_ticket_fastauth") { obfs.type = type; }

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

@@ -42,7 +42,7 @@ shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/
     // handle ssr obfs
     proxy.obfs = obfs.type;
 }
-shadowsocks = tag equals "shadowsocks"i address method password (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
     proxy.type = "ss";
     // handle ss obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -143,6 +143,9 @@ username = & {
 password = comma '"' match:[^"]* '"' { proxy.password = match.join(""); }
 uuid = comma '"' match:[^"]+ '"' { proxy.uuid = match.join(""); }
 
+obfs_typev = comma type:("http"/"tls") { obfs.type = type; }
+obfs_hostv = comma match:[^,]+ { obfs.host = match.join(""); }
+
 obfs_ss = comma "obfs-name" equals type:("http"/"tls") { obfs.type = type; }
 
 obfs_ssr = comma "obfs" equals type:("plain"/"http_simple"/"http_post"/"random_head"/"tls1.2_ticket_auth"/"tls1.2_ticket_fastauth") { obfs.type = type; }

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

@@ -25,7 +25,10 @@ function Base64Encoded() {
     ];
 
     const test = function (raw) {
-        return keys.some((k) => raw.indexOf(k) !== -1);
+        return (
+            !/^\w+:\/\/\w+/im.test(raw) &&
+            keys.some((k) => raw.indexOf(k) !== -1)
+        );
     };
     const parse = function (raw) {
         raw = Base64.decode(raw);
@@ -37,7 +40,9 @@ function Base64Encoded() {
 function Clash() {
     const name = 'Clash Pre-processor';
     const test = function (raw) {
-        return /proxies/.test(raw);
+        if (!/proxies/.test(raw)) return false;
+        const content = safeLoad(raw);
+        return content.proxies && Array.isArray(content.proxies);
     };
     const parse = function (raw) {
         // Clash YAML format
@@ -105,4 +110,4 @@ function FullConfig() {
     return { name, test, parse };
 }
 
-export default [HTML(), Base64Encoded(), Clash(), SSD(), FullConfig()];
+export default [HTML(), Clash(), Base64Encoded(), SSD(), FullConfig()];

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

@@ -451,7 +451,9 @@ function ResolveDomainOperator({ provider }) {
             const limit = 15; // more than 20 concurrency may result in surge TCP connection shortage.
             const totalDomain = [
                 ...new Set(
-                    proxies.filter((p) => !isIP(p.server)).map((c) => c.server),
+                    proxies
+                        .filter((p) => !isIP(p.server) && !p['no-resolve'])
+                        .map((c) => c.server),
                 ),
             ];
             const totalBatch = Math.ceil(totalDomain.length / limit);
@@ -475,8 +477,15 @@ function ResolveDomainOperator({ provider }) {
                 }
                 await Promise.all(currentBatch);
             }
-            proxies.forEach((proxy) => {
-                proxy.server = results[proxy.server] || proxy.server;
+            proxies.forEach((p) => {
+                if (!p['no-resolve']) {
+                    if (results[p.server]) {
+                        p.server = results[p.server];
+                        p.resolved = true;
+                    } else {
+                        p.resolved = false;
+                    }
+                }
             });
 
             return proxies;
@@ -596,6 +605,22 @@ function ScriptFilter(script, targetPlatform, $arguments, source) {
             })();
             return output;
         },
+        nodeFunc: async (proxies) => {
+            let output = FULL(proxies.length, true);
+            await (async function () {
+                const filter = createDynamicFunction(
+                    'filter',
+                    `async function filter(proxies = []) {
+                        return proxies.filter(($server = {}) => {
+                          ${script}
+                        })
+                      }`,
+                    $arguments,
+                );
+                output = filter(proxies, targetPlatform, { source, ...env });
+            })();
+            return output;
+        },
     };
 }
 
@@ -626,7 +651,29 @@ async function ApplyFilter(filter, objs) {
     } catch (err) {
         // print log and skip this filter
         $.error(`Cannot apply filter ${filter.name}\n Reason: ${err}`);
-        throw new Error(`脚本过滤失败 ${err.message ?? err}`);
+        let funcErr = '';
+        let funcErrMsg = `${err.message ?? err}`;
+        if (funcErrMsg.includes('$server is not defined')) {
+            funcErr = '';
+        } else {
+            funcErr = `执行 function filter 失败 ${funcErrMsg}; `;
+        }
+        try {
+            selected = await filter.nodeFunc(objs);
+        } catch (err) {
+            $.error(
+                `Cannot apply filter ${filter.name}(node script)! Reason: ${err}`,
+            );
+            let nodeErr = '';
+            let nodeErrMsg = `${err.message ?? err}`;
+            if (funcErr && nodeErrMsg === funcErrMsg) {
+                nodeErr = '';
+                funcErr = `执行失败 ${funcErrMsg}`;
+            } else {
+                nodeErr = `执行节点快捷过滤脚本 失败 ${nodeErr}`;
+            }
+            throw new Error(`脚本过滤 ${funcErr}${nodeErr}`);
+        }
     }
     return objs.filter((_, i) => selected[i]);
 }

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

@@ -7,6 +7,7 @@ export default function Clash_Producer() {
         // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/docs/config.yaml#L532
         // github.com/Dreamacro/clash/pull/2891/files
         // filter unsupported proxies
+        // https://clash.wiki/configuration/outbound.html#shadowsocks
         proxies = proxies.filter((proxy) => {
             if (
                 ![
@@ -20,6 +21,23 @@ export default function Clash_Producer() {
                     'trojan',
                     'wireguard',
                 ].includes(proxy.type) ||
+                (proxy.type === 'ss' &&
+                    ![
+                        'aes-128-gcm',
+                        'aes-192-gcm',
+                        'aes-256-gcm',
+                        'aes-128-cfb',
+                        'aes-192-cfb',
+                        'aes-256-cfb',
+                        'aes-128-ctr',
+                        'aes-192-ctr',
+                        'aes-256-ctr',
+                        'rc4-md5',
+                        'chacha20-ietf',
+                        'xchacha20',
+                        'chacha20-ietf-poly1305',
+                        'xchacha20-ietf-poly1305',
+                    ].includes(proxy.cipher)) ||
                 (proxy.type === 'snell' && String(proxy.version) === '4') ||
                 (proxy.type === 'vless' &&
                     (typeof proxy.flow !== 'undefined' ||

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

@@ -2,143 +2,143 @@ import { isPresent } from '@/core/proxy-utils/producers/utils';
 
 export default function ClashMeta_Producer() {
     const type = 'ALL';
-    const produce = (proxies) => {
-        return (
-            'proxies:\n' +
-            proxies
-                .filter((proxy) => {
+    const produce = (proxies, type) => {
+        const list = proxies
+            .filter((proxy) => {
+                if (proxy.type === 'snell' && String(proxy.version) === '4') {
+                    return false;
+                }
+                return true;
+            })
+            .map((proxy) => {
+                if (proxy.type === 'vmess') {
+                    // handle vmess aead
+                    if (isPresent(proxy, 'aead')) {
+                        if (proxy.aead) {
+                            proxy.alterId = 0;
+                        }
+                        delete proxy.aead;
+                    }
+                    if (isPresent(proxy, 'sni')) {
+                        proxy.servername = proxy.sni;
+                        delete proxy.sni;
+                    }
+                    // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/docs/config.yaml#L400
+                    // https://stash.wiki/proxy-protocols/proxy-types#vmess
                     if (
-                        proxy.type === 'snell' &&
-                        String(proxy.version) === '4'
+                        isPresent(proxy, 'cipher') &&
+                        ![
+                            'auto',
+                            'aes-128-gcm',
+                            'chacha20-poly1305',
+                            'none',
+                        ].includes(proxy.cipher)
                     ) {
-                        return false;
+                        proxy.cipher = 'auto';
                     }
-                    return true;
-                })
-                .map((proxy) => {
-                    if (proxy.type === 'vmess') {
-                        // handle vmess aead
-                        if (isPresent(proxy, 'aead')) {
-                            if (proxy.aead) {
-                                proxy.alterId = 0;
-                            }
-                            delete proxy.aead;
-                        }
-                        if (isPresent(proxy, 'sni')) {
-                            proxy.servername = proxy.sni;
-                            delete proxy.sni;
-                        }
-                        // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/docs/config.yaml#L400
-                        // https://stash.wiki/proxy-protocols/proxy-types#vmess
-                        if (
-                            isPresent(proxy, 'cipher') &&
-                            ![
-                                'auto',
-                                'aes-128-gcm',
-                                'chacha20-poly1305',
-                                'none',
-                            ].includes(proxy.cipher)
-                        ) {
-                            proxy.cipher = 'auto';
-                        }
-                    } else if (proxy.type === 'tuic') {
-                        if (isPresent(proxy, 'alpn')) {
-                            proxy.alpn = Array.isArray(proxy.alpn)
-                                ? proxy.alpn
-                                : [proxy.alpn];
-                        } else {
-                            proxy.alpn = ['h3'];
-                        }
-                        if (
-                            isPresent(proxy, 'tfo') &&
-                            !isPresent(proxy, 'fast-open')
-                        ) {
-                            proxy['fast-open'] = proxy.tfo;
-                        }
-                        // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/adapter/outbound/tuic.go#L197
-                        if (
-                            (!proxy.token || proxy.token.length === 0) &&
-                            !isPresent(proxy, 'version')
-                        ) {
-                            proxy.version = 5;
-                        }
-                    } else if (proxy.type === 'hysteria') {
-                        // auth_str 将会在未来某个时候删除 但是有的机场不规范
-                        if (
-                            isPresent(proxy, 'auth_str') &&
-                            !isPresent(proxy, 'auth-str')
-                        ) {
-                            proxy['auth-str'] = proxy['auth_str'];
-                        }
-                        if (isPresent(proxy, 'alpn')) {
-                            proxy.alpn = Array.isArray(proxy.alpn)
-                                ? proxy.alpn
-                                : [proxy.alpn];
-                        }
-                        if (
-                            isPresent(proxy, 'tfo') &&
-                            !isPresent(proxy, 'fast-open')
-                        ) {
-                            proxy['fast-open'] = proxy.tfo;
-                        }
-                    } else if (proxy.type === 'wireguard') {
-                        proxy.keepalive =
-                            proxy.keepalive ?? proxy['persistent-keepalive'];
-                        proxy['persistent-keepalive'] = proxy.keepalive;
-                        proxy['preshared-key'] =
-                            proxy['preshared-key'] ?? proxy['pre-shared-key'];
-                        proxy['pre-shared-key'] = proxy['preshared-key'];
-                    } else if (proxy.type === 'vless') {
-                        if (isPresent(proxy, 'sni')) {
-                            proxy.servername = proxy.sni;
-                            delete proxy.sni;
-                        }
+                } else if (proxy.type === 'tuic') {
+                    if (isPresent(proxy, 'alpn')) {
+                        proxy.alpn = Array.isArray(proxy.alpn)
+                            ? proxy.alpn
+                            : [proxy.alpn];
+                    } else {
+                        proxy.alpn = ['h3'];
                     }
+                    if (
+                        isPresent(proxy, 'tfo') &&
+                        !isPresent(proxy, 'fast-open')
+                    ) {
+                        proxy['fast-open'] = proxy.tfo;
+                    }
+                    // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/adapter/outbound/tuic.go#L197
+                    if (
+                        (!proxy.token || proxy.token.length === 0) &&
+                        !isPresent(proxy, 'version')
+                    ) {
+                        proxy.version = 5;
+                    }
+                } else if (proxy.type === 'hysteria') {
+                    // auth_str 将会在未来某个时候删除 但是有的机场不规范
+                    if (
+                        isPresent(proxy, 'auth_str') &&
+                        !isPresent(proxy, 'auth-str')
+                    ) {
+                        proxy['auth-str'] = proxy['auth_str'];
+                    }
+                    if (isPresent(proxy, 'alpn')) {
+                        proxy.alpn = Array.isArray(proxy.alpn)
+                            ? proxy.alpn
+                            : [proxy.alpn];
+                    }
+                    if (
+                        isPresent(proxy, 'tfo') &&
+                        !isPresent(proxy, 'fast-open')
+                    ) {
+                        proxy['fast-open'] = proxy.tfo;
+                    }
+                } else if (proxy.type === 'wireguard') {
+                    proxy.keepalive =
+                        proxy.keepalive ?? proxy['persistent-keepalive'];
+                    proxy['persistent-keepalive'] = proxy.keepalive;
+                    proxy['preshared-key'] =
+                        proxy['preshared-key'] ?? proxy['pre-shared-key'];
+                    proxy['pre-shared-key'] = proxy['preshared-key'];
+                } else if (proxy.type === 'vless') {
+                    if (isPresent(proxy, 'sni')) {
+                        proxy.servername = proxy.sni;
+                        delete proxy.sni;
+                    }
+                }
 
+                if (
+                    ['vmess', 'vless'].includes(proxy.type) &&
+                    proxy.network === 'http'
+                ) {
+                    let httpPath = proxy['http-opts']?.path;
                     if (
-                        ['vmess', 'vless'].includes(proxy.type) &&
-                        proxy.network === 'http'
+                        isPresent(proxy, 'http-opts.path') &&
+                        !Array.isArray(httpPath)
                     ) {
-                        let httpPath = proxy['http-opts']?.path;
-                        if (
-                            isPresent(proxy, 'http-opts.path') &&
-                            !Array.isArray(httpPath)
-                        ) {
-                            proxy['http-opts'].path = [httpPath];
-                        }
-                        let httpHost = proxy['http-opts']?.headers?.Host;
-                        if (
-                            isPresent(proxy, 'http-opts.headers.Host') &&
-                            !Array.isArray(httpHost)
-                        ) {
-                            proxy['http-opts'].headers.Host = [httpHost];
-                        }
+                        proxy['http-opts'].path = [httpPath];
                     }
+                    let httpHost = proxy['http-opts']?.headers?.Host;
+                    if (
+                        isPresent(proxy, 'http-opts.headers.Host') &&
+                        !Array.isArray(httpHost)
+                    ) {
+                        proxy['http-opts'].headers.Host = [httpHost];
+                    }
+                }
 
-                    if (
-                        ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
-                            proxy.type,
-                        )
-                    ) {
-                        delete proxy.tls;
-                    }
+                if (
+                    ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(
+                        proxy.type,
+                    )
+                ) {
+                    delete proxy.tls;
+                }
 
-                    if (proxy['tls-fingerprint']) {
-                        proxy.fingerprint = proxy['tls-fingerprint'];
-                    }
-                    delete proxy['tls-fingerprint'];
-                    delete proxy.subName;
-                    delete proxy.collectionName;
-                    if (
-                        ['grpc'].includes(proxy.network) &&
-                        proxy[`${proxy.network}-opts`]
-                    ) {
-                        delete proxy[`${proxy.network}-opts`]['_grpc-type'];
-                    }
-                    return '  - ' + JSON.stringify(proxy) + '\n';
-                })
-                .join('')
-        );
+                if (proxy['tls-fingerprint']) {
+                    proxy.fingerprint = proxy['tls-fingerprint'];
+                }
+                delete proxy['tls-fingerprint'];
+                delete proxy.subName;
+                delete proxy.collectionName;
+                if (
+                    ['grpc'].includes(proxy.network) &&
+                    proxy[`${proxy.network}-opts`]
+                ) {
+                    delete proxy[`${proxy.network}-opts`]['_grpc-type'];
+                }
+                return proxy;
+            });
+
+        return type === 'internal'
+            ? list
+            : 'proxies:\n' +
+                  list
+                      .map((proxy) => '  - ' + JSON.stringify(proxy) + '\n')
+                      .join('');
     };
     return { type, produce };
 }

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

@@ -99,7 +99,7 @@ function trojan(proxy) {
         if (proxy.network === 'ws') {
             result.append(`,transport=ws`);
             result.appendIfPresent(
-                `,path=${proxy['ws-opts'].path}`,
+                `,path=${proxy['ws-opts']?.path}`,
                 'ws-opts.path',
             );
             result.appendIfPresent(

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

@@ -81,6 +81,25 @@ export default function ShadowRocket_Producer() {
                         ) {
                             proxy['fast-open'] = proxy.tfo;
                         }
+                    } else if (proxy.type === 'hysteria2') {
+                        if (
+                            proxy['obfs-password'] &&
+                            proxy.obfs == 'salamander'
+                        ) {
+                            proxy.obfs = proxy['obfs-password'];
+                            delete proxy['obfs-password'];
+                        }
+                        if (isPresent(proxy, 'alpn')) {
+                            proxy.alpn = Array.isArray(proxy.alpn)
+                                ? proxy.alpn
+                                : [proxy.alpn];
+                        }
+                        if (
+                            isPresent(proxy, 'tfo') &&
+                            !isPresent(proxy, 'fast-open')
+                        ) {
+                            proxy['fast-open'] = proxy.tfo;
+                        }
                     } else if (proxy.type === 'wireguard') {
                         proxy.keepalive =
                             proxy.keepalive ?? proxy['persistent-keepalive'];

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

@@ -3,6 +3,7 @@ import { isPresent } from '@/core/proxy-utils/producers/utils';
 export default function Stash_Producer() {
     const type = 'ALL';
     const produce = (proxies) => {
+        // https://stash.wiki/proxy-protocols/proxy-types#shadowsocks
         return (
             'proxies:\n' +
             proxies
@@ -22,6 +23,23 @@ export default function Stash_Producer() {
                             'hysteria',
                             'hysteria2',
                         ].includes(proxy.type) ||
+                        (proxy.type === 'ss' &&
+                            ![
+                                'aes-128-gcm',
+                                'aes-192-gcm',
+                                'aes-256-gcm',
+                                'aes-128-cfb',
+                                'aes-192-cfb',
+                                'aes-256-cfb',
+                                'aes-128-ctr',
+                                'aes-192-ctr',
+                                'aes-256-ctr',
+                                'rc4-md5',
+                                'chacha20-ietf',
+                                'xchacha20',
+                                'chacha20-ietf-poly1305',
+                                'xchacha20-ietf-poly1305',
+                            ].includes(proxy.cipher)) ||
                         (proxy.type === 'snell' &&
                             String(proxy.version) === '4') ||
                         (proxy.type === 'vless' && proxy['reality-opts'])
@@ -112,6 +130,14 @@ export default function Stash_Producer() {
                             proxy['up-speed'] = proxy.up;
                             delete proxy.up;
                         }
+                        if (isPresent(proxy, 'down-speed')) {
+                            proxy['down-speed'] =
+                                `${proxy['down-speed']}`.match(/\d+/)?.[0] || 0;
+                        }
+                        if (isPresent(proxy, 'up-speed')) {
+                            proxy['up-speed'] =
+                                `${proxy['up-speed']}`.match(/\d+/)?.[0] || 0;
+                        }
                     } else if (proxy.type === 'hysteria2') {
                         if (
                             isPresent(proxy, 'password') &&
@@ -141,6 +167,14 @@ export default function Stash_Producer() {
                             proxy['up-speed'] = proxy.up;
                             delete proxy.up;
                         }
+                        if (isPresent(proxy, 'down-speed')) {
+                            proxy['down-speed'] =
+                                `${proxy['down-speed']}`.match(/\d+/)?.[0] || 0;
+                        }
+                        if (isPresent(proxy, 'up-speed')) {
+                            proxy['up-speed'] =
+                                `${proxy['up-speed']}`.match(/\d+/)?.[0] || 0;
+                        }
                     } else if (proxy.type === 'wireguard') {
                         proxy.keepalive =
                             proxy.keepalive ?? proxy['persistent-keepalive'];

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

@@ -1,10 +1,14 @@
 /* eslint-disable no-case-declarations */
 import { Base64 } from 'js-base64';
+import { isIPv6 } from '@/utils';
 
 export default function URI_Producer() {
     const type = 'SINGLE';
     const produce = (proxy) => {
         let result = '';
+        if (proxy.server && isIPv6(proxy.server)) {
+            proxy.server = `[${proxy.server}]`;
+        }
         switch (proxy.type) {
             case 'ss':
                 const userinfo = `${proxy.cipher}:${proxy.password}`;
@@ -222,6 +226,44 @@ export default function URI_Producer() {
                     proxy['skip-cert-verify'] ? '&allowInsecure=1' : ''
                 }${trojanTransport}#${encodeURIComponent(proxy.name)}`;
                 break;
+            case 'hysteria2':
+                let hysteria2params = [];
+                if (proxy['skip-cert-verify']) {
+                    hysteria2params.push(`insecure=1`);
+                }
+                if (proxy.obfs) {
+                    hysteria2params.push(
+                        `obfs=${encodeURIComponent(proxy.obfs)}`,
+                    );
+                    if (proxy['obfs-password']) {
+                        hysteria2params.push(
+                            `obfs-password=${encodeURIComponent(
+                                proxy['obfs-password'],
+                            )}`,
+                        );
+                    }
+                }
+                if (proxy.sni) {
+                    hysteria2params.push(
+                        `sni=${encodeURIComponent(proxy.sni)}`,
+                    );
+                }
+                if (proxy['tls-fingerprint']) {
+                    hysteria2params.push(
+                        `pinSHA256=${encodeURIComponent(
+                            proxy['tls-fingerprint'],
+                        )}`,
+                    );
+                }
+                if (proxy.tfo) {
+                    hysteria2params.push(`fastopen=1`);
+                }
+                result = `hysteria2://${encodeURIComponent(proxy.password)}@${
+                    proxy.server
+                }:${proxy.port}?${hysteria2params.join(
+                    '&',
+                )}#${encodeURIComponent(proxy.name)}`;
+                break;
         }
         return result;
     };

backend/src/restful/download.js

@@ -20,15 +20,22 @@ async function downloadSubscription(req, res) {
         req.query.target || getPlatformFromHeaders(req.headers) || 'JSON';
 
     $.info(`正在下载订阅：${name}`);
-    const { url, ua, content } = req.query;
+    let { url, ua, content, mergeSources } = req.query;
     if (url) {
-        $.info(`指定 url: ${url}`);
+        url = decodeURIComponent(url);
+        $.info(`指定远程订阅 URL: ${url}`);
     }
     if (ua) {
-        $.info(`指定 ua: ${ua}`);
+        ua = decodeURIComponent(ua);
+        $.info(`指定远程订阅 User-Agent: ${ua}`);
     }
     if (content) {
-        $.info(`指定 content: ${content}`);
+        content = decodeURIComponent(content);
+        $.info(`指定本地订阅: ${content}`);
+    }
+    if (mergeSources) {
+        mergeSources = decodeURIComponent(mergeSources);
+        $.info(`指定合并来源: ${mergeSources}`);
     }
 
     const allSubs = $.read(SUBS_KEY);
@@ -42,6 +49,7 @@ async function downloadSubscription(req, res) {
                 url,
                 ua,
                 content,
+                mergeSources,
             });
 
             if (sub.source !== 'local' || url) {

backend/src/restful/index.js

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

backend/src/restful/miscs.js

@@ -22,12 +22,26 @@ export default function register($app) {
     // Storage management
     $app.route('/api/storage')
         .get((req, res) => {
-            res.json($.read('#sub-store'));
+            res.set('content-type', 'application/json')
+                .set(
+                    'content-disposition',
+                    'attachment; filename="sub-store.json"',
+                )
+                .send(
+                    $.env.isNode
+                        ? JSON.stringify($.cache)
+                        : $.read('#sub-store'),
+                );
         })
         .post((req, res) => {
-            const data = req.body;
-            $.write(JSON.stringify(data), '#sub-store');
-            res.end();
+            const { content } = req.body;
+            $.write(content, '#sub-store');
+            if ($.env.isNode) {
+                $.cache = JSON.parse(content);
+                $.persistCache();
+            }
+            migrate();
+            success(res);
         });
 
     // Redirect sub.store to vercel webpage

backend/src/restful/preview.js

@@ -16,11 +16,20 @@ async function compareSub(req, res) {
         const sub = req.body;
         const target = req.query.target || 'JSON';
         let content;
-        if (sub.source === 'local') {
+        if (
+            sub.source === 'local' &&
+            !['localFirst', 'remoteFirst'].includes(sub.mergeSources)
+        ) {
             content = sub.content;
         } else {
             try {
-                content = await download(sub.url, sub.ua);
+                content = await Promise.all(
+                    sub.url
+                        .split(/[\r\n]+/)
+                        .map((i) => i.trim())
+                        .filter((i) => i.length)
+                        .map((url) => download(url, sub.ua)),
+                );
             } catch (err) {
                 failed(
                     res,
@@ -32,9 +41,16 @@ async function compareSub(req, res) {
                 );
                 return;
             }
+            if (sub.mergeSources === 'localFirst') {
+                content.unshift(sub.content);
+            } else if (sub.mergeSources === 'remoteFirst') {
+                content.push(sub.content);
+            }
         }
         // parse proxies
-        const original = ProxyUtils.parse(content);
+        const original = (Array.isArray(content) ? content : [content])
+            .map((i) => ProxyUtils.parse(i))
+            .flat();
 
         // add id
         original.forEach((proxy, i) => {
@@ -71,46 +87,69 @@ async function compareCollection(req, res) {
         const collection = req.body;
         const subnames = collection.subscriptions;
         const results = {};
-
+        let hasError;
         await Promise.all(
             subnames.map(async (name) => {
-                const sub = findByName(allSubs, name);
-                try {
-                    let raw;
-                    if (sub.source === 'local') {
-                        raw = sub.content;
-                    } else {
-                        raw = await download(sub.url, sub.ua);
+                if (!hasError) {
+                    const sub = findByName(allSubs, name);
+                    try {
+                        let raw;
+                        if (
+                            sub.source === 'local' &&
+                            !['localFirst', 'remoteFirst'].includes(
+                                sub.mergeSources,
+                            )
+                        ) {
+                            raw = sub.content;
+                        } else {
+                            raw = await Promise.all(
+                                sub.url
+                                    .split(/[\r\n]+/)
+                                    .map((i) => i.trim())
+                                    .filter((i) => i.length)
+                                    .map((url) => download(url, sub.ua)),
+                            );
+                            if (sub.mergeSources === 'localFirst') {
+                                raw.unshift(sub.content);
+                            } else if (sub.mergeSources === 'remoteFirst') {
+                                raw.push(sub.content);
+                            }
+                        }
+                        // parse proxies
+                        let currentProxies = (Array.isArray(raw) ? raw : [raw])
+                            .map((i) => ProxyUtils.parse(i))
+                            .flat();
+
+                        currentProxies.forEach((proxy) => {
+                            proxy.subName = sub.name;
+                            proxy.collectionName = collection.name;
+                        });
+
+                        // apply processors
+                        currentProxies = await ProxyUtils.process(
+                            currentProxies,
+                            sub.process || [],
+                            'JSON',
+                            { [sub.name]: sub, _collection: collection },
+                        );
+                        results[name] = currentProxies;
+                    } catch (err) {
+                        if (!hasError) {
+                            hasError = true;
+                            failed(
+                                res,
+                                new InternalServerError(
+                                    'PROCESS_FAILED',
+                                    `处理子订阅 ${name} 失败`,
+                                    `Reason: ${err}`,
+                                ),
+                            );
+                        }
                     }
-                    // parse proxies
-                    let currentProxies = ProxyUtils.parse(raw);
-
-                    currentProxies.forEach((proxy) => {
-                        proxy.subName = sub.name;
-                        proxy.collectionName = collection.name;
-                    });
-
-                    // apply processors
-                    currentProxies = await ProxyUtils.process(
-                        currentProxies,
-                        sub.process || [],
-                        'JSON',
-                        { [sub.name]: sub, _collection: collection },
-                    );
-                    results[name] = currentProxies;
-                } catch (err) {
-                    failed(
-                        res,
-                        new InternalServerError(
-                            'PROCESS_FAILED',
-                            `处理子订阅 ${name} 失败`,
-                            `Reason: ${err}`,
-                        ),
-                    );
                 }
             }),
         );
-
+        if (hasError) return;
         // merge proxies with the original order
         const original = Array.prototype.concat.apply(
             [],

backend/src/restful/settings.js

@@ -10,7 +10,12 @@ export default function register($app) {
 }
 
 async function getSettings(req, res) {
-    const settings = $.read(SETTINGS_KEY);
+    let settings = $.read(SETTINGS_KEY);
+    if (!settings) {
+        settings = {};
+        $.write(settings, SETTINGS_KEY);
+    }
+
     if (!settings.avatarUrl) await updateGitHubAvatar();
     if (!settings.artifactStore) await updateArtifactStore();
     success(res, settings);

backend/src/restful/sync.js

@@ -22,24 +22,60 @@ export default function register($app) {
     $app.get('/api/sync/artifact/:name', syncArtifact);
 }
 
-async function produceArtifact({ type, name, platform, url, ua, content }) {
+async function produceArtifact({
+    type,
+    name,
+    platform,
+    url,
+    ua,
+    content,
+    mergeSources,
+}) {
     platform = platform || 'JSON';
 
     if (type === 'subscription') {
         const allSubs = $.read(SUBS_KEY);
         const sub = findByName(allSubs, name);
         let raw;
-        if (url) {
-            raw = await download(url, ua);
-        } else if (content) {
+        if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) {
             raw = content;
-        } else if (sub.source === 'local') {
+        } else if (url) {
+            raw = await Promise.all(
+                url
+                    .split(/[\r\n]+/)
+                    .map((i) => i.trim())
+                    .filter((i) => i.length)
+                    .map((url) => download(url, ua)),
+            );
+            if (mergeSources === 'localFirst') {
+                raw.unshift(content);
+            } else if (mergeSources === 'remoteFirst') {
+                raw.push(content);
+            }
+        } else if (
+            sub.source === 'local' &&
+            !['localFirst', 'remoteFirst'].includes(sub.mergeSources)
+        ) {
             raw = sub.content;
         } else {
-            raw = await download(sub.url, sub.ua);
+            raw = await Promise.all(
+                sub.url
+                    .split(/[\r\n]+/)
+                    .map((i) => i.trim())
+                    .filter((i) => i.length)
+                    .map((url) => download(url, sub.ua)),
+            );
+            if (sub.mergeSources === 'localFirst') {
+                raw.unshift(sub.content);
+            } else if (sub.mergeSources === 'remoteFirst') {
+                raw.push(sub.content);
+            }
         }
         // parse proxies
-        let proxies = ProxyUtils.parse(raw);
+        let proxies = (Array.isArray(raw) ? raw : [raw])
+            .map((i) => ProxyUtils.parse(i))
+            .flat();
+
         proxies.forEach((proxy) => {
             proxy.subName = sub.name;
         });
@@ -87,13 +123,31 @@ async function produceArtifact({ type, name, platform, url, ua, content }) {
                 try {
                     $.info(`正在处理子订阅：${sub.name}...`);
                     let raw;
-                    if (sub.source === 'local') {
+                    if (
+                        sub.source === 'local' &&
+                        !['localFirst', 'remoteFirst'].includes(
+                            sub.mergeSources,
+                        )
+                    ) {
                         raw = sub.content;
                     } else {
-                        raw = await download(sub.url, sub.ua);
+                        raw = await await Promise.all(
+                            sub.url
+                                .split(/[\r\n]+/)
+                                .map((i) => i.trim())
+                                .filter((i) => i.length)
+                                .map((url) => download(url, sub.ua)),
+                        );
+                        if (sub.mergeSources === 'localFirst') {
+                            raw.unshift(sub.content);
+                        } else if (sub.mergeSources === 'remoteFirst') {
+                            raw.push(sub.content);
+                        }
                     }
                     // parse proxies
-                    let currentProxies = ProxyUtils.parse(raw);
+                    let currentProxies = (Array.isArray(raw) ? raw : [raw])
+                        .map((i) => ProxyUtils.parse(i))
+                        .flat();
 
                     currentProxies.forEach((proxy) => {
                         proxy.subName = sub.name;

backend/src/utils/download.js

@@ -1,4 +1,4 @@
-import { FILES_KEY, MODULES_KEY } from '@/constants';
+import { FILES_KEY, MODULES_KEY, SETTINGS_KEY } from '@/constants';
 import { findByName } from '@/utils/database';
 import { HTTP, ENV } from '@/vendor/open-api';
 import { hex_md5 } from '@/vendor/md5';
@@ -45,7 +45,8 @@ export default async function download(url, ua) {
     }
 
     const { isNode } = ENV();
-    ua = ua || 'Quantumult%20X/1.0.29 (iPhone14,5; iOS 15.4.1)';
+    const { defaultUserAgent } = $.read(SETTINGS_KEY);
+    ua = ua || defaultUserAgent || 'clash.meta';
     const id = hex_md5(ua + url);
     if (!isNode && tasks.has(id)) {
         return tasks.get(id);
@@ -63,6 +64,7 @@ export default async function download(url, ua) {
         if (!$arguments?.noCache && cached) {
             resolve(cached);
         } else {
+            $.info(`Downloading...\nUser-Agent: ${ua}\nURL: ${url}`);
             http.get(url)
                 .then((resp) => {
                     const body = resp.body;

backend/src/utils/flow.js

@@ -3,7 +3,10 @@ import { HTTP } from '@/vendor/open-api';
 export async function getFlowHeaders(url) {
     const http = HTTP();
     const { headers } = await http.get({
-        url,
+        url: url
+            .split(/[\r\n]+/)
+            .map((i) => i.trim())
+            .filter((i) => i.length)[0],
         headers: {
             'User-Agent': 'Quantumult%20X/1.0.30 (iPhone14,2; iOS 15.6)',
         },

backend/src/vendor/express.js

@@ -1,8 +1,7 @@
 /* eslint-disable no-undef */
 import { ENV } from './open-api';
 
-export default function express({ substore: $, port }) {
-    port = port || 3000;
+export default function express({ substore: $, port, host }) {
     const { isNode } = ENV();
     const DEFAULT_HEADERS = {
         'Content-Type': 'text/plain;charset=UTF-8',
@@ -29,8 +28,9 @@ export default function express({ substore: $, port }) {
 
         // adapter
         app.start = () => {
-            app.listen(port, () => {
-                $.info(`Express started on port: ${port}`);
+            const listener = app.listen(port, host, () => {
+                const { address, port } = listener.address();
+                $.info(`[BACKEND] ${address}:${port}`);
             });
         };
         return app;

config/QX-Task.json

@@ -0,0 +1,7 @@
+{
+    "name":"Sub-Store",
+    "description":"",
+    "task":[
+      "0 0 * * * https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js, tag=Sub-Store Sync, img-url=https://raw.githubusercontent.com/58xinian/icon/master/Sub-Store1.png"
+    ]
+}

package-lock.json

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