hifun-tools 1.4.28 → 1.4.35

package/dist/init/index.d.ts

@@ -30,6 +30,7 @@ declare class InitCls {
         appGateway?: string;
         backupAddress?: string[];
         retry?: boolean;
+        lineDictData?: string;
     }): Promise<(string | null)[]>;
     getOnlyBackup(): boolean;
     setOnlyBackup(value: boolean): void;
@@ -49,7 +50,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, // 提取这个参数
+         } = options;
         if (defaultBaseUrl)
             this.defaultBaseUrl = defaultBaseUrl;
         if (localPath)
@@ -44,7 +45,7 @@ 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...");
@@ -102,11 +103,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 +119,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));
@@ -319,10 +351,10 @@ class InitCls {
             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 : "");
-            console.log("++++++++++");
             /** 3️⃣ 主线路测速 */
             try {
                 await setBaseUrl(baseUrlList);
+                localStorage.removeItem("retryHttpTime");
                 console.info("✅ 成功加载生产环境配置:", this.domainBaseUrl);
             }
             catch {
@@ -331,6 +363,7 @@ class InitCls {
                     if (this.ErrorDomainUrl?.length == 0) {
                         const fallbackList = filterSmartLines(tenantDictList.filter((a) => a.lineGroup !== currentLineGroup), originBaseUrl);
                         await setBaseUrl(fallbackList);
+                        localStorage.removeItem("retryHttpTime");
                     }
                     else {
                         await loadBackupAddress();
@@ -342,6 +375,7 @@ class InitCls {
                     }
                     catch {
                         this.domainBaseUrl = toStandardUrl(originBaseUrl[0]);
+                        localStorage.removeItem("retryHttpTime");
                         console.warn("⚠️ 备选测速失败，使用备用配置:", this.domainBaseUrl);
                         this.onlyBackUp = true;
                     }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.4.27";
+export declare const VERSION = "1.4.34";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "1.4.27";
+export const VERSION = "1.4.34";

package/package.json

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