hifun-tools 1.3.13 → 1.3.15

package/dist/init/__tests/utils.test.d.ts

@@ -0,0 +1,4 @@
+/**
+ * @jest-environment jsdom
+ */
+export {};

package/dist/init/__tests/utils.test.js

@@ -0,0 +1,87 @@
+/**
+ * @jest-environment jsdom
+ */
+import { isIPv4, extractRootDomain, isDomainMatch, toStandardUrl, getOptimalDecodedString, } from "../utils";
+// --------------------- isIPv4 -------------------------
+describe("isIPv4", () => {
+    test("纯 IPv4", () => {
+        expect(isIPv4("192.168.1.1")).toBe(true);
+    });
+    test("带协议的 IPv4 链接", () => {
+        expect(isIPv4("http://8.8.8.8")).toBe(true);
+    });
+    test("非法 IP", () => {
+        expect(isIPv4("999.999.999.999")).toBe(false);
+    });
+    test("localhost 不能当成 IP", () => {
+        expect(isIPv4("localhost")).toBe(false);
+    });
+});
+// --------------------- extractRootDomain -------------------------
+describe("extractRootDomain", () => {
+    test("普通域名", () => {
+        expect(extractRootDomain("https://sub.example.com")).toBe("example.com");
+    });
+    test("多级后缀", () => {
+        expect(extractRootDomain("a.b.example.com.cn")).toBe("example.com.cn");
+    });
+    test("无协议", () => {
+        expect(extractRootDomain("www.test.co.uk")).toBe("test.co.uk");
+    });
+    test("非法 URL 返回空", () => {
+        expect(extractRootDomain("%%%--非法")).toBe("");
+    });
+});
+// --------------------- isDomainMatch -------------------------
+describe("isDomainMatch", () => {
+    test("匹配根域", () => {
+        const list = ["a.example.com", "b.test.co.uk"];
+        expect(isDomainMatch(list, "https://api.example.com")).toBe(true);
+    });
+    test("多级后缀匹配", () => {
+        const list = ["node.test.co.uk"];
+        expect(isDomainMatch(list, "api.test.co.uk")).toBe(true);
+    });
+    test("不匹配", () => {
+        const list = ["a.example.com"];
+        expect(isDomainMatch(list, "another.com")).toBe(false);
+    });
+});
+// --------------------- toStandardUrl -------------------------
+describe("toStandardUrl", () => {
+    test("自动补协议", () => {
+        expect(toStandardUrl("baidu.com")).toBe("http://baidu.com");
+    });
+    test("保留原协议", () => {
+        expect(toStandardUrl("http://example.com")).toBe("http://example.com");
+    });
+    test("去除路径", () => {
+        expect(toStandardUrl("https://a.com/xxx/yyy")).toBe("https://a.com");
+    });
+});
+// --------------------- getOptimalDecodedString -------------------------
+describe("getOptimalDecodedString", () => {
+    beforeEach(() => {
+        jest.useFakeTimers();
+        global.fetch = jest.fn(() => Promise.resolve({ ok: true }));
+    });
+    afterEach(() => {
+        jest.clearAllMocks();
+        jest.useRealTimers();
+    });
+    test("返回最快的域名", async () => {
+        const arr = ["a.com", "b.com"];
+        const promise = getOptimalDecodedString(arr);
+        jest.advanceTimersByTime(10);
+        const res = await promise;
+        expect(res).toBe("a.com");
+    });
+    test("超时 fallback 到第一个", async () => {
+        fetch.mockImplementation(() => new Promise(() => { }));
+        const arr = ["a.com", "b.com"];
+        const promise = getOptimalDecodedString(arr);
+        jest.advanceTimersByTime(4000);
+        const res = await promise;
+        expect(res).toBe("a.com");
+    });
+});

package/dist/init/index.d.ts

