hifun-tools 1.4.47 → 1.4.49

package/dist/init/index.d.ts

@@ -15,8 +15,9 @@ declare class InitCls {
     isRefreshNow: boolean;
     private localPath;
     private onlyBackUp;
-    private OriginBaseUrl;
+    OriginBaseUrl: string[];
     retry: boolean | undefined;
+    speedDelay: number;
     private tenant;
     private tenantConfig;
     private tenantDict;
@@ -63,6 +64,13 @@ declare class InitCls {
     private _fetchLineDict;
     /** 按顺序依次请求 txt 文件，成功即返回内容，全部失败返回空字符串 */
     private fetchTxtFile;
+    /**
+     * 手动切换address线路
+     * 直接传入域名
+     */
+    switchAddressLine(line: string): void;
+    /** 手动更新线路速度延迟 */
+    updateLineDelay(speed: number): void;
     /** 获取并处理 lineAddress.txt */
     private _loadGatewayConfig;
 }

package/dist/init/index.js

@@ -23,6 +23,7 @@ class InitCls {
     onlyBackUp = false;
     OriginBaseUrl = [];
     retry = false;
+    speedDelay = 99;
     tenant = "";
     tenantConfig = null;
     tenantDict = null;
@@ -335,16 +336,116 @@ class InitCls {
         // 所有 url 都失败
         return "";
     }
+    /**
+     * 手动切换address线路
+     * 直接传入域名
+     */
+    switchAddressLine(line) {
+        this.domainBaseUrl = toStandardUrl(line);
+        console.log("切换线路为:", line);
+    }
+    /** 手动更新线路速度延迟 */
+    updateLineDelay(speed) {
+        this.speedDelay = speed;
+    }
     /** 获取并处理 lineAddress.txt */
     async _loadGatewayConfig(retry = false, lineAddressData) {
         if (this.domainBaseUrl && !retry)
             return this.domainBaseUrl;
+        // 检查 defaultBaseUrl 是否正常
         if (this.defaultBaseUrl && !retry) {
-            this.domainBaseUrl = this.defaultBaseUrl;
-            return this.domainBaseUrl;
+            try {
+                // 测试 defaultBaseUrl 是否可用
+                const startTime = Date.now();
+                // 创建 AbortController 实例用于控制超时
+                const controller = new AbortController();
+                const timeoutId = setTimeout(() => controller.abort(), 3000); // 3秒超时
+                const response = await fetch(`${toStandardUrl(this.defaultBaseUrl)}/actuator-security/health?t=${Date.now()}`, {
+                    method: "GET",
+                    cache: "no-store",
+                    signal: controller.signal, // 添加信号以支持超时
+                });
+                clearTimeout(timeoutId); // 请求完成后清除超时定时器
+                const endTime = Date.now();
+                this.speedDelay = endTime - startTime; // 记录实际速度（单位ms）
+                if (response.ok) {
+                    const tenantDictList = this.getTenantDictList().filter((a) => !this.ErrorDomainUrl.includes(a.lineGroup));
+                    this.domainBaseUrl = this.defaultBaseUrl;
+                    console.info(`✅ defaultBaseUrl 可用，响应时间: ${this.speedDelay}ms`);
+                    // 尝试获取 OriginBaseUrl 数据，不用于测速，仅用于设置 OriginBaseUrl
+                    let originBaseUrlRetrieved = false;
+                    // 1. 尝试使用传入的 lineAddressData
+                    if (lineAddressData && !originBaseUrlRetrieved) {
+                        try {
+                            const originBaseUrl = JSON.parse(AesDecrypt(lineAddressData));
+                            this.OriginBaseUrl = filterSmartLines(tenantDictList, originBaseUrl);
+                            if (this.OriginBaseUrl.length > 0)
+                                originBaseUrlRetrieved = true;
+                            console.info("✅ 使用传入的 lineAddressData 设置 OriginBaseUrl");
+                        }
+                        catch (err) {
+                            console.info("⚠️ 传入的 lineAddressData 解析失败，尝试其他方式");
+                        }
+                    }
+                    // 2. 尝试获取远程 lineAddress.txt
+                    if (!originBaseUrlRetrieved) {
+                        try {
+                            console.info("🌐 尝试获取远程 lineAddress.txt 设置 OriginBaseUrl...");
+                            const response = await fetch(`/lineAddress.txt?t=${Date.now()}`);
+                            if (response.ok) {
+                                const configText = await response.text();
+                                const originBaseUrl = JSON.parse(AesDecrypt(configText));
+                                this.OriginBaseUrl = filterSmartLines(tenantDictList, originBaseUrl);
+                                if (this.OriginBaseUrl.length > 0)
+                                    originBaseUrlRetrieved = true;
+                                console.info("✅ 使用远程 lineAddress.txt 设置 OriginBaseUrl");
+                            }
+                        }
+                        catch (err) {
+                            console.info("⚠️ 获取远程 lineAddress.txt 失败，尝试备用地址");
+                        }
+                    }
+                    // 3. 尝试备用地址
+                    if (!originBaseUrlRetrieved) {
+                        try {
+                            console.info(" ambulance 尝试备用地址设置 OriginBaseUrl...");
+                            if (this.tenant === "t1sport")
+                                this.backupAddress = t1BackGateWay;
+                            const backupRaw = await this.fetchTxtFile(this.backupAddress);
+                            if (backupRaw) {
+                                const backupList = JSON.parse(AesDecrypt(backupRaw));
+                                this.backupAddressList = backupList || [];
+                                this.OriginBaseUrl = filterSmartLines(tenantDictList, this.backupAddressList);
+                                if (this.OriginBaseUrl.length > 0)
+                                    originBaseUrlRetrieved = true;
+                                console.info("✅ 使用备用地址设置 OriginBaseUrl");
+                            }
+                        }
+                        catch (err) {
+                            console.info("⚠️ 备用地址获取失败");
+                        }
+                    }
+                    // 如果所有方式都失败了，至少保留 defaultBaseUrl
+                    if (!originBaseUrlRetrieved) {
+                        this.OriginBaseUrl = [this.defaultBaseUrl];
+                        console.info("📋 使用 defaultBaseUrl 设置 OriginBaseUrl（兜底方案）");
+                    }
+                    return this.domainBaseUrl;
+                }
+                else {
+                    console.info(`⚠️ defaultBaseUrl 不可用，HTTP状态: ${response.status}，将进入后续选择线路逻辑`);
+                }
+            }
+            catch (err) {
+                console.info(`⚠️ defaultBaseUrl 请求失败，将进入后续选择线路逻辑`);
+                console.error(err);
+            }
         }
         const setBaseUrl = async (list) => {
+            const startTime = Date.now();
             this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(list));
+            const endTime = Date.now();
+            this.speedDelay = endTime - startTime; // 记录实际速度（单位ms）
             return this.domainBaseUrl;
         };
         /** 封装：根据传入的加密字符串执行测速流程 */
@@ -393,7 +494,7 @@ class InitCls {
         }
         // 3️⃣ 降级策略：如果传入数据和远程文件都测速失败，进入备用/App兜底
         try {
-            console.info("🚑 尝试最终降级逻辑 (备用地址/App配置)...");
+            console.info(" ambulance 尝试最终降级逻辑 (备用地址/App配置)...");
             // 这里执行你原本代码里的 loadBackupAddress 等逻辑
             if (this.getIsApp() && this.appGateway) {
                 this.domainBaseUrl = toStandardUrl(this.appGateway);
@@ -406,6 +507,7 @@ class InitCls {
             if (backupRaw) {
                 const backupList = JSON.parse(AesDecrypt(backupRaw));
                 this.backupAddressList = backupList || [];
+                this.OriginBaseUrl = this.backupAddressList; // 设置OriginBaseUrl
                 await setBaseUrl(this.backupAddressList);
                 return this.domainBaseUrl;
             }
@@ -413,7 +515,9 @@ class InitCls {
         catch (finalErr) {
             // 最终无奈的保底：取第一个已知的 URL
             this.domainBaseUrl =
-                this.defaultBaseUrl || toStandardUrl(this.OriginBaseUrl[0]) || (location.origin + '/api');
+                this.defaultBaseUrl ||
+                    toStandardUrl(this.OriginBaseUrl[0]) ||
+                    location.origin + "/api";
             this.onlyBackUp = true;
             console.warn("⚠️ 所有链路均不可用，使用最后保底地址:", this.domainBaseUrl);
         }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.4.46";
+export declare const VERSION = "1.4.48";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "1.4.46";
+export const VERSION = "1.4.48";

package/package.json

@@ -1,37 +1,37 @@
-{
-  "name": "hifun-tools",
-  "version": "1.4.47",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "build": "node scripts/generate-version.js && tsc",
-    "pub": "npm run build && npm version patch && npm publish --access public",
-    "test": "jest",
-    "test:watch": "jest --watch"
-  },
-  "files": [
-    "dist"
-  ],
-  "devDependencies": {
-    "@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",
-    "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",
-    "tldts": "^7.0.28"
-  }
-}
+{
+  "name": "hifun-tools",
+  "version": "1.4.49",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "node scripts/generate-version.js && tsc",
+    "pub": "npm run build && npm version patch && npm publish --access public",
+    "test": "jest",
+    "test:watch": "jest --watch"
+  },
+  "files": [
+    "dist"
+  ],
+  "devDependencies": {
+    "@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",
+    "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",
+    "tldts": "^7.0.28"
+  }
+}