🐛 修复后台脚本中无法使用 GM_openInTab 的问题 #873

Author: CodFrm

src/app/service/service_worker/gm_api.ts

@@ -12,7 +12,7 @@ import PermissionVerify, { PermissionVerifyApiGet } from "./permission_verify";
 import { cacheInstance } from "@App/app/cache";
 import EventEmitter from "eventemitter3";
 import { type RuntimeService } from "./runtime";
-import { getIcon, isFirefox, openInCurrentTab, cleanFileName } from "@App/pkg/utils/utils";
+import { getIcon, isFirefox, openInCurrentTab, cleanFileName, getCurrentTab } from "@App/pkg/utils/utils";
 import { type SystemConfig } from "@App/pkg/config/config";
 import i18next, { i18nName } from "@App/locales/locales";
 import FileSystemFactory from "@Packages/filesystem/factory";
@@ -854,9 +854,12 @@ export default class GMApi {
     const getNewTabId = async () => {
       const { tabId, windowId } = sender.getExtMessageSender();
       const active = options.active;
-      const currentTab = await chrome.tabs.get(tabId);
+      let currentTab: chrome.tabs.Tab | undefined;
+      if (tabId !== -1) {
+        currentTab = await chrome.tabs.get(tabId);
+      }
       let newTabIndex = -1;
-      if (options.incognito && !currentTab.incognito) {
+      if (options.incognito && !currentTab?.incognito) {
         // incognito: "split" 在 normal 里不会看到 incognito
         // 只能创建新 incognito window
         // pinned 无效

src/pkg/utils/utils.ts

@@ -79,7 +79,7 @@ export function parseStorageValue(str: string): unknown {
 }
 
 // https://developer.chrome.com/docs/extensions/reference/api/tabs?hl=en#get_the_current_tab
-export async function getCurrentTab() {
+export async function getCurrentTab(): Promise<chrome.tabs.Tab | undefined> {
   // `tab` will either be a `tabs.Tab` instance or `undefined`.
   const [tab] = await chrome.tabs.query({ active: true, lastFocusedWindow: true, windowType: "normal" });
   return tab;