release: backend version 2.14.256

[Feat]规则转换增加对GEOIP与GEOSITE的支持

backend/package.json

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

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

@@ -231,6 +231,10 @@ const sshParser = (proxy = {}) => {
     // https://wiki.metacubex.one/config/proxies/ssh
     // https://sing-box.sagernet.org/zh/configuration/outbound/ssh
     if (proxy['privateKey']) parsedProxy.private_key_path = proxy['privateKey'];
+    if (proxy['private-key'])
+        parsedProxy.private_key_path = proxy['private-key'];
+    if (proxy['private-key-passphrase'])
+        parsedProxy.private_key_passphrase = proxy['private-key-passphrase'];
     if (proxy['server-fingerprint']) {
         parsedProxy.host_key = [proxy['server-fingerprint']];
         // https://manual.nssurge.com/policy/ssh.html
@@ -240,6 +244,9 @@ const sshParser = (proxy = {}) => {
             proxy['server-fingerprint'].split(' ')[0],
         ];
     }
+    if (proxy['host-key']) parsedProxy.host_key = proxy['host-key'];
+    if (proxy['host-key-algorithms'])
+        parsedProxy.host_key_algorithms = proxy['host-key-algorithms'];
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     tfoParser(proxy, parsedProxy);
     return parsedProxy;

backend/src/core/rule-utils/parsers.js

@@ -10,6 +10,8 @@ const RULE_TYPES_MAPPING = [
     [/^PROTOCOL$/, 'PROTOCOL'],
     [/^IP-CIDR$/i, 'IP-CIDR'],
     [/^(IP-CIDR6|ip6-cidr|IP6-CIDR)$/, 'IP-CIDR6'],
+    [/^GEOIP$/i, 'GEOIP'],
+    [/^GEOSITE$/i, 'GEOSITE'],
 ];
 
 function AllRuleParser() {

backend/src/restful/download.js

@@ -113,7 +113,7 @@ async function downloadSubscription(req, res) {
                         // forward flow headers
                         const flowInfo = await getFlowHeaders(
                             url,
-                            undefined,
+                            $arguments.flowUserAgent,
                             undefined,
                             sub.proxy,
                         );
@@ -250,7 +250,7 @@ async function downloadCollection(req, res) {
                         if (!$arguments.noFlow) {
                             const flowInfo = await getFlowHeaders(
                                 url,
-                                undefined,
+                                $arguments.flowUserAgent,
                                 undefined,
                                 sub.proxy,
                             );

backend/src/restful/subscriptions.js

@@ -115,7 +115,7 @@ async function getFlowInfo(req, res) {
         } else {
             const flowHeaders = await getFlowHeaders(
                 url,
-                undefined,
+                $arguments.flowUserAgent,
                 undefined,
                 sub.proxy,
             );

backend/src/utils/download.js

@@ -53,7 +53,7 @@ export default async function download(rawUrl, ua, timeout, proxy) {
     //     return item.content;
     // }
 
-    const { isNode, isStash } = ENV();
+    const { isNode, isStash, isLoon, isShadowRocket, isQX } = ENV();
     const { defaultUserAgent, defaultTimeout, cacheThreshold } =
         $.read(SETTINGS_KEY);
     const userAgent = ua || defaultUserAgent || 'clash.meta';
@@ -66,8 +66,10 @@ export default async function download(rawUrl, ua, timeout, proxy) {
     const http = HTTP({
         headers: {
             'User-Agent': userAgent,
-            'X-Stash-Selected-Proxy':
+            ...(isStash && proxy
-                isStash && proxy ? encodeURIComponent(proxy) : undefined,
+                ? { 'X-Stash-Selected-Proxy': encodeURIComponent(proxy) }
+                : {}),
+            ...(isShadowRocket && proxy ? { 'X-Surge-Policy': proxy } : {}),
         },
         timeout: requestTimeout,
     });
@@ -86,8 +88,10 @@ export default async function download(rawUrl, ua, timeout, proxy) {
         try {
             const { body, headers } = await http.get({
                 url,
-                proxy,
+                ...(proxy ? { proxy } : {}),
-                ...getPolicyDescriptor(proxy),
+                ...(isLoon && proxy ? { node: proxy } : {}),
+                ...(isQX && proxy ? { opts: { policy: proxy } } : {}),
+                ...(proxy ? getPolicyDescriptor(proxy) : {}),
             });
 
             if (headers) {
@@ -125,7 +129,12 @@ export default async function download(rawUrl, ua, timeout, proxy) {
     if ($arguments?.validCheck) {
         await validCheck(
             parseFlowHeaders(
-                await getFlowHeaders(url, undefined, undefined, proxy),
+                await getFlowHeaders(
+                    url,
+                    $arguments.flowUserAgent,
+                    undefined,
+                    proxy,
+                ),
             ),
         );
     }

backend/src/utils/flow.js

@@ -34,7 +34,7 @@ export async function getFlowHeaders(rawUrl, ua, timeout, proxy) {
     if ($arguments?.noFlow) {
         return;
     }
-    const { isStash } = ENV();
+    const { isStash, isLoon, isShadowRocket, isQX } = ENV();
     const cached = headersResourceCache.get(url);
     let flowInfo;
     if (!$arguments?.noCache && cached) {
@@ -49,7 +49,11 @@ export async function getFlowHeaders(rawUrl, ua, timeout, proxy) {
         const requestTimeout = timeout || defaultTimeout;
         const http = HTTP();
         try {
-            // $.info(`使用 HEAD 方法获取流量信息: ${url}`);
+            $.info(
+                `使用 HEAD 方法获取流量信息: ${url}, User-Agent: ${
+                    userAgent || ''
+                }`,
+            );
             const { headers } = await http.head({
                 url: url
                     .split(/[\r\n]+/)
@@ -57,23 +61,36 @@ export async function getFlowHeaders(rawUrl, ua, timeout, proxy) {
                     .filter((i) => i.length)[0],
                 headers: {
                     'User-Agent': userAgent,
+                    ...(isStash && proxy
+                        ? {
                               'X-Stash-Selected-Proxy':
-                        isStash && proxy
+                                  encodeURIComponent(proxy),
-                            ? encodeURIComponent(proxy)
+                          }
-                            : undefined,
+                        : {}),
+                    ...(isShadowRocket && proxy
+                        ? { 'X-Surge-Policy': proxy }
+                        : {}),
                 },
                 timeout: requestTimeout,
-                proxy,
+                ...(proxy ? { proxy } : {}),
-                ...getPolicyDescriptor(proxy),
+                ...(isLoon && proxy ? { node: proxy } : {}),
+                ...(isQX && proxy ? { opts: { policy: proxy } } : {}),
+                ...(proxy ? getPolicyDescriptor(proxy) : {}),
             });
             flowInfo = getFlowField(headers);
         } catch (e) {
             $.error(
-                `使用 HEAD 方法获取流量信息失败: ${url}: ${e.message ?? e}`,
+                `使用 HEAD 方法获取流量信息失败: ${url}, User-Agent: ${
+                    userAgent || ''
+                }: ${e.message ?? e}`,
             );
         }
         if (!flowInfo) {
-            $.info(`使用 GET 方法获取流量信息: ${url}`);
+            $.info(
+                `使用 GET 方法获取流量信息: ${url}, User-Agent: ${
+                    userAgent || ''
+                }`,
+            );
             const { headers } = await http.get({
                 url: url
                     .split(/[\r\n]+/)

backend/src/vendor/open-api.js

@@ -316,6 +316,7 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                 url: options.url,
                 headers: options.headers,
                 body: options.body,
+                opts: options.opts,
             });
         } else if (isLoon || isSurge || isNode) {
             worker = new Promise((resolve, reject) => {