From 442ad4f9a36ee897ac3013528d135ca1c7f2c844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Fri, 6 Mar 2026 22:33:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=AD=A3=E5=BC=8F=E4=B8=AD=E6=96=AD?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=B3=A8=E5=85=A5=E5=90=AF=E5=8A=A8=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 2 +- packages/napcat-framework/liteloader.cjs | 19 ----------- packages/napcat-framework/manifest.json | 29 ----------------- packages/napcat-framework/preload.cjs | 14 -------- packages/napcat-framework/renderer.js | 41 ------------------------ packages/napcat-framework/vite.config.ts | 1 - packages/napcat-universal/napcat.ts | 5 --- 7 files changed, 1 insertion(+), 110 deletions(-) delete mode 100644 packages/napcat-framework/liteloader.cjs delete mode 100644 packages/napcat-framework/manifest.json delete mode 100644 packages/napcat-framework/preload.cjs delete mode 100644 packages/napcat-framework/renderer.js diff --git a/.vscode/settings.json b/.vscode/settings.json index 1c6af163..61e337af 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,7 +6,7 @@ "vite.config.ts": "vite*.ts", "README.md": "CODE_OF_CONDUCT.md, RELEASES.md, CONTRIBUTING.md, CHANGELOG.md, SECURITY.md", "tsconfig.json": "tsconfig.*.json, env.d.ts", - "package.json": "package-lock.json, eslint*, .prettier*, .editorconfig, manifest.json, logo.png, .gitignore, LICENSE" + "package.json": "package-lock.json, eslint*, .prettier*, .editorconfig, logo.png, .gitignore, LICENSE" }, "css.customData": [ ".vscode/tailwindcss.json" diff --git a/packages/napcat-framework/liteloader.cjs b/packages/napcat-framework/liteloader.cjs deleted file mode 100644 index 768caaaf..00000000 --- a/packages/napcat-framework/liteloader.cjs +++ /dev/null @@ -1,19 +0,0 @@ -// LiteLoader需要提供部分IPC接口，以便于其他插件调用 -const { ipcMain, BrowserWindow } = require('electron'); -const napcat = require('./napcat.cjs'); -const { shell } = require('electron'); -ipcMain.handle('napcat_get_webui', async () => { - return napcat.NCgetWebUiUrl(); -}); -ipcMain.on('open_external_url', (event, url) => { - shell.openExternal(url); -}); -ipcMain.on('napcat_open_inner_url', (event, url) => { - const win = new BrowserWindow({ - autoHideMenuBar: true, - }); - win.loadURL(url); - win.webContents.setWindowOpenHandler(details => { - win.loadURL(details.url); - }); -}); diff --git a/packages/napcat-framework/manifest.json b/packages/napcat-framework/manifest.json deleted file mode 100644 index 90c90f4f..00000000 --- a/packages/napcat-framework/manifest.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "manifest_version": 4, - "type": "extension", - "name": "NapCatQQ", - "slug": "NapCat.Framework", - "description": "高性能的 OneBot 11 协议实现", - "version": "0.0.1", - "icon": "./logo.png", - "authors": [ - { - "name": "NapNeko", - "link": "https://github.com/NapNeko" - } - ], - "repository": { - "repo": "NapNeko/NapCatQQ", - "branch": "main" - }, - "platform": [ - "win32", - "linux", - "darwin" - ], - "injects": { - "renderer": "./renderer.js", - "main": "./liteloader.cjs", - "preload": "./preload.cjs" - } -} diff --git a/packages/napcat-framework/preload.cjs b/packages/napcat-framework/preload.cjs deleted file mode 100644 index bc262b9d..00000000 --- a/packages/napcat-framework/preload.cjs +++ /dev/null @@ -1,14 +0,0 @@ -const { contextBridge, ipcRenderer } = require('electron'); -const napcat = { - getWebUiUrl: async () => { - return ipcRenderer.invoke('napcat_get_webui'); - }, - openExternalUrl: async (url) => { - ipcRenderer.send('open_external_url', url); - }, - openInnerUrl: async (url) => { - ipcRenderer.send('napcat_open_inner_url', url); - }, -}; -// 在window对象下导出只读对象 -contextBridge.exposeInMainWorld('napcat', napcat); diff --git a/packages/napcat-framework/renderer.js b/packages/napcat-framework/renderer.js deleted file mode 100644 index 57bdea3b..00000000 --- a/packages/napcat-framework/renderer.js +++ /dev/null @@ -1,41 +0,0 @@ -export const onSettingWindowCreated = async (view) => { - const webui = await window.napcat.getWebUiUrl(); - view.innerHTML = ` - - - - - 在QQ内打开配置页面 - 在默认浏览器打开配置页面 - - -
- WebUi远程地址可以点击下方复制哦~ - WebUi -
- - - - - `; - - view.querySelector('.nc_openwebui').addEventListener('click', () => { - window.napcat.openInnerUrl(webui); - }); - view.querySelector('.nc_openwebui_ex').addEventListener('click', () => { - window.napcat.openExternalUrl(webui); - }); - - view.querySelector('.nc_webui').innerText = webui; - - // 添加点击复制功能 - view.querySelector('.nc_webui').addEventListener('click', async () => { - try { - await navigator.clipboard.writeText(webui); - // eslint-disable-next-line no-undef - alert('WebUi URL 已复制到剪贴板'); - } catch (err) { - console.error('复制到剪贴板失败: ', err); - } - }); -}; diff --git a/packages/napcat-framework/vite.config.ts b/packages/napcat-framework/vite.config.ts index 5b6238dc..78d2115d 100644 --- a/packages/napcat-framework/vite.config.ts +++ b/packages/napcat-framework/vite.config.ts @@ -27,7 +27,6 @@ const FrameworkBaseConfigPlugin: PluginOption[] = [ { src: './manifest.json', dest: 'dist' }, { src: '../napcat-core/external/napcat.json', dest: 'dist/config/' }, { src: '../napcat-webui-frontend/dist/', dest: 'dist/static/', flatten: false }, - { src: './liteloader.cjs', dest: 'dist' }, { src: './napcat.cjs', dest: 'dist' }, { src: './nativeLoader.cjs', dest: 'dist' }, { src: './preload.cjs', dest: 'dist' }, diff --git a/packages/napcat-universal/napcat.ts b/packages/napcat-universal/napcat.ts index 35610ffa..a94c2796 100644 --- a/packages/napcat-universal/napcat.ts +++ b/packages/napcat-universal/napcat.ts @@ -1,7 +1,2 @@ -import { NCoreInitShell } from 'napcat-shell/base'; export * from 'napcat-framework/napcat'; export * from 'napcat-shell/base'; - -if ((global as unknown as { LiteLoader: unknown }).LiteLoader === undefined) { - NCoreInitShell(); -}