hifun-tools 1.3.32 → 1.4.2

package/dist/init/index.d.ts

@@ -3,6 +3,7 @@ import { AesDecrypt, AesEncrypt } from "./ende";
 declare class InitCls {
     AesDecrypt: typeof AesDecrypt;
     AesEncrypt: typeof AesEncrypt;
+    private appGateway;
     private appLine;
     private appTenant;
     private defaultBaseUrl;
@@ -20,6 +21,7 @@ declare class InitCls {
         localPath?: string;
         appLine?: string;
         appTenant?: string;
+        appGateway?: string;
     }): Promise<(string | null)[]>;
     /** 是否 App 环境 */
     getIsApp(): boolean;
@@ -41,7 +43,7 @@ declare class InitCls {
     private _getTenantInfoStrictSync;
     /** 匹配默认租户 */
     private _matchDefaultTenant;
-    refreshHttp(): void;
+    refreshHttp(): Promise<void>;
     /** 获取 lineDict.txt 内容 */
     private _fetchLineDict;
     /** 获取并处理 lineAddress.txt */

package/dist/init/index.js

@@ -6,6 +6,7 @@ import { rewardMsg } from "../msg";
 class InitCls {
     AesDecrypt = AesDecrypt;
     AesEncrypt = AesEncrypt;
+    appGateway = "";
     appLine = "";
     appTenant = "";
     defaultBaseUrl = "";
@@ -18,7 +19,7 @@ class InitCls {
     tenantDictList = [];
     /** 初始化配置入口 */
     async InitConfig(options) {
-        const { fileType, defaultBaseUrl, localPath, appLine, appTenant } = options;
+        const { fileType, defaultBaseUrl, localPath, appLine, appTenant, appGateway = "", } = options;
         if (defaultBaseUrl)
             this.defaultBaseUrl = defaultBaseUrl;
         if (localPath)
@@ -26,6 +27,7 @@ class InitCls {
         if (appLine && appTenant) {
             this.appLine = appLine;
             this.appTenant = appTenant;
+            this.appGateway = appGateway;
             console.info("📱 appLine:", appLine, "appTenant:", appTenant);
         }
         console.info("📝 加载类型:", fileType);
@@ -134,7 +136,11 @@ class InitCls {
     /** 匹配默认租户 */
     _matchDefaultTenant() {
         const host = location.host;
-        if (host.includes("iggame") ||
+        if (this.getIsApp()) {
+            console.info("🏠 匹配到app传入租户");
+            return { tenant: this.appTenant };
+        }
+        else if (host.includes("iggame") ||
             host.includes("localhost") ||
             (!!this.localPath &&
                 location.origin.includes(this.localPath.replace(/\/+$/, "")))) {
@@ -143,9 +149,9 @@ class InitCls {
         }
         throw new Error("无法获取有效的租户信息");
     }
-    refreshHttp() {
+    async refreshHttp() {
         try {
-            getOptimalDecodedString([this.getBaseUrl()]);
+            await getOptimalDecodedString([this.getBaseUrl()]);
         }
         catch (error) {
             rewardMsg({
@@ -199,8 +205,14 @@ class InitCls {
             return this.domainBaseUrl;
         }
         catch (err) {
-            console.error("⚠️ 加载 lineAddress.txt 失败:", err);
-            if ((this.defaultBaseUrl &&
+            if (this.getIsApp()) {
+                if (this.appGateway) {
+                    this.domainBaseUrl = toStandardUrl(this.appGateway);
+                    console.info("🏠 使用app传入网关:", this.domainBaseUrl);
+                    return this.domainBaseUrl;
+                }
+            }
+            else if ((this.defaultBaseUrl &&
                 (location.host.includes("iggame") ||
                     location.host.includes("localhost"))) ||
                 (!!this.localPath &&
@@ -209,6 +221,7 @@ class InitCls {
                 console.info("🏠 使用默认 BaseUrl:", this.domainBaseUrl);
                 return this.domainBaseUrl;
             }
+            console.error("⚠️ 加载 lineAddress.txt 失败:", err);
             return null;
         }
     }

package/package.json

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

package/dist/init/TenantManager.d.ts

@@ -1,23 +0,0 @@
-type TenantConfig = {
-    PUBLIC_TITLE: string;
-    SITE_TITLE: string;
-    SITE_URL: string;
-    USER_TENANT: string;
-};
-export declare class TenantManagerClass {
-    private tenantConfig;
-    private initialized;
-    private static instance;
-    tenant: string | null;
-    constructor();
-    /** 获取配置 */
-    getConfig(): TenantConfig | null;
-    /** 获取租户名 */
-    getTenant(): string;
-    getImgPath(imgName: string): string;
-    /** 严格同步获取租户信息 */
-    private getTenantInfoStrictSync;
-    /** 严格初始化（必须在应用启动时调用） */
-    initialize(): void;
-}
-export {};

package/dist/init/TenantManager.js

@@ -1,94 +0,0 @@
-import { getResource } from "./getResource";
-export class TenantManagerClass {
-    tenantConfig = null;
-    initialized = false;
-    static instance;
-    tenant = null;
-    constructor() {
-        if (TenantManagerClass.instance) {
-            return TenantManagerClass.instance;
-        }
-        TenantManagerClass.instance = this;
-    }
-    /** 获取配置 */
-    getConfig() {
-        return this.tenantConfig;
-    }
-    /** 获取租户名 */
-    getTenant() {
-        if (!this.initialized || !this.tenant) {
-            throw new Error("租户尚未初始化或初始化失败");
-        }
-        return this.tenant;
-    }
-    getImgPath(imgName) {
-        if (!this.initialized || !this.tenant) {
-            throw new Error("租户尚未初始化或初始化失败");
-        }
-        return getResource(`${this.tenant}/image/${imgName}`);
-    }
-    /** 严格同步获取租户信息 */
-    getTenantInfoStrictSync() {
-        const xhr = new XMLHttpRequest();
-        xhr.open("GET", "/lineTenants.txt?t=" + Date.now(), false);
-        xhr.send(null);
-        if (xhr.status === 200) {
-            try {
-                const rawData = atob(xhr.responseText);
-                const data = JSON.parse(rawData);
-                const host = location.host;
-                const matchedEntry = Object.entries(data).find(([key]) => {
-                    // key 是明文主机地址，直接比较即可
-                    // 兼容 www 前缀的情况
-                    // 如果当前 host 有 www 前缀，则也匹配无 www 前缀的配置
-                    // 如果当前 host 无 www 前缀，则也匹配有 www 前缀的配置
-                    return (key === host ||
-                        (host.startsWith("www.") && key === host.substring(4)) ||
-                        (!host.startsWith("www.") && key === "www." + host));
-                });
-                if (matchedEntry) {
-                    const matched = matchedEntry[1];
-                    if (data && matched) {
-                        console.info(`🏠 匹配租户: ${matched}`);
-                        return { tenant: matched };
-                    }
-                }
-            }
-            catch (error) {
-                console.error("解析 lineTenants.txt 失败:", error);
-                if (location.host.includes("iggame") ||
-                    location.host.includes("localhost")) {
-                    console.info(`🏠 iggame匹配到默认租户`);
-                    return {
-                        tenant: "iggame",
-                    };
-                }
-                throw new Error("lineTenants.txt 格式错误");
-            }
-        }
-        if (location.host.includes("iggame") ||
-            location.host.includes("localhost")) {
-            console.info(`🏠 iggame匹配到默认租户`);
-            return {
-                tenant: "iggame",
-            };
-        }
-        throw new Error("无法获取有效的租户信息");
-    }
-    /** 严格初始化（必须在应用启动时调用） */
-    initialize() {
-        if (this.initialized)
-            return;
-        try {
-            const tenantInfo = this.getTenantInfoStrictSync();
-            this.tenant = tenantInfo.tenant;
-            this.tenantConfig = getResource(`${tenantInfo.tenant}/config.json`);
-            this.initialized = true;
-            console.info(`🏢 严格加载租户成功: ${this.tenant}`, this.getImgPath("logo-default.png"));
-        }
-        catch (error) {
-            console.error("严格租户加载失败:", error);
-            throw error;
-        }
-    }
-}

package/dist/init/viteResource.d.ts

@@ -1 +0,0 @@
-export declare function viteLoadSync(path: string): any;

package/dist/init/viteResource.js

@@ -1,13 +0,0 @@
-// viteResource.ts
-export function viteLoadSync(path) {
-    const modules = import.meta.glob([
-        "/config/**/*.json",
-        "/config/**/*.png",
-        "/config/**/*.jpg",
-        "/config/**/*.jpeg",
-        "/config/**/*.svg",
-        "/config/**/*.webp",
-    ], { eager: true, import: "default" });
-    const match = Object.entries(modules).find(([key]) => key.endsWith(path));
-    return match ? match[1] : null;
-}

package/dist/src/index.d.ts

@@ -1,3 +0,0 @@
-export * from "./tenant";
-export * from "./request";
-export * from "./init";

package/dist/src/index.js

@@ -1,3 +0,0 @@
-export * from "./tenant";
-export * from "./request";
-export * from "./init";

package/dist/src/init/index.d.ts

@@ -1,6 +0,0 @@
-import { InitConfig } from "../../types";
-declare class InitCls {
-    config(opt: InitConfig): void;
-}
-declare const Init: InitCls;
-export { Init };

package/dist/src/init/index.js

@@ -1,7 +0,0 @@
-class InitCls {
-    config(opt) {
-        console.log(opt);
-    }
-}
-const Init = new InitCls();
-export { Init };

package/dist/src/request/index.d.ts

@@ -1 +0,0 @@
-export declare function request(url: string, options?: RequestInit): Promise<any>;

package/dist/src/request/index.js

@@ -1,6 +0,0 @@
-export async function request(url, options = {}) {
-    const res = await fetch(url, options);
-    if (!res.ok)
-        throw new Error(`HTTP ${res.status}`);
-    return res.json();
-}

package/dist/src/tenant/index.d.ts

@@ -1,5 +0,0 @@
-declare class useTenant {
-    id: number;
-}
-declare const Tenant: useTenant;
-export { Tenant };

package/dist/src/tenant/index.js

@@ -1,7 +0,0 @@
-class useTenant {
-    constructor() {
-        this.id = 123;
-    }
-}
-const Tenant = new useTenant();
-export { Tenant };

package/dist/tenant/index.d.ts

@@ -1,5 +0,0 @@
-declare class useTenant {
-    id: number;
-}
-declare const Tenant: useTenant;
-export { Tenant };

package/dist/tenant/index.js

@@ -1,5 +0,0 @@
-class useTenant {
-    id = 123;
-}
-const Tenant = new useTenant();
-export { Tenant };

package/dist/types/index.d.ts

@@ -1,3 +0,0 @@
-export interface InitConfig {
-    fileType: ("lineAddress" | "lineTenants")[];
-}

package/dist/types/index.js

@@ -1 +0,0 @@
-export {};