Merge branch 'main' into release/v1.3

Author: CodFrm

.github/workflows/test.yaml

@@ -23,18 +23,29 @@ jobs:
           node-version: 22
           cache: 'pnpm'
 
+      - name: Setup pnpm
+        run: corepack enable
+
       - name: Install dependencies
         run: pnpm i --frozen-lockfile
 
+      - name: Cache ESLint cache
+        uses: actions/cache@v4
+        with:
+          path: .eslintcache
+          key: eslint-${{ hashFiles('pnpm-lock.yaml', '.eslintrc*') }}
+          restore-keys: |
+            eslint-
+
       - name: Lint
         run: |
           pnpm run typecheck
-          pnpm run lint
+          pnpm run lint:ci
 
       - name: Unit Test
         run: |
-          pnpm test
-          pnpm run coverage
+          pnpm test:ci
+          pnpm coverage:ci
 
       - name: Upload coverage reports to Codecov with GitHub Action
         uses: codecov/codecov-action@v5

package.json

@@ -8,14 +8,17 @@
   "scripts": {
     "preinstall": "pnpm dlx only-allow pnpm",
     "test": "vitest --test-timeout=500 --no-coverage --isolate=false --reporter=verbose",
+    "test:ci": "vitest run --test-timeout=500 --no-coverage --isolate=false --reporter=default --reporter.summary=false",
     "coverage": "vitest run --coverage",
     "typecheck": "tsc --noEmit",
+    "coverage:ci": "vitest run --coverage --silent --reporter=default --reporter.default.summary=false",
     "build": "cross-env NODE_ENV=production rspack build",
     "dev": "cross-env NODE_ENV=development rspack",
     "dev:noMap": "cross-env NODE_ENV=development NO_MAP=true rspack",
     "pack": "node ./scripts/pack.js",
     "format": "prettier --write .",
     "lint": "eslint .",
+    "lint:ci": "eslint . --cache --cache-location .eslintcache",
     "lint-fix": "eslint --fix .",
     "changlog": "node ./scripts/changlog.js",
     "crowdin": "crowdin",

packages/message/custom_event_message.ts

@@ -5,6 +5,23 @@ import LoggerCore from "@App/app/logger/core";
 import EventEmitter from "eventemitter3";
 import { DefinedFlags } from "@App/app/service/service_worker/runtime.consts";
 
+// 避免页面载入后改动 EventTarget.prototype 的方法导致消息传递失败
+const pageDispatchEvent = performance.dispatchEvent.bind(performance);
+const pageAddEventListener = performance.addEventListener.bind(performance);
+
+// 避免页面载入后改动全域物件导致消息传递失败
+const MouseEventClone = MouseEvent;
+const CustomEventClone = CustomEvent;
+
+// 避免页面载入后改动 Map.prototype 导致消息传递失败
+const relatedTargetMap = new Map<number, EventTarget>();
+relatedTargetMap.set = Map.prototype.set;
+relatedTargetMap.get = Map.prototype.get;
+relatedTargetMap.delete = Map.prototype.delete;
+
+let relateId = 0;
+const maxInteger = Number.MAX_SAFE_INTEGER;
+
 export class CustomEventPostMessage implements PostMessage {
   constructor(private send: CustomEventMessage) {}
 
@@ -28,10 +45,10 @@ export class CustomEventMessage implements Message {
   ) {
     this.receiveFlag = `evt${messageFlag}${isContent ? DefinedFlags.contentFlag : DefinedFlags.injectFlag}${DefinedFlags.domEvent}`;
     this.sendFlag = `evt${messageFlag}${isContent ? DefinedFlags.injectFlag : DefinedFlags.contentFlag}${DefinedFlags.domEvent}`;
-    window.addEventListener(this.receiveFlag, (event) => {
-      if (event instanceof MouseEvent && event.movementX && event.relatedTarget) {
-        this.relatedTarget.set(event.movementX, event.relatedTarget!);
-      } else if (event instanceof CustomEvent) {
+    pageAddEventListener(this.receiveFlag, (event) => {
+      if (event instanceof MouseEventClone && event.movementX && event.relatedTarget) {
+        relatedTargetMap.set(event.movementX, event.relatedTarget!);
+      } else if (event instanceof CustomEventClone) {
         this.messageHandle(event.detail, new CustomEventPostMessage(this));
       }
     });
@@ -100,10 +117,10 @@ export class CustomEventMessage implements Message {
       }
     }
 
-    const ev = new CustomEvent(this.sendFlag, {
+    const ev = new CustomEventClone(this.sendFlag, {
       detail,
     });
-    window.dispatchEvent(ev);
+    pageDispatchEvent(ev);
   }
 
   sendMessage<T = any>(data: TMessage): Promise<T> {
@@ -146,24 +163,22 @@ export class CustomEventMessage implements Message {
     return ret;
   }
 
-  relateId = 0;
-
   sendRelatedTarget(target: EventTarget): number {
     // 特殊处理relatedTarget，返回id进行关联
     // 先将relatedTarget转换成id发送过去
-    const id = ++this.relateId;
+    const id = (relateId = relateId === maxInteger ? 1 : relateId + 1);
     // 可以使用此种方式交互element
-    const ev = new MouseEvent(this.sendFlag, {
+    const ev = new MouseEventClone(this.sendFlag, {
       movementX: id,
       relatedTarget: target,
     });
-    window.dispatchEvent(ev);
+    pageDispatchEvent(ev);
     return id;
   }
 
   getAndDelRelatedTarget(id: number) {
-    const target = this.relatedTarget.get(id);
-    this.relatedTarget.delete(id);
+    const target = relatedTargetMap.get(id);
+    relatedTargetMap.delete(id);
     return target;
   }
 }

packages/message/extension_message.ts

@@ -180,7 +180,7 @@ export class ExtensionContentMessageSend implements MessageSend {
 
   sendMessage<T = any>(data: TMessage): Promise<T> {
     return new Promise((resolve) => {
-      if (!this.options?.documentId || this.options?.frameId) {
+      if (!this.options?.documentId && !this.options?.frameId) {
         // 发送给指定的tab
         chrome.tabs.sendMessage(this.tabId, data, (resp: T) => {
           const lastError = chrome.runtime.lastError;

packages/message/server.ts

@@ -100,7 +100,7 @@ export class SenderRuntime {
   }
 }
 
-type ApiFunction = (params: any, con: IGetSender) => Promise<any> | void;
+type ApiFunction = (params: any, con: IGetSender) => Promise<any> | any | void;
 type ApiFunctionSync = (params: any, con: IGetSender) => any;
 type MiddlewareFunction = (params: any, con: IGetSender, next: () => Promise<any> | any) => Promise<any> | any;
 

src/app/service/content/content.ts

@@ -5,6 +5,9 @@ import type { MessageSend } from "@Packages/message/types";
 import type { ScriptExecutor } from "./script_executor";
 import { RuntimeClient } from "../service_worker/client";
 import { makeBlobURL } from "@App/pkg/utils/utils";
+import type { GMInfoEnv } from "./types";
+import type { Logger } from "@App/app/repo/logger";
+import LoggerCore from "@App/app/logger/core";
 
 // content页的处理
 export default class ContentRuntime {
@@ -36,6 +39,9 @@ export default class ContentRuntime {
       this.scriptExecutor.valueUpdate(data);
       return sendMessage(this.senderToInject, "inject/runtime/valueUpdate", data);
     });
+    this.server.on("logger", (data: Logger) => {
+      LoggerCore.logger().log(data.level, data.message, data.label);
+    });
     forwardMessage("serviceWorker", "script/isInstalled", this.server, this.senderToExt);
     forwardMessage(
       "serviceWorker",
@@ -121,8 +127,8 @@ export default class ContentRuntime {
     );
   }
 
-  pageLoad(messageFlag: string) {
-    this.scriptExecutor.checkEarlyStartScript("content", messageFlag);
+  pageLoad(messageFlag: string, envInfo: GMInfoEnv) {
+    this.scriptExecutor.checkEarlyStartScript("content", messageFlag, envInfo);
     const client = new RuntimeClient(this.senderToExt);
     // 向service_worker请求脚本列表及环境信息
     client.pageLoad().then((o) => {
@@ -136,10 +142,8 @@ export default class ContentRuntime {
       for (const script of contentScriptList) {
         this.contentScriptSet.add(script.uuid);
       }
-      // 监听事件
-      this.scriptExecutor.setEnvInfo(envInfo);
       // 启动脚本
-      this.scriptExecutor.startScripts(contentScriptList);
+      this.scriptExecutor.startScripts(contentScriptList, envInfo);
     });
   }
 }

src/app/service/content/inject.ts

@@ -24,12 +24,8 @@ export class InjectRuntime {
     });
   }
 
-  setEnvInfo(envInfo: GMInfoEnv) {
-    this.scriptExecutor.setEnvInfo(envInfo);
-  }
-
-  startScripts(injectScriptList: TScriptInfo[]) {
-    this.scriptExecutor.startScripts(injectScriptList);
+  startScripts(injectScriptList: TScriptInfo[], envInfo: GMInfoEnv) {
+    this.scriptExecutor.startScripts(injectScriptList, envInfo);
   }
 
   onInjectPageLoaded() {

src/app/service/content/script_executor.ts

@@ -14,19 +14,30 @@ export type ExecScriptEntry = {
   scriptFunc: any;
 };
 
+export let initEnvInfo: GMInfoEnv;
+
+try {
+  initEnvInfo = {
+    userAgentData: UserAgentData, // 从全局变量获取
+    sandboxMode: "raw", // 预留字段，当前固定为 raw
+    isIncognito: false, // inject 环境下无法判断，固定为 false
+  };
+} catch {
+  // 如果 UserAgentData 不存在，可能是在非inject/content环境下运行
+  initEnvInfo = {
+    userAgentData: {},
+    sandboxMode: "raw",
+    isIncognito: false,
+  };
+}
+
 // 脚本执行器
 export class ScriptExecutor {
   earlyScriptFlag: Set<string> = new Set();
   execMap: Map<string, ExecScript> = new Map();
 
-  envInfo: GMInfoEnv | undefined;
-
   constructor(private msg: Message) {}
 
-  setEnvInfo(envInfo: GMInfoEnv) {
-    this.envInfo = envInfo;
-  }
-
   emitEvent(data: EmitEventRequest) {
     // 转发给脚本
     const exec = this.execMap.get(data.uuid);
@@ -44,13 +55,13 @@ export class ScriptExecutor {
     }
   }
 
-  startScripts(scripts: TScriptInfo[]) {
+  startScripts(scripts: TScriptInfo[], envInfo: GMInfoEnv) {
     const loadExec = (script: TScriptInfo, scriptFunc: any) => {
       this.execScriptEntry({
         scriptLoadInfo: script,
         scriptFlag: script.flag,
         scriptFunc,
-        envInfo: this.envInfo!,
+        envInfo: envInfo,
       });
     };
     // 监听脚本加载
@@ -61,7 +72,7 @@ export class ScriptExecutor {
         for (const val of this.execMap.values()) {
           if (val.scriptRes.flag === flag) {
             // 处理早期脚本的沙盒环境
-            val.updateEarlyScriptGMInfo(this.envInfo!);
+            val.updateEarlyScriptGMInfo(envInfo);
             return;
           }
         }
@@ -72,34 +83,34 @@ export class ScriptExecutor {
     });
   }
 
-  checkEarlyStartScript(env: "content" | "inject", messageFlag: string) {
+  checkEarlyStartScript(env: "content" | "inject", messageFlag: string, envInfo: GMInfoEnv) {
     const isContent = env === "content";
     const eventNamePrefix = `evt${messageFlag}${isContent ? DefinedFlags.contentFlag : DefinedFlags.injectFlag}`;
     const scriptLoadCompleteEvtName = `${eventNamePrefix}${DefinedFlags.scriptLoadComplete}`;
     const envLoadCompleteEvtName = `${eventNamePrefix}${DefinedFlags.envLoadComplete}`;
     // 监听 脚本加载
     // 适用于此「通知环境加载完成」代码执行后的脚本加载
-    window.addEventListener(scriptLoadCompleteEvtName, (ev) => {
+    performance.addEventListener(scriptLoadCompleteEvtName, (ev) => {
       const detail = (ev as CustomEvent).detail;
       const scriptFlag = detail?.scriptFlag;
       if (typeof scriptFlag === "string") {
         ev.preventDefault(); // dispatchEvent 会回传 false -> 分离环境也能得知环境加载代码已执行
-        this.execEarlyScript(scriptFlag, detail.scriptInfo);
+        this.execEarlyScript(scriptFlag, detail.scriptInfo, envInfo);
       }
     });
     // 通知 环境 加载完成
     // 适用于此「通知环境加载完成」代码执行前的脚本加载
     const ev = new CustomEvent(envLoadCompleteEvtName);
-    window.dispatchEvent(ev);
+    performance.dispatchEvent(ev);
   }
 
-  execEarlyScript(flag: string, scriptInfo: TScriptInfo) {
+  execEarlyScript(flag: string, scriptInfo: TScriptInfo, envInfo: GMInfoEnv) {
     const scriptFunc = (window as any)[flag] as ScriptFunc;
     this.execScriptEntry({
       scriptLoadInfo: scriptInfo,
       scriptFunc: scriptFunc,
       scriptFlag: flag,
-      envInfo: {},
+      envInfo: envInfo,
     });
     this.earlyScriptFlag.add(flag);
   }

src/app/service/content/types.ts

@@ -48,6 +48,6 @@ export interface ApiValue {
 
 export interface GMInfoEnv {
   userAgentData: typeof GM_info.userAgentData;
-  sandboxMode: typeof GM_info.sandboxMode;
+  sandboxMode: typeof GM_info.sandboxMode; // 目前固定为 "raw"，预留
   isIncognito: typeof GM_info.isIncognito;
 }

src/app/service/content/utils.ts

@@ -151,9 +151,9 @@ export function compilePreInjectScript(
   return `window['${flag}'] = function(){${autoDeleteMountCode}${scriptCode}};
 {
   let o = { cancelable: true, detail: { scriptFlag: '${flag}', scriptInfo: (${scriptInfoJSON}) } },
-  f = () => window.dispatchEvent(new CustomEvent('${evScriptLoad}', o)),
+  f = () => performance.dispatchEvent(new CustomEvent('${evScriptLoad}', o)),
   needWait = f();
-  if (needWait) window.addEventListener('${evEnvLoad}', f, { once: true });
+  if (needWait) performance.addEventListener('${evEnvLoad}', f, { once: true });
 }
 `;
 }