hifun-tools 1.4.19 → 1.4.21

package/dist/init/index.d.ts

@@ -49,6 +49,7 @@ declare class InitCls {
     private _getTenantInfoStrictSync;
     /** 匹配默认租户 */
     private _matchDefaultTenant;
+    retryHttp(): Promise<void>;
     refreshHttp(): Promise<void>;
     /** 获取 lineDict.txt 内容 */
     private _fetchLineDict;

package/dist/init/index.js

@@ -158,6 +158,14 @@ class InitCls {
         }
         throw new Error("无法获取有效的租户信息");
     }
+    async retryHttp() {
+        try {
+            await getOptimalDecodedString([this.getBaseUrl()]);
+        }
+        catch (error) {
+            await this._loadGatewayConfig(true);
+        }
+    }
     async refreshHttp() {
         const startTime = Date.now();
         const log = (msg) => {
@@ -184,7 +192,6 @@ class InitCls {
         const tryRequest = async (label) => {
             log(`${label}：开始请求`);
             try {
-                loadingText("网络波动，正在优选线路...");
                 await getOptimalDecodedString([this.getBaseUrl()]);
                 success = true;
                 closeLoadingText();
@@ -194,6 +201,7 @@ class InitCls {
                 return true;
             }
             catch (err) {
+                loadingText("正在为您检测最优线路，请稍等...");
                 log(`${label}：请求失败 ❌`);
                 return false;
             }
@@ -222,6 +230,7 @@ class InitCls {
                 const nowLineGroup = this.tenantDictList.find((a) => toStandardUrl(a.line) == toStandardUrl(this.domainBaseUrl))?.lineGroup;
                 if (!!nowLineGroup)
                     Cache("ErrorDomainUrl", uniq([...this.ErrorDomainUrl, nowLineGroup]));
+                closeLoadingText();
                 rewardMsg({
                     title: "提示",
                     text: "优选线路超时，刷新页面以重置" + (nowLineGroup ? "" : "..."),
@@ -271,56 +280,74 @@ class InitCls {
         return "";
     }
     /** 获取并处理 lineAddress.txt */
-    async _loadGatewayConfig() {
-        if (this.domainBaseUrl)
+    async _loadGatewayConfig(retry = false) {
+        if (this.domainBaseUrl && !retry)
+            return this.domainBaseUrl;
+        /** 设置 domainBaseUrl 并返回 */
+        const setBaseUrl = async (list) => {
+            this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(list));
             return this.domainBaseUrl;
+        };
+        /** 备用 Address 策略 */
+        const loadBackupAddress = async () => {
+            const backupList = JSON.parse(AesDecrypt(await this.fetchTxtFile(this.backupAddress)));
+            this.backupAddressList = backupList || [];
+            await setBaseUrl(this.backupAddressList);
+            console.info("✅ 备用远程Address配置成功:", this.domainBaseUrl);
+        };
         try {
+            /** 1️⃣ 读取主配置 */
             const response = await fetch(`/lineAddress.txt?t=${Date.now()}`);
             const configText = await response.text();
-            const resArray = JSON.parse(AesDecrypt(configText));
-            let OriginBaseUrl = resArray;
-            this.OriginBaseUrl = OriginBaseUrl;
-            const dictList = this.getTenantDictList().filter((a) => !this.ErrorDomainUrl.includes(a.lineGroup));
-            const lineGroup = this.getTenantDict()?.lineGroup;
-            let baseUrl = filterSmartLines(dictList, OriginBaseUrl, this.ErrorDomainUrl?.length == 0 ? lineGroup : "");
+            const originBaseUrl = JSON.parse(AesDecrypt(configText));
+            this.OriginBaseUrl = originBaseUrl;
+            /** 2️⃣ 计算智能线路 */
+            const tenantDictList = this.getTenantDictList().filter((a) => !this.ErrorDomainUrl.includes(a.lineGroup));
+            const currentLineGroup = this.getTenantDict()?.lineGroup;
+            let baseUrlList = filterSmartLines(tenantDictList, originBaseUrl, this.ErrorDomainUrl?.length === 0 ? currentLineGroup : "");
+            /** 3️⃣ 主线路测速 */
             try {
-                this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(baseUrl));
+                await setBaseUrl(baseUrlList);
                 console.info("✅ 成功加载生产环境配置:", this.domainBaseUrl);
             }
-            catch (error) {
-                const backUrl = JSON.parse(AesDecrypt(await this.fetchTxtFile(this.backupAddress)));
-                this.backupAddressList = backUrl || [];
-                // 备用策略
+            catch {
+                /** 4️⃣ 降级策略 */
                 try {
-                    this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(backUrl));
-                    console.info("✅ 备用配置成功:", this.domainBaseUrl);
+                    if (this.ErrorDomainUrl?.length == 0) {
+                        const fallbackList = filterSmartLines(tenantDictList.filter((a) => a.lineGroup !== currentLineGroup), originBaseUrl);
+                        await setBaseUrl(fallbackList);
+                    }
+                    else {
+                        await loadBackupAddress();
+                    }
                 }
-                catch (err) {
-                    this.domainBaseUrl = toStandardUrl(backUrl?.length > 0 ? backUrl[0] : OriginBaseUrl[0]);
-                    console.warn("⚠️ 备选测速失败，使用备用配置:", this.domainBaseUrl);
+                catch {
+                    try {
+                        await loadBackupAddress();
+                    }
+                    catch {
+                        this.domainBaseUrl = toStandardUrl(originBaseUrl[0]);
+                        console.warn("⚠️ 备选测速失败，使用备用配置:", this.domainBaseUrl);
+                    }
                 }
             }
             return this.domainBaseUrl;
         }
         catch (err) {
-            if (this.getIsApp()) {
-                if (this.appGateway) {
-                    this.domainBaseUrl = toStandardUrl(this.appGateway);
-                    console.info("🏠 使用app传入网关:", this.domainBaseUrl);
-                    return this.domainBaseUrl;
-                }
-            }
-            else {
-                this.domainBaseUrl =
-                    this.defaultBaseUrl ||
-                        toStandardUrl(this.backupAddressList?.length > 0
-                            ? this.backupAddressList[0]
-                            : this.OriginBaseUrl[0]);
-                console.info("🏠 使用默认 BaseUrl1:", this.domainBaseUrl);
+            /** 5️⃣ 最终兜底 */
+            if (this.getIsApp() && this.appGateway) {
+                this.domainBaseUrl = toStandardUrl(this.appGateway);
+                console.info("🏠 使用app传入网关:", this.domainBaseUrl);
                 return this.domainBaseUrl;
             }
+            this.domainBaseUrl =
+                this.defaultBaseUrl ||
+                    toStandardUrl(this.backupAddressList?.length > 0
+                        ? this.backupAddressList[0]
+                        : this.OriginBaseUrl[0]);
+            console.info("🏠 使用默认 BaseUrl:", this.domainBaseUrl);
             console.error("⚠️ 加载 lineAddress.txt 失败:", err);
-            return null;
+            return this.domainBaseUrl ?? null;
         }
     }
 }

package/dist/init/utils.js

@@ -138,41 +138,59 @@ export async function getOptimalDecodedString(arr, options) {
             ? targetArr.filter(isIPv4)
             : targetArr.filter((v) => !isIPv4(v));
     }
+    if (!targetArr.length) {
+        throw new Error("过滤后数组为空");
+    }
     const failedUrls = [];
     const controllerMap = {};
     return new Promise((resolve, reject) => {
         let resolved = false;
+        let pendingCount = targetArr.length;
+        const checkAllFailed = () => {
+            if (!resolved && pendingCount === 0) {
+                // 所有请求都完成了，但没有一个成功
+                if (error) {
+                    error(failedUrls);
+                }
+                reject({ message: "测速全部失败", failedUrls });
+            }
+        };
         targetArr.forEach((url) => {
             const controller = new AbortController();
             controllerMap[url] = controller;
             const timeoutId = setTimeout(() => {
                 controller.abort();
                 failedUrls.push(url);
+                pendingCount--;
+                checkAllFailed();
             }, 3000);
             fetch(`${toStandardUrl(url)}/actuator-security/health?t=${Date.now()}`, {
                 signal: controller.signal,
             })
-                .then(() => {
+                .then((response) => {
                 clearTimeout(timeoutId);
+                if (!response.ok) {
+                    throw new Error(`HTTP ${response.status}`);
+                }
                 if (!resolved) {
                     resolved = true;
+                    // 成功时中止所有其他请求
+                    Object.values(controllerMap).forEach((c) => {
+                        if (c !== controller)
+                            c.abort();
+                    });
                     resolve(url);
                 }
             })
-                .catch(() => {
+                .catch((err) => {
                 clearTimeout(timeoutId);
-                failedUrls.push(url);
+                if (!failedUrls.includes(url)) {
+                    failedUrls.push(url);
+                }
+                pendingCount--;
+                checkAllFailed();
             });
         });
-        // 等待所有请求完成
-        setTimeout(() => {
-            if (failedUrls.length && error) {
-                error(failedUrls);
-            }
-            if (!resolved) {
-                reject({ message: "测速全部失败", failedUrls });
-            }
-        }, 3500);
     });
 }
 /**

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.4.18";
+export declare const VERSION = "1.4.20";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "1.4.18";
+export const VERSION = "1.4.20";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hifun-tools",
-  "version": "1.4.19",
+  "version": "1.4.21",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",