feat: 单条订阅和文件支持链接参数 produceType raw, 此时返回原始数据的数组

backend/package.json

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

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

@@ -1,3 +1,4 @@
+import { Base64 } from 'js-base64';
 import { Buffer } from 'buffer';
 import rs from '@/utils/rs';
 import YAML from '@/utils/yaml';
@@ -333,6 +334,8 @@ export const ProxyUtils = {
     downloadFile,
     isValidUUID,
     doh,
+    Buffer,
+    Base64,
 };
 
 function tryParse(parser, line) {

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

@@ -134,7 +134,7 @@ function URI_SS() {
         };
         content = content.split('#')[0]; // strip proxy name
         // handle IPV4 and IPV6
-        let serverAndPortArray = content.match(/@([^/]*)(\/|$)/);
+        let serverAndPortArray = content.match(/@([^/?]*)(\/|\?|$)/);
 
         let rawUserInfoStr = decodeURIComponent(content.split('@')[0]); // 其实应该分隔之后, 用户名和密码再 decodeURIComponent. 但是问题不大
         let userInfoStr;
@@ -456,8 +456,12 @@ function URI_VMess() {
                 );
             }
             // 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 && params.sni && params.sni !== '') {
-                proxy.sni = params.sni;
+            if (proxy.tls) {
+                if (params.sni && params.sni !== '') {
+                    proxy.sni = params.sni;
+                } else if (params.peer && params.peer !== '') {
+                    proxy.sni = params.peer;
+                }
             }
             let httpupgrade = false;
             // handle obfs

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

