🐛 处理tld域名

Author: CodFrm

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scriptcat",
-  "version": "0.18.0-beta",
+  "version": "0.18.1-beta",
   "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!",
   "author": "CodFrm",
   "license": "GPLv3",

src/app/service/service_worker/gm_api.ts

@@ -1157,7 +1157,6 @@ export default class GMApi {
                 removeRuleIds: [parseInt(requestId)],
                 addRules: [rule],
               });
-              console.log("old rule", requestId, rule);
               return;
             }
             this.gmXhrHeadersReceived.emit("headersReceived:" + requestId, details);

src/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "__MSG_scriptcat__",
-  "version": "0.18.0.1100",
+  "version": "0.18.1.1100",
   "author": "CodFrm",
   "description": "__MSG_scriptcat_description__",
   "options_ui": {

src/pkg/utils/match.test.ts

@@ -157,15 +157,17 @@ describe("dealPatternMatches", () => {
       "*.example.com/path/*",
       "http*",
       "/^.*?://.*?.example.com.*?$/",
+      "*://*.example.tld/*",
     ]);
     expect(matches.patternResult).toEqual([
       "*://*/*",
       "*://*.example.com/*",
       "*://*.example.com/*",
       "*://example.com/*",
       "*://*.example.com/path/*",
-      "*://*/*",
-      "*://*/*",
+      "*://*/*", // http*
+      "*://*/*", // 正则
+      "*://*/*", // tld
     ]);
     expect(matches.result).toEqual([
       "*://www.example.com*",
@@ -175,6 +177,7 @@ describe("dealPatternMatches", () => {
       "*.example.com/path/*",
       "http*",
       "/^.*?://.*?.example.com.*?$/",
+      "*://*.example.tld/*",
     ]);
   });
   it("特殊情况-exclude", () => {
@@ -246,6 +249,14 @@ describe("parsePatternMatchesURL", () => {
       path: "search",
     });
   });
+  it("tld顶级域名", () => {
+    const matches = parsePatternMatchesURL("http://*.example.tld/*");
+    expect(matches).toEqual({
+      scheme: "http",
+      host: "*",
+      path: "*",
+    });
+  });
   it("一些怪异的情况", () => {
     let matches = parsePatternMatchesURL("*://*./*");
     expect(matches).toEqual({

src/pkg/utils/match.ts

@@ -333,6 +333,10 @@ export function parsePatternMatchesURL(
   if (pos !== undefined && pos !== -1) {
     result!.host = `${result!.host.substring(0, pos)}:*`;
   }
+  // 如果host以.tld结尾
+  if (result?.host.endsWith(".tld")) {
+    result.host = "*";
+  }
   return result;
 }