GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2025-07-19 12:03:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: 心跳

Browse Source
This commit is contained in:
手瓜一十雪
2024-08-11 10:12:53 +08:00
parent 404a213896
commit e99ff1be35
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/onebot/network/active-websocket.ts
View File

@@ -31,7 +31,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
if (this.connection) { if (this.connection) {
this.heartbeatTimer = setInterval(() => { this.heartbeatTimer = setInterval(() => {
if (this.connection && this.connection.readyState === NodeWebSocket.OPEN) { if (this.connection && this.connection.readyState === NodeWebSocket.OPEN) {
this.connection.ping(JSON.stringify(new OB11HeartbeatEvent(this.coreContext, this.heartbeatInterval, this.coreContext.selfInfo.online, true))); this.connection.send(JSON.stringify(new OB11HeartbeatEvent(this.coreContext, this.heartbeatInterval, this.coreContext.selfInfo.online, true)));
} }
}, this.heartbeatInterval); }, this.heartbeatInterval);
} }

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

@@ -8,6 +8,7 @@ import { ActionName } from '../action/types';
import { NapCatCore } from '@/core'; import { NapCatCore } from '@/core';
import { NapCatOneBot11Adapter } from '..'; import { NapCatOneBot11Adapter } from '..';
import { LogWrapper } from '@/common/utils/log'; import { LogWrapper } from '@/common/utils/log';
import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent';
export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter { export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
wsServer: WebSocketServer; wsServer: WebSocketServer;
@@ -20,6 +21,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
onebotContext: NapCatOneBot11Adapter; onebotContext: NapCatOneBot11Adapter;
coreContext: NapCatCore; coreContext: NapCatCore;
logger: LogWrapper; logger: LogWrapper;
private heartbeatIntervalId: NodeJS.Timeout | null = null;
constructor(ip: string, port: number, heartbeatInterval: number, token: string, coreContext: NapCatCore, onebotContext: NapCatOneBot11Adapter) { constructor(ip: string, port: number, heartbeatInterval: number, token: string, coreContext: NapCatCore, onebotContext: NapCatOneBot11Adapter) {
this.coreContext = coreContext; this.coreContext = coreContext;
@@ -56,19 +58,21 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
}); });
}); });
} }
registerActionMap(actionMap: Map<string, BaseAction<any, any>>) { registerActionMap(actionMap: Map<string, BaseAction<any, any>>) {
this.actionMap = actionMap; this.actionMap = actionMap;
} }
registerAction<T extends BaseAction<P, R>, P, R>(action: T) { registerAction<T extends BaseAction<P, R>, P, R>(action: T) {
this.actionMap.set(action.actionName, action); this.actionMap.set(action.actionName, action);
} }
registerHeartBeat() { registerHeartBeat() {
setInterval(() => { this.heartbeatIntervalId = setInterval(() => {
this.wsClientsMutex.runExclusive(async () => { this.wsClientsMutex.runExclusive(async () => {
this.wsClients.forEach((wsClient) => { this.wsClients.forEach((wsClient) => {
if (wsClient.readyState === WebSocket.OPEN) { if (wsClient.readyState === WebSocket.OPEN) {
wsClient.ping(); wsClient.send(JSON.stringify(new OB11HeartbeatEvent(this.coreContext, this.heartbeatInterval, this.coreContext.selfInfo.online, true)));
} }
}); });
}); });
@@ -86,17 +90,23 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
open() { open() {
if (this.hasBeenClosed) { if (this.hasBeenClosed) {
// throw new Error('Cannot open a closed WebSocket server');
this.logger.logError('Cannot open a closed WebSocket server'); this.logger.logError('Cannot open a closed WebSocket server');
return;
} }
this.isOpen = true; this.isOpen = true;
this.registerHeartBeat();
} }
async close() { async close() {
this.isOpen = false; this.isOpen = false;
this.hasBeenClosed = true; this.hasBeenClosed = true;
this.wsServer.close(); this.wsServer.close();
if (this.heartbeatIntervalId) {
clearInterval(this.heartbeatIntervalId);
this.heartbeatIntervalId = null;
} }
}
async WsReplyAll<T>(data: T) { async WsReplyAll<T>(data: T) {
this.wsClientsMutex.runExclusive(async () => { this.wsClientsMutex.runExclusive(async () => {
this.wsClients.forEach((wsClient) => { this.wsClients.forEach((wsClient) => {
@@ -106,11 +116,13 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
}); });
}); });
} }
async WsReply<T>(data: T, wsClient: WebSocket) { async WsReply<T>(data: T, wsClient: WebSocket) {
if (wsClient.readyState === WebSocket.OPEN) { if (wsClient.readyState === WebSocket.OPEN) {
wsClient.send(JSON.stringify(data)); wsClient.send(JSON.stringify(data));
} }
} }
private handleMessage(wsClient: WebSocket, message: any) { private 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 = null;
@@ -120,11 +132,11 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
echo = receiveData.echo; echo = receiveData.echo;
this.logger.logDebug('收到正向Websocket消息', receiveData); this.logger.logDebug('收到正向Websocket消息', receiveData);
} catch (e) { } catch (e) {
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 : {};//兼容类型验证
} 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);
} }
} }