✨ 优化安装、权限等的打开窗口交互

CodFrm · CodFrm · commit 0d9ba53ba3b4 · 2025-07-25T21:55:54.000+08:00
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: "新功能请求"
 about: 期望能够增加的功能
-title: "[Feature]"
+title: "[Feature] "
 labels: "enhancement"
 assignees: ""
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request_en.md b/.github/ISSUE_TEMPLATE/feature_request_en.md
@@ -1,7 +1,7 @@
 ---
 name: "Feature Request"
 about: Features you would like to see added
-title: "[Feature]"
+title: "[Feature] "
 labels: "enhancement"
 assignees: ""
 ---
diff --git a/packages/message/extension_message.ts b/packages/message/extension_message.ts
@@ -149,6 +149,10 @@ export class ExtensionMessageConnect implements MessageConnect {
   onDisconnect(callback: () => void) {
     this.con.onDisconnect.addListener(callback);
   }
+
+  getPort(): chrome.runtime.Port {
+    return this.con;
+  }
 }
 
 export class ExtensionContentMessageSend extends ExtensionMessageSend {
diff --git a/packages/message/server.ts b/packages/message/server.ts
@@ -1,6 +1,7 @@
 import type { MessageSender, MessageConnect, ExtMessageSender, Message, MessageSend } from "./types";
 import LoggerCore from "@App/app/logger/core";
 import { connect, sendMessage } from "./client";
+import { ExtensionMessageConnect } from "./extension_message";
 
 export class GetSender {
   constructor(private sender: MessageConnect | MessageSender) {}
@@ -10,6 +11,14 @@ export class GetSender {
   }
 
   getExtMessageSender(): ExtMessageSender {
+    if (this.sender instanceof ExtensionMessageConnect) {
+      const con = this.sender.getPort();
+      return {
+        tabId: con.sender?.tab?.id || -1, // -1表示后台脚本
+        frameId: con.sender?.frameId,
+        documentId: con.sender?.documentId,
+      };
+    }
     const sender = this.sender as MessageSender;
     return {
       tabId: sender.tab?.id || -1, // -1表示后台脚本
diff --git a/src/app/service/service_worker/client.ts b/src/app/service/service_worker/client.ts
@@ -309,9 +309,7 @@ export class SynchronizeClient extends Client {
       url: url,
     });
     // 打开导入窗口，用cache实现数据交互
-    chrome.tabs.create({
-      url: `/src/import.html?uuid=${uuid}`,
-    });
+    window.open(chrome.runtime.getURL(`/src/import.html?uuid=${uuid}`), "_blank");
   }
 
   importResources(
diff --git a/src/app/service/service_worker/gm_api.ts b/src/app/service/service_worker/gm_api.ts
@@ -142,7 +142,7 @@ export default class GMApi {
     }
     const req = await this.parseRequest(data);
     try {
-      await this.permissionVerify.verify(req, api);
+      await this.permissionVerify.verify(req, api, sender);
     } catch (e) {
       this.logger.error("verify error", { api: data.api }, Logger.E(e));
       throw e;
@@ -310,10 +310,12 @@ export default class GMApi {
   }
 
   @PermissionVerify.API()
-  CAT_userConfig(request: Request) {
+  CAT_userConfig(request: Request, sender: GetSender): void {
+    const tabId = sender.getExtMessageSender().tabId;
     chrome.tabs.create({
       url: `/src/options.html#/?userConfig=${request.uuid}`,
       active: true,
+      openerTabId: tabId === -1 ? undefined : tabId,
     });
   }
 
@@ -337,12 +339,14 @@ export default class GMApi {
       } as ConfirmParam;
     },
   })
-  async CAT_fileStorage(request: Request): Promise<{ action: string; data: any } | boolean> {
+  async CAT_fileStorage(request: Request, sender: GetSender): Promise<{ action: string; data: any } | boolean> {
     const [action, details] = request.params;
     if (action === "config") {
+      const tabId = sender.getExtMessageSender().tabId;
       chrome.tabs.create({
         url: `/src/options.html#/setting`,
         active: true,
+        openerTabId: tabId === -1 ? undefined : tabId,
       });
       return true;
     }
@@ -811,7 +815,12 @@ export default class GMApi {
         return false;
       }
     } else {
-      const tab = await chrome.tabs.create({ url, active: options.active });
+      const tabId = sender.getExtMessageSender().tabId;
+      const tab = await chrome.tabs.create({
+        url,
+        active: options.active,
+        openerTabId: tabId === -1 ? undefined : tabId,
+      });
       await Cache.getInstance().set(`GM_openInTab:${tab.id}`, {
         uuid: request.uuid,
         sender: sender.getExtMessageSender(),
diff --git a/src/app/service/service_worker/permission_verify.ts b/src/app/service/service_worker/permission_verify.ts
@@ -1,6 +1,7 @@
 // gm api 权限验证
 import type { Script } from "@App/app/repo/scripts";
 import { type Permission, PermissionDAO } from "@App/app/repo/permission";
+import type { GetSender } from "@Packages/message/server";
 import { type Group } from "@Packages/message/server";
 import { type MessageQueue } from "@Packages/message/message_queue";
 import type { Api, Request } from "./types";
@@ -97,6 +98,7 @@ export default class PermissionVerify {
     confirm: ConfirmParam | boolean;
     resolve: (value: boolean) => void;
     reject: (reason: any) => void;
+    sender: GetSender;
   }> = new Queue();
 
   private permissionDAO: PermissionDAO = new PermissionDAO();
@@ -109,7 +111,7 @@ export default class PermissionVerify {
   }
 
   // 验证是否有权限
-  async verify(request: Request, api: ApiValue): Promise<boolean> {
+  async verify(request: Request, api: ApiValue, sender: GetSender): Promise<boolean> {
     const { alias, link, confirm } = api.param;
     if (api.param.default) {
       return true;
@@ -132,7 +134,7 @@ export default class PermissionVerify {
         // 需要用户确认
         let result = true;
         if (confirm) {
-          result = await this.pushConfirmQueue(request, confirm);
+          result = await this.pushConfirmQueue(request, confirm, sender);
         }
         return result;
       }
@@ -148,7 +150,7 @@ export default class PermissionVerify {
       return;
     }
     try {
-      const ret = await this.confirm(data.request, data.confirm);
+      const ret = await this.confirm(data.request, data.confirm, data.sender);
       data.resolve(ret);
     } catch (e) {
       data.reject(e);
@@ -157,17 +159,17 @@ export default class PermissionVerify {
   }
 
   // 确认队列,为了防止一次性打开过多的窗口
-  async pushConfirmQueue(request: Request, confirmFn: ApiParamConfirmFn): Promise<boolean> {
+  async pushConfirmQueue(request: Request, confirmFn: ApiParamConfirmFn, sender: GetSender): Promise<boolean> {
     const confirm = await confirmFn(request);
     if (confirm === true) {
       return true;
     }
     return await new Promise((resolve, reject) => {
-      this.confirmQueue.push({ request, confirm, resolve, reject });
+      this.confirmQueue.push({ request, confirm, resolve, reject, sender });
     });
   }
 
-  async confirm(request: Request, confirm: boolean | ConfirmParam): Promise<boolean> {
+  async confirm(request: Request, confirm: boolean | ConfirmParam, sender: GetSender): Promise<boolean> {
     if (typeof confirm === "boolean") {
       return confirm;
     }
@@ -192,7 +194,7 @@ export default class PermissionVerify {
       throw new Error("permission denied");
     }
     // 没有权限,则弹出页面让用户进行确认
-    const userConfirm = await this.confirmWindow(request.script, confirm);
+    const userConfirm = await this.confirmWindow(request.script, confirm, sender);
     // 成功存入数据库
     const model: Permission = {
       uuid: request.uuid,
@@ -248,7 +250,7 @@ export default class PermissionVerify {
   > = new Map();
 
   // 弹出窗口让用户进行确认
-  async confirmWindow(script: Script, confirm: ConfirmParam): Promise<UserConfirm> {
+  async confirmWindow(script: Script, confirm: ConfirmParam, sender: GetSender): Promise<UserConfirm> {
     return new Promise((resolve, reject) => {
       const uuid = uuidv4();
       // 超时处理
@@ -267,8 +269,10 @@ export default class PermissionVerify {
         reject,
       });
       // 打开窗口
+      const tabId = sender.getExtMessageSender().tabId;
       chrome.tabs.create({
         url: chrome.runtime.getURL(`src/confirm.html?uuid=${uuid}`),
+        openerTabId: tabId === -1 ? undefined : tabId, // 如果是后台脚本,则不设置openerTabId
       });
     });
   }
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
@@ -36,8 +36,8 @@ export class ScriptService {
 
   listenerScriptInstall() {
     // 初始化脚本安装监听
-    chrome.webRequest.onBeforeSendHeaders.addListener(
-      (req: chrome.webRequest.OnBeforeSendHeadersDetails) => {
+    chrome.webRequest.onResponseStarted.addListener(
+      (req: chrome.webRequest.OnResponseStartedDetails) => {
         // 处理url, 实现安装脚本
         if (req.method !== "GET") {
           return undefined;
diff --git a/src/pkg/utils/utils.ts b/src/pkg/utils/utils.ts
@@ -112,6 +112,7 @@ export function openInCurrentTab(url: string) {
       if (tabs.length) {
         chrome.tabs.create({
           url,
+          openerTabId: tabs[0].id,
           index: tabs[0].index + 1,
         });
       } else {

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,10 @@ export class ExtensionMessageConnect implements MessageConnect {`
`149`	`149`	`onDisconnect(callback: () => void) {`
`150`	`150`	`this.con.onDisconnect.addListener(callback);`
`151`	`151`	`}`
	`152`	`+`
	`153`	`+ getPort(): chrome.runtime.Port {`
	`154`	`+ return this.con;`
	`155`	`+ }`
`152`	`156`	`}`
`153`	`157`
`154`	`158`	`export class ExtensionContentMessageSend extends ExtensionMessageSend {`