feat: 脚本链接叠加参数调整

backend/package.json

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

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

@@ -114,12 +114,7 @@ async function processFn(
         if (item.type.indexOf('Script') !== -1) {
             const { mode, content } = item.args;
             if (mode === 'link') {
-                let noCache;
                 let url = content || '';
-                if (url.endsWith('#noCache')) {
-                    url = url.replace(/#noCache$/, '');
-                    noCache = true;
-                }
                 // extract link arguments
                 const rawArgs = url.split('#');
                 if (rawArgs.length > 1) {
@@ -138,7 +133,14 @@ async function processFn(
                         }
                     }
                 }
-                url = `${url.split('#')[0]}${noCache ? '#noCache' : ''}`;
+                url = `${url.split('#')[0]}${
+                    rawArgs[2]
+                        ? `#${rawArgs[2]}`
+                        : $arguments?.noCache != null ||
+                          $arguments?.insecure != null
+                        ? `#${rawArgs[1]}`
+                        : ''
+                }`;
                 const downloadUrlMatch = url.match(
                     /^\/api\/(file|module)\/(.+)/,
                 );

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

@@ -361,10 +361,12 @@ function vless(proxy, includeUnsupportedProxy) {
             ['xtls-rprx-vision'].includes(proxy.flow)
         ) {
             isReality = true;
-        } else if (proxy['reality-opts'] || proxy.flow) {
+        } else if (proxy['reality-opts']) {
             throw new Error(
-                `VLESS XTLS/REALITY with flow(${proxy.flow}) is not supported`,
+                `VLESS REALITY with flow(${proxy.flow}) is not supported`,
             );
+        } else if (proxy.flow) {
+            throw new Error(`VLESS XTLS is not supported`);
         }
     }
     const result = new Result(proxy);
@@ -416,6 +418,7 @@ function vless(proxy, includeUnsupportedProxy) {
 
     // sni
     if (isReality) {
+        result.appendIfPresent(`,flow=${proxy.flow}`, 'flow');
         result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
         result.appendIfPresent(
             `,public-key="${proxy['reality-opts']['public-key']}"`,

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

@@ -14,10 +14,12 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
         `
     ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
          Sub-Store -- v${version}
+         Loon -- ${$loon}
     ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
     `,
     );
 
+    const build = $loon.match(/\((\d+)\)$/)?.[1];
     let arg;
     if (typeof $argument != 'undefined') {
         arg = Object.fromEntries(
@@ -26,23 +28,28 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
     } else {
         arg = {};
     }
+    console.log(`arg: ${JSON.stringify(arg)}`);
 
     const RESOURCE_TYPE = {
         PROXY: 1,
         RULE: 2,
     };
-
-    result = resource;
+    if (!arg.resourceUrlOnly) {
+        result = resource;
+    }
 
     if (resourceType === RESOURCE_TYPE.PROXY) {
-        try {
-            let proxies = ProxyUtils.parse(resource);
-            result = ProxyUtils.produce(proxies, 'Loon', undefined, {
-                'include-unsupported-proxy': arg?.includeUnsupportedProxy,
-            });
-        } catch (e) {
-            console.log('解析器: 使用 resource 出现错误');
-            console.log(e.message ?? e);
+        if (!arg.resourceUrlOnly) {
+            try {
+                let proxies = ProxyUtils.parse(resource);
+                result = ProxyUtils.produce(proxies, 'Loon', undefined, {
+                    'include-unsupported-proxy':
+                        arg?.includeUnsupportedProxy || build >= 838,
+                });
+            } catch (e) {
+                console.log('解析器: 使用 resource 出现错误');
+                console.log(e.message ?? e);
+            }
         }
         if ((!result || /^\s*$/.test(result)) && resourceUrl) {
             console.log(`解析器: 尝试从 ${resourceUrl} 获取订阅`);
@@ -59,18 +66,21 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
                 );
                 let proxies = ProxyUtils.parse(raw);
                 result = ProxyUtils.produce(proxies, 'Loon', undefined, {
-                    'include-unsupported-proxy': arg?.includeUnsupportedProxy,
+                    'include-unsupported-proxy':
+                        arg?.includeUnsupportedProxy || build >= 838,
                 });
             } catch (e) {
                 console.log(e.message ?? e);
             }
         }
     } else if (resourceType === RESOURCE_TYPE.RULE) {
-        try {
-            const rules = RuleUtils.parse(resource);
-            result = RuleUtils.produce(rules, 'Loon');
-        } catch (e) {
-            console.log(e.message ?? e);
+        if (!arg.resourceUrlOnly) {
+            try {
+                const rules = RuleUtils.parse(resource);
+                result = RuleUtils.produce(rules, 'Loon');
+            } catch (e) {
+                console.log(e.message ?? e);
+            }
         }
         if ((!result || /^\s*$/.test(result)) && resourceUrl) {
             console.log(`解析器: 尝试从 ${resourceUrl} 获取规则`);