🚑 修复其他扩展注入 chrome.runtime 导致环境误判的问题 #1280 (#1281)

CodFrm · cyfung1031 · Copilot · web-flow · commit 216a78c00023 · 2026-03-13T17:20:47.000+08:00
* 🐛 修复其他扩展注入 chrome.runtime 导致环境误判的问题 #1280 移除 isContent 运行时检测，改为通过 CustomEventMessage.envTag 在构建入口确定环境， 避免其他扩展（如大学搜题酱）向页面注入 chrome.runtime 对象导致 inject 环境被误判为 content 环境。 * Update src/app/service/content/gm_api/gm_api.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * update * 删除不必要的isconnect * 将 typecheck 集成到 lint/lint-fix 脚本中 * 修复引用 * 删除test-results --------- Co-authored-by: cyfung1031 <44498510+cyfung1031@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scriptcat",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!",
   "author": "CodFrm",
   "license": "GPLv3",
@@ -18,9 +18,9 @@
     "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 .",
+    "lint": "tsc --noEmit && eslint .",
+    "lint:ci": "tsc --noEmit && eslint . --cache --cache-location .eslintcache",
+    "lint-fix": "tsc --noEmit && eslint --fix .",
     "changlog": "node ./scripts/changlog.js",
     "crowdin": "crowdin",
     "crowdin:download": "node ./scripts/crowdin-download.js",
diff --git a/packages/message/common.ts b/packages/message/common.ts
@@ -6,9 +6,6 @@ export const CustomEventClone = CustomEvent;
 
 const performanceClone = (process.env.VI_TESTING === "true" ? new EventTarget() : performance) as Performance;
 
-// 判断当前是否运行在 USER_SCRIPT 环境 (content环境)
-export const isContent = typeof chrome === "object" && typeof chrome?.runtime?.sendMessage === "function";
-
 // 避免页面载入后改动 EventTarget.prototype 的方法导致消息传递失败
 export const pageDispatchEvent = performanceClone.dispatchEvent.bind(performanceClone);
 export const pageAddEventListener = performanceClone.addEventListener.bind(performanceClone);
diff --git a/packages/message/custom_event_message.ts b/packages/message/custom_event_message.ts
@@ -12,6 +12,7 @@ import {
   createMouseEvent,
 } from "@Packages/message/common";
 import { ReadyWrap } from "@App/pkg/utils/ready-wrap";
+import type { ScriptEnvTag } from "@Packages/message/consts";
 
 // 避免页面载入后改动 Map.prototype 导致消息传递失败
 const relatedTargetMap = new Map<number, EventTarget>();
