🐛 修复GM_notification无法触发 onclick #406

Author: CodFrm

src/app/service/content/content.ts

@@ -1,5 +1,3 @@
-import LoggerCore from "@App/app/logger/core";
-import Logger from "@App/app/logger/logger";
 import { ScriptRunResouce } from "@App/app/repo/scripts";
 import { Client, sendMessage } from "@Packages/message/client";
 import { CustomEventMessage } from "@Packages/message/custom_event_message";

src/app/service/content/gm_api.ts

@@ -687,7 +687,7 @@ export default class GMApi {
         switch (resp.event) {
           case "click":
           case "buttonClick": {
-            click && click.apply({ id }, [id, resp.params.index]);
+            click && click.apply({ id }, [id, resp.params?.index]);
             break;
           }
           case "close": {

src/app/service/content/inject.ts

@@ -1,9 +1,8 @@
-import { ScriptRunResouce } from "@App/app/repo/scripts";
 import { Message, Server } from "@Packages/message/server";
 import ExecScript, { ValueUpdateData } from "./exec_script";
 import { addStyle, ScriptFunc } from "./utils";
 import { getStorageName } from "@App/pkg/utils/utils";
-import { EmitEventRequest } from "../service_worker/runtime";
+import { EmitEventRequest, ScriptLoadInfo } from "../service_worker/runtime";
 import { ExternalWhitelist } from "@App/app/const";
 import { sendMessage } from "@Packages/message/client";
 
@@ -13,7 +12,7 @@ export class InjectRuntime {
   constructor(
     private server: Server,
     private msg: Message,
-    private scripts: ScriptRunResouce[]
+    private scripts: ScriptLoadInfo[]
   ) {}
 
   start() {
@@ -82,7 +81,7 @@ export class InjectRuntime {
     }
   }
 
-  execScript(script: ScriptRunResouce, scriptFunc: ScriptFunc) {
+  execScript(script: ScriptLoadInfo, scriptFunc: ScriptFunc) {
     // @ts-ignore
     delete window[script.flag];
     const exec = new ExecScript(script, "content", this.msg, scriptFunc);

src/inject.ts

@@ -2,8 +2,8 @@ import LoggerCore from "./app/logger/core";
 import MessageWriter from "./app/logger/message_writer";
 import { CustomEventMessage } from "@Packages/message/custom_event_message";
 import { Server } from "@Packages/message/server";
-import { ScriptRunResouce } from "./app/repo/scripts";
 import { InjectRuntime } from "./app/service/content/inject";
+import { ScriptLoadInfo } from "./app/service/service_worker/runtime";
 
 const msg = new CustomEventMessage(MessageFlag, false);
 
@@ -15,7 +15,7 @@ const logger = new LoggerCore({
 
 const server = new Server("inject", msg);
 
-server.on("pageLoad", (data: { scripts: ScriptRunResouce[] }) => {
+server.on("pageLoad", (data: { scripts: ScriptLoadInfo[] }) => {
   logger.logger().debug("inject start");
   // 监听事件
   const runtime = new InjectRuntime(server, msg, data.scripts);

src/template/scriptcat.d.tpl

@@ -97,7 +97,18 @@ declare function GM_getResourceText(name: string): string | undefined;
 
 declare function GM_getResourceURL(name: string, isBlobUrl?: boolean): string | undefined;
 
-declare function GM_registerMenuCommand(name: string, listener: () => void, accessKey?: string): number;
+declare function GM_registerMenuCommand(
+  name: string,
+  listener: () => void,
+  optionsOrAccessKey?:
+    | string
+    | {
+        id?: number | string;
+        accessKey?: string;
+        autoClose?: boolean;
+        title?: string;
+      }
+): number;
 
 declare function GM_unregisterMenuCommand(id: number): void;
 
@@ -363,7 +374,7 @@ declare namespace GMTypes {
     user?: string;
     password?: string;
     nocache?: boolean;
-    redirect?: "follow" | "error" | "manual";// 为了与tm保持一致, 在v0.17.0后废弃maxRedirects, 使用redirect替代, 会强制使用fetch模式
+    redirect?: "follow" | "error" | "manual"; // 为了与tm保持一致, 在v0.17.0后废弃maxRedirects, 使用redirect替代, 会强制使用fetch模式
 
     onload?: Listener<XHRResponse>;
     onloadstart?: Listener<XHRResponse>;