feat: geo 更新

backend/package.json

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

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

@@ -23,6 +23,7 @@ import { produceArtifact } from '@/restful/sync';
 import { getFlag, removeFlag, getISO, MMDB } from '@/utils/geo';
 import Gist from '@/utils/gist';
 import { isPresent } from './producers/utils';
+import { doh } from '@/utils/dns';
 
 function preprocess(raw) {
     for (const processor of PROXY_PREPROCESSORS) {
@@ -327,6 +328,7 @@ export const ProxyUtils = {
     Gist,
     download,
     isValidUUID,
+    doh,
 };
 
 function tryParse(parser, line) {

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

@@ -63,7 +63,7 @@ function Clash() {
         // 防止 VLESS节点 reality-opts 选项中的 short-id 被解析成 Infinity
         // 匹配 short-id 冒号后面的值(包含空格和引号)
         const afterReplace = raw.replace(
-            /short-id:([ ]*[^,\n}]*)/g,
+            /short-id:([ \t]*[^#\n,}]*)/g,
             (matched, value) => {
                 const afterTrim = value.trim();
 

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

@@ -641,6 +641,23 @@ const tuic5Parser = (proxy = {}) => {
     smuxParser(proxy.smux, parsedProxy);
     return parsedProxy;
 };
+const anytlsParser = (proxy = {}) => {
+    const parsedProxy = {
+        tag: proxy.name,
+        type: 'anytls',
+        server: proxy.server,
+        server_port: parseInt(`${proxy.port}`, 10),
+        password: proxy.password,
+        tls: { enabled: true, server_name: proxy.server, insecure: false },
+    };
+    if (/^\d+$/.test(proxy['idle-session-check-interval']))
+        parsedProxy.idle_session_check_interval = `${proxy['idle-session-check-interval']}s`;
+    if (/^\d+$/.test(proxy['idle-session-timeout']))
+        parsedProxy.idle_session_timeout = `${proxy['idle-session-timeout']}s`;
+    detourParser(proxy, parsedProxy);
+    tlsParser(proxy, parsedProxy);
+    return parsedProxy;
+};
 
 const wireguardParser = (proxy = {}) => {
     const local_address = ['ip', 'ipv6']
@@ -829,6 +846,9 @@ export default function singbox_Producer() {
                         case 'wireguard':
                             list.push(wireguardParser(proxy));
                             break;
+                        case 'anytls':
+                            list.push(anytlsParser(proxy));
+                            break;
                         default:
                             throw new Error(
                                 `Platform sing-box does not support proxy type: ${proxy.type}`,

backend/src/restful/miscs.js

@@ -109,6 +109,21 @@ async function gistBackupAction(action) {
     const updated = settings.syncTime;
     switch (action) {
         case 'upload':
+            try {
+                content = $.read('#sub-store');
+                if ($.env.isNode) content = JSON.stringify($.cache, null, `  `);
+                $.info(`下载备份, 与本地内容对比...`);
+                const onlineContent = await gist.download(
+                    GIST_BACKUP_FILE_NAME,
+                );
+                if (onlineContent === content) {
+                    $.info(`内容一致, 无需上传备份`);
+                    return;
+                }
+            } catch (error) {
+                $.error(`${error.message ?? error}`);
+            }
+
             // update syncTime
             settings.syncTime = new Date().getTime();
             $.write(settings, SETTINGS_KEY);

backend/src/utils/geo.js

@@ -18,7 +18,9 @@ const ISOFlags = {
     '🇧🇬': ['BG', 'BGR'],
     '🇧🇭': ['BH', 'BHR'],
     '🇧🇴': ['BO', 'BOL'],
+    '🇧🇳': ['BN', 'BRN'],
     '🇧🇷': ['BR', 'BRA'],
+    '🇧🇹': ['BT', 'BTN'],
     '🇧🇾': ['BY', 'BLR'],
     '🇨🇦': ['CA', 'CAN'],
     '🇨🇭': ['CH', 'CHE'],
@@ -40,6 +42,7 @@ const ISOFlags = {
     '🇬🇪': ['GE', 'GEO'],
     '🇬🇷': ['GR', 'GRC'],
     '🇬🇹': ['GT', 'GTM'],
+    '🇬🇺': ['GU', 'GUM'],
     '🇭🇰': ['HK', 'HKG', 'HKT', 'HKBN', 'HGC', 'WTT', 'CMI'],
     '🇭🇷': ['HR', 'HRV'],
     '🇭🇺': ['HU', 'HUN'],
@@ -59,12 +62,15 @@ const ISOFlags = {
     '🇮🇷': ['IR', 'IRN'],
     '🇮🇸': ['IS', 'ISL'],
     '🇮🇹': ['IT', 'ITA'],
+    '🇱🇦': ['LA', 'LAO'],
+    '🇱🇰': ['LK', 'LKA'],
     '🇱🇹': ['LT', 'LTU'],
     '🇱🇺': ['LU', 'LUX'],
     '🇱🇻': ['LV', 'LVA'],
     '🇲🇦': ['MA', 'MAR'],
     '🇲🇩': ['MD', 'MDA'],
     '🇳🇬': ['NG', 'NGA'],
+    '🇲🇲': ['MM', 'MMR'],
     '🇲🇰': ['MK', 'MKD'],
     '🇲🇳': ['MN', 'MNG'],
     '🇲🇴': ['MO', 'MAC', 'CTM'],
@@ -83,6 +89,7 @@ const ISOFlags = {
     '🇵🇷': ['PR', 'PRI'],
     '🇵🇹': ['PT', 'PRT'],
     '🇵🇾': ['PY', 'PRY'],
+    '🇵🇬': ['PG', 'PNG'],
     '🇷🇴': ['RO', 'ROU'],
     '🇷🇸': ['RS', 'SRB'],
     '🇷🇪': ['RE', 'REU'],
@@ -142,8 +149,10 @@ export function getFlag(name) {
         '🇧🇬': ['Bulgaria', '保加利亚', '保加利亞'],
         '🇧🇭': ['Bahrain', '巴林'],
         '🇧🇷': ['Brazil', '巴西', '圣保罗'],
+        '🇧🇳': ['Brunei', '文莱', '汶萊'],
         '🇧🇾': ['Belarus', '白俄罗斯', '白俄'],
         '🇧🇴': ['Bolivia', '玻利维亚'],
+        '🇧🇹': ['Bhutan', '不丹', '不丹王国'],
         '🇨🇦': [
             'Canada',
             '加拿大',
@@ -194,6 +203,7 @@ export function getFlag(name) {
         ],
         '🇬🇪': ['Georgia', '格鲁吉亚', '格魯吉亞'],
         '🇬🇷': ['Greece', '希腊', '希臘'],
+        '🇬🇺': ['Guam', '关岛', '關島'],
         '🇬🇹': ['Guatemala', '危地马拉'],
         '🇭🇰': [
             'Hongkong',
@@ -254,11 +264,14 @@ export function getFlag(name) {
         '🇮🇷': ['Iran', '伊朗'],
         '🇮🇸': ['Iceland', '冰岛', '冰島'],
         '🇮🇹': ['Italy', '意大利', '義大利', '米兰', 'Nachash'],
+        '🇱🇰': ['Sri Lanka', '斯里兰卡', '斯里蘭卡'],
+        '🇱🇦': ['Laos', '老挝', '老撾'],
         '🇱🇹': ['Lithuania', '立陶宛'],
         '🇱🇺': ['Luxembourg', '卢森堡'],
         '🇱🇻': ['Latvia', '拉脱维亚', 'Latvija'],
         '🇲🇦': ['Morocco', '摩洛哥'],
         '🇲🇩': ['Moldova', '摩尔多瓦', '摩爾多瓦'],
+        '🇲🇲': ['Myanmar', '缅甸', '緬甸'],
         '🇳🇬': ['Nigeria', '尼日利亚', '尼日利亞'],
         '🇲🇰': ['Macedonia', '马其顿', '馬其頓'],
         '🇲🇳': ['Mongolia', '蒙古'],
@@ -284,6 +297,7 @@ export function getFlag(name) {
         '🇵🇱': ['Poland', '波兰', '波蘭', '华沙', 'Warsaw'],
         '🇵🇷': ['Puerto Rico', '波多黎各'],
         '🇵🇹': ['Portugal', '葡萄牙'],
+        '🇵🇬': ['Papua New Guinea', '巴布亚新几内亚'],
         '🇵🇾': ['Paraguay', '巴拉圭'],
         '🇷🇴': ['Romania', '罗马尼亚'],
         '🇷🇸': ['Serbia', '塞尔维亚'],

backend/src/utils/gist.js

@@ -118,6 +118,7 @@ export default class Gist {
                 .get('/gists?per_page=100&page=1')
                 .then((response) => {
                     const gists = JSON.parse(response.body);
+                    $.info(`获取到当前 GitHub 用户的 gist: ${gists.length} 个`);
                     for (let g of gists) {
                         if (g.description === this.key) {
                             return g;