@@ -41,9 +42,11 @@ export class CustomEventMessage implements Message {
   readyWrap: ReadyWrap = new ReadyWrap();
 
   constructor(
-    messageFlag: string,
-    protected readonly isInbound: boolean
+    eventFlag: string,
+    protected readonly isInbound: boolean,
+    public readonly envTag: ScriptEnvTag | "" = ""
   ) {
+    const messageFlag = `${eventFlag}${envTag}`;
     this.receiveFlag = `${messageFlag}${isInbound ? DefinedFlags.inboundFlag : DefinedFlags.outboundFlag}${DefinedFlags.domEvent}`;
     this.sendFlag = `${messageFlag}${isInbound ? DefinedFlags.outboundFlag : DefinedFlags.inboundFlag}${DefinedFlags.domEvent}`;
     pageAddEventListener(this.receiveFlag, (event: Event) => {
diff --git a/src/app/service/content/gm_api/gm_api.ts b/src/app/service/content/gm_api/gm_api.ts
@@ -18,13 +18,13 @@ import GMContext from "./gm_context";
 import { type ScriptRunResource } from "@App/app/repo/scripts";
 import type { ValueUpdateDataEncoded } from "../types";
 import { connect, sendMessage } from "@Packages/message/client";
-import { isContent } from "@Packages/message/common";
 import { getStorageName } from "@App/pkg/utils/utils";
 import { ListenerManager } from "../listener_manager";
 import { decodeRValue, encodeRValue, type REncoded } from "@App/pkg/utils/message_value";
 import { type TGMKeyValue } from "@App/app/repo/value";
 import type { ContextType } from "./gm_xhr";
 import { convObjectToURL, GM_xmlhttpRequest, toBlobURL, urlToDocumentInContentPage } from "./gm_xhr";
+import { ScriptEnvTag } from "@Packages/message/consts";
 
 // 内部函数呼叫定义
 export interface IGM_Base {
@@ -526,7 +526,12 @@ export default class GMApi extends GM_Base {
 
   @GMContext.API()
   public async CAT_fetchDocument(url: string): Promise<Document | undefined> {
-    return urlToDocumentInContentPage(this, url, isContent);
+    // 上下文已失效时直接返回，避免访问已释放的 message 造成异常
+    if (this.isInvalidContext()) return undefined;
+
+    const message = this.message as CustomEventMessage | null;
+    const isContentEnv = !!message && message.envTag === ScriptEnvTag.content;
+    return urlToDocumentInContentPage(this, url, isContentEnv);
   }
 
   static _GM_cookie(
diff --git a/src/content.ts b/src/content.ts
@@ -4,16 +4,16 @@ import { CustomEventMessage } from "@Packages/message/custom_event_message";
 import { Server } from "@Packages/message/server";
 import { ScriptExecutor } from "./app/service/content/script_executor";
 import type { Message } from "@Packages/message/types";
-import { getEventFlag, isContent } from "@Packages/message/common";
+import { getEventFlag } from "@Packages/message/common";
 import { ScriptRuntime } from "./app/service/content/script_runtime";
 import { ScriptEnvTag } from "@Packages/message/consts";
 
 const messageFlag = process.env.SC_RANDOM_KEY!;
 
 getEventFlag(messageFlag, (eventFlag: string) => {
-  const scriptEnvTag = isContent ? ScriptEnvTag.content : ScriptEnvTag.inject;
+  const scriptEnvTag = ScriptEnvTag.content;
 
-  const msg: Message = new CustomEventMessage(`${eventFlag}${scriptEnvTag}`, false);
+  const msg: Message = new CustomEventMessage(eventFlag, false, scriptEnvTag);
 
   // 初始化日志组件
   const logger = new LoggerCore({
@@ -25,7 +25,7 @@ getEventFlag(messageFlag, (eventFlag: string) => {
   logger.logger().debug("content start");
 
   const server = new Server("content", msg);
-  const scriptExecutor = new ScriptExecutor(msg, new CustomEventMessage(`${eventFlag}${scriptEnvTag}`, true));
+  const scriptExecutor = new ScriptExecutor(msg, new CustomEventMessage(eventFlag, true, scriptEnvTag));
   const runtime = new ScriptRuntime(scriptEnvTag, server, msg, scriptExecutor);
   runtime.contentInit();
   runtime.init();
diff --git a/src/inject.ts b/src/inject.ts
@@ -4,16 +4,16 @@ import { CustomEventMessage } from "@Packages/message/custom_event_message";
 import { Server } from "@Packages/message/server";
 import { ScriptExecutor } from "./app/service/content/script_executor";
 import type { Message } from "@Packages/message/types";
-import { getEventFlag, isContent } from "@Packages/message/common";
+import { getEventFlag } from "@Packages/message/common";
 import { ScriptRuntime } from "./app/service/content/script_runtime";
 import { ScriptEnvTag } from "@Packages/message/consts";
 
 const messageFlag = process.env.SC_RANDOM_KEY!;
 
 getEventFlag(messageFlag, (eventFlag: string) => {
-  const scriptEnvTag = isContent ? ScriptEnvTag.content : ScriptEnvTag.inject;
+  const scriptEnvTag = ScriptEnvTag.inject;
 
-  const msg: Message = new CustomEventMessage(`${eventFlag}${scriptEnvTag}`, false);
+  const msg: Message = new CustomEventMessage(eventFlag, false, scriptEnvTag);
 
   // 初始化日志组件
   const logger = new LoggerCore({
@@ -25,7 +25,7 @@ getEventFlag(messageFlag, (eventFlag: string) => {
   logger.logger().debug("inject start");
 
   const server = new Server("inject", msg);
-  const scriptExecutor = new ScriptExecutor(msg, new CustomEventMessage(`${eventFlag}${ScriptEnvTag.content}`, true));
+  const scriptExecutor = new ScriptExecutor(msg, new CustomEventMessage(eventFlag, true, ScriptEnvTag.content));
   const runtime = new ScriptRuntime(scriptEnvTag, server, msg, scriptExecutor);
   runtime.init();
 
diff --git a/src/manifest.json b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "__MSG_scriptcat__",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "author": "CodFrm",
   "description": "__MSG_scriptcat_description__",
   "options_ui": {
diff --git a/src/scripting.ts b/src/scripting.ts
@@ -22,8 +22,8 @@ negotiateEventFlag(messageFlag, 2, (eventFlag) => {
 
   logger.logger().debug("scripting start");
 
-  const contentMsg = new CustomEventMessage(`${eventFlag}${ScriptEnvTag.content}`, true);
-  const injectMsg = new CustomEventMessage(`${eventFlag}${ScriptEnvTag.inject}`, true);
+  const contentMsg = new CustomEventMessage(eventFlag, true, ScriptEnvTag.content);
+  const injectMsg = new CustomEventMessage(eventFlag, true, ScriptEnvTag.inject);
 
   const server = new Server("scripting", [contentMsg, injectMsg]);
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"manifest_version": 3,`
`3`	`3`	`"name": "__MSG_scriptcat__",`
`4`		`- "version": "1.3.0",`
	`4`	`+ "version": "1.3.1",`
`5`	`5`	`"author": "CodFrm",`
`6`	`6`	`"description": "__MSG_scriptcat_description__",`
`7`	`7`	`"options_ui": {`