hifun-tools 1.4.17 → 1.4.18

package/dist/init/index.d.ts

@@ -6,12 +6,15 @@ declare class InitCls {
     private appGateway;
     private appLine;
     private appTenant;
+    private backupAddress;
+    private backupAddressList;
     private defaultBaseUrl;
     private domainBaseUrl;
     private ErrorDomainUrl;
     private initialized;
     isRefreshNow: boolean;
     private localPath;
+    private OriginBaseUrl;
     private tenant;
     private tenantConfig;
     private tenantDict;
@@ -24,6 +27,7 @@ declare class InitCls {
         appLine?: string;
         appTenant?: string;
         appGateway?: string;
+        backupAddress?: string[];
     }): Promise<(string | null)[]>;
     /** 是否 App 环境 */
     getIsApp(): boolean;
@@ -48,6 +52,8 @@ declare class InitCls {
     refreshHttp(): Promise<void>;
     /** 获取 lineDict.txt 内容 */
     private _fetchLineDict;
+    /** 按顺序依次请求 txt 文件，成功即返回内容，全部失败返回空字符串 */
+    private fetchTxtFile;
     /** 获取并处理 lineAddress.txt */
     private _loadGatewayConfig;
 }

package/dist/init/index.js

@@ -1,33 +1,38 @@
 // index.ts
 import { getResource } from "./getResource";
-import { isDomainMatch, filterSmartLines, getOptimalDecodedString, matchBrowser, toStandardUrl, difArr, } from "./utils";
+import { isDomainMatch, filterSmartLines, getOptimalDecodedString, matchBrowser, toStandardUrl, } from "./utils";
 import { AesDecrypt, AesEncrypt } from "./ende";
 import { closeLoadingText, loadingText, rewardMsg } from "../msg";
 import { Cache } from "../utils";
