From cb8727d4879fd445e5a71a417094228b1f87080a 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, 4 Feb 2025 19:34:51 +0800
Subject: [PATCH] fix: reload and parse msg

---
 .../pages/dashboard/debug/websocket/index.tsx    |  2 +-
 src/onebot/api/msg.ts                            |  2 +-
 src/onebot/network/websocket-server.ts           | 16 ++++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/napcat.webui/src/pages/dashboard/debug/websocket/index.tsx b/napcat.webui/src/pages/dashboard/debug/websocket/index.tsx
index d68b1a32..2c9e0927 100644
--- a/napcat.webui/src/pages/dashboard/debug/websocket/index.tsx
+++ b/napcat.webui/src/pages/dashboard/debug/websocket/index.tsx
@@ -15,7 +15,7 @@ import { useWebSocketDebug } from '@/hooks/use-websocket-debug'
 
 export default function WSDebug() {
   const url = new URL(window.location.origin)
-  url.port = '3000'
+  url.port = '3001'
   url.protocol = 'ws:'
   const defaultWsUrl = url.href
   const [socketConfig, setSocketConfig] = useLocalStorage(key.wsDebugConfig, {
diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts
index ffc3c3d1..e3361f82 100644
--- a/src/onebot/api/msg.ts
+++ b/src/onebot/api/msg.ts
@@ -857,7 +857,7 @@ export class OneBotMsgApi {
                         return parsedElement;
                     }
                 }
-                return [];
+                return;
             },
         ));
 
diff --git a/src/onebot/network/websocket-server.ts b/src/onebot/network/websocket-server.ts
index 7e92f634..56eb44f0 100644
--- a/src/onebot/network/websocket-server.ts
+++ b/src/onebot/network/websocket-server.ts
@@ -15,7 +15,7 @@ import { IOB11NetworkAdapter } from '@/onebot/network/adapter';
 import json5 from 'json5';
 
 export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketServerConfig> {
-    wsServer: WebSocketServer;
+    wsServer?: WebSocketServer;
     wsClients: WebSocket[] = [];
     wsClientsMutex = new Mutex();
     private heartbeatIntervalId: NodeJS.Timeout | null = null;
@@ -30,7 +30,11 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
             host: this.config.host === '0.0.0.0' ? '' : this.config.host,
             maxPayload: 1024 * 1024 * 1024,
         });
-        this.wsServer.on('connection', async (wsClient, wsReq) => {
+        this.createServer(this.wsServer);
+
+    }
+    createServer(newServer: WebSocketServer) {
+        newServer.on('connection', async (wsClient, wsReq) => {
             if (!this.isEnable) {
                 wsClient.close();
                 return;
@@ -40,7 +44,7 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
             const paramUrl = wsReq.url?.indexOf('?') !== -1 ? wsReq.url?.substring(0, wsReq.url?.indexOf('?')) : wsReq.url;
             const isApiConnect = paramUrl === '/api' || paramUrl === '/api/';
             if (!isApiConnect) {
-                this.connectEvent(core, wsClient);
+                this.connectEvent(this.core, wsClient);
             }
 
             wsClient.on('error', (err) => this.logger.log('[OneBot] [WebSocket Server] Client Error:', err.message));
@@ -74,7 +78,6 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
             });
         }).on('error', (err) => this.logger.log('[OneBot] [WebSocket Server] Server Error:', err.message));
     }
-
     connectEvent(core: NapCatCore, wsClient: WebSocket) {
         try {
             this.checkStateAndReply<unknown>(new OB11LifeCycleEvent(core, LifeCycleSubType.CONNECT), wsClient);
@@ -96,7 +99,7 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
             this.logger.logError('[OneBot] [WebSocket Server] Cannot open a opened WebSocket server');
             return;
         }
-        const addressInfo = this.wsServer.address();
+        const addressInfo = this.wsServer?.address();
         this.logger.log('[OneBot] [WebSocket Server] Server Started', typeof (addressInfo) === 'string' ? addressInfo : addressInfo?.address + ':' + addressInfo?.port);
 
         this.isEnable = true;
@@ -108,7 +111,7 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
 
     async close() {
         this.isEnable = false;
-        this.wsServer.close((err) => {
+        this.wsServer?.close((err) => {
             if (err) {
                 this.logger.logError('[OneBot] [WebSocket Server] Error closing server:', err.message);
             } else {
@@ -205,6 +208,7 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
                 host: newConfig.host === '0.0.0.0' ? '' : newConfig.host,
                 maxPayload: 1024 * 1024 * 1024,
             });
+            this.createServer(this.wsServer);
             if (newConfig.enable) {
                 this.open();
             }