hifun-tools 1.4.15 → 1.4.17

package/dist/init/index.js

@@ -2,7 +2,7 @@
 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 {
@@ -154,19 +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()]);
-        }
-        catch (error) {
-            this.isRefreshNow = true;
-            Cache("ErrorDomainUrl", [...this.ErrorDomainUrl, this.domainBaseUrl]);
-            rewardMsg({
-                title: "提示",
-                text: "网络环境异常，刷新页面以重置",
-                onSubmit() {
-                    location.reload();
-                },
-            });
+            // 立即请求
+            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;
+        }
+        finally {
+            clearTicker();
         }
     }
     /** 获取 lineDict.txt 内容 */

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.4.14";
+export declare const VERSION = "1.4.16";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "1.4.14";
+export const VERSION = "1.4.16";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hifun-tools",
-  "version": "1.4.15",
+  "version": "1.4.17",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,13 +24,13 @@
     "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"
   },
   "dependencies": {
     "crypto-js": "^4.2.0",
+    "lodash-es": "^4.17.22",
     "md5": "^2.3.0"
   }
 }