hifun-tools 1.4.43 → 1.4.45

package/dist/init/index.d.ts

@@ -21,6 +21,7 @@ declare class InitCls {
     private tenantConfig;
     private tenantDict;
     private tenantDictList;
+    getDomain(e: string): string | null;
     /** 初始化配置入口 */
     InitConfig(options: {
         fileType?: string[];
@@ -55,6 +56,7 @@ declare class InitCls {
     private _getTenantInfoStrictSync;
     /** 匹配默认租户 */
     private _matchDefaultTenant;
+    getHostUrl(): string;
     retryHttp(): Promise<void>;
     refreshHttp(): Promise<void>;
     /** 获取 lineDict.txt 内容 */

package/dist/init/index.js

@@ -1,6 +1,6 @@
 // index.ts
 import { getResource } from "./getResource";
-import { isDomainMatch, filterSmartLines, getOptimalDecodedString, matchBrowser, toStandardUrl, } from "./utils";
+import { isDomainMatch, filterSmartLines, getOptimalDecodedString, matchBrowser, toStandardUrl, getHostUrl, } from "./utils";
 import { AesDecrypt, AesEncrypt } from "./ende";
 import { closeLoadingText, loadingText, rewardMsg } from "../msg";
 import { Cache } from "../utils";
@@ -27,6 +27,9 @@ class InitCls {
     tenantConfig = null;
     tenantDict = null;
     tenantDictList = [];
+    getDomain(e) {
+        return getDomain(e);
+    }
     /** 初始化配置入口 */
     async InitConfig(options) {
         const { fileType, defaultBaseUrl, localPath, appLine, appTenant, appGateway = "", backupAddress, retry = false, lineDictData, lineAddressData, // ✨ 提取参数
@@ -128,7 +131,7 @@ class InitCls {
         if (lineDictData) {
             try {
                 const data = JSON.parse(AesDecrypt(lineDictData));
-                const host = getHostUrl();
+                const host = this.getHostUrl();
                 if (this.getIsApp()) {
                     this.tenantDict = {
                         browserCheck: [],
@@ -159,7 +162,7 @@ class InitCls {
         try {
             const rawText = await this._fetchLineDict();
             const data = JSON.parse(AesDecrypt(rawText));
-            const host = getHostUrl();
+            const host = this.getHostUrl();
             this.tenantDictList = [...data];
             if (this.getIsApp()) {
                 this.tenantDict = {
@@ -187,7 +190,7 @@ class InitCls {
     }
     /** 匹配默认租户 */
     _matchDefaultTenant() {
-        const host = getHostUrl();
+        const host = this.getHostUrl();
         if (this.getIsApp()) {
             console.info("🏠 匹配到app传入租户");
             return { tenant: this.appTenant };
@@ -201,6 +204,9 @@ class InitCls {
         }
         throw new Error("无法获取有效的租户信息");
     }
+    getHostUrl() {
+        return getHostUrl(location.host);
+    }
     async retryHttp() {
         try {
             if (this.onlyBackUp)
@@ -413,8 +419,5 @@ class InitCls {
 }
 const HF = new InitCls();
 const t1BackGateWay = ["https://s3.t1game888.com/gateway/lineAddress.txt"];
-function getHostUrl() {
-    return getDomain(location.host) ? getDomain(location.host) : location.host;
-}
 window.HF = HF;
 export { HF, isDomainMatch, toStandardUrl, AesEncrypt, AesDecrypt, filterSmartLines, matchBrowser, getOptimalDecodedString, };

package/dist/init/utils.d.ts

@@ -4,6 +4,7 @@ export type TenantDict = {
     lineGroup: string;
     tenant: string;
 };
+export declare function getHostUrl(e: string): string;
 /** 保留端口，去掉协议 */
 export declare function normalizeHost(hostname: string): string;
 /** 域名严格匹配，允许 www 特例 */

package/dist/init/utils.js

@@ -1,8 +1,12 @@
+import { getDomain } from "tldts";
 /** 浏览器识别（结果缓存） */
 let cachedBrowser = null;
 let retryHttpTime = localStorage.getItem("retryHttpTime")
     ? Number(localStorage.getItem("retryHttpTime"))
     : 3000;
+export function getHostUrl(e) {
+    return getDomain(e) ? getDomain(e) : e;
+}
 /** 保留端口，去掉协议 */
 export function normalizeHost(hostname) {
     hostname = hostname.trim().toLowerCase();
@@ -20,7 +24,8 @@ export function normalizeHost(hostname) {
 /** 域名严格匹配，允许 www 特例 */
 export function isDomainStrictEqual(a, b) {
     const stripWww = (h) => (h.startsWith("www.") ? h.slice(4) : h);
-    return stripWww(normalizeHost(a)) === stripWww(normalizeHost(b));
+    return (getHostUrl(stripWww(normalizeHost(a))) ===
+        getHostUrl(stripWww(normalizeHost(b))));
 }
 export function isDomainMatch(list, target) {
     const t = normalizeHost(target);

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.4.42";
+export declare const VERSION = "1.4.44";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "1.4.42";
+export const VERSION = "1.4.44";

package/package.json

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