🐛 支持一些正则表达式

Author: CodFrm

src/pkg/utils/match.test.ts

@@ -46,7 +46,7 @@ describe("UrlMatch-google-error", () => {
 });
 
 // 从tm找的一些特殊的匹配规则
-describe("UrlMatch-search", () => {
+describe("UrlMatch-special", () => {
   const url = new UrlMatch<string>();
   url.add("https://www.google.com/search?q=*", "ok1");
   it("match1", () => {
@@ -88,6 +88,14 @@ describe("UrlMatch-search", () => {
     expect(url.match("http://www.example.com")).toEqual(["ok1"]);
     expect(url.match("https://www.example.com")).toEqual(["ok1"]);
   });
+  it("/^.*?://.*?.example.com.*?$/", () => {
+    const url = new UrlMatch<string>();
+    url.add("/^.*?://.*?.example.com.*?$/", "ok1");
+    expect(url.match("https://www.example.com")).toEqual(["ok1"]);
+    expect(url.match("http://www.example.com")).toEqual(["ok1"]);
+    expect(url.match("https://api.example.com/foo/bar")).toEqual(["ok1"]);
+    expect(url.match("https://api.foo.example.com/foo/bar")).toEqual(["ok1"]);
+  });
 });
 
 describe("UrlMatch-port1", () => {
@@ -148,6 +156,7 @@ describe("dealPatternMatches", () => {
       "*://*example.com/*",
       "*.example.com/path/*",
       "http*",
+      "/^.*?://.*?.example.com.*?$/",
     ]);
     expect(matches.patternResult).toEqual([
       "*://*/*",
@@ -156,6 +165,7 @@ describe("dealPatternMatches", () => {
       "*://example.com/*",
       "*://*.example.com/path/*",
       "*://*/*",
+      "*://*/*",
     ]);
     expect(matches.result).toEqual([
       "*://www.example.com*",
@@ -164,6 +174,7 @@ describe("dealPatternMatches", () => {
       "*://*example.com/*",
       "*.example.com/path/*",
       "http*",
+      "/^.*?://.*?.example.com.*?$/",
     ]);
   });
   it("特殊情况-exclude", () => {

src/pkg/utils/match.ts

@@ -122,11 +122,19 @@ export default class Match<T> {
   public add(url: string, val: T) {
     // 判断是不是一个正则
     if (url.startsWith("/^") || url.endsWith("$/")) {
+      // 删除开头和结尾的/
+      if (url.startsWith("/")) {
+        url = url.substring(1);
+      }
+      if (url.endsWith("/")) {
+        url = url.substring(0, url.length - 1);
+      }
       this.addRegex(url, val);
+      return;
     }
     const re = this.compileRe(url);
     if (!re) {
-      console.warn("bad match rule", { url, val });
+      console.warn("add failed: bad rule", { url, val });
       return;
     }
     this.addRegex(re, val);
@@ -145,7 +153,7 @@ export default class Match<T> {
           ret.push(...val);
         }
       } catch (e) {
-        console.warn("bad match rule", { val }, Logger.E(e));
+        console.warn("match failed: bad rule", { val }, Logger.E(e));
         // LoggerCore.getLogger({ component: "match" }).warn(
         //   "bad match rule",
         //   Logger.E(e)