release: bump version

backend/package.json

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

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

@@ -13,6 +13,7 @@ import getQXParser from './peggy/qx';
 import getTrojanURIParser from './peggy/trojan-uri';
 import $ from '@/core/app';
 import JSON5 from 'json5';
+import YAML from '@/utils/yaml';
 
 import { Base64 } from 'js-base64';
 
@@ -1130,15 +1131,21 @@ function URI_Trojan() {
 function Clash_All() {
     const name = 'Clash Parser';
     const test = (line) => {
+        let proxy;
         try {
-            JSON5.parse(line);
+            proxy = JSON5.parse(line);
         } catch (e) {
-            return false;
+            proxy = YAML.parse(line);
         }
-        return true;
+        return !!proxy?.type;
     };
     const parse = (line) => {
-        const proxy = JSON5.parse(line);
+        let proxy;
+        try {
+            proxy = JSON5.parse(line);
+        } catch (e) {
+            proxy = YAML.parse(line);
+        }
         if (
             ![
                 'anytls',

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

@@ -54,31 +54,31 @@ shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs
         $set(proxy, "plugin-opts.path", obfs.path);
     }
 }
-vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/others)* {
+vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     proxy.alterId = proxy.alterId || 0;
     handleTransport();
 }
-vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/others)* {
+vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/others)* {
     proxy.type = "vless";
     handleTransport();
 }
-trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/block_quic/others)* {
+hysteria2 = tag equals "hysteria2"i address password (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/block_quic/others)* {
     proxy.type = "hysteria2";
 }
-https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+https = tag equals "https"i address (username password)? (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
 http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "http";
 }
-socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "socks5";
 }
 
@@ -175,7 +175,8 @@ shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-s
 shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
 
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }
-tls_host = comma sni:("tls-name"/"sni") equals host:domain { proxy.sni = host; }
+tls_name = comma sni:("tls-name") equals host:domain { proxy.sni = host; }
+sni = comma sni:("sni") equals host:domain { proxy.sni = host; }
 tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-verify"] = flag; }
 tls_cert_sha256 = comma "tls-cert-sha256" equals match:[^,]+ { proxy["tls-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals match:[^,]+ { proxy["tls-pubkey-sha256"] = match.join("").replace(/^"(.*)"$/, '$1'); }

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

@@ -52,31 +52,31 @@ shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs
         $set(proxy, "plugin-opts.path", obfs.path);
     }
 }
-vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/others)* {
+vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     proxy.alterId = proxy.alterId || 0;
     handleTransport();
 }
-vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/others)* {
+vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/others)* {
     proxy.type = "vless";
     handleTransport();
 }
-trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/block_quic/others)* {
+hysteria2 = tag equals "hysteria2"i address password (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/ip_mode/block_quic/others)* {
     proxy.type = "hysteria2";
 }
-https = tag equals "https"i address (username password)? (tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+https = tag equals "https"i address (username password)? (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
 http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "http";
 }
-socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_host/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "socks5";
 }
 
@@ -173,7 +173,8 @@ shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-s
 shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
 
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }
-tls_host = comma sni:("tls-name"/"sni") equals host:domain { proxy.sni = host; }
+tls_name = comma sni:("tls-name") equals host:domain { proxy.sni = host; }
+sni = comma sni:("sni") equals host:domain { proxy.sni = host; }
 tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-verify"] = flag; }
 tls_cert_sha256 = comma "tls-cert-sha256" equals match:[^,]+ { proxy["tls-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals match:[^,]+ { proxy["tls-pubkey-sha256"] = match.join("").replace(/^"(.*)"$/, '$1'); }

backend/src/utils/download.js

@@ -260,37 +260,27 @@ export default async function download(
                     shouldCache = false;
                 }
             }
+            if (preprocess) {
+                try {
+                    const proxies = ProxyUtils.parse(body);
+                    if (!Array.isArray(proxies) || proxies.length === 0) {
+                        $.error(`URL ${url} 不包含有效节点, 不缓存`);
+                        shouldCache = false;
+                    }
+                } catch (e) {
+                    $.error(
+                        `URL ${url} 尝试解析节点失败 ${e.message ?? e}, 不缓存`,
+                    );
+                    shouldCache = false;
+                }
+            }
             if (shouldCache) {
                 resourceCache.set(id, body);
                 if (customCacheKey) {
-                    let shouldWriteCustomCacheKey = true;
-                    if (preprocess) {
-                        try {
-                            const proxies = ProxyUtils.parse(body);
-                            if (
-                                !Array.isArray(proxies) ||
-                                proxies.length === 0
-                            ) {
-                                $.error(
-                                    `URL ${url} 不包含有效节点\n不写入自定义缓存 ${$arguments?.cacheKey}`,
-                                );
-                                shouldWriteCustomCacheKey = false;
-                            }
-                        } catch (e) {
-                            $.error(
-                                `URL ${url} 尝试解析节点失败 ${
-                                    e.message ?? e
-                                }\n不写入自定义缓存 ${$arguments?.cacheKey}`,
-                            );
-                            shouldWriteCustomCacheKey = false;
-                        }
-                    }
-                    if (shouldWriteCustomCacheKey) {
-                        $.info(
-                            `URL ${url}\n写入自定义缓存 ${$arguments?.cacheKey}`,
-                        );
-                        $.write(body, customCacheKey);
-                    }
+                    $.info(
+                        `URL ${url}\n写入自定义缓存 ${$arguments?.cacheKey}`,
+                    );
+                    $.write(body, customCacheKey);
                 }
             }
 

backend/src/utils/flow.js

@@ -342,6 +342,12 @@ export function normalizeFlowHeader(flowHeaders) {
                         ) {
                             try {
                                 decodedValue = Number(decodedValue).toFixed(0);
+                                if (
+                                    ['expire'].includes(key) &&
+                                    decodedValue <= 0
+                                ) {
+                                    decodedValue = '';
+                                }
                             } catch (e) {
                                 $.error(
                                     `Failed to convert value for key "${key}=${encodedValue}": ${

backend/src/utils/geo.js

@@ -46,6 +46,7 @@ const ISOFlags = {
     '🇭🇰': ['HK', 'HKG', 'HKT', 'HKBN', 'HGC', 'WTT', 'CMI'],
     '🇭🇷': ['HR', 'HRV'],
     '🇭🇺': ['HU', 'HUN'],
+    '🇮🇶': ['IQ', 'IRQ'], // 伊拉克
     '🇯🇴': ['JO', 'JOR'],
     '🇯🇵': ['JP', 'JPN', 'TYO'],
     '🇰🇪': ['KE', 'KEN'],
@@ -99,6 +100,7 @@ const ISOFlags = {
     '🇸🇬': ['SG', 'SGP'],
     '🇸🇮': ['SI', 'SVN'],
     '🇸🇰': ['SK', 'SVK'],
+    '🇹🇬': ['TG', 'TGO'], // 多哥
     '🇹🇭': ['TH', 'THA'],
     '🇹🇳': ['TN', 'TUN'],
     '🇹🇷': ['TR', 'TUR'],
@@ -220,6 +222,7 @@ export function getFlag(name) {
         ],
         '🇭🇷': ['Croatia', '克罗地亚', '克羅地亞'],
         '🇭🇺': ['Hungary', '匈牙利'],
+        '🇮🇶': ['Iraq', '伊拉克', '巴格达', 'Baghdad'], // 伊拉克
         '🇯🇴': ['Jordan', '约旦'],
         '🇯🇵': [
             'Japan',
@@ -338,6 +341,7 @@ export function getFlag(name) {
         ],
         '🇸🇮': ['Slovenia', '斯洛文尼亚'],
         '🇸🇰': ['Slovakia', '斯洛伐克'],
+        '🇹🇬': ['Togo', '多哥', '洛美', 'Lomé', 'Lome'], // 多哥
         '🇹🇭': ['Thailand', '泰国', '泰國', '曼谷'],
         '🇹🇳': ['Tunisia', '突尼斯'],
         '🇹🇷': ['Turkey', '土耳其', '伊斯坦布尔', 'Istanbul'],