🔥 弃掉 GM_openInTab({ useOpen: true }) (#867)

* 弃掉 `GM_openInTab({ useOpen: true })`

* 处理lint问题和删除定义

---------

Co-authored-by: 王一之 <yz@ggnb.top>

Author: cyfung1031

src/app/service/offscreen/gm_api.ts

@@ -179,10 +179,6 @@ export default class GMApi {
     });
   }
 
-  async openInTab({ url }: { url: string }) {
-    return window.open(url) !== undefined;
-  }
-
   textarea: HTMLTextAreaElement = document.createElement("textarea");
 
   clipboardData: { type?: string; data: string } | undefined;
@@ -210,7 +206,6 @@ export default class GMApi {
     });
 
     this.group.on("xmlHttpRequest", this.xmlHttpRequest.bind(this));
-    this.group.on("openInTab", this.openInTab.bind(this));
     this.group.on("setClipboard", this.setClipboard.bind(this));
   }
 }

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, getCurrentTab, openInCurrentTab, cleanFileName } from "@App/pkg/utils/utils";
+import { getIcon, isFirefox, openInCurrentTab, cleanFileName } 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";
@@ -852,61 +852,47 @@ export default class GMApi {
     const url = request.params[0];
     const options = request.params[1];
     const getNewTabId = async () => {
-      if (options.useOpen === true) {
-        // 发送给offscreen页面处理 （使用window.open）
-        const ok = await sendMessage(this.msgSender, "offscreen/gmApi/openInTab", { url });
-        if (ok) {
-          // 由于window.open强制在前台打开标签，因此获取状态为{ active:true }的标签即为新标签
-          const tab = await getCurrentTab();
-          return tab.id;
-        } else {
-          // 当新tab被浏览器阻止时window.open()会返回null 视为已经关闭
-          // 似乎在Firefox中禁止在background页面使用window.open()，强制返回null
-          return false;
-        }
-      } else {
-        const { tabId, windowId } = sender.getExtMessageSender();
-        const active = options.active;
-        const currentTab = await chrome.tabs.get(tabId);
-        let newTabIndex = -1;
-        if (options.incognito && !currentTab.incognito) {
-          // incognito: "split" 在 normal 里不会看到 incognito
-          // 只能创建新 incognito window
-          // pinned 无效
-          // insert 不重要
-          await chrome.windows.create({
-            url,
-            incognito: true,
-            focused: active,
-          });
-          return 0;
-        }
-        if ((typeof options.insert === "number" || options.insert === true) && currentTab && currentTab.index >= 0) {
-          // insert 为 boolean 时，插入至当前Tab下一格 (TM行为)
-          // insert 为 number 时，插入至相对位置 （SC独自）
-          const insert = +options.insert;
-          newTabIndex = currentTab.index + insert;
-          if (newTabIndex < 0) newTabIndex = 0;
-        }
-        const createProperties = {
+      const { tabId, windowId } = sender.getExtMessageSender();
+      const active = options.active;
+      const currentTab = await chrome.tabs.get(tabId);
+      let newTabIndex = -1;
+      if (options.incognito && !currentTab.incognito) {
+        // incognito: "split" 在 normal 里不会看到 incognito
+        // 只能创建新 incognito window
+        // pinned 无效
+        // insert 不重要
+        await chrome.windows.create({
           url,
-          active: active,
-        } as chrome.tabs.CreateProperties;
-        if (options.setParent) {
-          // SC 预设 setParent: true 以避免不可预计的问题
-          createProperties.openerTabId = tabId === -1 ? undefined : tabId;
-          createProperties.windowId = windowId === -1 ? undefined : windowId;
-        }
-        if (options.pinned) {
-          // VM/FM行为
-          createProperties.pinned = true;
-        } else if (newTabIndex >= 0) {
-          // insert option; pinned 情况下无效
-          createProperties.index = newTabIndex;
-        }
-        const tab = await chrome.tabs.create(createProperties);
-        return tab.id;
+          incognito: true,
+          focused: active,
+        });
+        return 0;
+      }
+      if ((typeof options.insert === "number" || options.insert === true) && currentTab && currentTab.index >= 0) {
+        // insert 为 boolean 时，插入至当前Tab下一格 (TM行为)
+        // insert 为 number 时，插入至相对位置 （SC独自）
+        const insert = +options.insert;
+        newTabIndex = currentTab.index + insert;
+        if (newTabIndex < 0) newTabIndex = 0;
+      }
+      const createProperties = {
+        url,
+        active: active,
+      } as chrome.tabs.CreateProperties;
+      if (options.setParent) {
+        // SC 预设 setParent: true 以避免不可预计的问题
+        createProperties.openerTabId = tabId === -1 ? undefined : tabId;
+        createProperties.windowId = windowId === -1 ? undefined : windowId;
+      }
+      if (options.pinned) {
+        // VM/FM行为
+        createProperties.pinned = true;
+      } else if (newTabIndex >= 0) {
+        // insert option; pinned 情况下无效
+        createProperties.index = newTabIndex;
       }
+      const tab = await chrome.tabs.create(createProperties);
+      return tab.id;
     };
     const tabId = await getNewTabId();
     if (tabId) {

src/template/scriptcat.d.tpl

@@ -335,6 +335,14 @@ declare namespace CATType {
     // 文件修改时间
     updatetime: number;
   }
+
+  type CATFileStorageDetails = {
+    baseDir: string;
+    path: string;
+    filename: any;
+    file: FileStorageFileInfo;
+    data?: string;
+  };
 }
 
 declare namespace GMTypes {
@@ -454,17 +462,10 @@ declare namespace GMTypes {
      * 默认值：false
      */
     pinned?: boolean;
-
-    /**
-     * 使用 `window.open` 打开新窗口，而不是浏览器 API。
-     * 可以打开某些特殊的链接
-     *
-     * 相关：Issue #178
-     * 默认值：false
-     */
-    useOpen?: boolean;
   }
 
+  type SWOpenTabOptions = OpenTabOptions & Required<Pick<OpenTabOptions, "active">>;
+
   interface XHRResponse {
     finalUrl?: string;
     readyState?: 0 | 1 | 2 | 3 | 4;
@@ -594,4 +595,6 @@ declare namespace GMTypes {
     closed?: boolean;
     name?: string;
   }
+
+  type GMClipboardInfo = string | { type?: string; mimetype?: string };
 }

src/types/scriptcat.d.ts

@@ -462,15 +462,6 @@ declare namespace GMTypes {
      * 默认值：false
      */
     pinned?: boolean;
-
-    /**
-     * 使用 `window.open` 打开新窗口，而不是浏览器 API。
-     * 可以打开某些特殊的链接
-     *
-     * 相关：Issue #178
-     * 默认值：false
-     */
-    useOpen?: boolean;
   }
 
   type SWOpenTabOptions = OpenTabOptions & Required<Pick<OpenTabOptions, "active">>;