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: 正向ws测试完成

Browse Source
This commit is contained in:
手瓜一十雪 2024-08-11 10:29:21 +08:00
parent 062cc307fb
commit b5e8218551
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/onebot/network/passive-websocket.ts
View File

@ -68,7 +68,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
this.authorize(token, wsClient, wsReq); this.authorize(token, wsClient, wsReq);
wsClient.on('message', (message) => { wsClient.on('message', (message) => {
this.handleMessage(wsClient, message); this.handleMessage(wsClient, message).then().catch(this.logger.logError);
}); });
wsClient.once('close', () => { wsClient.once('close', () => {
this.wsClientsMutex.runExclusive(async () => { this.wsClientsMutex.runExclusive(async () => {
@ -118,6 +118,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
this.logger.logError('Cannot open a closed WebSocket server'); this.logger.logError('Cannot open a closed WebSocket server');
return; return;
} }
this.logger.log('WebSocket server started', this.wsServer.address());
this.isOpen = true; this.isOpen = true;
this.registerHeartBeat(); this.registerHeartBeat();
} }
@ -148,9 +149,9 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
} }
} }
private handleMessage(wsClient: WebSocket, message: any) { private async handleMessage(wsClient: WebSocket, message: any) {
let receiveData: { action: ActionName, params?: any, echo?: any } = { action: ActionName.Unknown, params: {} }; let receiveData: { action: ActionName, params?: any, echo?: any } = { action: ActionName.Unknown, params: {} };
let echo = null; let echo = undefined;
try { try {
try { try {
receiveData = JSON.parse(message.toString()); receiveData = JSON.parse(message.toString());
@ -160,6 +161,9 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
this.WsReply<any>(OB11Response.error('json解析失败,请检查数据格式', 1400, echo), wsClient); this.WsReply<any>(OB11Response.error('json解析失败,请检查数据格式', 1400, echo), wsClient);
} }
receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证 receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证
let retdata = await this.actionMap.get(receiveData.action)?.websocketHandle(receiveData.params, echo || "");
const packet = Object.assign({}, retdata);
this.WsReply<any>(packet, wsClient);
} catch (e) { } catch (e) {
this.WsReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo), wsClient); this.WsReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo), wsClient);
} }