🎨 优化窗口打开逻辑

Author: CodFrm

packages/message/server.ts

@@ -92,6 +92,7 @@ export class Server {
             })
             .catch((e: Error) => {
               con.sendMessage({ code: -1, message: e.message || e.toString() });
+              this.logger.error("connectHandle error", Logger.E(e));
             });
           return true;
         } else {
@@ -118,13 +119,15 @@ export class Server {
             })
             .catch((e: Error) => {
               sendResponse({ code: -1, message: e.message || e.toString() });
+              this.logger.error("messageHandle error", Logger.E(e));
             });
           return true;
         } else {
           sendResponse({ code: 0, data: ret });
         }
       } catch (e: any) {
         sendResponse({ code: -1, message: e.message || e.toString() });
+        this.logger.error("messageHandle error", Logger.E(e));
       }
     } else {
       sendResponse({ code: -1, message: "no such api " + action });

src/app/logger/logger.ts

@@ -96,6 +96,7 @@ export default class Logger {
       return { error: e };
     }
     if (e instanceof Error) {
+      console.error(e);
       return { error: e.message };
     }
     if (typeof e === "object") {

src/app/service/service_worker/gm_api.ts

@@ -311,8 +311,9 @@ export default class GMApi {
   }
 
   @PermissionVerify.API()
-  CAT_userConfig(request: Request): void {
-    openInCurrentTab(`/src/options.html#/?userConfig=${request.uuid}`);
+  CAT_userConfig(request: Request, sender: GetSender): void {
+    const { tabId } = sender.getExtMessageSender();
+    openInCurrentTab(`/src/options.html#/?userConfig=${request.uuid}`, tabId === -1 ? undefined : tabId);
   }
 
   @PermissionVerify.API({

src/app/service/service_worker/permission_verify.ts

@@ -151,7 +151,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);
@@ -170,7 +170,7 @@ export default class PermissionVerify {
     });
   }
 
-  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;
     }
@@ -195,7 +195,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,
@@ -251,7 +251,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();
       // 超时处理
@@ -270,7 +270,8 @@ export default class PermissionVerify {
         reject,
       });
       // 打开窗口
-      openInCurrentTab(`src/confirm.html?uuid=${uuid}`);
+      const { tabId } = sender.getExtMessageSender();
+      openInCurrentTab(`src/confirm.html?uuid=${uuid}`, tabId === -1 ? undefined : tabId);
     });
   }
 

src/app/service/service_worker/runtime.ts

@@ -476,6 +476,7 @@ export class RuntimeService {
         }),
         // 加载resource
         resource.getScriptResources(script, false).then((resource) => {
+          script.resource = resource;
           for (const name of Object.keys(resource)) {
             const res = script.resource[name];
             // 删除base64以节省资源
@@ -484,7 +485,6 @@ export class RuntimeService {
               res.base64 = undefined;
             }
           }
-          script.resource = resource;
         }),
         // 加载code相关的信息
         scriptDAO.scriptCodeDAO.get(script.uuid).then((code) => {

src/pkg/utils/utils.ts

@@ -84,9 +84,13 @@ export async function getCurrentTab() {
   return tab;
 }
 
-// 在当前页后打开一个新页面
-export async function openInCurrentTab(url: string) {
-  const tab = await getCurrentTab();
+export async function getTab(tabId: number) {
+  return await chrome.tabs.get(tabId).catch(() => undefined);
+}
+
+// 在当前页后打开一个新页面，如果指定tabId则在该tab后打开
+export async function openInCurrentTab(url: string, tabId?: number) {
+  const tab = await (tabId ? getTab(tabId) : getCurrentTab());
   const createProperties: chrome.tabs.CreateProperties = { url };
   if (tab) {
     // 添加 openerTabId 有可能出现 Error "Tab opener must be in the same window as the updated tab."