feat: sing-box includeUnsupportedProxy 开启支持 Hysteria2 端口跳跃

backend/package.json

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

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

@@ -72,6 +72,9 @@ export default function Egern_Producer() {
                 return true;
             })
             .map((proxy) => {
+                if (proxy.tls && !proxy.sni) {
+                    proxy.sni = proxy.server;
+                }
                 if (proxy.type === 'http') {
                     proxy = {
                         type: 'http',

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

@@ -568,7 +568,7 @@ const hysteriaParser = (proxy = {}) => {
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
 };
-const hysteria2Parser = (proxy = {}) => {
+const hysteria2Parser = (proxy = {}, includeUnsupportedProxy) => {
     const parsedProxy = {
         tag: proxy.name,
         type: 'hysteria2',
@@ -580,6 +580,16 @@ const hysteria2Parser = (proxy = {}) => {
     };
     if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
+    if (includeUnsupportedProxy) {
+        if (proxy['hop-interval'])
+            parsedProxy.hop_interval = /^\d+$/.test(proxy['hop-interval'])
+                ? `${proxy['hop-interval']}s`
+                : proxy['hop-interval'];
+        if (proxy['ports'])
+            parsedProxy.server_ports = proxy['ports']
+                .split(/\s*,\s*/)
+                .map((p) => p.replace(/\s*-\s*/, ':'));
+    }
     if (proxy.up) parsedProxy.up_mbps = parseInt(`${proxy.up}`, 10);
     if (proxy.down) parsedProxy.down_mbps = parseInt(`${proxy.down}`, 10);
     if (proxy.obfs === 'salamander') parsedProxy.obfs.type = 'salamander';
@@ -790,7 +800,12 @@ export default function singbox_Producer() {
                             list.push(hysteriaParser(proxy));
                             break;
                         case 'hysteria2':
-                            list.push(hysteria2Parser(proxy));
+                            list.push(
+                                hysteria2Parser(
+                                    proxy,
+                                    opts['include-unsupported-proxy'],
+                                ),
+                            );
                             break;
                         case 'tuic':
                             if (!proxy.token || proxy.token.length === 0) {

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

@@ -47,7 +47,16 @@ let resourceUrl = typeof $resourceUrl !== 'undefined' ? $resourceUrl : '';
         if ((!result || /^\s*$/.test(result)) && resourceUrl) {
             console.log(`解析器: 尝试从 ${resourceUrl} 获取订阅`);
             try {
-                let raw = await download(resourceUrl, arg?.ua, arg?.timeout);
+                let raw = await download(
+                    resourceUrl,
+                    arg?.ua,
+                    arg?.timeout,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    true,
+                );
                 let proxies = ProxyUtils.parse(raw);
                 result = ProxyUtils.produce(proxies, 'Loon', undefined, {
                     'include-unsupported-proxy': arg?.includeUnsupportedProxy,

backend/src/restful/download.js

@@ -63,7 +63,7 @@ async function downloadSubscription(req, res) {
     $.info(
         `正在下载订阅：${name}\n请求 User-Agent: ${
             req.headers['user-agent'] || req.headers['User-Agent']
-        }`,
+        }\n请求 target: ${req.query.target}\n实际输出: ${platform}`,
     );
     let {
         url,
@@ -303,7 +303,7 @@ async function downloadCollection(req, res) {
     $.info(
         `正在下载组合订阅：${name}\n请求 User-Agent: ${
             req.headers['user-agent'] || req.headers['User-Agent']
-        }`,
+        }\n请求 target: ${req.query.target}\n实际输出: ${platform}`,
     );
 
     let {

backend/src/restful/file.js

@@ -62,6 +62,7 @@ async function getFile(req, res) {
         mergeSources,
         ignoreFailedRemoteFile,
         proxy,
+        noCache,
     } = req.query;
     let $options = {};
     if (req.query.$options) {
@@ -113,6 +114,9 @@ async function getFile(req, res) {
         ignoreFailedRemoteFile = decodeURIComponent(ignoreFailedRemoteFile);
         $.info(`指定忽略失败的远程文件: ${ignoreFailedRemoteFile}`);
     }
+    if (noCache) {
+        $.info(`指定不使用缓存: ${noCache}`);
+    }
 
     const allFiles = $.read(FILES_KEY);
     const file = findByName(allFiles, name);
@@ -128,6 +132,7 @@ async function getFile(req, res) {
                 ignoreFailedRemoteFile,
                 $options,
                 proxy,
+                noCache,
             });
 
             try {

backend/src/restful/preview.js

@@ -114,6 +114,10 @@ async function compareSub(req, res) {
                                 sub.ua,
                                 undefined,
                                 sub.proxy,
+                                undefined,
+                                undefined,
+                                undefined,
+                                true,
                             );
                         } catch (err) {
                             errors[url] = err;
@@ -219,6 +223,10 @@ async function compareCollection(req, res) {
                                             sub.ua,
                                             undefined,
                                             sub.proxy,
+                                            undefined,
+                                            undefined,
+                                            undefined,
+                                            true,
                                         );
                                     } catch (err) {
                                         errors[url] = err;

backend/src/restful/sync.js

@@ -74,6 +74,7 @@ async function produceArtifact({
                                 undefined,
                                 awaitCustomCache,
                                 noCache,
+                                true,
                             );
                         } catch (err) {
                             errors[url] = err;
@@ -122,6 +123,7 @@ async function produceArtifact({
                                 undefined,
                                 awaitCustomCache,
                                 noCache,
+                                true,
                             );
                         } catch (err) {
                             errors[url] = err;
@@ -243,6 +245,7 @@ async function produceArtifact({
                                             undefined,
                                             undefined,
                                             noCache,
+                                            true,
                                         );
                                     } catch (err) {
                                         errors[url] = err;

backend/src/utils/download.js

@@ -11,6 +11,10 @@ import {
     validCheck,
 } from '@/utils/flow';
 import $ from '@/core/app';
+import PROXY_PREPROCESSORS from '@/core/proxy-utils/preprocessors';
+const clashPreprocessor = PROXY_PREPROCESSORS.find(
+    (processor) => processor.name === 'Clash Pre-processor',
+);
 
 const tasks = new Map();
 
@@ -22,6 +26,7 @@ export default async function download(
     skipCustomCache,
     awaitCustomCache,
     noCache,
+    preprocess,
 ) {
     let $arguments = {};
     let url = rawUrl.replace(/#noFlow$/, '');
@@ -87,6 +92,9 @@ export default async function download(
                         timeout,
                         proxy,
                         true,
+                        undefined,
+                        undefined,
+                        preprocess,
                     );
                 } catch (e) {
                     $.error(
@@ -107,6 +115,9 @@ export default async function download(
                     timeout,
                     proxy,
                     true,
+                    undefined,
+                    undefined,
+                    preprocess,
                 ).catch((e) => {
                     $.error(
                         `乐观缓存: URL ${url} 异步更新缓存发生错误 ${
@@ -169,10 +180,10 @@ export default async function download(
                 : { insecure: true }
             : undefined;
         $.info(
-            `Downloading...\nUser-Agent: ${userAgent}\nTimeout: ${requestTimeout}\nProxy: ${proxy}\nInsecure: ${!!insecure}\nURL: ${url}`,
+            `Downloading...\nUser-Agent: ${userAgent}\nTimeout: ${requestTimeout}\nProxy: ${proxy}\nInsecure: ${!!insecure}\nPreprocess: ${preprocess}\nURL: ${url}`,
         );
         try {
-            const { body, headers, statusCode } = await http.get({
+            let { body, headers, statusCode } = await http.get({
                 url,
                 ...(proxy ? { proxy } : {}),
                 ...(isLoon && proxy ? { node: proxy } : {}),
@@ -193,6 +204,15 @@ export default async function download(
             }
             if (body.replace(/\s/g, '').length === 0)
                 throw new Error(new Error('远程资源内容为空'));
+            if (preprocess) {
+                try {
+                    if (clashPreprocessor.test(body)) {
+                        body = clashPreprocessor.parse(body);
+                    }
+                } catch (e) {
+                    $.error(`Clash Pre-processor error: ${e}`);
+                }
+            }
             let shouldCache = true;
             if (cacheThreshold) {
                 const size = body.length / 1024;

backend/src/utils/geo.js

@@ -17,6 +17,7 @@ const ISOFlags = {
     '🇧🇪': ['BE', 'BEL'],
     '🇧🇬': ['BG', 'BGR'],
     '🇧🇭': ['BH', 'BHR'],
+    '🇧🇴': ['BO', 'BOL'],
     '🇧🇷': ['BR', 'BRA'],
     '🇧🇾': ['BY', 'BLR'],
     '🇨🇦': ['CA', 'CAN'],
@@ -38,6 +39,7 @@ const ISOFlags = {
     '🇬🇧': ['GB', 'GBR', 'UK'],
     '🇬🇪': ['GE', 'GEO'],
     '🇬🇷': ['GR', 'GRC'],
+    '🇬🇹': ['GT', 'GTM'],
     '🇭🇰': ['HK', 'HKG', 'HKT', 'HKBN', 'HGC', 'WTT', 'CMI'],
     '🇭🇷': ['HR', 'HRV'],
     '🇭🇺': ['HU', 'HUN'],
@@ -141,6 +143,7 @@ export function getFlag(name) {
         '🇧🇭': ['Bahrain', '巴林'],
         '🇧🇷': ['Brazil', '巴西', '圣保罗'],
         '🇧🇾': ['Belarus', '白俄罗斯', '白俄'],
+        '🇧🇴': ['Bolivia', '玻利维亚'],
         '🇨🇦': [
             'Canada',
             '加拿大',
@@ -191,6 +194,7 @@ export function getFlag(name) {
         ],
         '🇬🇪': ['Georgia', '格鲁吉亚', '格魯吉亞'],
         '🇬🇷': ['Greece', '希腊', '希臘'],
+        '🇬🇹': ['Guatemala', '危地马拉'],
         '🇭🇰': [
             'Hongkong',
             '香港',