Merge pull request #233 from eltociear/master-1

Fix typo in README.md

README.md

@@ -91,4 +91,4 @@ This project is under the GPL V3 LICENSE.
 ## Acknowledgements
 
 - Special thanks to @KOP-XIAO for his awesome resource-parser. Please give a [star](https://github.com/KOP-XIAO/QuantumultX) for his great work!
-- Speicial thanks to @Orz-3 and @58xinian for their awesome icons.
+- Special thanks to @Orz-3 and @58xinian for their awesome icons.

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.10",
+  "version": "2.14.26",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {

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

@@ -1,5 +1,5 @@
 import download from '@/utils/download';
-
+import { isIPv4, isIPv6 } from '@/utils';
 import PROXY_PROCESSORS, { ApplyProcessor } from './processors';
 import PROXY_PREPROCESSORS from './preprocessors';
 import PROXY_PRODUCERS from './producers';
@@ -36,7 +36,7 @@ function parse(raw) {
         if (lastParser) {
             const [proxy, error] = tryParse(lastParser, line);
             if (!error) {
-                proxies.push(proxy);
+                proxies.push(lastParse(proxy));
                 success = true;
             }
         }
@@ -46,7 +46,7 @@ function parse(raw) {
             for (const parser of PROXY_PARSERS) {
                 const [proxy, error] = tryParse(parser, line);
                 if (!error) {
-                    proxies.push(proxy);
+                    proxies.push(lastParse(proxy));
                     lastParser = parser;
                     success = true;
                     $.info(`${parser.name} is activated`);
@@ -182,3 +182,31 @@ function safeMatch(parser, line) {
         return false;
     }
 }
+
+function lastParse(proxy) {
+    if (proxy.type === 'trojan') {
+        if (proxy.network === 'tcp') {
+            delete proxy.network;
+        }
+        proxy.tls = true;
+    }
+    if (proxy.tls && !proxy.sni) {
+        if (proxy.network) {
+            let transportHost = proxy[`${proxy.network}-opts`]?.headers?.Host;
+            transportHost = Array.isArray(transportHost)
+                ? transportHost[0]
+                : transportHost;
+            if (transportHost) {
+                proxy.sni = transportHost;
+            }
+        }
+        if (!proxy.sni && !isIP(proxy.server)) {
+            proxy.sni = proxy.server;
+        }
+    }
+    return proxy;
+}
+
+function isIP(ip) {
+    return isIPv4(ip) || isIPv6(ip);
+}

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

@@ -157,7 +157,7 @@ function URI_VMess() {
     };
     const parse = (line) => {
         line = line.split('vmess://')[1];
-        const content = Base64.decode(line);
+        let content = Base64.decode(line);
         if (/=\s*vmess/.test(content)) {
             // Quantumult VMess URI format
             const partitions = content.split(',').map((p) => p.trim());
@@ -209,30 +209,95 @@ function URI_VMess() {
             }
             return proxy;
         } else {
-            // V2rayN URI format
-            const params = JSON.parse(content);
+            let params = {};
+
+            try {
+                // V2rayN URI format
+                params = JSON.parse(content);
+            } catch (e) {
+                // console.error(e);
+                // Shadowrocket URI format
+                // eslint-disable-next-line no-unused-vars
+                let [__, base64Line, qs] = /(^[^?]+?)\/?\?(.*)$/.exec(line);
+                content = Base64.decode(base64Line);
+
+                for (const addon of qs.split('&')) {
+                    const [key, valueRaw] = addon.split('=');
+                    let value = valueRaw;
+                    value = decodeURIComponent(valueRaw);
+                    if (value.indexOf(',') === -1) {
+                        params[key] = value;
+                    } else {
+                        params[key] = value.split(',');
+                    }
+                }
+                // eslint-disable-next-line no-unused-vars
+                let [___, cipher, uuid, server, port] =
+                    /(^[^:]+?):([^:]+?)@(.*):(\d+)$/.exec(content);
+
+                params.scy = cipher;
+                params.id = uuid;
+                params.port = port;
+                params.add = server;
+            }
             const proxy = {
-                name: params.ps,
+                name: params.ps ?? params.remark,
                 type: 'vmess',
                 server: params.add,
-                port: params.port,
-                cipher: 'auto', // V2rayN has no default cipher! use aes-128-gcm as default.
+                port: parseInt(getIfPresent(params.port), 10),
+                cipher: getIfPresent(params.scy, 'auto'),
                 uuid: params.id,
-                alterId: getIfPresent(params.aid, 0),
-                tls: params.tls === 'tls' || params.tls === true,
+                alterId: parseInt(
+                    getIfPresent(params.aid ?? params.alterId, 0),
+                    10,
+                ),
+                tls: ['tls', true, 1, '1'].includes(params.tls),
                 'skip-cert-verify': isPresent(params.verify_cert)
                     ? !params.verify_cert
                     : undefined,
             };
+            // https://github.com/2dust/v2rayN/wiki/%E5%88%86%E4%BA%AB%E9%93%BE%E6%8E%A5%E6%A0%BC%E5%BC%8F%E8%AF%B4%E6%98%8E(ver-2)
+            if (proxy.tls && proxy.sni) {
+                proxy.sni = params.sni;
+            }
             // handle obfs
-            if (params.net === 'ws') {
+            if (params.net === 'ws' || params.obfs === 'websocket') {
                 proxy.network = 'ws';
-                proxy['ws-opts'] = {
-                    path: getIfNotBlank(params.path),
-                    headers: { Host: getIfNotBlank(params.host) },
-                };
-                if (proxy.tls && params.host) {
-                    proxy.sni = params.host;
+            } else if (
+                ['tcp', 'http'].includes(params.net) ||
+                params.obfs === 'http'
+            ) {
+                proxy.network = 'http';
+            }
+            if (proxy.network) {
+                let transportHost = params.host ?? params.obfsParam;
+                let transportPath = params.path;
+
+                if (proxy.network === 'http') {
+                    if (transportHost) {
+                        transportHost = Array.isArray(transportHost)
+                            ? transportHost[0]
+                            : transportHost;
+                    }
+                    if (transportPath) {
+                        transportPath = Array.isArray(transportPath)
+                            ? transportPath[0]
+                            : transportPath;
+                    }
+                }
+                if (transportPath || transportHost) {
+                    proxy[`${proxy.network}-opts`] = {
+                        path: getIfNotBlank(transportPath),
+                        headers: { Host: getIfNotBlank(transportHost) },
+                    };
+                } else {
+                    delete proxy.network;
+                }
+
+                // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/docs/config.yaml#L413
+                // sni 优先级应高于 host
+                if (proxy.tls && !proxy.sni && transportHost) {
+                    proxy.sni = transportHost;
                 }
             }
             return proxy;
@@ -278,6 +343,7 @@ function Clash_All() {
                 'snell',
                 'trojan',
                 'tuic',
+                'vless',
             ].includes(proxy.type)
         ) {
             throw new Error(
@@ -286,9 +352,19 @@ function Clash_All() {
         }
 
         // handle vmess sni
-        if (proxy.type === 'vmess') {
+        if (['vmess', 'vless'].includes(proxy.type)) {
             proxy.sni = proxy.servername;
             delete proxy.servername;
+            if (proxy.tls && !proxy.sni) {
+                if (proxy.network === 'ws') {
+                    proxy.sni = proxy['ws-opts']?.headers?.Host;
+                } else if (proxy.network === 'http') {
+                    let httpHost = proxy['http-opts']?.headers?.Host;
+                    proxy.sni = Array.isArray(httpHost)
+                        ? httpHost[0]
+                        : httpHost;
+                }
+            }
         }
 
         return proxy;

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

@@ -25,6 +25,9 @@ const grammars = String.raw`
             proxy.network = "ws";
             $set(proxy, "ws-opts.path", obfs.path);
             $set(proxy, "ws-opts.headers", obfs['ws-headers']);
+            if (proxy['ws-opts'] && proxy['ws-opts']['headers'] && proxy['ws-opts']['headers'].Host) {
+                proxy['ws-opts']['headers'].Host = proxy['ws-opts']['headers'].Host.replace(/^"(.*)"$/, '$1')
+            }
         }
     }
 }

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

@@ -23,6 +23,9 @@
             proxy.network = "ws";
             $set(proxy, "ws-opts.path", obfs.path);
             $set(proxy, "ws-opts.headers", obfs['ws-headers']);
+            if (proxy['ws-opts'] && proxy['ws-opts']['headers'] && proxy['ws-opts']['headers'].Host) {
+                proxy['ws-opts']['headers'].Host = proxy['ws-opts']['headers'].Host.replace(/^"(.*)"$/, '$1')
+            }
         }
     }
 }

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

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

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

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

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

@@ -55,6 +55,26 @@ export default function Clash_Producer() {
                         }
                     }
 
+                    if (
+                        ['vmess', 'vless'].includes(proxy.type) &&
+                        proxy.network === 'http'
+                    ) {
+                        let httpPath = proxy['http-opts']?.path;
+                        if (
+                            isPresent(proxy, 'http-opts.path') &&
+                            !Array.isArray(httpPath)
+                        ) {
+                            proxy['http-opts'].path = [httpPath];
+                        }
+                        let httpHost = proxy['http-opts']?.headers?.Host;
+                        if (
+                            isPresent(proxy, 'http-opts.headers.Host') &&
+                            !Array.isArray(httpHost)
+                        ) {
+                            proxy['http-opts'].headers.Host = [httpHost];
+                        }
+                    }
+
                     delete proxy['tls-fingerprint'];
                     return '  - ' + JSON.stringify(proxy) + '\n';
                 })

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

@@ -5,6 +5,7 @@ import Loon_Producer from './loon';
 import URI_Producer from './uri';
 import V2Ray_Producer from './v2ray';
 import QX_Producer from './qx';
+import ShadowRocket_Producer from './shadowrocket';
 
 function JSON_Producer() {
     const type = 'ALL';
@@ -21,4 +22,5 @@ export default {
     V2Ray: V2Ray_Producer(),
     JSON: JSON_Producer(),
     Stash: Stash_Producer(),
+    ShadowRocket: ShadowRocket_Producer(),
 };

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

@@ -127,9 +127,7 @@ function trojan(proxy) {
 function vmess(proxy) {
     const result = new Result(proxy);
     result.append(
-        `${proxy.name}=vmess,${proxy.server},${proxy.port},${
-            proxy.cipher === 'auto' ? 'none' : proxy.cipher
-        },"${proxy.uuid}"`,
+        `${proxy.name}=vmess,${proxy.server},${proxy.port},${proxy.cipher},"${proxy.uuid}"`,
     );
 
     // transport
@@ -146,12 +144,14 @@ function vmess(proxy) {
             );
         } else if (proxy.network === 'http') {
             result.append(`,transport=http`);
+            let httpPath = proxy['http-opts']?.path;
+            let httpHost = proxy['http-opts']?.headers?.Host;
             result.appendIfPresent(
-                `,path=${proxy['http-opts'].path}`,
+                `,path=${Array.isArray(httpPath) ? httpPath[0] : httpPath}`,
                 'http-opts.path',
             );
             result.appendIfPresent(
-                `,host=${proxy['http-opts'].headers.Host}`,
+                `,host=${Array.isArray(httpHost) ? httpHost[0] : httpHost}`,
                 'http-opts.headers.Host',
             );
         } else {
@@ -189,6 +189,9 @@ function vmess(proxy) {
 }
 
 function vless(proxy) {
+    if (proxy['reality-opts']) {
+        throw new Error(`reality is unsupported`);
+    }
     const result = new Result(proxy);
     result.append(
         `${proxy.name}=vless,${proxy.server},${proxy.port},"${proxy.uuid}"`,
@@ -208,12 +211,14 @@ function vless(proxy) {
             );
         } else if (proxy.network === 'http') {
             result.append(`,transport=http`);
+            let httpPath = proxy['http-opts']?.path;
+            let httpHost = proxy['http-opts']?.headers?.Host;
             result.appendIfPresent(
-                `,path=${proxy['http-opts'].path}`,
+                `,path=${Array.isArray(httpPath) ? httpPath[0] : httpPath}`,
                 'http-opts.path',
             );
             result.appendIfPresent(
-                `,host=${proxy['http-opts'].headers.Host}`,
+                `,host=${Array.isArray(httpHost) ? httpHost[0] : httpHost}`,
                 'http-opts.headers.Host',
             );
         } else {

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

@@ -62,18 +62,20 @@ function shadowsocks(proxy) {
         );
     }
 
-    // tls fingerprint
-    appendIfPresent(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
+    if (needTls(proxy)) {
+        // tls fingerprint
+        appendIfPresent(
+            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+            'tls-fingerprint',
+        );
 
-    // tls verification
-    appendIfPresent(
-        `,tls-verification=${!proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+        // tls verification
+        appendIfPresent(
+            `,tls-verification=${!proxy['skip-cert-verify']}`,
+            'skip-cert-verify',
+        );
+        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+    }
 
     // tfo
     appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -150,18 +152,20 @@ function trojan(proxy) {
         append(`,over-tls=true`);
     }
 
-    // tls fingerprint
-    appendIfPresent(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
+    if (needTls(proxy)) {
+        // tls fingerprint
+        appendIfPresent(
+            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+            'tls-fingerprint',
+        );
 
-    // tls verification
-    appendIfPresent(
-        `,tls-verification=${!proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+        // tls verification
+        appendIfPresent(
+            `,tls-verification=${!proxy['skip-cert-verify']}`,
+            'skip-cert-verify',
+        );
+        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+    }
 
     // tfo
     appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -206,12 +210,18 @@ function vmess(proxy) {
         } else {
             throw new Error(`network ${proxy.network} is unsupported`);
         }
+        let transportPath = proxy[`${proxy.network}-opts`]?.path;
+        let transportHost = proxy[`${proxy.network}-opts`]?.headers?.Host;
         appendIfPresent(
-            `,obfs-uri=${proxy[`${proxy.network}-opts`].path}`,
+            `,obfs-uri=${
+                Array.isArray(transportPath) ? transportPath[0] : transportPath
+            }`,
             `${proxy.network}-opts.path`,
         );
         appendIfPresent(
-            `,obfs-host=${proxy[`${proxy.network}-opts`].headers.Host}`,
+            `,obfs-host=${
+                Array.isArray(transportHost) ? transportHost[0] : transportHost
+            }`,
             `${proxy.network}-opts.headers.Host`,
         );
     } else {
@@ -219,18 +229,20 @@ function vmess(proxy) {
         if (proxy.tls) append(`,obfs=over-tls`);
     }
 
-    // tls fingerprint
-    appendIfPresent(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
+    if (needTls(proxy)) {
+        // tls fingerprint
+        appendIfPresent(
+            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+            'tls-fingerprint',
+        );
 
-    // tls verification
-    appendIfPresent(
-        `,tls-verification=${!proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+        // tls verification
+        appendIfPresent(
+            `,tls-verification=${!proxy['skip-cert-verify']}`,
+            'skip-cert-verify',
+        );
+        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+    }
 
     // AEAD
     if (isPresent(proxy, 'aead')) {
@@ -266,18 +278,20 @@ function http(proxy) {
     }
     appendIfPresent(`,over-tls=${proxy.tls}`, 'tls');
 
-    // tls fingerprint
-    appendIfPresent(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
+    if (needTls(proxy)) {
+        // tls fingerprint
+        appendIfPresent(
+            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+            'tls-fingerprint',
+        );
 
-    // tls verification
-    appendIfPresent(
-        `,tls-verification=${!proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+        // tls verification
+        appendIfPresent(
+            `,tls-verification=${!proxy['skip-cert-verify']}`,
+            'skip-cert-verify',
+        );
+        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+    }
 
     // tfo
     appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -306,18 +320,20 @@ function socks5(proxy) {
     }
     appendIfPresent(`,over-tls=${proxy.tls}`, 'tls');
 
-    // tls fingerprint
-    appendIfPresent(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
+    if (needTls(proxy)) {
+        // tls fingerprint
+        appendIfPresent(
+            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+            'tls-fingerprint',
+        );
 
-    // tls verification
-    appendIfPresent(
-        `,tls-verification=${!proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+        // tls verification
+        appendIfPresent(
+            `,tls-verification=${!proxy['skip-cert-verify']}`,
+            'skip-cert-verify',
+        );
+        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+    }
 
     // tfo
     appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -332,11 +348,5 @@ function socks5(proxy) {
 }
 
 function needTls(proxy) {
-    return (
-        proxy.tls ||
-        proxy.sni ||
-        typeof proxy['skip-cert-verify'] !== 'undefined' ||
-        typeof proxy['tls-fingerprint'] !== 'undefined' ||
-        typeof proxy['tls-host'] !== 'undefined'
-    );
+    return proxy.tls;
 }

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

@@ -0,0 +1,88 @@
+import { isPresent } from '@/core/proxy-utils/producers/utils';
+
+export default function Stash_Producer() {
+    const type = 'ALL';
+    const produce = (proxies) => {
+        return (
+            'proxies:\n' +
+            proxies
+                .filter((proxy) => {
+                    if (
+                        proxy.type === 'snell' &&
+                        String(proxy.version) === '4'
+                    ) {
+                        return false;
+                    }
+                    return true;
+                })
+                .map((proxy) => {
+                    if (proxy.type === 'vmess') {
+                        // handle vmess aead
+                        if (isPresent(proxy, 'aead')) {
+                            if (proxy.aead) {
+                                proxy.alterId = 0;
+                            }
+                            delete proxy.aead;
+                        }
+                        if (isPresent(proxy, 'sni')) {
+                            proxy.servername = proxy.sni;
+                            delete proxy.sni;
+                        }
+                        // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/docs/config.yaml#L400
+                        // https://stash.wiki/proxy-protocols/proxy-types#vmess
+                        if (
+                            isPresent(proxy, 'cipher') &&
+                            ![
+                                'auto',
+                                'aes-128-gcm',
+                                'chacha20-poly1305',
+                                'none',
+                            ].includes(proxy.cipher)
+                        ) {
+                            proxy.cipher = 'auto';
+                        }
+                    } else if (proxy.type === 'tuic') {
+                        if (isPresent(proxy, 'alpn')) {
+                            proxy.alpn = Array.isArray(proxy.alpn)
+                                ? proxy.alpn
+                                : [proxy.alpn];
+                        } else {
+                            proxy.alpn = ['h3'];
+                        }
+                        // 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;
+                        }
+                    }
+
+                    if (
+                        ['vmess', 'vless'].includes(proxy.type) &&
+                        proxy.network === 'http'
+                    ) {
+                        let httpPath = proxy['http-opts']?.path;
+                        if (
+                            isPresent(proxy, 'http-opts.path') &&
+                            !Array.isArray(httpPath)
+                        ) {
+                            proxy['http-opts'].path = [httpPath];
+                        }
+                        let httpHost = proxy['http-opts']?.headers?.Host;
+                        if (
+                            isPresent(proxy, 'http-opts.headers.Host') &&
+                            !Array.isArray(httpHost)
+                        ) {
+                            proxy['http-opts'].headers.Host = [httpHost];
+                        }
+                    }
+
+                    delete proxy['tls-fingerprint'];
+                    return '  - ' + JSON.stringify(proxy) + '\n';
+                })
+                .join('')
+        );
+    };
+    return { type, produce };
+}

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

@@ -8,8 +8,20 @@ export default function Stash_Producer() {
             proxies
                 .filter((proxy) => {
                     if (
-                        proxy.type === 'snell' &&
-                        String(proxy.version) === '4'
+                        ![
+                            'ss',
+                            'ssr',
+                            'vmess',
+                            'socks',
+                            'http',
+                            'snell',
+                            'trojan',
+                            'tuic',
+                            'vless',
+                        ].includes(proxy.type) ||
+                        (proxy.type === 'snell' &&
+                            String(proxy.version) === '4') ||
+                        (proxy.type === 'vless' && proxy['reality-opts'])
                     ) {
                         return false;
                     }
@@ -58,6 +70,26 @@ export default function Stash_Producer() {
                         }
                     }
 
+                    if (
+                        ['vmess', 'vless'].includes(proxy.type) &&
+                        proxy.network === 'http'
+                    ) {
+                        let httpPath = proxy['http-opts']?.path;
+                        if (
+                            isPresent(proxy, 'http-opts.path') &&
+                            !Array.isArray(httpPath)
+                        ) {
+                            proxy['http-opts'].path = [httpPath];
+                        }
+                        let httpHost = proxy['http-opts']?.headers?.Host;
+                        if (
+                            isPresent(proxy, 'http-opts.headers.Host') &&
+                            !Array.isArray(httpHost)
+                        ) {
+                            proxy['http-opts'].headers.Host = [httpHost];
+                        }
+                    }
+
                     delete proxy['tls-fingerprint'];
                     return '  - ' + JSON.stringify(proxy) + '\n';
                 })

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

@@ -301,7 +301,13 @@ function handleTransport(result, proxy) {
                 if (isPresent(proxy, 'ws-opts.headers')) {
                     const headers = proxy['ws-opts'].headers;
                     const value = Object.keys(headers)
-                        .map((k) => `${k}:${headers[k]}`)
+                        .map((k) => {
+                            let v = headers[k];
+                            if (['Host'].includes(k)) {
+                                v = `"${v}"`;
+                            }
+                            return `${k}:${v}`;
+                        })
                         .join('|');
                     if (isNotBlank(value)) {
                         result.append(`,ws-headers=${value}`);

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

@@ -55,27 +55,73 @@ export default function URI_Producer() {
                 break;
             case 'vmess':
                 // V2RayN URI format
+                let type = '';
+                let net = proxy.network || 'tcp';
+                if (proxy.network === 'http') {
+                    net = 'tcp';
+                    type = 'http';
+                }
                 result = {
+                    v: '2',
                     ps: proxy.name,
                     add: proxy.server,
                     port: proxy.port,
                     id: proxy.uuid,
-                    type: '',
+                    type,
                     aid: 0,
-                    net: proxy.network || 'tcp',
+                    net,
                     tls: proxy.tls ? 'tls' : '',
                 };
+                if (proxy.tls && proxy.sni) {
+                    result.sni = proxy.sni;
+                }
                 // obfs
-                if (proxy.network === 'ws') {
-                    result.path = proxy['ws-opts'].path || '/';
-                    result.host = proxy['ws-opts'].headers.Host || proxy.server;
+                if (proxy.network) {
+                    let vmessTransportPath =
+                        proxy[`${proxy.network}-opts`]?.path;
+                    let vmessTransportHost =
+                        proxy[`${proxy.network}-opts`]?.headers?.Host;
+                    if (vmessTransportPath) {
+                        result.path = Array.isArray(vmessTransportPath)
+                            ? vmessTransportPath[0]
+                            : vmessTransportPath;
+                    }
+                    if (vmessTransportHost) {
+                        result.host = Array.isArray(vmessTransportHost)
+                            ? vmessTransportHost[0]
+                            : vmessTransportHost;
+                    }
                 }
                 result = 'vmess://' + Base64.encode(JSON.stringify(result));
                 break;
             case 'trojan':
+                let trojanTransport = '';
+                if (proxy.network) {
+                    trojanTransport = `&type=${proxy.network}`;
+                    let trojanTransportPath =
+                        proxy[`${proxy.network}-opts`]?.path;
+                    let trojanTransportHost =
+                        proxy[`${proxy.network}-opts`]?.headers?.Host;
+                    if (trojanTransportPath) {
+                        trojanTransport += `&path=${encodeURIComponent(
+                            Array.isArray(trojanTransportPath)
+                                ? trojanTransportPath[0]
+                                : trojanTransportPath,
+                        )}`;
+                    }
+                    if (trojanTransportHost) {
+                        trojanTransport += `&host=${encodeURIComponent(
+                            Array.isArray(trojanTransportHost)
+                                ? trojanTransportHost[0]
+                                : trojanTransportHost,
+                        )}`;
+                    }
+                }
                 result = `trojan://${proxy.password}@${proxy.server}:${
                     proxy.port
-                }#${encodeURIComponent(proxy.name)}`;
+                }?sni=${encodeURIComponent(proxy.sni || proxy.server)}${
+                    proxy['skip-cert-verify'] ? '&allowInsecure=1' : ''
+                }${trojanTransport}#${encodeURIComponent(proxy.name)}`;
                 break;
         }
         return result;

backend/src/restful/artifacts.js

@@ -19,7 +19,10 @@ export default function register($app) {
     if (!$.read(ARTIFACTS_KEY)) $.write({}, ARTIFACTS_KEY);
 
     // RESTful APIs
-    $app.route('/api/artifacts').get(getAllArtifacts).post(createArtifact);
+    $app.route('/api/artifacts')
+        .get(getAllArtifacts)
+        .post(createArtifact)
+        .put(replaceArtifact);
 
     $app.route('/api/artifact/:name')
         .get(getArtifact)
@@ -32,6 +35,12 @@ function getAllArtifacts(req, res) {
     success(res, allArtifacts);
 }
 
+function replaceArtifact(req, res) {
+    const allArtifacts = req.body;
+    $.write(allArtifacts, ARTIFACTS_KEY);
+    success(res);
+}
+
 async function getArtifact(req, res) {
     let { name } = req.params;
     name = decodeURIComponent(name);
@@ -131,7 +140,7 @@ async function deleteArtifact(req, res) {
             files[encodeURIComponent(artifact.name)] = {
                 content: '',
             };
-            // 当别的Sub 删了同步订阅 或 gist里面删了 当前设备没有删除 时 无法删除的bug 
+            // 当别的Sub 删了同步订阅 或 gist里面删了 当前设备没有删除 时 无法删除的bug
             try {
                 await syncToGist(files);
             } catch (i) {

backend/src/restful/sync.js

@@ -25,9 +25,6 @@ export default function register($app) {
 async function produceArtifact({ type, name, platform }) {
     platform = platform || 'JSON';
 
-    // produce Clash node format for ShadowRocket
-    if (platform === 'ShadowRocket') platform = 'Clash';
-
     if (type === 'subscription') {
         const allSubs = $.read(SUBS_KEY);
         const sub = findByName(allSubs, name);

backend/src/utils/geo.js

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

config/Surge-Noability.sgmodule

@@ -1,5 +1,5 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 可以用原版
+#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加国旗脚本或者cname脚本] 可以用带 ability 参数
 
 [MITM]
 hostname = %APPEND% sub.store

config/Surge-ability.sgmodule

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

config/Surge.sgmodule

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