GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: better log

Browse Source
This commit is contained in:
pk5ls20 2024-11-05 13:52:56 +08:00
parent 9b448b17e6
commit 017b8b7f15
No known key found for this signature in database
GPG Key ID: 6370ED7A169F493A
5 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/apis/packet.ts
View File

@ -48,14 +48,9 @@ export class NTQQPacketApi {
this.core = core; this.core = core;
this.logger = core.context.logger; this.logger = core.context.logger;
this.packetSession = undefined; this.packetSession = undefined;
const config = this.core.configLoader.configData; this.InitSendPacket(this.context.basicInfoWrapper.getFullQQVesion())
if (config) { .then()
this.InitSendPacket(this.context.basicInfoWrapper.getFullQQVesion()) .catch(this.core.context.logger.logError.bind(this.core.context.logger));
.then()
.catch(this.core.context.logger.logError.bind(this.core.context.logger));
} else {
this.core.context.logger.logWarn('PacketServer未配置，NapCat.Packet将不会加载！');
}
} }
get available(): boolean { get available(): boolean {

3
src/core/packet/client/client.ts
View File

@ -65,9 +65,6 @@ export abstract class PacketClient {
private async sendCommand(cmd: string, data: string, trace_id: string, rsp: boolean = false, timeout: number = 20000, sendcb: (json: RecvPacketData) => void = () => { private async sendCommand(cmd: string, data: string, trace_id: string, rsp: boolean = false, timeout: number = 20000, sendcb: (json: RecvPacketData) => void = () => {
}): Promise<RecvPacketData> { }): Promise<RecvPacketData> {
return new Promise<RecvPacketData>((resolve, reject) => { return new Promise<RecvPacketData>((resolve, reject) => {
if (!this.isAvailable) {
throw new Error("Packet Service is not available");
}
if (rsp) { if (rsp) {
this.registerCallback(trace_id, 'recv', async (json: RecvPacketData) => { this.registerCallback(trace_id, 'recv', async (json: RecvPacketData) => {
clearTimeout(timeoutHandle); clearTimeout(timeoutHandle);

4
src/core/packet/client/nativeClient.ts
View File

@ -27,12 +27,12 @@ export class NativePacketClient extends PacketClient {
static compatibilityScore(logger: LogWrapper): number { static compatibilityScore(logger: LogWrapper): number {
const platform = process.platform + '.' + process.arch; const platform = process.platform + '.' + process.arch;
if (!this.supportedPlatforms.includes(platform)) { if (!this.supportedPlatforms.includes(platform)) {
logger.logError(`[NativePacketClient] Unsupported platform: ${platform}`); logger.logError(`[Core] [Packet:Native] 不支持的平台: ${platform}`);
return 0; return 0;
} }
const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node'); const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
if (!fs.existsSync(moehoo_path)) { if (!fs.existsSync(moehoo_path)) {
logger.logError(`[NativePacketClient] Missing moehoo binary: ${moehoo_path}`); logger.logError(`[Core] [Packet:Native] 缺失运行时文件: ${moehoo_path}`);
return 0; return 0;
} }
return 10; return 10;

8
src/core/packet/client/wsClient.ts
View File

@ -32,7 +32,7 @@ export class wsPacketClient extends PacketClient {
this.websocket.onopen = () => { this.websocket.onopen = () => {
this.isAvailable = true; this.isAvailable = true;
this.reconnectAttempts = 0; this.reconnectAttempts = 0;
this.logger.log.bind(this.logger)(`[Core] [Packet Server] 已连接到 ${this.clientUrl}`); this.logger.log.bind(this.logger)(`[Core] [Packet:Server] 已连接到 ${this.clientUrl}`);
cb(); cb();
resolve(); resolve();
}; };
@ -62,14 +62,14 @@ export class wsPacketClient extends PacketClient {
this.reconnectAttempts++; this.reconnectAttempts++;
setTimeout(() => { setTimeout(() => {
this.connect(cb).catch((error) => { this.connect(cb).catch((error) => {
this.logger.logError.bind(this.logger)(`[Core] [Packet Server] 尝试重连失败：${error.message}`); this.logger.logError.bind(this.logger)(`[Core] [Packet:Server] 尝试重连失败：${error.message}`);
}); });
}, 5000 * this.reconnectAttempts); }, 5000 * this.reconnectAttempts);
} else { } else {
this.logger.logError.bind(this.logger)(`[Core] [Packet Server] ${this.clientUrl} 已达到最大重连次数！`); this.logger.logError.bind(this.logger)(`[Core] [Packet:Server] ${this.clientUrl} 已达到最大重连次数！`);
} }
} catch (error: any) { } catch (error: any) {
this.logger.logError.bind(this.logger)(`[Core] [Packet Server] 重连时出错: ${error.message}`); this.logger.logError.bind(this.logger)(`[Core] [Packet:Server] 重连时出错: ${error.message}`);
} }
} }

4
src/core/packet/session.ts
View File

@ -41,9 +41,9 @@ export class PacketSession {
} }
} }
if (!selectedClient) { if (!selectedClient) {
throw new Error("No compatible PacketClient found"); throw new Error("[Core] [Packet] 无可用的后端，NapCat.Packet将不会加载！");
} }
this.logger.log(`[Packet] 自动选择了: ${selectedClient.name}`); this.logger.log(`[Core] [Packet] 自动选择 ${selectedClient.name} 作为后端`);
return selectedClient.create(core); return selectedClient.create(core);
} }
} }