hifun-tools 1.3.15 → 1.3.17

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

@@ -35,15 +35,18 @@ describe("extractRootDomain", () => {
 // --------------------- isDomainMatch -------------------------
 describe("isDomainMatch", () => {
     test("匹配根域", () => {
-        const list = ["a.example.com", "b.test.co.uk"];
-        expect(isDomainMatch(list, "https://api.example.com")).toBe(true);
+        const list = [
+            " localhost:3000/asdnajkd ",
+            " http://192.168.101.85:3000/asdasdasd ",
+        ];
+        expect(isDomainMatch(list, "localhost:3000")).toBe(true);
     });
     test("多级后缀匹配", () => {
-        const list = ["node.test.co.uk"];
+        const list = [" node.test.co.uk "];
         expect(isDomainMatch(list, "api.test.co.uk")).toBe(true);
     });
     test("不匹配", () => {
-        const list = ["a.example.com"];
+        const list = [" a.example.com "];
         expect(isDomainMatch(list, "another.com")).toBe(false);
     });
 });

package/dist/init/index.d.ts

@@ -1,4 +1,4 @@
-import { isDomainMatch, toStandardUrl } from "./utils";
+import { filterSmartLines, isDomainMatch, matchBrowser, TenantDict, toStandardUrl } from "./utils";
 import { AesDecrypt, AesEncrypt } from "./ende";
 type TenantConfig = {
     PUBLIC_TITLE: string;
@@ -9,6 +9,8 @@ type TenantConfig = {
 declare class InitCls {
     private domainBaseUrl;
     private tenantConfig;
+    private tenantDict;
+    private tenantDictList;
     private initialized;
     private tenant;
     private defaultBaseUrl;
@@ -16,6 +18,8 @@ declare class InitCls {
     getBaseUrl(): string;
     /** 获取配置 */
     getTenantConfig(): TenantConfig | null;
+    getTenantDict(): TenantDict | null;
+    getTenantDictList(): TenantDict[];
     /** 获取租户名 */
     getTenant(): string;
     getImgPath(imgName: string): string;
@@ -33,4 +37,4 @@ declare class InitCls {
     AesDecrypt: typeof AesDecrypt;
 }
 declare const HF: InitCls;
-export { HF, isDomainMatch, toStandardUrl, AesEncrypt, AesDecrypt };
+export { HF, isDomainMatch, toStandardUrl, AesEncrypt, AesDecrypt, filterSmartLines, matchBrowser, };

package/dist/init/index.js

@@ -1,9 +1,11 @@
 import { getResource } from "./getResource";
-import { getOptimalDecodedString, isDomainMatch, toStandardUrl } from "./utils";
+import { filterSmartLines, getOptimalDecodedString, isDomainMatch, matchBrowser, toStandardUrl, } from "./utils";
 import { AesDecrypt, AesEncrypt } from "./ende";
 class InitCls {
     domainBaseUrl = "";
     tenantConfig = null;
+    tenantDict = null;
+    tenantDictList = [];
     initialized = false;
     tenant = "";
     defaultBaseUrl = "";
@@ -21,6 +23,18 @@ class InitCls {
         }
         return this.tenantConfig;
     }
+    getTenantDict() {
+        if (!this.initialized || !this.tenant) {
+            throw new Error("租户尚未初始化或初始化失败getTenantDict");
+        }
+        return this.tenantDict;
+    }
+    getTenantDictList() {
+        if (!this.initialized || !this.tenant) {
+            throw new Error("租户尚未初始化或初始化失败getTenantDictList");
+        }
+        return this.tenantDictList;
+    }
     /** 获取租户名 */
     getTenant() {
         return this.tenant;
@@ -34,7 +48,7 @@ class InitCls {
     /** 严格同步获取租户信息 */
     async getTenantInfoStrictSync() {
         try {
-            const response = await fetch(`/lineTenants.txt?t=${Date.now()}`, {
+            const response = await fetch(`/lineDict.txt?t=${Date.now()}`, {
                 method: "GET",
                 cache: "no-store",
             });
@@ -45,15 +59,14 @@ class InitCls {
             const rawData = AesDecrypt(rawText);
             const data = JSON.parse(rawData);
             const host = location.host;
-            const matchedEntry = Object.entries(data).find(([key]) => {
-                return isDomainMatch([key], host);
+            const matchedEntry = data.find((item) => {
+                return isDomainMatch([item.line], host);
             });
+            this.tenantDictList = data;
             if (matchedEntry) {
-                const matched = matchedEntry[1];
-                if (data && matched) {
-                    console.info(`🏠 匹配租户: ${matched}`);
-                    return { tenant: matched };
-                }
+                this.tenantDict = matchedEntry;
+                console.info(`🏠 匹配租户: ${matchedEntry.tenant}`);
+                return { tenant: matchedEntry.tenant };
             }
             // 默认租户匹配
             if (host.includes("iggame") || host.includes("localhost")) {
@@ -63,7 +76,7 @@ class InitCls {
             throw new Error("未找到匹配租户");
         }
         catch (error) {
-            console.error("解析 lineTenants.txt 失败:", error);
+            console.error("解析 lineDict.txt 失败:", error);
             const host = location.host;
             if (host.includes("iggame") ||
                 host.includes("localhost") ||
@@ -99,17 +112,17 @@ class InitCls {
             this.localPath = localPath;
         }
         console.log("加载类型:", fileType);
-        const tasks = [];
+        const results = [];
+        if (fileType.includes("lineDict")) {
+            console.log("初始化 lineDict...");
+            const res1 = await this.initialize();
+            results.push(res1);
+        }
         if (fileType.includes("lineAddress")) {
             console.log("初始化 lineAddress...");
-            tasks.push(this.LoadGatewayConfig());
-        }
-        if (fileType.includes("lineTenants")) {
-            console.log("初始化 lineTenants...");
-            tasks.push(this.initialize());
+            const res2 = await this.LoadGatewayConfig();
+            results.push(res2);
         }
-        // 等待所有异步任务完成
-        const results = await Promise.all(tasks);
         console.log("所有初始化完成:", results);
         return results;
     }
@@ -119,7 +132,10 @@ class InitCls {
         try {
             const response = await fetch(`/lineAddress.txt?t=${Date.now()}`);
             const configText = await response.text();
-            const baseUrl = JSON.parse(AesDecrypt(configText));
+            let baseUrl = JSON.parse(AesDecrypt(configText));
+            const dict = this.getTenantDict();
+            const dictList = this.getTenantDictList();
+            baseUrl = filterSmartLines(dictList, baseUrl, dict?.lineGroup);
             if (Array.isArray(baseUrl)) {
                 try {
                     this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(baseUrl));
@@ -155,4 +171,4 @@ class InitCls {
     AesDecrypt = AesDecrypt;
 }
 const HF = new InitCls();
-export { HF, isDomainMatch, toStandardUrl, AesEncrypt, AesDecrypt };
+export { HF, isDomainMatch, toStandardUrl, AesEncrypt, AesDecrypt, filterSmartLines, matchBrowser, };

package/dist/init/utils.d.ts

@@ -1,3 +1,9 @@
+export type TenantDict = {
+    browserCheck: string[];
+    line: string;
+    lineGroup: string;
+    tenant: string;
+};
 export declare function isIPv4(str: string): boolean;
 export declare function getOptimalDecodedString(encodedArray: string[]): Promise<string>;
 /**
@@ -9,3 +15,14 @@ export declare function extractRootDomain(url: string): string;
  */
 export declare function isDomainMatch(list: string[], target: string): boolean;
 export declare function toStandardUrl(input: string): string;
+/**
+ * 匹配规则：模糊 + 正则 + 不区分大小写
+ */
+export declare function matchBrowser(checkItem: string, currentBrowser: string): boolean;
+/**
+ * 1. 过滤 browserCheck
+ * 2. 按 tenant 过滤
+ * 3. 按 groupType（可为空）过滤
+ * 4. 与 list2 求交集
+ */
+export declare function filterSmartLines(list1: TenantDict[], list2: string[], groupType?: string, tenant?: string): string[];

package/dist/init/utils.js

@@ -18,8 +18,10 @@ export async function getOptimalDecodedString(encodedArray) {
         throw new Error("输入数组为空或无效");
     const hostname = window.location.hostname;
     const isIp = isIPv4(hostname);
-    // ✅ 修正：Base64 解码后再过滤
-    const decodedList = encodedArray.filter(Boolean);
+    // ✨ 关键增强：先 trim 再过滤
+    const decodedList = encodedArray
+        .filter(Boolean)
+        .map((v) => v.trim());
     const ipList = decodedList.filter((v) => isIPv4(v));
     const domainList = decodedList.filter((v) => !isIPv4(v));
     const getOptimal = (arr) => new Promise((resolve) => {
@@ -28,6 +30,7 @@ export async function getOptimalDecodedString(encodedArray) {
             return;
         }
         const currentProtocol = window.location.protocol;
+        // 过滤协议
         const filteredArr = arr.filter((url) => url.startsWith("http") ? url.startsWith(currentProtocol) : true);
         const targetArr = filteredArr.length ? filteredArr : arr;
         if (targetArr.length === 1)
@@ -86,6 +89,7 @@ const MULTI_LEVEL_TLDS = new Set([
  */
 export function extractRootDomain(url) {
     try {
+        url = url.trim(); // ✨ 增加
         if (!/^https?:\/\//i.test(url)) {
             url = "http://" + url;
         }
@@ -94,13 +98,11 @@ export function extractRootDomain(url) {
         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) {
@@ -117,16 +119,102 @@ export function isDomainMatch(list, target) {
 }
 export function toStandardUrl(input) {
     try {
+        input = input.trim(); // ✨ 增加
         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; // 当成普通字符串返回
+        return input;
     }
 }
+/**
+ * 浏览器识别：返回一个归一化的浏览器类型字符串
+ */
+function detectBrowser() {
+    const ua = navigator.userAgent.toLowerCase();
+    const rules = [
+        { key: "baidu", regex: /baidubrowser|baiduboxapp|baidu/i },
+        { key: "uc", regex: /ucbrowser|ucweb/i },
+        { key: "qq", regex: /mqqbrowser|qqbrowser/i },
+        { key: "quark", regex: /quarkbrowser|quark/i },
+        { key: "sougou", regex: /se 2\.x|sogoumobilebrowser|sogou/i },
+        { key: "360", regex: /360browser|qhbrowser|360se|360ee/i },
+        { key: "xiaomi", regex: /miuibrowser/i },
+        { key: "huawei", regex: /huaweibrowser|hwbrowser/i },
+        { key: "oppo", regex: /oppobrowser/i },
+        { key: "vivo", regex: /vivobrowser/i },
+        { key: "samsung", regex: /samsungbrowser/i },
+        { key: "edge", regex: /edg|edge/i },
+        { key: "firefox", regex: /firefox/i },
+        { key: "opera", regex: /opr|opera/i },
+        { key: "safari", regex: /safari/i, exclude: /chrome|crios|android/i },
+        { key: "chrome", regex: /chrome|crios/i },
+        { key: "weixin", regex: /micromessenger/i },
+        { key: "alipay", regex: /alipayclient/i },
+        { key: "douyin", regex: /aweme|douyin/i },
+    ];
+    for (const item of rules) {
+        if (item.exclude && item.exclude.test(ua))
+            continue;
+        if (item.regex.test(ua))
+            return item.key;
+    }
+    return "unknown";
+}
+/**
+ * 匹配规则：模糊 + 正则 + 不区分大小写
+ */
+export function matchBrowser(checkItem, currentBrowser) {
+    if (!checkItem)
+        return false;
+    if (!currentBrowser)
+        return false;
+    const normalized = checkItem.toString().toLowerCase();
+    const browser = currentBrowser.toLowerCase();
+    // 正则格式，如 "/uc/i"
+    if (normalized.startsWith("/") && normalized.endsWith("/")) {
+        try {
+            const body = normalized.slice(1, -1);
+            const regex = new RegExp(body, "i");
+            return regex.test(browser);
+        }
+        catch (_) { }
+    }
+    // 字符串模糊匹配
+    return browser.includes(normalized);
+}
+/**
+ * 1. 过滤 browserCheck
+ * 2. 按 tenant 过滤
+ * 3. 按 groupType（可为空）过滤
+ * 4. 与 list2 求交集
+ */
+export function filterSmartLines(list1, list2, groupType, tenant) {
+    if (!Array.isArray(list1) || !Array.isArray(list2)) {
+        throw new Error("前两个参数必须是数组");
+    }
+    const currentBrowser = detectBrowser();
+    // 1. 浏览器过滤
+    let result = list1.filter((item) => {
+        const checks = item.browserCheck || [];
+        const blocked = checks.some((checkItem) => matchBrowser(checkItem, currentBrowser));
+        return !blocked;
+    });
+    // 2. tenant 过滤（如果有传值）
+    if (tenant) {
+        result = result.filter((item) => item.tenant === tenant);
+    }
+    // 3. 按 groupType 过滤
+    if (groupType) {
+        result = result.filter((item) => item.lineGroup === groupType);
+    }
+    // 4. 提取 lines
+    const lines = result.map((item) => toStandardUrl(item.line));
+    // 5. 与 list2 求交集
+    const set = new Set(lines);
+    return list2.filter((v) => set.has(toStandardUrl(v))).map(toStandardUrl);
+}

package/package.json

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