chore: 调整出包方式

This commit is contained in:
手瓜一十雪 2024-08-10 17:50:23 +08:00
parent 6371d79d33
commit 1f71a01453
7 changed files with 15 additions and 16 deletions

View File

@ -27,7 +27,7 @@
],
"injects": {
"renderer": "./renderer.js",
"main": "./napcat.cjs",
"main": "./liteloader.cjs",
"preload": "./preload.cjs"
}
}

View File

@ -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 {

View File

@ -0,0 +1,3 @@
//LiteLoader需要提供部分IPC接口以便于其他插件调用
const electron = require('electron');
require('./napcat.cjs');

View File

@ -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);

View File

@ -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,

View File

@ -1,5 +0,0 @@
//LiteLoader/Shell ES统一出包口
if(!(window as any).LiteLoader) {
//LiteLoader 模式
}
//Shell模式

View File

@ -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' },