hifun-tools 1.4.44 → 1.4.45

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";
@@ -205,7 +205,7 @@ class InitCls {
         throw new Error("无法获取有效的租户信息");
     }
     getHostUrl() {
-        return getDomain(location.host) ? getDomain(location.host) : location.host;
+        return getHostUrl(location.host);
     }
     async retryHttp() {
         try {

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.43";
+export declare const VERSION = "1.4.44";

package/dist/version.js

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

package/package.json

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