feat: completely remove BetterQQNT support

MANUAL.md

@@ -14,6 +14,8 @@
 
 **请务必仔细阅读本章节内容以避免不必要的麻烦！**
 
+QQNTim 支持 LiteLoader，但**不支持 BetterQQNT**。
+
 > ### LiteLoader 相关安装教程：
 >
 > #### 如果你已经安装了 LiteLoader，想安装 QQNTim：

src/builtins/settings/src/panel.tsx

@@ -111,7 +111,7 @@ function SettingsPanel({ qqntim, config, setConfig }: PanelsProps) {
                             ],
                             [
                                 "禁用兼容性处理",
-                                "禁用后，LiteLoader 和 BetterQQNT 可能将不能与 QQNTim 一起使用。",
+                                "禁用后，LiteLoader 可能将不能与 QQNTim 一起使用。",
                                 config.disableCompatibilityProcessing,
                                 (state) =>
                                     setConfig((prev) => {

src/ipc.ts

@@ -4,12 +4,6 @@ import { QQNTim } from "@flysoftbeta/qqntim-typings";
 
 const interruptIpcs: [QQNTim.IPC.InterruptFunction, QQNTim.IPC.InterruptIPCOptions | undefined][] = [];
 
-function wrapIpc(args: QQNTim.IPC.Args<any>, direction: QQNTim.IPC.Direction) {
-    if (direction == "out" && (!args[0] || !args[0]?.eventName)) return [{ eventName: "QQNTIM_WRAPPER", type: "request" }, args];
-    else if (direction == "in" && args[0]?.eventName == "QQNTIM_WRAPPER") return args[1];
-    return args;
-}
-
 function interruptIpc(args: QQNTim.IPC.Args<any>, direction: QQNTim.IPC.Direction, channel: string, sender?: Electron.WebContents) {
     for (const [func, options] of interruptIpcs) {
         if (options?.cmdName && (!args[1] || (args[1][0]?.cmdName != options?.cmdName && args[1][0] != options?.cmdName))) continue;
@@ -26,7 +20,6 @@ function interruptIpc(args: QQNTim.IPC.Args<any>, direction: QQNTim.IPC.Directio
 
 export function handleIpc(args: QQNTim.IPC.Args<any>, direction: QQNTim.IPC.Direction, channel: string, sender?: Electron.WebContents) {
     if (args[0]?.eventName?.startsWith("ns-LoggerApi-")) return false;
-    wrapIpc(args, direction);
     return interruptIpc(args, direction, channel, sender);
 }
 

src/main/patch.ts

@@ -18,7 +18,7 @@ ipcMain.on("___!boot", (event) => {
     if (!event.returnValue) event.returnValue = { enabled: false };
 });
 
-ipcMain.handle("___!dialog", (event, _, method: string, options: object) => dialog[method](BrowserWindow.fromWebContents(event.sender), options));
+ipcMain.handle("___!dialog", (event, method: string, options: object) => dialog[method](BrowserWindow.fromWebContents(event.sender), options));
 
 function patchBrowserWindow(BrowserWindow: typeof Electron.BrowserWindow) {
     const windowMenu: Electron.MenuItem[] = [
@@ -106,12 +106,12 @@ function patchBrowserWindow(BrowserWindow: typeof Electron.BrowserWindow) {
                 handleIpc(args, "out", channel);
                 return send.call(win.webContents, channel, ...args);
             };
-            win.webContents.on("ipc-message", (_, channel, ...args: QQNTim.IPC.Args<any>) => {
-                if (!handleIpc(args, "in", channel, win.webContents)) throw new Error("QQNTim 已强行中断了一条 IPC 消息");
-                if (channel == "___!apply_plugins") applyPlugins(plugins, args[1] as string);
+            win.webContents.on("ipc-message", (_, channel, ...args) => {
+                if (!handleIpc(args as any, "in", channel, win.webContents)) throw new Error("QQNTim 已强行中断了一条 IPC 消息");
+                if (channel == "___!apply_plugins") applyPlugins(plugins, args[0] as string);
             });
-            win.webContents.on("ipc-message-sync", (event, channel, ...args: QQNTim.IPC.Args<any>) => {
-                handleIpc(args, "in", channel, win.webContents);
+            win.webContents.on("ipc-message-sync", (event, channel, ...args) => {
+                handleIpc(args as any, "in", channel, win.webContents);
                 if (channel == "___!boot") {
                     event.returnValue = {
                         enabled: true,
@@ -122,9 +122,9 @@ function patchBrowserWindow(BrowserWindow: typeof Electron.BrowserWindow) {
                         env: env,
                     };
                 } else if (channel == "___!browserwindow_api") {
-                    event.returnValue = win[args[1][0]](...args[1][1]);
+                    event.returnValue = win[args[0][0]](...args[0][1]);
                 } else if (channel == "___!app_api") {
-                    event.returnValue = app[args[1][0]](...args[1][1]);
+                    event.returnValue = app[args[0][0]](...args[0][1]);
                 }
             });
             if (!env.config.useNativeDevTools)

src/renderer/api/app.ts

@@ -3,34 +3,16 @@ import { ipcRenderer } from "electron";
 
 class AppAPI implements QQNTim.API.Renderer.AppAPI {
     relaunch() {
-        ipcRenderer.sendSync(
-            "___!app_api",
-            {
-                eventName: "QQNTIM_APP_API",
-            },
-            ["relaunch", []],
-        );
+        ipcRenderer.sendSync("___!app_api", ["relaunch", []]);
         this.quit();
     }
 
     quit() {
-        ipcRenderer.sendSync(
-            "___!app_api",
-            {
-                eventName: "QQNTIM_APP_API",
-            },
-            ["quit", []],
-        );
+        ipcRenderer.sendSync("___!app_api", ["quit", []]);
     }
 
     exit() {
-        ipcRenderer.sendSync(
-            "___!app_api",
-            {
-                eventName: "QQNTIM_APP_API",
-            },
-            ["exit", []],
-        );
+        ipcRenderer.sendSync("___!app_api", ["exit", []]);
     }
 }
 

src/renderer/api/dialog.ts

@@ -2,17 +2,6 @@ import { QQNTim } from "@flysoftbeta/qqntim-typings";
 import { ipcRenderer } from "electron";
 
 class DialogAPI implements QQNTim.API.Renderer.DialogAPI {
-    private api<R, T>(method: string, options: T): Promise<R> {
-        return ipcRenderer.invoke(
-            "___!dialog",
-            {
-                eventName: "QQNTIM_DIALOG_API",
-            },
-            method,
-            options,
-        ) as Promise<R>;
-    }
-
     async confirm(message = "") {
         const res = await this.messageBox({ message, buttons: ["确定", "取消"], defaultId: 0, type: "question" });
         return res.response == 0;
@@ -24,15 +13,15 @@ class DialogAPI implements QQNTim.API.Renderer.DialogAPI {
     }
 
     messageBox(options: Electron.MessageBoxOptions): Promise<Electron.MessageBoxReturnValue> {
-        return this.api("showMessageBox", options);
+        return ipcRenderer.invoke("___!dialog", "showMessageBox", options);
     }
 
     openDialog(options: Electron.OpenDialogOptions): Promise<Electron.OpenDialogReturnValue> {
-        return this.api("showOpenDialog", options);
+        return ipcRenderer.invoke("___!dialog", "showOpenDialog", options);
     }
 
     saveDialog(options: Electron.SaveDialogOptions): Promise<Electron.SaveDialogReturnValue> {
-        return this.api("showSaveDialog", options);
+        return ipcRenderer.invoke("___!dialog", "showSaveDialog", options);
     }
 }
 

src/renderer/loader.ts

@@ -35,14 +35,7 @@ export function applyPlugins(allPlugins: QQNTim.Plugin.AllUsersPlugins, uin = ""
 
     windowLoadPromise.then(() => applyStylesheets());
 
-    if (uin != "")
-        ipcRenderer.send(
-            "___!apply_plugins",
-            {
-                eventName: "QQNTIM_APPLY_PLUGINS",
-            },
-            uin,
-        );
+    if (uin != "") ipcRenderer.send("___!apply_plugins", uin);
 
     return true;
 }

src/renderer/main.ts

@@ -9,10 +9,9 @@ import { ipcRenderer } from "electron";
 import * as React from "react";
 import * as ReactDOMClient from "react-dom/client";
 
-export const { enabled, preload, debuggerOrigin, webContentsId, plugins, env } = ipcRenderer.sendSync("___!boot", {
-    eventName: "QQNTIM_BOOT",
-});
+export const { enabled, preload, debuggerOrigin, webContentsId, plugins, env } = ipcRenderer.sendSync("___!boot");
 
+patchElectron();
 if (enabled) {
     setEnv(env);
     setAllPlugins(plugins);
@@ -37,6 +36,4 @@ if (enabled) {
     }, 1);
 }
 
-patchElectron();
-
 preload.forEach((item: string) => require(item));