@@ -1,3 +1,4 @@
+import { isDomainMatch, toStandardUrl } from "./utils";
 import { AesDecrypt, AesEncrypt } from "./ende";
 type TenantConfig = {
     PUBLIC_TITLE: string;
@@ -32,4 +33,4 @@ declare class InitCls {
     AesDecrypt: typeof AesDecrypt;
 }
 declare const HF: InitCls;
-export { HF };
+export { HF, isDomainMatch, toStandardUrl, AesEncrypt, AesDecrypt };

package/dist/init/index.js

@@ -1,5 +1,5 @@
 import { getResource } from "./getResource";
-import { getOptimalDecodedString } from "./utils";
+import { getOptimalDecodedString, isDomainMatch, toStandardUrl } from "./utils";
 import { AesDecrypt, AesEncrypt } from "./ende";
 class InitCls {
     domainBaseUrl = "";
@@ -46,9 +46,7 @@ class InitCls {
             const data = JSON.parse(rawData);
             const host = location.host;
             const matchedEntry = Object.entries(data).find(([key]) => {
-                return (key === host ||
-                    (host.startsWith("www.") && key === host.substring(4)) ||
-                    (!host.startsWith("www.") && key === "www." + host));
+                return isDomainMatch([key], host);
             });
             if (matchedEntry) {
                 const matched = matchedEntry[1];
@@ -124,16 +122,16 @@ class InitCls {
             const baseUrl = JSON.parse(AesDecrypt(configText));
             if (Array.isArray(baseUrl)) {
                 try {
-                    this.domainBaseUrl = await getOptimalDecodedString(baseUrl);
+                    this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(baseUrl));
                     console.log("✅ 成功加载生产环境配置(测速选择):", this.domainBaseUrl);
                 }
                 catch (error) {
-                    this.domainBaseUrl = baseUrl[0];
+                    this.domainBaseUrl = toStandardUrl(baseUrl[0]);
                     console.warn("⚠️ 测速失败，使用第一个配置:", this.domainBaseUrl, error);
                 }
             }
             else {
-                this.domainBaseUrl = baseUrl;
+                this.domainBaseUrl = toStandardUrl(baseUrl);
                 console.log("✅ 成功加载生产环境配置:", this.domainBaseUrl);
             }
             return this.domainBaseUrl;
@@ -144,7 +142,7 @@ class InitCls {
                     location.host.includes("localhost"))) ||
                 location.origin.includes(this.localPath.replace(/\/+$/, ""))) {
                 console.info(`🏠 iggame匹配到默认链接`, this.defaultBaseUrl);
-                this.domainBaseUrl = this.defaultBaseUrl;
+                this.domainBaseUrl = toStandardUrl(this.defaultBaseUrl);
                 return this.domainBaseUrl;
             }
             else {
@@ -157,4 +155,4 @@ class InitCls {
     AesDecrypt = AesDecrypt;
 }
 const HF = new InitCls();
-export { HF };
+export { HF, isDomainMatch, toStandardUrl, AesEncrypt, AesDecrypt };

package/dist/init/utils.d.ts

@@ -1 +1,11 @@
+export declare function isIPv4(str: string): boolean;
 export declare function getOptimalDecodedString(encodedArray: string[]): Promise<string>;
+/**
+ * 提取主域名（支持多级 TLD）
+ */
+export declare function extractRootDomain(url: string): string;
+/**
+ * 判断 b 是否匹配 a[] 中任意一个域名
+ */
+export declare function isDomainMatch(list: string[], target: string): boolean;
+export declare function toStandardUrl(input: string): string;

package/dist/init/utils.js

@@ -1,4 +1,4 @@
-function isIPv4(str) {
+export function isIPv4(str) {
     if (str.startsWith("http://") || str.startsWith("https://")) {
         try {
             const url = new URL(str);
@@ -34,10 +34,7 @@ export async function getOptimalDecodedString(encodedArray) {
             return resolve(targetArr[0]);
         let hasResolved = false;
         targetArr.forEach((url) => {
-            const cleanUrl = url.replace(/\/+$/, "");
-            const testUrl = `${cleanUrl.startsWith("http")
-                ? cleanUrl
-                : currentProtocol + "//" + cleanUrl}/health?t=${Date.now()}`;
+            const testUrl = `${toStandardUrl(url)}/health?t=${Date.now()}`;
             const controller = new AbortController();
             const timeoutId = setTimeout(() => {
                 controller.abort();
@@ -61,3 +58,75 @@ export async function getOptimalDecodedString(encodedArray) {
     });
     return isIp ? await getOptimal(ipList) : await getOptimal(domainList);
 }
+/**
+ * 常见多级后缀（Public Suffix List 的子集，可按需扩展）
+ * 如 .co.uk、.com.cn、.gov.cn、.org.cn 等
+ */
+const MULTI_LEVEL_TLDS = new Set([
+    "co.uk",
+    "org.uk",
+    "gov.uk",
+    "com.cn",
+    "net.cn",
+    "gov.cn",
+    "org.cn",
+    "co.jp",
+    "ne.jp",
+    "or.jp",
+    "go.jp",
+    "com.au",
+    "net.au",
+    "org.au",
+    "co.kr",
+    "ne.kr",
+    "or.kr",
+]);
+/**
+ * 提取主域名（支持多级 TLD）
+ */
+export function extractRootDomain(url) {
+    try {
+        if (!/^https?:\/\//i.test(url)) {
+            url = "http://" + url;
+        }
+        const { hostname } = new URL(url);
+        const parts = hostname.split(".").filter(Boolean);
+        if (parts.length < 2)
+            return hostname;
+        const last2 = parts.slice(-2).join(".");
+        // 匹配多级 TLD（如 example.com.cn → example.com.cn）
+        if (MULTI_LEVEL_TLDS.has(last2)) {
+            if (parts.length >= 3) {
+                return parts.slice(-3).join(".");
+            }
+        }
+        // 通用规则：主域 = 最后两段
+        return last2;
+    }
+    catch (e) {
+        return "";
+    }
+}
+/**
+ * 判断 b 是否匹配 a[] 中任意一个域名
+ */
+export function isDomainMatch(list, target) {
+    const normalizedList = list.map(extractRootDomain).filter(Boolean);
+    const targetDomain = extractRootDomain(target);
+    return normalizedList.includes(targetDomain);
+}
+export function toStandardUrl(input) {
+    try {
+        let protocol = window?.location?.protocol || "https:";
+        // 自动补协议
+        if (!/^https?:\/\//i.test(input)) {
+            input = protocol + "//" + input;
+        }
+        const url = new URL(input);
+        // 输出 protocol://hostname
+        return `${url.protocol}//${url.hostname}`;
+    }
+    catch (e) {
+        return input; // 当成普通字符串返回
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hifun-tools",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,12 +9,18 @@
   },
   "scripts": {
     "build": "tsc",
-    "pub": "npm run build && npm version patch && npm publish --access public"
+    "pub": "npm run build && npm version patch && npm publish --access public",
+    "test": "jest",
+    "test:watch": "jest --watch"
   },
   "files": [
     "dist"
   ],
   "devDependencies": {
+    "@types/jest": "^30.0.0",
+    "jest": "^30.2.0",
+    "jest-environment-jsdom": "^30.2.0",
+    "ts-jest": "^29.4.5",
     "typescript": "^5.6.3"
   },
   "dependencies": {