From 017b8b7f1520d12ca7e2a8966a0720e62e99face Mon Sep 17 00:00:00 2001
From: pk5ls20 <pk5ls20@outlook.com>
Date: Tue, 5 Nov 2024 13:52:56 +0800
Subject: [PATCH] chore: better log
---
src/core/apis/packet.ts | 11 +++--------
src/core/packet/client/client.ts | 3 ---
src/core/packet/client/nativeClient.ts | 4 ++--
src/core/packet/client/wsClient.ts | 8 ++++----
src/core/packet/session.ts | 4 ++--
5 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/src/core/apis/packet.ts b/src/core/apis/packet.ts
index 23b6ef73..0bbb9cef 100644
--- a/src/core/apis/packet.ts
+++ b/src/core/apis/packet.ts
@@ -48,14 +48,9 @@ export class NTQQPacketApi {
this.core = core;
this.logger = core.context.logger;
this.packetSession = undefined;
- const config = this.core.configLoader.configData;
- if (config) {
- this.InitSendPacket(this.context.basicInfoWrapper.getFullQQVesion())
- .then()
- .catch(this.core.context.logger.logError.bind(this.core.context.logger));
- } else {
- this.core.context.logger.logWarn('PacketServer未配置，NapCat.Packet将不会加载！');
- }
+ this.InitSendPacket(this.context.basicInfoWrapper.getFullQQVesion())
+ .then()
+ .catch(this.core.context.logger.logError.bind(this.core.context.logger));
}
get available(): boolean {
diff --git a/src/core/packet/client/client.ts b/src/core/packet/client/client.ts
index 88147054..fee48dd2 100644
--- a/src/core/packet/client/client.ts
+++ b/src/core/packet/client/client.ts
@@ -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 = () => {
}): Promise<RecvPacketData> {
return new Promise<RecvPacketData>((resolve, reject) => {
- if (!this.isAvailable) {
- throw new Error("Packet Service is not available");
- }
if (rsp) {
this.registerCallback(trace_id, 'recv', async (json: RecvPacketData) => {
clearTimeout(timeoutHandle);
diff --git a/src/core/packet/client/nativeClient.ts b/src/core/packet/client/nativeClient.ts
index c409f443..c374e41c 100644
--- a/src/core/packet/client/nativeClient.ts
+++ b/src/core/packet/client/nativeClient.ts
@@ -27,12 +27,12 @@ export class NativePacketClient extends PacketClient {
static compatibilityScore(logger: LogWrapper): number {
const platform = process.platform + '.' + process.arch;
if (!this.supportedPlatforms.includes(platform)) {
- logger.logError(`[NativePacketClient] Unsupported platform: ${platform}`);
+ logger.logError(`[Core] [Packet:Native] 不支持的平台: ${platform}`);
return 0;
}
const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
if (!fs.existsSync(moehoo_path)) {
- logger.logError(`[NativePacketClient] Missing moehoo binary: ${moehoo_path}`);
+ logger.logError(`[Core] [Packet:Native] 缺失运行时文件: ${moehoo_path}`);
return 0;
}
return 10;
diff --git a/src/core/packet/client/wsClient.ts b/src/core/packet/client/wsClient.ts
index bf34e0e0..dd91f533 100644
--- a/src/core/packet/client/wsClient.ts
+++ b/src/core/packet/client/wsClient.ts
@@ -32,7 +32,7 @@ export class wsPacketClient extends PacketClient {
this.websocket.onopen = () => {
this.isAvailable = true;
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();
resolve();
};
@@ -62,14 +62,14 @@ export class wsPacketClient extends PacketClient {
this.reconnectAttempts++;
setTimeout(() => {
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);
} 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) {
- this.logger.logError.bind(this.logger)(`[Core] [Packet Server] 重连时出错: ${error.message}`);
+ this.logger.logError.bind(this.logger)(`[Core] [Packet:Server] 重连时出错: ${error.message}`);
}
}
diff --git a/src/core/packet/session.ts b/src/core/packet/session.ts
index 208997dc..3b6df17b 100644
--- a/src/core/packet/session.ts
+++ b/src/core/packet/session.ts
@@ -41,9 +41,9 @@ export class PacketSession {
}
}
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);
}
}