diff --git a/manifest.json b/manifest.json index b4ec933c..740894b1 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,7 @@ ], "injects": { "renderer": "./renderer.js", - "main": "./napcat.cjs", + "main": "./liteloader.cjs", "preload": "./preload.cjs" } } \ No newline at end of file diff --git a/src/core/core.ts b/src/core/core.ts index 7a6f801b..f9f4234b 100644 --- a/src/core/core.ts +++ b/src/core/core.ts @@ -14,7 +14,7 @@ import { NTQQCollectionApi } from "./apis/collection"; export enum NapCatCoreWorkingEnv { Unknown = 0, Shell = 1, - LiteLoader = 2, + Framework = 2, } export function loadQQWrapper(QQVersion: string): WrapperNodeApi { diff --git a/src/framework/liteloader.cjs b/src/framework/liteloader.cjs new file mode 100644 index 00000000..cad921ca --- /dev/null +++ b/src/framework/liteloader.cjs @@ -0,0 +1,3 @@ +//LiteLoader需要提供部分IPC接口,以便于其他插件调用 +const electron = require('electron'); +require('./napcat.cjs'); \ No newline at end of file diff --git a/src/framework/napcat.cjs b/src/framework/napcat.cjs index bbf832ad..ac3e8e85 100644 --- a/src/framework/napcat.cjs +++ b/src/framework/napcat.cjs @@ -122,9 +122,9 @@ async function NCInit() { try { const { wrapperSession, wrapperLoginService } = await fetchServices(); - const { NCoreInitLiteLoader } = await import('file://' + path.join(currentPath, './napcat.mjs')); + const { NCoreInitFramework } = await import('file://' + path.join(currentPath, './napcat.mjs')); //传入LoginService Session 其余自载入 - await NCoreInitLiteLoader(wrapperSession, wrapperLoginService, registerInitCallback); + await NCoreInitFramework(wrapperSession, wrapperLoginService, registerInitCallback); //console.log("[NapCat] [Info] NapCat初始化完成"); } catch (error) { console.error("[NapCat] [Error] 初始化NapCat失败", error); diff --git a/src/framework/napcat.ts b/src/framework/napcat.ts index af0637b4..33d19eb4 100644 --- a/src/framework/napcat.ts +++ b/src/framework/napcat.ts @@ -11,14 +11,14 @@ import { WrapperNodeApi, NodeIQQNTWrapperSession } from "@/core/wrapper/wrapper" import { NapCatOneBot11Adapter } from "@/onebot/main"; import { sleep } from "@/common/utils/helper"; -//LiteLoader ES入口文件 -export async function NCoreInitLiteLoader( +//Framework ES入口文件 +export async function NCoreInitFramework( session: NodeIQQNTWrapperSession, loginService: NodeIKernelLoginService, registerInitCallback: (callback: () => void) => void ) { //在进入本层前是否登录未进行判断 - console.log("NapCat LiteLoader App Loading..."); + console.log("NapCat Framework App Loading..."); const pathWrapper = new NapCatPathWrapper(); const logger = new LogWrapper(pathWrapper.logsPath); const basicInfoWrapper = new QQBasicInfoWrapper({ logger }); @@ -42,8 +42,8 @@ export async function NCoreInitLiteLoader( }); // 过早进入会导致addKernelMsgListener等Listener添加失败 // await sleep(2500); - // 初始化 NapCatLiteLoader - const loaderObject = new NapCatLiteLoader(wrapper, session, logger, loginService, selfInfo, basicInfoWrapper, pathWrapper); + // 初始化 NapCatFramework + const loaderObject = new NapCatFramework(wrapper, session, logger, loginService, selfInfo, basicInfoWrapper, pathWrapper); //启动WebUi @@ -51,7 +51,7 @@ export async function NCoreInitLiteLoader( new NapCatOneBot11Adapter(loaderObject.core, loaderObject.context, pathWrapper); } -export class NapCatLiteLoader { +export class NapCatFramework { public core: NapCatCore; context: InstanceContext; @@ -65,7 +65,7 @@ export class NapCatLiteLoader { pathWrapper: NapCatPathWrapper ) { this.context = { - workingEnv: NapCatCoreWorkingEnv.LiteLoader, + workingEnv: NapCatCoreWorkingEnv.Framework, wrapper, session, logger, diff --git a/src/index.ts b/src/index.ts index d72ae75b..e69de29b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +0,0 @@ -//LiteLoader/Shell ES统一出包口 -if(!(window as any).LiteLoader) { - //LiteLoader 模式 -} -//Shell模式 \ No newline at end of file diff --git a/vite.config.ts b/vite.config.ts index faa040ad..1f0abd4e 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -46,6 +46,7 @@ const FrameworkBaseConfigPlugin: PluginOption[] = [ cp({ targets: [ { src: './manifest.json', dest: 'dist' }, + { src: './src/framework/liteloader.cjs', dest: 'dist' }, { src: './src/framework/napcat.cjs', dest: 'dist' }, { src: './src/framework/preload.cjs', dest: 'dist' }, { src: './src/framework/renderer.js', dest: 'dist' },