🐛 修复端口导致注册userScript失败的问题 #390

Author: CodFrm

.gitignore

@@ -29,3 +29,6 @@ CHANGELOG.md
 tailwind.config.js
 
 .env
+
+package-lock.json
+yarn.lock

src/app/logger/core.ts

@@ -32,8 +32,8 @@ export default class LoggerCore {
   // 日志级别, 会记录在日志文件中
   level: LogLevel = "info";
 
-  // 日志debug等级, 会在控制台输出
-  debug: LogLevel | "none" = "none";
+  // 打印在console的等级, 会在控制台输出
+  consoleLevel: LogLevel = "warn";
 
   labels: LogLabel;
 
@@ -43,7 +43,7 @@ export default class LoggerCore {
     this.labels = config.labels || {};
     // 获取日志debug等级, 如果是开发环境, 则默认为debug
     if (process.env.NODE_ENV === "development") {
-      this.debug = "debug";
+      this.consoleLevel = "debug";
     }
     if (!LoggerCore.instance) {
       LoggerCore.instance = this;

src/app/logger/logger.ts

@@ -36,7 +36,7 @@ export default class Logger {
     if (levelNumber[level] >= levelNumber[this.core.level]) {
       this.core.writer.write(level, message, newLabel);
     }
-    if (this.core.debug !== "none" && levelNumber[level] >= levelNumber[this.core.debug]) {
+    if (this.core.consoleLevel !== "none" && levelNumber[level] >= levelNumber[this.core.consoleLevel]) {
       if (typeof message === "object") {
         message = JSON.stringify(message);
       }

src/app/service/service_worker/runtime.ts

@@ -219,6 +219,18 @@ export class RuntimeService {
           await chrome.userScripts.register(registerScripts);
         } catch (e: any) {
           this.logger.error("registerScript error", Logger.E(e));
+          // 批量注册失败则退回单个注册
+          registerScripts.forEach(async (script) => {
+            try {
+              await chrome.userScripts.register([script]);
+            } catch (e: any) {
+              this.logger.error(
+                "registerScript single error",
+                { id: script.id, matches: script.matches, excludeMatches: script.excludeMatches },
+                Logger.E(e)
+              );
+            }
+          });
         }
         const batchData: { [key: string]: any } = {};
         registerScripts.forEach((script) => {

src/pkg/utils/match.test.ts

@@ -211,6 +211,14 @@ describe("parsePatternMatchesURL", () => {
       path: "*",
     });
   });
+  it("端口", () => {
+    const matches = parsePatternMatchesURL("http://examle:80/search");
+    expect(matches).toEqual({
+      scheme: "http",
+      host: "examle:*",
+      path: "search",
+    });
+  });
   it("一些怪异的情况", () => {
     let matches = parsePatternMatchesURL("*://*./*");
     expect(matches).toEqual({

src/pkg/utils/match.ts

@@ -280,6 +280,11 @@ export function parsePatternMatchesURL(
       }
     }
   }
+  // 如果host存在端口, 则将端口换成通配符
+  const pos = result?.host.indexOf(":");
+  if (pos !== undefined && pos !== -1) {
+    result!.host = `${result!.host.substring(0, pos)}:*`;
+  }
   return result;
 }