From b33b33739d522f627cfea564d291ff56bf1cd14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Sat, 19 Oct 2024 21:17:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A5=E5=BF=97=E6=A2=B3=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/packet/client.ts | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/core/packet/client.ts b/src/core/packet/client.ts
index 9b28dc23..aa65fc31 100644
--- a/src/core/packet/client.ts
+++ b/src/core/packet/client.ts
@@ -4,7 +4,7 @@ import WebSocket, { Data } from "ws";
 import crypto, { createHash } from "crypto";
 import { NapCatCore } from "@/core";
 import { PacketHexStr } from "@/core/packet/packer";
-import {sleep} from "@/common/helper";
+import { sleep } from "@/common/helper";
 
 export interface RecvPacket {
     type: string, // 仅recv
@@ -49,20 +49,20 @@ export class PacketClient {
 
     connect(): Promise<void> {
         return new Promise((resolve, reject) => {
-            this.logger.log.bind(this.logger)(`Attempting to connect to ${this.clientUrl}`);
+            this.logger.log.bind(this.logger)(`[Core] [Packet Server] Attempting to connect to ${this.clientUrl}`);
             this.websocket = new WebSocket(this.clientUrl);
             this.websocket.on('error', (err) => this.logger.logError.bind(this.logger)('[Core] [Packet Server] Error:', err.message));
 
             this.websocket.onopen = () => {
                 this.isConnected = true;
                 this.reconnectAttempts = 0;
-                this.logger.log.bind(this.logger)(`Connected to ${this.clientUrl}`);
+                this.logger.log.bind(this.logger)(`[Core] [Packet Server] Connected to ${this.clientUrl}`);
                 resolve();
             };
 
             this.websocket.onerror = (error) => {
                 //this.logger.logError.bind(this.logger)(`WebSocket error: ${error}`);
-                reject(new Error(`${error.message}`));
+                reject(new Error(`WebSocket error: ${error.message}`));
             };
 
             this.websocket.onmessage = (event) => {
@@ -73,7 +73,7 @@ export class PacketClient {
 
             this.websocket.onclose = () => {
                 this.isConnected = false;
-                this.logger.logWarn.bind(this.logger)(`Disconnected from ${this.clientUrl}`);
+                this.logger.logWarn.bind(this.logger)(`[Core] [Packet Server] Disconnected from ${this.clientUrl}`);
                 this.attemptReconnect();
             };
         });
@@ -83,14 +83,13 @@ export class PacketClient {
         try {
             if (this.reconnectAttempts < this.maxReconnectAttempts) {
                 this.reconnectAttempts++;
-                this.logger.logError.bind(this.logger)(`Reconnecting attempt ${this.reconnectAttempts}`);
                 setTimeout(() => {
                     this.connect().catch((error) => {
-                        this.logger.logError.bind(this.logger)(`Reconnect attempt failed: ${error.message}`);
+                        this.logger.logError.bind(this.logger)(`[Core] [Packet Server] Reconnecting attempt failed: ${error.message}`);
                     });
                 }, 5000 * this.reconnectAttempts);
             } else {
-                this.logger.logError.bind(this.logger)(`Max reconnect attempts reached. Could not reconnect to ${this.clientUrl}`);
+                this.logger.logError.bind(this.logger)(`[Core] [Packet Server] Max reconnect attempts reached. ${this.clientUrl}`);
             }
         } catch (error: any) {
             this.logger.logError.bind(this.logger)(`Error attempting to reconnect: ${error.message}`);