hifun-tools 1.3.23 → 1.3.25

package/dist/init/index.js

@@ -70,7 +70,7 @@ class InitCls {
             }
             // 默认租户匹配
             if (host.includes("iggame") || host.includes("localhost")) {
-                console.info(`🏠 iggame匹配到默认租户`);
+                console.info(`🏠 iggame匹配到默认租户2`);
                 return { tenant: "iggame" };
             }
             throw new Error("未找到匹配租户");
@@ -80,8 +80,9 @@ class InitCls {
             const host = location.host;
             if (host.includes("iggame") ||
                 host.includes("localhost") ||
-                location.origin.includes(this.localPath.replace(/\/+$/, ""))) {
-                console.info(`🏠 iggame匹配到默认租户`);
+                (!!this.localPath &&
+                    location.origin.includes(this.localPath.replace(/\/+$/, "")))) {
+                console.info(`🏠 iggame匹配到默认租户1`);
                 return { tenant: "iggame" };
             }
             throw new Error("无法获取有效的租户信息");
@@ -133,9 +134,9 @@ class InitCls {
             const response = await fetch(`/lineAddress.txt?t=${Date.now()}`);
             const configText = await response.text();
             let baseUrl = JSON.parse(AesDecrypt(configText));
-            const { lineGroup, tenant } = this.getTenantDict();
+            const { lineGroup } = this.getTenantDict();
             const dictList = this.getTenantDictList();
-            baseUrl = filterSmartLines(dictList, baseUrl, lineGroup, tenant);
+            baseUrl = filterSmartLines(dictList, baseUrl, lineGroup);
             if (Array.isArray(baseUrl)) {
                 try {
                     this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(baseUrl));
@@ -153,10 +154,12 @@ class InitCls {
             return this.domainBaseUrl;
         }
         catch (error) {
+            console.error(error);
             if ((this.defaultBaseUrl &&
                 (location.host.includes("iggame") ||
                     location.host.includes("localhost"))) ||
-                location.origin.includes(this.localPath.replace(/\/+$/, ""))) {
+                (!!this.localPath &&
+                    location.origin.includes(this.localPath.replace(/\/+$/, "")))) {
                 console.info(`🏠 iggame匹配到默认链接`, this.defaultBaseUrl);
                 this.domainBaseUrl = toStandardUrl(this.defaultBaseUrl);
                 return this.domainBaseUrl;

package/dist/init/utils.d.ts

@@ -8,14 +8,5 @@ export declare function isIPv4(str: string): boolean;
 export declare function getOptimalDecodedString(encodedArray: string[]): Promise<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,7 +18,6 @@ export async function getOptimalDecodedString(encodedArray) {
         throw new Error("输入数组为空或无效");
     const hostname = window.location.hostname;
     const isIp = isIPv4(hostname);
-    // ✨ 关键增强：先 trim 再过滤
     const decodedList = encodedArray
         .filter(Boolean)
         .map((v) => v.trim());
@@ -30,7 +29,6 @@ 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)
@@ -61,37 +59,33 @@ export async function getOptimalDecodedString(encodedArray) {
     });
     return isIp ? await getOptimal(ipList) : await getOptimal(domainList);
 }
+/**
+ * normalizeHost：保留端口，只清理协议
+ */
 function normalizeHost(hostname) {
     hostname = hostname.trim().toLowerCase();
-    // 去掉典型协议
-    if (hostname.startsWith("http://") || hostname.startsWith("https://")) {
-        try {
-            hostname = new URL(hostname).hostname;
-        }
-        catch (_) { }
+    // 如果没有协议，加上 http:// 方便 URL 解析
+    let urlStr = hostname;
+    if (!/^https?:\/\//i.test(hostname)) {
+        urlStr = "http://" + hostname;
+    }
+    try {
+        const url = new URL(urlStr);
+        // 保留 hostname + port
+        return url.port ? `${url.hostname}:${url.port}` : url.hostname;
+    }
+    catch (_) {
+        return hostname; // 保留原始字符串
     }
-    return hostname;
 }
 /**
- * 域名是否严格匹配，允许 www 特例
- *
- * 允许：
- *   www.a.com  <=>  a.com
- *   完全相同
- *
- * 不允许：
- *   1.a.com  vs 2.a.com
- *   1.a.com  vs a.com
- *   2.a.com  vs a.com
- *   1.a.com  vs www.a.com
+ * 域名严格匹配，允许 www 特例
  */
 function isDomainStrictEqual(a, b) {
     a = normalizeHost(a);
     b = normalizeHost(b);
     if (a === b)
         return true;
-    // www 特例：只允许这种
-    // www.x.com <-> x.com
     const stripWww = (h) => (h.startsWith("www.") ? h.slice(4) : h);
     return stripWww(a) === stripWww(b);
 }
@@ -108,26 +102,28 @@ export function toStandardUrl(input) {
             return "";
         input = input.trim();
         let protocol = window?.location?.protocol || "https:";
-        // 如果没有 http / https，则自动补协议
         if (!/^https?:\/\//i.test(input)) {
             input = protocol + "//" + input;
         }
         const url = new URL(input);
         const hostname = url.hostname;
-        // ❗ hostname 必须包含至少 1 个点 或是合法 IPv4，否则判断为无效
-        const isHostnameValid = /^[a-zA-Z0-9.-]+$/.test(hostname) &&
-            (hostname.includes(".") || isIPv4(hostname));
+        const port = url.port;
+        const isHostnameValid = hostname === "localhost" ||
+            (/^[a-zA-Z0-9.-]+$/.test(hostname) &&
+                (hostname.includes(".") || isIPv4(hostname)));
         if (!isHostnameValid) {
             return "";
         }
-        return `${url.protocol}//${hostname}`;
+        return port
+            ? `${url.protocol}//${hostname}:${port}`
+            : `${url.protocol}//${hostname}`;
     }
     catch (e) {
         return "";
     }
 }
 /**
- * 浏览器识别：返回一个归一化的浏览器类型字符串
+ * 浏览器识别
  */
 function detectBrowser() {
     const ua = navigator.userAgent.toLowerCase();
@@ -160,17 +156,11 @@ function detectBrowser() {
     }
     return "unknown";
 }
-/**
- * 匹配规则：模糊 + 正则 + 不区分大小写
- */
 export function matchBrowser(checkItem, currentBrowser) {
-    if (!checkItem)
-        return false;
-    if (!currentBrowser)
+    if (!checkItem || !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);
@@ -179,15 +169,8 @@ export function matchBrowser(checkItem, currentBrowser) {
         }
         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("前两个参数必须是数组");
@@ -198,13 +181,10 @@ export function filterSmartLines(list1, list2, groupType, tenant) {
         const blocked = checks.some((checkItem) => matchBrowser(checkItem, currentBrowser));
         return !blocked;
     });
-    if (tenant) {
+    if (tenant)
         result = result.filter((item) => item.tenant === tenant);
-    }
-    if (groupType) {
+    if (groupType)
         result = result.filter((item) => item.lineGroup === groupType);
-    }
-    console.log("list2.map(toStandardUrl)", list2.map(toStandardUrl), list2);
     const lines = result.map((item) => toStandardUrl(item.line));
-    return list2.map(toStandardUrl).filter((v) => isDomainMatch(lines, v)); // ✨ 使用域名匹配
+    return list2.map(toStandardUrl).filter((v) => isDomainMatch(lines, v));
 }

package/package.json

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