mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2024-11-21 09:36:35 +00:00
chore: 调整出包方式
This commit is contained in:
parent
6371d79d33
commit
1f71a01453
@ -27,7 +27,7 @@
|
|||||||
],
|
],
|
||||||
"injects": {
|
"injects": {
|
||||||
"renderer": "./renderer.js",
|
"renderer": "./renderer.js",
|
||||||
"main": "./napcat.cjs",
|
"main": "./liteloader.cjs",
|
||||||
"preload": "./preload.cjs"
|
"preload": "./preload.cjs"
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -14,7 +14,7 @@ import { NTQQCollectionApi } from "./apis/collection";
|
|||||||
export enum NapCatCoreWorkingEnv {
|
export enum NapCatCoreWorkingEnv {
|
||||||
Unknown = 0,
|
Unknown = 0,
|
||||||
Shell = 1,
|
Shell = 1,
|
||||||
LiteLoader = 2,
|
Framework = 2,
|
||||||
}
|
}
|
||||||
|
|
||||||
export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
|
export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
|
||||||
|
3
src/framework/liteloader.cjs
Normal file
3
src/framework/liteloader.cjs
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
//LiteLoader需要提供部分IPC接口,以便于其他插件调用
|
||||||
|
const electron = require('electron');
|
||||||
|
require('./napcat.cjs');
|
@ -122,9 +122,9 @@ async function NCInit() {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const { wrapperSession, wrapperLoginService } = await fetchServices();
|
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 其余自载入
|
//传入LoginService Session 其余自载入
|
||||||
await NCoreInitLiteLoader(wrapperSession, wrapperLoginService, registerInitCallback);
|
await NCoreInitFramework(wrapperSession, wrapperLoginService, registerInitCallback);
|
||||||
//console.log("[NapCat] [Info] NapCat初始化完成");
|
//console.log("[NapCat] [Info] NapCat初始化完成");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[NapCat] [Error] 初始化NapCat失败", error);
|
console.error("[NapCat] [Error] 初始化NapCat失败", error);
|
||||||
|
@ -11,14 +11,14 @@ import { WrapperNodeApi, NodeIQQNTWrapperSession } from "@/core/wrapper/wrapper"
|
|||||||
import { NapCatOneBot11Adapter } from "@/onebot/main";
|
import { NapCatOneBot11Adapter } from "@/onebot/main";
|
||||||
import { sleep } from "@/common/utils/helper";
|
import { sleep } from "@/common/utils/helper";
|
||||||
|
|
||||||
//LiteLoader ES入口文件
|
//Framework ES入口文件
|
||||||
export async function NCoreInitLiteLoader(
|
export async function NCoreInitFramework(
|
||||||
session: NodeIQQNTWrapperSession,
|
session: NodeIQQNTWrapperSession,
|
||||||
loginService: NodeIKernelLoginService,
|
loginService: NodeIKernelLoginService,
|
||||||
registerInitCallback: (callback: () => void) => void
|
registerInitCallback: (callback: () => void) => void
|
||||||
) {
|
) {
|
||||||
//在进入本层前是否登录未进行判断
|
//在进入本层前是否登录未进行判断
|
||||||
console.log("NapCat LiteLoader App Loading...");
|
console.log("NapCat Framework App Loading...");
|
||||||
const pathWrapper = new NapCatPathWrapper();
|
const pathWrapper = new NapCatPathWrapper();
|
||||||
const logger = new LogWrapper(pathWrapper.logsPath);
|
const logger = new LogWrapper(pathWrapper.logsPath);
|
||||||
const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
|
const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
|
||||||
@ -42,8 +42,8 @@ export async function NCoreInitLiteLoader(
|
|||||||
});
|
});
|
||||||
// 过早进入会导致addKernelMsgListener等Listener添加失败
|
// 过早进入会导致addKernelMsgListener等Listener添加失败
|
||||||
// await sleep(2500);
|
// await sleep(2500);
|
||||||
// 初始化 NapCatLiteLoader
|
// 初始化 NapCatFramework
|
||||||
const loaderObject = new NapCatLiteLoader(wrapper, session, logger, loginService, selfInfo, basicInfoWrapper, pathWrapper);
|
const loaderObject = new NapCatFramework(wrapper, session, logger, loginService, selfInfo, basicInfoWrapper, pathWrapper);
|
||||||
|
|
||||||
//启动WebUi
|
//启动WebUi
|
||||||
|
|
||||||
@ -51,7 +51,7 @@ export async function NCoreInitLiteLoader(
|
|||||||
new NapCatOneBot11Adapter(loaderObject.core, loaderObject.context, pathWrapper);
|
new NapCatOneBot11Adapter(loaderObject.core, loaderObject.context, pathWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
export class NapCatLiteLoader {
|
export class NapCatFramework {
|
||||||
public core: NapCatCore;
|
public core: NapCatCore;
|
||||||
context: InstanceContext;
|
context: InstanceContext;
|
||||||
|
|
||||||
@ -65,7 +65,7 @@ export class NapCatLiteLoader {
|
|||||||
pathWrapper: NapCatPathWrapper
|
pathWrapper: NapCatPathWrapper
|
||||||
) {
|
) {
|
||||||
this.context = {
|
this.context = {
|
||||||
workingEnv: NapCatCoreWorkingEnv.LiteLoader,
|
workingEnv: NapCatCoreWorkingEnv.Framework,
|
||||||
wrapper,
|
wrapper,
|
||||||
session,
|
session,
|
||||||
logger,
|
logger,
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
//LiteLoader/Shell ES统一出包口
|
|
||||||
if(!(window as any).LiteLoader) {
|
|
||||||
//LiteLoader 模式
|
|
||||||
}
|
|
||||||
//Shell模式
|
|
@ -46,6 +46,7 @@ const FrameworkBaseConfigPlugin: PluginOption[] = [
|
|||||||
cp({
|
cp({
|
||||||
targets: [
|
targets: [
|
||||||
{ src: './manifest.json', dest: 'dist' },
|
{ src: './manifest.json', dest: 'dist' },
|
||||||
|
{ src: './src/framework/liteloader.cjs', dest: 'dist' },
|
||||||
{ src: './src/framework/napcat.cjs', dest: 'dist' },
|
{ src: './src/framework/napcat.cjs', dest: 'dist' },
|
||||||
{ src: './src/framework/preload.cjs', dest: 'dist' },
|
{ src: './src/framework/preload.cjs', dest: 'dist' },
|
||||||
{ src: './src/framework/renderer.js', dest: 'dist' },
|
{ src: './src/framework/renderer.js', dest: 'dist' },
|
||||||
|
Loading…
x
Reference in New Issue
Block a user