@@ -86,10 +86,10 @@ vmess = "vmess" equals address
     (uuid/method/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/tag/obfs/obfs_host/obfs_uri/udp_relay/udp_over_tcp/fast_open/aead/server_check_url/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
-    if (proxy.aead) {
-        proxy.alterId = 0;
+    if (proxy.aead === false) {
+        proxy.alterId = 1;
     } else {
-        proxy.alterId = proxy.alterId || 0;
+        proxy.alterId = 0;
     }
     handleObfs();
 }

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

@@ -84,10 +84,10 @@ vmess = "vmess" equals address
     (uuid/method/over_tls/tls_host/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/tag/obfs/obfs_host/obfs_uri/udp_relay/udp_over_tcp/fast_open/aead/server_check_url/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
-    if (proxy.aead) {
-        proxy.alterId = 0;
+    if (proxy.aead === false) {
+        proxy.alterId = 1;
     } else {
-        proxy.alterId = proxy.alterId || 0;
+        proxy.alterId = 0;
     }
     handleObfs();
 }

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

@@ -55,10 +55,11 @@ shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/
 vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls/sni/tls_fingerprint/tls_verification/fast_open/tfo/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
+    // Surfboard 与 Surge 默认不一致, 不管 Surfboard https://getsurfboard.com/docs/profile-format/proxy/external-proxy/vmess
     if (proxy.aead) {
         proxy.alterId = 0;
     } else {
-        proxy.alterId = proxy.alterId || 0;
+        proxy.alterId = 1;
     }
     handleWebsocket();
     handleShadowTLS();

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

@@ -53,10 +53,11 @@ shadowsocks = tag equals "ss" address (method/passwordk/obfs/obfs_host/obfs_uri/
 vmess = tag equals "vmess" address (vmess_uuid/vmess_aead/ws/ws_path/ws_headers/method/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls/sni/tls_fingerprint/tls_verification/fast_open/tfo/udp_relay/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
+    // Surfboard 与 Surge 默认不一致, 不管 Surfboard https://getsurfboard.com/docs/profile-format/proxy/external-proxy/vmess
     if (proxy.aead) {
         proxy.alterId = 0;
     } else {
-        proxy.alterId = proxy.alterId || 0;
+        proxy.alterId = 1;
     }
     handleWebsocket();
     handleShadowTLS();

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

@@ -1141,6 +1141,10 @@ function createDynamicFunction(name, script, $arguments, $options) {
             '$httpClient',
             '$notification',
             'ProxyUtils',
+            'yaml',
+            'Buffer',
+            'b64d',
+            'b64e',
             'scriptResourceCache',
             'flowUtils',
             'produceArtifact',
@@ -1158,6 +1162,10 @@ function createDynamicFunction(name, script, $arguments, $options) {
             // eslint-disable-next-line no-undef
             $notification,
             ProxyUtils,
+            ProxyUtils.yaml,
+            ProxyUtils.Buffer,
+            ProxyUtils.Base64.decode,
+            ProxyUtils.Base64.encode,
             scriptResourceCache,
             flowUtils,
             produceArtifact,
@@ -1170,6 +1178,10 @@ function createDynamicFunction(name, script, $arguments, $options) {
             '$substore',
             'lodash',
             'ProxyUtils',
+            'yaml',
+            'Buffer',
+            'b64d',
+            'b64e',
             'scriptResourceCache',
             'flowUtils',
             'produceArtifact',
@@ -1181,6 +1193,10 @@ function createDynamicFunction(name, script, $arguments, $options) {
             $,
             lodash,
             ProxyUtils,
+            ProxyUtils.yaml,
+            ProxyUtils.Buffer,
+            ProxyUtils.Base64.decode,
+            ProxyUtils.Base64.encode,
             scriptResourceCache,
             flowUtils,
             produceArtifact,

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

@@ -1,4 +1,5 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
+import $ from '@/core/app';
 
 export default function Clash_Producer() {
     const type = 'ALL';
@@ -46,6 +47,11 @@ export default function Clash_Producer() {
                             proxy['reality-opts']))
                 ) {
                     return false;
+                } else if (proxy['underlying-proxy'] || proxy['dialer-proxy']) {
+                    $.error(
+                        `Clash 不支持前置代理字段. 已过滤节点 ${proxy.name}`,
+                    );
+                    return false;
                 }
                 return true;
             })
@@ -152,11 +158,6 @@ export default function Clash_Producer() {
                 }
                 delete proxy['tls-fingerprint'];
 
-                if (proxy['underlying-proxy']) {
-                    proxy['dialer-proxy'] = proxy['underlying-proxy'];
-                }
-                delete proxy['underlying-proxy'];
-
                 if (isPresent(proxy, 'tls') && typeof proxy.tls !== 'boolean') {
                     delete proxy.tls;
                 }

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

@@ -365,7 +365,7 @@ function vmess(proxy) {
 
     // AEAD
     if (isPresent(proxy, 'aead')) {
-        result.append(`,alterId=0`);
+        result.append(`,alterId=${proxy.aead ? 0 : 1}`);
     } else {
         result.append(`,alterId=${proxy.alterId}`);
     }

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

@@ -7,7 +7,7 @@ export default function QX_Producer() {
     const produce = (proxy, type, opts = {}) => {
         switch (proxy.type) {
             case 'ss':
-                return shadowsocks(proxy, opts['include-unsupported-proxy']);
+                return shadowsocks(proxy);
             case 'ssr':
                 return shadowsocksr(proxy);
             case 'trojan':
@@ -28,7 +28,7 @@ export default function QX_Producer() {
     return { produce };
 }
 
-function shadowsocks(proxy, includeUnsupportedProxy) {
+function shadowsocks(proxy) {
     const result = new Result(proxy);
     const append = result.append.bind(result);
     const appendIfPresent = result.appendIfPresent.bind(result);
@@ -58,9 +58,8 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
             'aes-256-gcm',
             'chacha20-ietf-poly1305',
             'xchacha20-ietf-poly1305',
-            ...(includeUnsupportedProxy
-                ? ['2022-blake3-aes-128-gcm', '2022-blake3-aes-256-gcm']
-                : []),
+            '2022-blake3-aes-128-gcm',
+            '2022-blake3-aes-256-gcm',
         ].includes(proxy.cipher)
     ) {
         throw new Error(`cipher ${proxy.cipher} is not supported`);

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

@@ -1,4 +1,5 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';
+import $ from '@/core/app';
 
 export default function Shadowrocket_Producer() {
     const type = 'ALL';
@@ -10,6 +11,11 @@ export default function Shadowrocket_Producer() {
                     return false;
                 } else if (['mieru', 'anytls'].includes(proxy.type)) {
                     return false;
+                } else if (proxy['underlying-proxy'] || proxy['dialer-proxy']) {
+                    $.error(
+                        `Shadowrocket 不支持前置代理字段. 已过滤节点 ${proxy.name}. 请使用 App 内的 "代理通过" 功能`,
+                    );
+                    return false;
                 }
                 return true;
             })

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

@@ -567,12 +567,13 @@ const hysteriaParser = (proxy = {}) => {
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     // eslint-disable-next-line no-control-regex
     const reg = new RegExp('^[0-9]+[ \t]*[KMGT]*[Bb]ps$');
-    if (reg.test(`${proxy.up}`)) {
+    // sing-box 跟文档不一致, 但是懒得全转, 只处理最常见的 Mbps
+    if (reg.test(`${proxy.up}`) && !`${proxy.up}`.endsWith('Mbps')) {
         parsedProxy.up = `${proxy.up}`;
     } else {
         parsedProxy.up_mbps = parseInt(`${proxy.up}`, 10);
     }
-    if (reg.test(`${proxy.down}`)) {
+    if (reg.test(`${proxy.down}`) && !`${proxy.down}`.endsWith('Mbps')) {
         parsedProxy.down = `${proxy.down}`;
     } else {
         parsedProxy.down_mbps = parseInt(`${proxy.down}`, 10);

backend/src/restful/file.js

@@ -64,6 +64,7 @@ async function getFile(req, res) {
         ignoreFailedRemoteFile,
         proxy,
         noCache,
+        produceType,
     } = req.query;
     let $options = {
         _req: {
@@ -128,6 +129,10 @@ async function getFile(req, res) {
     if (noCache) {
         $.info(`指定不使用缓存: ${noCache}`);
     }
+    if (produceType) {
+        produceType = decodeURIComponent(produceType);
+        $.info(`指定生产类型: ${produceType}`);
+    }
 
     const allFiles = $.read(FILES_KEY);
     const file = findByName(allFiles, name);
@@ -144,6 +149,7 @@ async function getFile(req, res) {
                 $options,
                 proxy,
                 noCache,
+                produceType,
             });
 
             try {

backend/src/restful/sync.js

@@ -173,6 +173,9 @@ async function produceArtifact({
                 raw.push(sub.content);
             }
         }
+        if (produceType === 'raw') {
+            return (Array.isArray(raw) ? raw : [raw]).flat();
+        }
         // parse proxies
         let proxies = (Array.isArray(raw) ? raw : [raw])
             .map((i) => ProxyUtils.parse(i))
@@ -570,6 +573,9 @@ async function produceArtifact({
                 }
             }
         }
+        if (produceType === 'raw') {
+            return (Array.isArray(raw) ? raw : [raw]).flat();
+        }
         const files = (Array.isArray(raw) ? raw : [raw]).flat();
         let filesContent = files
             .filter((i) => i != null && i !== '')

backend/src/utils/yaml.js

@@ -34,4 +34,6 @@ export default {
     load,
     safeDump,
     dump,
+    parse: safeLoad,
+    stringify: safeDump,
 };

scripts/demo.js

@@ -17,6 +17,7 @@ function operator(proxies = [], targetPlatform, context) {
   //    只给 mihomo 输出的话, `dialer-proxy` 也行
   //    只给 sing-box 输出的话, `detour` 也行
   //    只给 egern 输出的话, `prev_hop` 也行
+  //    输出到 Clash/Stash/Shadowrocket 时, 会过滤掉配置了前置代理的节点, 并提示使用对应的功能.
   // 9. `trojan`, `tuic`, `hysteria`, `hysteria2`, `juicity` 会在解析时设置 `tls`: true (会使用 tls 类协议的通用逻辑),  输出时删除
   // 10. `sni` 在某些协议里会自动与 `servername` 转换
   // 11. 读取节点的 ca-str 和 _ca (后端文件路径) 字段, 自动计算 fingerprint (参考 https://t.me/zhetengsha/1512)
@@ -119,7 +120,10 @@ function operator(proxies = [], targetPlatform, context) {
   //     downloadFile, // 下载二进制文件, 见 backend/src/utils/download.js
   //     MMDB, // Node.js 环境 可用于模拟 Surge/Loon 的 $utils.ipasn, $utils.ipaso, $utils.geoip. 具体见 https://t.me/zhetengsha/1269
   //     isValidUUID, // 辅助判断是否为有效的 UUID
+  //     Buffer, // https://github.com/feross/buffer
+  //     Base64, // https://github.com/dankogai/js-base64
   // }
+  //  为兼容 https://github.com/xishang0128/sparkle 的 JavaScript 覆写, 也可以直接使用 `b64d`(Base64 解码), `b64e`(Base64 编码), `Buffer`, `yaml`(简单兼容了下 `yaml.parse` 和 `yaml.stringify`)
 
   // 如果只是为了快速修改或者筛选 可以参考 脚本操作支持节点快捷脚本 https://t.me/zhetengsha/970 和 脚本筛选支持节点快捷脚本 https://t.me/zhetengsha/1009
   // ⚠️ 注意: 函数式(即本文件这样的 function operator() {}) 和快捷操作(下面使用 $server) 只能二选一