🐛 处理特殊的match #440

Author: CodFrm

src/pkg/utils/match.test.ts

@@ -79,6 +79,14 @@ describe("UrlMatch-search", () => {
     expect(url.match("https://example.com/foo/bar/example.path")).toEqual(["ok1"]);
     expect(url.match("https://example.com/foo/bar/example.path2")).toEqual(["ok1"]);
   });
+  it("*.example.com/path/*", () => {
+    const url = new UrlMatch<string>();
+    url.add("*.example.com/path/*", "ok1");
+    expect(url.match("https://www.example.com/path/foo")).toEqual(["ok1"]);
+    expect(url.match("https://www.example.com/path/foo/bar")).toEqual(["ok1"]);
+    expect(url.match("https://www.example.com/path/foo/bar/baz")).toEqual(["ok1"]);
+    expect(url.match("https://www.example.com/path2/foo")).toEqual([]);
+  });
 });
 
 describe("UrlMatch-port1", () => {
@@ -137,18 +145,21 @@ describe("dealPatternMatches", () => {
       "*://api.*.example.com/*",
       "*://api.*.*.example.com/*",
       "*://*example.com/*",
+      "*.example.com/path/*",
     ]);
     expect(matches.patternResult).toEqual([
       "*://*/*",
       "*://*.example.com/*",
       "*://*.example.com/*",
       "*://example.com/*",
+      "*://*.example.com/path/*",
     ]);
     expect(matches.result).toEqual([
       "*://www.example.com*",
       "*://api.*.example.com/*",
       "*://api.*.*.example.com/*",
       "*://*example.com/*",
+      "*.example.com/path/*",
     ]);
   });
   it("特殊情况-exclude", () => {
@@ -239,5 +250,12 @@ describe("parsePatternMatchesURL", () => {
       host: "*.example.com",
       path: "*",
     });
+    matches = parsePatternMatchesURL("*.example.com/path/*");
+    console.log(matches);
+    expect(matches).toEqual({
+      scheme: "*",
+      host: "*.example.com",
+      path: "path/*",
+    });
   });
 });

src/pkg/utils/match.ts

@@ -43,6 +43,19 @@ export default class Match<T> {
           search: "*",
         };
       default:
+        // 无*://的情况
+        if (!url.includes("://")) {
+          // 直接转为通配符
+          const match = /^(.*?)((\/.*?)(\?.*?|)|)$/.exec(url);
+          if (match) {
+            return {
+              scheme: "*",
+              host: match[1],
+              path: match[3] || (url[url.length - 1] === "*" ? "*" : "/"),
+              search: match[4],
+            };
+          }
+        }
     }
     return undefined;
   }
@@ -61,10 +74,6 @@ export default class Match<T> {
         break;
       default:
     }
-    let pos = u.host.indexOf("*");
-    if (u.host === "*" || u.host === "**") {
-      pos = -1;
-    }
     u.host = u.host.replace(/\*/g, "[^/]*?");
     // 处理 *.开头
     if (u.host.startsWith("[^/]*?.")) {
@@ -240,6 +249,18 @@ export function parsePatternMatchesURL(
         };
         break;
       default:
+        // 无*://的情况
+        if (!url.includes("*://")) {
+          // 直接转为通配符
+          const match = /^(.+?)(\/(.*?)(\?.*?|)|)$/.exec(url);
+          if (match) {
+            result = {
+              scheme: "*",
+              host: match[1],
+              path: match[3] || (url[url.length - 1] === "*" ? "*" : ""),
+            };
+          }
+        }
     }
   }
   if (result) {