[v1.3] 修复 87c0a19dea9cad2e9ebdce13bb4d998ea386ad74 重构代码时不正确的修改

src/app/service/content/external.ts

@@ -0,0 +1,86 @@
+import { ExternalWhitelist } from "@App/app/const";
+import { sendMessage } from "@Packages/message/client";
+import type { Message } from "@Packages/message/types";
+
+// ================================
+// 对外接口：external 注入
+// ================================
+
+// 判断当前 hostname 是否命中白名单（含子域名）
+const isExternalWhitelisted = (hostname: string) => {
+  return ExternalWhitelist.some(
+    (t) => hostname.endsWith(t) && (hostname.length === t.length || hostname.endsWith(`.${t}`))
+  );
+};
+
+// 生成暴露给页面的 Scriptcat 外部接口
+const createScriptcatExpose = (msg: Message) => {
+  const scriptExpose: App.ExternalScriptCat = {
+    isInstalled(name: string, namespace: string, callback: (res: App.IsInstalledResponse | undefined) => unknown) {
+      sendMessage<App.IsInstalledResponse>(msg, "scripting/script/isInstalled", { name, namespace }).then(callback);
+    },
+  };
+  return scriptExpose;
+};
+
+// 尝试写入 external，失败则忽略
+const safeSetExternal = <T extends object>(external: any, key: string, value: T) => {
+  try {
+    external[key] = value;
+    return true;
+  } catch {
+    // 无法注入到 external，忽略
+    return false;
+  }
+};
+
+// 当 TM 与 SC 同时存在时的兼容处理：TM 未安装脚本时回退查询 SC
+const patchTampermonkeyIsInstalled = (external: any, scriptExpose: App.ExternalScriptCat) => {
+  const exposedTM = external.Tampermonkey;
+  const isInstalledTM = exposedTM?.isInstalled;
+  const isInstalledSC = scriptExpose.isInstalled;
+
+  // 满足这些字段时，认为是较完整的 TM 对象
+  if (isInstalledTM && exposedTM?.getVersion && exposedTM.openOptions) {
+    try {
+      exposedTM.isInstalled = (
+        name: string,
+        namespace: string,
+        callback: (res: App.IsInstalledResponse | undefined) => unknown
+      ) => {
+        isInstalledTM(name, namespace, (res: App.IsInstalledResponse | undefined) => {
+          if (res?.installed) callback(res);
+          else isInstalledSC(name, namespace, callback);
+        });
+      };
+    } catch {
+      // 忽略错误
+    }
+    return true;
+  }
+
+  return false;
+};
+
+// inject 环境 pageLoad 后执行：按白名单对页面注入 external 接口
+export const onInjectPageLoaded = (msg: Message) => {
+  const hostname = window.location.hostname;
+
+  // 不在白名单则不对外暴露接口
+  if (!isExternalWhitelisted(hostname)) return;
+
+  // 确保 external 存在
+  const external: External = (window.external || (window.external = {} as External)) as External;
+
+  // 创建 Scriptcat 暴露对象
+  const scriptExpose = createScriptcatExpose(msg);
+
+  // 尝试设置 external.Scriptcat
+  safeSetExternal(external, "Scriptcat", scriptExpose);
+
+  // 如果页面已有 Tampermonkey，则做兼容补丁；否则将 Tampermonkey 也指向 Scriptcat 接口
+  const patched = patchTampermonkeyIsInstalled(external, scriptExpose);
+  if (!patched) {
+    safeSetExternal(external, "Tampermonkey", scriptExpose);
+  }
+};

src/app/service/content/script_runtime.ts

@@ -1,12 +1,11 @@
 import { type Server } from "@Packages/message/server";
 import type { Message } from "@Packages/message/types";
-import { ExternalWhitelist } from "@App/app/const";
-import { sendMessage } from "@Packages/message/client";
 import { initEnvInfo, type ScriptExecutor } from "./script_executor";
 import type { TScriptInfo } from "@App/app/repo/scripts";
 import type { EmitEventRequest } from "../service_worker/types";
 import type { GMInfoEnv, ValueUpdateDataEncoded } from "./types";
 import type { ScriptEnvTag } from "@Packages/message/consts";
+import { onInjectPageLoaded } from "./external";
 
 export class ScriptRuntime {
   constructor(
@@ -40,59 +39,6 @@ export class ScriptRuntime {
   }
 
   externalMessage() {
-    // 对外接口白名单
-    const hostname = window.location.hostname;
-    if (
-      ExternalWhitelist.some(
-        // 如果当前页面的 hostname 是白名单的网域或其子网域
-        (t) => hostname.endsWith(t) && (hostname.length === t.length || hostname.endsWith(`.${t}`))
-      )
-    ) {
-      const msg = this.msg;
-      // 注入
-      const external: External = window.external || (window.external = {} as External);
-      const scriptExpose: App.ExternalScriptCat = {
-        isInstalled(name: string, namespace: string, callback: (res: App.IsInstalledResponse | undefined) => unknown) {
-          sendMessage<App.IsInstalledResponse>(msg, "content/script/isInstalled", {
-            name,
-            namespace,
-          }).then(callback);
-        },
-      };
-      try {
-        external.Scriptcat = scriptExpose;
-      } catch {
-        // 无法注入到 external，忽略
-      }
-      const exposedTM = external.Tampermonkey;
-      const isInstalledTM = exposedTM?.isInstalled;
-      const isInstalledSC = scriptExpose.isInstalled;
-      if (isInstalledTM && exposedTM?.getVersion && exposedTM.openOptions) {
-        // 当TM和SC同时启动的特殊处理：如TM没有安装，则查SC的安装状态
-        try {
-          exposedTM.isInstalled = (
-            name: string,
-            namespace: string,
-            callback: (res: App.IsInstalledResponse | undefined) => unknown
-          ) => {
-            isInstalledTM(name, namespace, (res) => {
-              if (res?.installed) callback(res);
-              else
-                isInstalledSC(name, namespace, (res) => {
-                  callback(res);
-                });
-            });
-          };
-        } catch {
-          // 忽略错误
-        }
-      } else {
-        try {
-          external.Tampermonkey = scriptExpose;
-        } catch {
-          // 无法注入到 external，忽略
-        }
-      }
-    }
+    onInjectPageLoaded(this.msg);
   }
 }