hifun-tools 1.4.29 → 1.4.36

package/dist/init/index.d.ts

@@ -30,6 +30,8 @@ declare class InitCls {
         appGateway?: string;
         backupAddress?: string[];
         retry?: boolean;
+        lineDictData?: string;
+        lineAddressData?: string;
     }): Promise<(string | null)[]>;
     getOnlyBackup(): boolean;
     setOnlyBackup(value: boolean): void;
@@ -49,7 +51,6 @@ declare class InitCls {
     getImgPath(imgName: string): string;
     /** 严格初始化租户信息 */
     private _initializeTenant;
-    /** 严格同步获取租户信息 */
     private _getTenantInfoStrictSync;
     /** 匹配默认租户 */
     private _matchDefaultTenant;

package/dist/init/index.js

@@ -27,7 +27,8 @@ class InitCls {
     tenantDictList = [];
     /** 初始化配置入口 */
     async InitConfig(options) {
-        const { fileType, defaultBaseUrl, localPath, appLine, appTenant, appGateway = "", backupAddress, retry, } = options;
+        const { fileType, defaultBaseUrl, localPath, appLine, appTenant, appGateway = "", backupAddress, retry, lineDictData, lineAddressData, // ✨ 提取参数
+         } = options;
         if (defaultBaseUrl)
             this.defaultBaseUrl = defaultBaseUrl;
         if (localPath)
@@ -44,11 +45,12 @@ class InitCls {
         const results = [];
         if (fileType?.includes("lineDict")) {
             console.info("初始化 lineDict...");
-            results.push(await this._initializeTenant());
+            results.push(await this._initializeTenant(lineDictData)); // 将参数传递给初始化方法
         }
         if (fileType?.includes("lineAddress")) {
             console.info("初始化 lineAddress...");
-            results.push(await this._loadGatewayConfig(retry));
+            // ✨ 将 lineAddressData 传递给加载方法
+            results.push(await this._loadGatewayConfig(retry, lineAddressData));
         }
         console.info("✅ 所有初始化完成:", results);
         return results;
@@ -102,11 +104,11 @@ class InitCls {
         return getResource(`${this.tenant}/image/${imgName}`);
     }
     /** 严格初始化租户信息 */
-    async _initializeTenant() {
+    async _initializeTenant(lineDictData) {
         if (this.initialized)
             return this.tenant;
         try {
-            const tenantInfo = await this._getTenantInfoStrictSync();
+            const tenantInfo = await this._getTenantInfoStrictSync(lineDictData);
             this.tenant = tenantInfo.tenant;
             this.tenantConfig = getResource(`${this.tenant}/config.json`);
             this.initialized = true;
@@ -118,8 +120,39 @@ class InitCls {
             throw err;
         }
     }
-    /** 严格同步获取租户信息 */
-    async _getTenantInfoStrictSync() {
+    async _getTenantInfoStrictSync(lineDictData) {
+        // 尝试使用传入的lineDictData进行匹配
+        if (lineDictData) {
+            try {
+                const data = JSON.parse(AesDecrypt(lineDictData));
+                const host = location.host;
+                if (this.getIsApp()) {
+                    this.tenantDict = {
+                        browserCheck: [],
+                        line: host,
+                        lineGroup: this.appLine,
+                        tenant: this.appTenant,
+                    };
+                    this.tenantDictList = [...data, this.tenantDict];
+                    console.info("🏠 匹配 App 租户:", this.tenantDict);
+                    return { tenant: this.appTenant };
+                }
+                const matched = data.find((item) => isDomainMatch([item.line], host));
+                if (matched) {
+                    this.tenantDictList = [...data];
+                    this.tenantDict = matched;
+                    console.info("🏠 匹配租户:", matched.tenant);
+                    return { tenant: matched.tenant };
+                }
+                // 如果传入的数据没有匹配到，继续执行下面的原始逻辑
+                console.info("⚠️ 传入的 lineDictData 未匹配到租户，尝试原始逻辑");
+            }
+            catch (err) {
+                console.warn("⚠️ 解析传入的 lineDictData 失败:", err);
+                // 如果传入的数据解析失败，也继续执行下面的原始逻辑
+            }
+        }
+        // 如果没有传入数据或传入数据匹配失败，执行原始逻辑
         try {
             const rawText = await this._fetchLineDict();
             const data = JSON.parse(AesDecrypt(rawText));
@@ -291,82 +324,84 @@ class InitCls {
         return "";
     }
     /** 获取并处理 lineAddress.txt */
-    async _loadGatewayConfig(retry = false) {
+    async _loadGatewayConfig(retry = false, lineAddressData) {
         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 () => {
-            if (this.tenant === "t1sport")
-                this.backupAddress = t1BackGateWay;
-            const backupList = JSON.parse(AesDecrypt(await this.fetchTxtFile(this.backupAddress)));
-            this.backupAddressList = backupList || [];
-            await setBaseUrl(this.backupAddressList);
-            console.info("✅ 备用远程Address配置成功:", this.domainBaseUrl);
+        /** 封装：根据传入的加密字符串执行测速流程 */
+        const trySpeedTestWithData = async (encryptedData, label) => {
+            try {
+                console.info(`🧪 尝试使用 [${label}] 进行解析和测速...`);
+                const originBaseUrl = JSON.parse(AesDecrypt(encryptedData));
+                this.OriginBaseUrl = originBaseUrl;
+                // 计算智能线路
+                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 : "");
+                // 执行测速
+                await setBaseUrl(baseUrlList);
+                console.info(`✅ [${label}] 测速成功:`, this.domainBaseUrl);
+                return true;
+            }
+            catch (e) {
+                console.warn(`⚠️ [${label}] 流程失败 (解析或测速未通过)`);
+                return false;
+            }
         };
         this.onlyBackUp = false;
+        // --- 核心执行流 ---
+        // 1️⃣ 第一优先级：如果有传入 lineAddressData，先跑一遍完整流程
+        if (lineAddressData) {
+            const success = await trySpeedTestWithData(lineAddressData, "传入参数 lineAddressData");
+            if (success) {
+                localStorage.removeItem("retryHttpTime");
+                return this.domainBaseUrl;
+            }
+        }
+        // 2️⃣ 第二优先级：如果上面失败了或没传，执行原始 fetch 逻辑
         try {
-            /** 1️⃣ 读取主配置 */
+            console.info("🌐 正在从服务端请求 lineAddress.txt 作为兜底...");
             const response = await fetch(`/lineAddress.txt?t=${Date.now()}`);
             const configText = await response.text();
-            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 {
-                await setBaseUrl(baseUrlList);
+            const success = await trySpeedTestWithData(configText, "远程文件 lineAddress.txt");
+            if (success) {
                 localStorage.removeItem("retryHttpTime");
-                console.info("✅ 成功加载生产环境配置:", this.domainBaseUrl);
-            }
-            catch {
-                /** 4️⃣ 降级策略 */
-                try {
-                    if (this.ErrorDomainUrl?.length == 0) {
-                        const fallbackList = filterSmartLines(tenantDictList.filter((a) => a.lineGroup !== currentLineGroup), originBaseUrl);
-                        await setBaseUrl(fallbackList);
-                        localStorage.removeItem("retryHttpTime");
-                    }
-                    else {
-                        await loadBackupAddress();
-                    }
-                }
-                catch {
-                    try {
-                        await loadBackupAddress();
-                    }
-                    catch {
-                        this.domainBaseUrl = toStandardUrl(originBaseUrl[0]);
-                        localStorage.removeItem("retryHttpTime");
-                        console.warn("⚠️ 备选测速失败，使用备用配置:", this.domainBaseUrl);
-                        this.onlyBackUp = true;
-                    }
-                }
+                return this.domainBaseUrl;
             }
-            return this.domainBaseUrl;
         }
         catch (err) {
-            /** 5️⃣ 最终兜底 */
+            console.error("❌ 远程 lineAddress.txt 获取失败", err);
+        }
+        // 3️⃣ 降级策略：如果传入数据和远程文件都测速失败，进入备用/App兜底
+        try {
+            console.info("🚑 尝试最终降级逻辑 (备用地址/App配置)...");
+            // 这里执行你原本代码里的 loadBackupAddress 等逻辑
             if (this.getIsApp() && this.appGateway) {
                 this.domainBaseUrl = toStandardUrl(this.appGateway);
-                console.info("🏠 使用app传入网关:", this.domainBaseUrl);
                 return this.domainBaseUrl;
             }
+            // 尝试备用地址
+            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 || [];
+                await setBaseUrl(this.backupAddressList);
+                return this.domainBaseUrl;
+            }
+        }
+        catch (finalErr) {
+            // 最终无奈的保底：取第一个已知的 URL
             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 this.domainBaseUrl ?? null;
+                this.defaultBaseUrl || toStandardUrl(this.OriginBaseUrl[0] || "");
+            this.onlyBackUp = true;
+            console.warn("⚠️ 所有链路均不可用，使用最后保底地址:", this.domainBaseUrl);
         }
+        return this.domainBaseUrl || null;
     }
 }
 const HF = new InitCls();

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.4.28";
+export declare const VERSION = "1.4.35";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "1.4.28";
+export const VERSION = "1.4.35";

package/package.json

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