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.22",
+  "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

@@ -185,6 +185,9 @@ function safeMatch(parser, line) {
 
 function lastParse(proxy) {
     if (proxy.type === 'trojan') {
+        if (proxy.network === 'tcp') {
+            delete proxy.network;
+        }
         proxy.tls = true;
     }
     if (proxy.tls && !proxy.sni) {

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,17 +209,49 @@ 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,
+                port: parseInt(getIfPresent(params.port), 10),
                 cipher: getIfPresent(params.scy, 'auto'),
                 uuid: params.id,
-                alterId: parseInt(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,
@@ -229,16 +261,43 @@ function URI_VMess() {
                 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) },
-                };
+            } 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 && params.host) {
-                    proxy.sni = params.host;
+                if (proxy.tls && !proxy.sni && transportHost) {
+                    proxy.sni = transportHost;
                 }
             }
             return proxy;
@@ -284,6 +343,7 @@ function Clash_All() {
                 'snell',
                 'trojan',
                 'tuic',
+                'vless',
             ].includes(proxy.type)
         ) {
             throw new Error(
@@ -292,7 +352,7 @@ 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) {

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

@@ -87,6 +87,7 @@ 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"]) {
@@ -103,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

@@ -102,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/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

@@ -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}"`,

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;
                     }

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

@@ -55,47 +55,65 @@ 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 || '/';
-                    if (proxy['ws-opts'].headers.Host) {
-                        result.host = proxy['ws-opts'].headers.Host;
+                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 transport = '';
+                let trojanTransport = '';
                 if (proxy.network) {
-                    transport = `&type=${proxy.network}`;
-                    let transportPath = proxy[`${proxy.network}-opts`]?.path;
-                    let transportHost =
+                    trojanTransport = `&type=${proxy.network}`;
+                    let trojanTransportPath =
+                        proxy[`${proxy.network}-opts`]?.path;
+                    let trojanTransportHost =
                         proxy[`${proxy.network}-opts`]?.headers?.Host;
-                    if (transportPath) {
-                        transport += `&path=${encodeURIComponent(
-                            Array.isArray(transportPath)
-                                ? transportPath[0]
-                                : transportPath,
+                    if (trojanTransportPath) {
+                        trojanTransport += `&path=${encodeURIComponent(
+                            Array.isArray(trojanTransportPath)
+                                ? trojanTransportPath[0]
+                                : trojanTransportPath,
                         )}`;
                     }
-                    if (transportHost) {
-                        transport += `&host=${encodeURIComponent(
-                            Array.isArray(transportHost)
-                                ? transportHost[0]
-                                : transportHost,
+                    if (trojanTransportHost) {
+                        trojanTransport += `&host=${encodeURIComponent(
+                            Array.isArray(trojanTransportHost)
+                                ? trojanTransportHost[0]
+                                : trojanTransportHost,
                         )}`;
                     }
                 }
@@ -103,7 +121,7 @@ export default function URI_Producer() {
                     proxy.port
                 }?sni=${encodeURIComponent(proxy.sni || proxy.server)}${
                     proxy['skip-cert-verify'] ? '&allowInsecure=1' : ''
-                }${transport}#${encodeURIComponent(proxy.name)}`;
+                }${trojanTransport}#${encodeURIComponent(proxy.name)}`;
                 break;
         }
         return result;

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);