hifun-tools 1.4.11 → 1.4.13

package/dist/init/index.d.ts

@@ -8,7 +8,9 @@ declare class InitCls {
     private appTenant;
     private defaultBaseUrl;
     private domainBaseUrl;
+    private ErrorDomainUrl;
     private initialized;
+    isRefreshNow: boolean;
     private localPath;
     private tenant;
     private tenantConfig;

package/dist/init/index.js

@@ -2,7 +2,9 @@
 import { getResource } from "./getResource";
 import { isDomainMatch, filterSmartLines, getOptimalDecodedString, matchBrowser, toStandardUrl, difArr, } from "./utils";
 import { AesDecrypt, AesEncrypt } from "./ende";
-import { rewardMsg } from "../msg";
+import { closeLoadingText, loadingText, rewardMsg } from "../msg";
+import { Cache } from "../utils";
+import { difference } from "lodash-es";
 class InitCls {
     AesDecrypt = AesDecrypt;
     AesEncrypt = AesEncrypt;
@@ -11,7 +13,9 @@ class InitCls {
     appTenant = "";
     defaultBaseUrl = "";
     domainBaseUrl = "";
+    ErrorDomainUrl = Cache("ErrorDomainUrl") || [];
     initialized = false;
+    isRefreshNow = false;
     localPath = "";
     tenant = "";
     tenantConfig = null;
@@ -150,17 +154,82 @@ class InitCls {
         throw new Error("无法获取有效的租户信息");
     }
     async refreshHttp() {
+        const startTime = Date.now();
+        const log = (msg) => {
+            const t = ((Date.now() - startTime) / 1000).toFixed(1);
+            console.log(`[refreshHttp +${t}s] ${msg}`);
+        };
+        this.isRefreshNow = true;
+        log("进入函数，isRefreshNow = true");
+        let success = false;
+        let finished = false;
+        // ⏱ 每秒心跳日志
+        const ticker = setInterval(() => {
+            const t = Math.floor((Date.now() - startTime) / 1000);
+            console.log(`[refreshHttp ⏱ ${t}s] alive`);
+        }, 1000);
+        const clearTicker = () => {
+            if (!finished) {
+                finished = true;
+                clearInterval(ticker);
+                log("停止每秒日志");
+            }
+        };
+        const retrySchedule = [5, 15, 30]; // 秒（绝对时间点）
+        const tryRequest = async (label) => {
+            log(`${label}：开始请求`);
+            try {
+                loadingText("网络环境异常，正在重连...");
+                await getOptimalDecodedString([this.getBaseUrl()]);
+                success = true;
+                closeLoadingText();
+                this.isRefreshNow = false;
+                log(`${label}：请求成功 ✅`);
+                clearTicker();
+                return true;
+            }
+            catch (err) {
+                log(`${label}：请求失败 ❌`);
+                return false;
+            }
+        };
         try {
-            await getOptimalDecodedString([this.getBaseUrl()]);
+            // 立即请求
+            await tryRequest("首次");
+            // 按 5 / 15 / 30 秒重试
+            for (const at of retrySchedule) {
+                if (success)
+                    break;
+                const wait = startTime + at * 1000 - Date.now();
+                if (wait > 0) {
+                    log(`等待到第 ${at}s（剩余 ${Math.ceil(wait / 1000)}s）`);
+                    await new Promise((r) => setTimeout(r, wait));
+                }
+                if (success)
+                    break;
+                await tryRequest(`第 ${at}s 重试`);
+            }
+            // 30 秒后仍失败
+            if (!success) {
+                log("30 秒后仍失败，进入兜底逻辑 ❗");
+                closeLoadingText();
+                this.isRefreshNow = false;
+                Cache("ErrorDomainUrl", [...this.ErrorDomainUrl, this.domainBaseUrl]);
+                rewardMsg({
+                    title: "提示",
+                    text: "网络环境异常，刷新页面以重置",
+                    onSubmit() {
+                        location.reload();
+                    },
+                });
+            }
+        }
+        catch (e) {
+            log("发生异常：" + e);
+            this.isRefreshNow = false;
         }
-        catch (error) {
-            rewardMsg({
-                title: "提示",
-                text: "网络环境异常，刷新页面以重置",
-                onSubmit() {
-                    location.reload();
-                },
-            });
+        finally {
+            clearTicker();
         }
     }
     /** 获取 lineDict.txt 内容 */
@@ -180,7 +249,14 @@ class InitCls {
         try {
             const response = await fetch(`/lineAddress.txt?t=${Date.now()}`);
             const configText = await response.text();
-            const OriginBaseUrl = JSON.parse(AesDecrypt(configText));
+            const resArray = JSON.parse(AesDecrypt(configText));
+            let OriginBaseUrl = [];
+            if (this.ErrorDomainUrl.length < resArray.length) {
+                OriginBaseUrl = difference(resArray, this.ErrorDomainUrl);
+            }
+            else {
+                OriginBaseUrl = resArray;
+            }
             const dictList = this.getTenantDictList();
             const lineGroup = this.getTenantDict()?.lineGroup;
             let baseUrl = filterSmartLines(dictList, OriginBaseUrl, lineGroup);

package/dist/msg/index.d.ts

@@ -16,3 +16,5 @@ export interface RewardOptions {
     onClose?: () => void;
 }
 export declare function rewardMsg(options: RewardOptions): void;
+export declare function loadingText(text?: string): void;
+export declare function closeLoadingText(): void;

package/dist/msg/index.js

@@ -1,4 +1,7 @@
 let isRewardShowing = false;
+// --------------------------- loadingText ---------------------------
+let loadingMask = null;
+let loadingTextEl = null;
 // --------------------------- 普通消息 ---------------------------
 let messageStackContainer = null;
 // --------------------------- reward 弹窗 ---------------------------
@@ -268,3 +271,51 @@ export function rewardMsg(options) {
     rewardQueue.push(options);
     showNextReward();
 }
+export function loadingText(text) {
+    if (text) {
+        if (!loadingMask) {
+            loadingMask = document.createElement("div");
+            Object.assign(loadingMask.style, {
+                position: "fixed",
+                top: "0",
+                left: "0",
+                width: "100vw",
+                height: "100vh",
+                background: "rgba(0,0,0,0)", // 透明蒙层
+                zIndex: "1000000",
+                pointerEvents: "auto", // 阻止所有操作
+                display: "flex",
+                justifyContent: "center",
+                alignItems: "flex-start",
+            });
+            loadingTextEl = document.createElement("div");
+            Object.assign(loadingTextEl.style, {
+                marginTop: "20px",
+                padding: "8px 16px",
+                background: "rgba(0,0,0,0.6)",
+                color: "#fff",
+                borderRadius: "8px",
+                fontSize: "14px",
+                fontWeight: "500",
+                maxWidth: "80%",
+                textAlign: "center",
+                wordBreak: "break-word",
+                boxShadow: "0 4px 12px rgba(0,0,0,0.2)",
+            });
+            loadingMask.appendChild(loadingTextEl);
+            document.body.appendChild(loadingMask);
+        }
+        loadingTextEl.textContent = text;
+        return;
+    }
+    // 如果没传 text，则关闭
+    closeLoadingText();
+}
+// 专门关闭函数
+export function closeLoadingText() {
+    if (loadingMask) {
+        loadingMask.remove();
+        loadingMask = null;
+        loadingTextEl = null;
+    }
+}

package/dist/utils/index.d.ts

@@ -1,4 +1,5 @@
 export declare function Local(name: string, value?: any, time?: number): any;
+export declare function Cache(name: string, value?: any, time?: number): any;
 /**
  * 获取链接参数
  * @param name

package/dist/utils/index.js

@@ -32,6 +32,40 @@ export function Local(name, value, time) {
         }
     }
 }
+export function Cache(name, value, time) {
+    const date = Number(new Date().getTime() / 1000);
+    if (value === null) {
+        sessionStorage.removeItem(name);
+    }
+    else if (value !== undefined) {
+        if (time) {
+            sessionStorage.setItem(name, JSON.stringify({ time: date + time, value }));
+        }
+        else {
+            sessionStorage.setItem(name, JSON.stringify({ value }));
+        }
+    }
+    else {
+        const v = sessionStorage.getItem(name);
+        if (v) {
+            if (JSON.parse(v).time) {
+                if (JSON.parse(v).time - date > 0) {
+                    return JSON.parse(v).value;
+                }
+                else {
+                    sessionStorage.removeItem(name);
+                    return undefined;
+                }
+            }
+            else {
+                return JSON.parse(v).value;
+            }
+        }
+        else {
+            return undefined;
+        }
+    }
+}
 /**
  * 获取链接参数
  * @param name

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.4.10";
+export declare const VERSION = "1.4.12";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "1.4.10";
+export const VERSION = "1.4.12";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hifun-tools",
-  "version": "1.4.11",
+  "version": "1.4.13",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,9 +20,11 @@
     "@babel/core": "^7.28.5",
     "@babel/preset-typescript": "^7.28.5",
     "@types/jest": "^30.0.0",
+    "@types/lodash-es": "^4.17.12",
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.2.0",
     "jscodeshift": "^17.3.0",
+    "lodash-es": "^4.17.22",
     "prettier": "^3.6.2",
     "ts-jest": "^29.4.5",
     "typescript": "^5.6.3"