-import { difference } from "lodash-es";
+import { uniq } from "lodash-es";
 class InitCls {
     AesDecrypt = AesDecrypt;
     AesEncrypt = AesEncrypt;
     appGateway = "";
     appLine = "";
     appTenant = "";
+    backupAddress = [];
+    backupAddressList = [];
     defaultBaseUrl = "";
     domainBaseUrl = "";
     ErrorDomainUrl = Cache("ErrorDomainUrl") || [];
     initialized = false;
     isRefreshNow = false;
     localPath = "";
+    OriginBaseUrl = [];
     tenant = "";
     tenantConfig = null;
     tenantDict = null;
     tenantDictList = [];
     /** 初始化配置入口 */
     async InitConfig(options) {
-        const { fileType, defaultBaseUrl, localPath, appLine, appTenant, appGateway = "", } = options;
+        const { fileType, defaultBaseUrl, localPath, appLine, appTenant, appGateway = "", backupAddress, } = options;
         if (defaultBaseUrl)
             this.defaultBaseUrl = defaultBaseUrl;
         if (localPath)
             this.localPath = localPath;
+        if (backupAddress)
+            this.backupAddress = backupAddress;
         if (appLine && appTenant) {
             this.appLine = appLine;
             this.appTenant = appTenant;
@@ -175,7 +180,8 @@ class InitCls {
                 log("停止每秒日志");
             }
         };
-        const retrySchedule = [5, 15, 30]; // 秒（绝对时间点）
+        // const retrySchedule = [5, 15, 30]; // 秒（绝对时间点）
+        const retrySchedule = [3]; // 秒（绝对时间点）
         const tryRequest = async (label) => {
             log(`${label}：开始请求`);
             try {
@@ -214,10 +220,12 @@ class InitCls {
                 log("30 秒后仍失败，进入兜底逻辑 ❗");
                 closeLoadingText();
                 this.isRefreshNow = false;
-                Cache("ErrorDomainUrl", [...this.ErrorDomainUrl, this.domainBaseUrl]);
+                const nowLineGroup = this.tenantDictList.find((a) => toStandardUrl(a.line) == toStandardUrl(this.domainBaseUrl))?.lineGroup;
+                if (!!nowLineGroup)
+                    Cache("ErrorDomainUrl", uniq([...this.ErrorDomainUrl, nowLineGroup]));
                 rewardMsg({
                     title: "提示",
-                    text: "网络环境异常，刷新页面以重置",
+                    text: "网络环境异常，刷新页面以重置" + (nowLineGroup ? "" : "..."),
                     onSubmit() {
                         location.reload();
                     },
@@ -242,6 +250,27 @@ class InitCls {
             throw new Error(`HTTP 错误: ${response.status}`);
         return response.text();
     }
+    /** 按顺序依次请求 txt 文件，成功即返回内容，全部失败返回空字符串 */
+    async fetchTxtFile(urls) {
+        for (const url of urls) {
+            try {
+                const response = await fetch(`${url}?t=${Date.now()}`, {
+                    method: "GET",
+                    cache: "no-store",
+                });
+                if (!response.ok) {
+                    throw new Error(`HTTP 错误: ${response.status}`);
+                }
+                return await response.text();
+            }
+            catch (err) {
+                // 当前 url 失败，继续请求下一个
+                continue;
+            }
+        }
+        // 所有 url 都失败
+        return "";
+    }
     /** 获取并处理 lineAddress.txt */
     async _loadGatewayConfig() {
         if (this.domainBaseUrl)
@@ -250,32 +279,26 @@ class InitCls {
             const response = await fetch(`/lineAddress.txt?t=${Date.now()}`);
             const configText = await response.text();
             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();
+            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, lineGroup);
+            let baseUrl = filterSmartLines(dictList, OriginBaseUrl, this.ErrorDomainUrl?.length == 0 ? lineGroup : "");
             try {
                 this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(baseUrl));
                 console.info("✅ 成功加载生产环境配置:", this.domainBaseUrl);
             }
-            catch {
+            catch (error) {
+                const backUrl = JSON.parse(AesDecrypt(await this.fetchTxtFile(this.backupAddress)));
+                this.backupAddressList = backUrl || [];
                 // 备用策略
-                let allBaseUrl = filterSmartLines(dictList, OriginBaseUrl);
                 try {
-                    this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(difArr(allBaseUrl, baseUrl), {
-                        filterIp: false,
-                    }));
+                    this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(backUrl));
                     console.info("✅ 备用配置成功:", this.domainBaseUrl);
                 }
                 catch (err) {
-                    this.domainBaseUrl = toStandardUrl(allBaseUrl[0]);
-                    console.warn("⚠️ 备选测速失败，使用备用配置:", allBaseUrl);
+                    this.domainBaseUrl = toStandardUrl(backUrl?.length > 0 ? backUrl[0] : OriginBaseUrl[0]);
+                    console.warn("⚠️ 备选测速失败，使用备用配置:", this.domainBaseUrl);
                 }
             }
             return this.domainBaseUrl;
@@ -288,13 +311,13 @@ class InitCls {
                     return this.domainBaseUrl;
                 }
             }
-            else if ((this.defaultBaseUrl &&
-                (location.host.includes("iggame") ||
-                    location.host.includes("localhost"))) ||
-                (!!this.localPath &&
-                    location.origin.includes(this.localPath.replace(/\/+$/, "")))) {
-                this.domainBaseUrl = toStandardUrl(this.defaultBaseUrl);
-                console.info("🏠 使用默认 BaseUrl:", this.domainBaseUrl);
+            else {
+                this.domainBaseUrl =
+                    this.defaultBaseUrl ||
+                        toStandardUrl(this.backupAddressList?.length > 0
+                            ? this.backupAddressList[0]
+                            : this.OriginBaseUrl[0]);
+                console.info("🏠 使用默认 BaseUrl1:", this.domainBaseUrl);
                 return this.domainBaseUrl;
             }
             console.error("⚠️ 加载 lineAddress.txt 失败:", err);

package/dist/version.d.ts

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

package/dist/version.js

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

package/package.json

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