Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2025-12-19 21:20:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve native packet handler loading and error checks

Browse Source 
Adds a 'loaded' flag to track native module loading status and improves error handling during initialization. The constructor now attempts to load the native module and logs warnings or errors if loading fails, while the init method checks the loaded status before proceeding.
This commit is contained in:
手瓜一十雪 2025-11-12 11:59:06 +08:00
parent 0ab0b939da
commit 63f42f1592
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/packet/handler/client.ts
View File

@ -18,7 +18,7 @@ export interface NativePacketExportType {
} }
export type PacketType = 0 | 1; // 0: send, 1: recv export type PacketType = 0 | 1; // 0: send, 1: recv
export type PacketCallback = (data: { type: PacketType, uin: string, cmd: string, seq: number, hex_data: string }) => void; export type PacketCallback = (data: { type: PacketType, uin: string, cmd: string, seq: number, hex_data: string; }) => void;
interface ListenerEntry { interface ListenerEntry {
callback: PacketCallback; callback: PacketCallback;
@ -27,14 +27,28 @@ interface ListenerEntry {
export class NativePacketHandler { export class NativePacketHandler {
private readonly supportedPlatforms = ['win32.x64', 'linux.x64', 'linux.arm64', 'darwin.x64', 'darwin.arm64']; private readonly supportedPlatforms = ['win32.x64', 'linux.x64', 'linux.arm64', 'darwin.x64', 'darwin.arm64'];
private readonly MoeHooExport: { exports: NativePacketExportType } = { exports: {} }; private readonly MoeHooExport: { exports: NativePacketExportType; } = { exports: {} };
protected readonly logger: LogWrapper; protected readonly logger: LogWrapper;
private loaded: boolean = false;
// 统一的监听器存储 - key: 'all' | 'type:0' | 'type:1' | 'cmd:xxx' | 'exact:type:cmd' // 统一的监听器存储 - key: 'all' | 'type:0' | 'type:1' | 'cmd:xxx' | 'exact:type:cmd'
private readonly listeners: Map<string, Set<ListenerEntry>> = new Map(); private readonly listeners: Map<string, Set<ListenerEntry>> = new Map();
constructor ({ logger }: { logger: LogWrapper }) { constructor ({ logger }: { logger: LogWrapper; }) {
this.logger = logger; this.logger = logger;
try {
const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './native/packet/MoeHoo.' + platform + '.node');
if (!fs.existsSync(moehoo_path)) {
this.logger.logWarn(`NativePacketClient: 缺失运行时文件: ${moehoo_path}`);
this.loaded = false;
}
process.dlopen(this.MoeHooExport, moehoo_path, constants.dlopen.RTLD_LAZY);
this.loaded = true;
} catch (error) {
this.logger.logError('NativePacketClient 加载出错:', error);
this.loaded = false;
}
} }
/** /**
@ -182,6 +196,10 @@ export class NativePacketHandler {
async init (version: string): Promise<boolean> { async init (version: string): Promise<boolean> {
const version_arch = version + '-' + process.arch; const version_arch = version + '-' + process.arch;
try { try {
if (!this.loaded) {
this.logger.logWarn('NativePacketClient 未成功加载，无法初始化');
return false;
}
const send = typedOffset[version_arch]?.send; const send = typedOffset[version_arch]?.send;
const recv = typedOffset[version_arch]?.recv; const recv = typedOffset[version_arch]?.recv;
if (!send || !recv) { if (!send || !recv) {
@ -193,13 +211,7 @@ export class NativePacketHandler {
this.logger.logWarn(`NativePacketClient: 不支持的平台: ${platform}`); this.logger.logWarn(`NativePacketClient: 不支持的平台: ${platform}`);
return false; return false;
} }
const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './native/packet/MoeHoo.' + platform + '.node');
process.dlopen(this.MoeHooExport, moehoo_path, constants.dlopen.RTLD_LAZY);
if (!fs.existsSync(moehoo_path)) {
this.logger.logWarn(`NativePacketClient: 缺失运行时文件: ${moehoo_path}`);
return false;
}
this.MoeHooExport.exports.initHook?.(send, recv, (type: PacketType, uin: string, cmd: string, seq: number, hex_data: string) => { this.MoeHooExport.exports.initHook?.(send, recv, (type: PacketType, uin: string, cmd: string, seq: number, hex_data: string) => {
this.emitPacket(type, uin, cmd, seq, hex_data); this.emitPacket(type, uin, cmd, seq, hex_data);
}, true); }, true);