From d79b98bd5571437b007f285bc612c497da4a39e0 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: Tue, 3 Sep 2024 18:34:33 +0800
Subject: [PATCH] fix: Error Handle

---
 src/onebot/action/BaseAction.ts        | 8 ++++----
 src/onebot/network/active-websocket.ts | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/onebot/action/BaseAction.ts b/src/onebot/action/BaseAction.ts
index c6d696d8..300e4974 100644
--- a/src/onebot/action/BaseAction.ts
+++ b/src/onebot/action/BaseAction.ts
@@ -37,17 +37,17 @@ abstract class BaseAction<PayloadType, ReturnDataType> {
         };
     }
 
-    public async handle(payload: PayloadType): Promise<OB11Return<ReturnDataType | null>> {
+    public async handle(payload: PayloadType, echo: any = null): Promise<OB11Return<ReturnDataType | null>> {
         const result = await this.check(payload);
         if (!result.valid) {
-            return OB11Response.error(result.message, 400);
+            return OB11Response.error(result.message, 400, echo);
         }
         try {
             const resData = await this._handle(payload);
-            return OB11Response.ok(resData);
+            return OB11Response.ok(resData, echo);
         } catch (e: any) {
             this.core.context.logger.logError('发生错误', e);
-            return OB11Response.error(e?.toString() || e?.stack?.toString() || '未知错误，可能操作超时', 200);
+            return OB11Response.error(e?.toString() || e?.stack?.toString() || '未知错误，可能操作超时', 200, echo);
         }
     }
 
diff --git a/src/onebot/network/active-websocket.ts b/src/onebot/network/active-websocket.ts
index 3224fb77..359f197c 100644
--- a/src/onebot/network/active-websocket.ts
+++ b/src/onebot/network/active-websocket.ts
@@ -135,7 +135,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
         try {
             receiveData = JSON.parse(message.toString());
             echo = receiveData.echo;
-            this.logger.logDebug('[OneBot] [WebSocket Client] 收到正向Websocket消息', receiveData);
+            //this.logger.logDebug('[OneBot] [WebSocket Client] 收到正向Websocket消息', receiveData);
         } catch (e) {
             this.checkStateAndReply<any>(OB11Response.error('json解析失败,请检查数据格式', 1400, echo));
             return;
@@ -147,7 +147,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
             this.checkStateAndReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo));
             return;
         }
-        const retdata = await action?.websocketHandle(receiveData.params, echo ?? '');
+        const retdata = await action.websocketHandle(receiveData.params, echo ?? '');
         const packet = Object.assign({}, retdata);
         this.checkStateAndReply<any>(packet);
     }