diff --git a/src/onebot/network/active-http.ts b/src/onebot/network/active-http.ts index 9a019394..d23071e9 100644 --- a/src/onebot/network/active-http.ts +++ b/src/onebot/network/active-http.ts @@ -5,8 +5,10 @@ import { OB11BaseEvent } from '@/onebot/event/OB11BaseEvent'; export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter { url: string; private actionMap: Map> = new Map(); + heartbeatInterval: number; - constructor(url: string) { + constructor(url: string, heartbeatInterval: number) { + this.heartbeatInterval = heartbeatInterval; this.url = url; } registerHeartBeat() { diff --git a/src/onebot/network/active-websocket.ts b/src/onebot/network/active-websocket.ts index e825099e..fa71e829 100644 --- a/src/onebot/network/active-websocket.ts +++ b/src/onebot/network/active-websocket.ts @@ -12,16 +12,18 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter { private connection: NodeWebSocket | null = null; private actionMap: Map> = new Map(); + heartbeatInterval: number; - constructor(url: string, reconnectIntervalInMillis: number) { + constructor(url: string, reconnectIntervalInMillis: number, heartbeatInterval: number) { this.url = url; + this.heartbeatInterval = heartbeatInterval; this.reconnectIntervalInMillis = reconnectIntervalInMillis; } registerHeartBeat() { //WS反向心跳 } - + registerAction, P, R>(action: T) { this.actionMap.set(action.actionName, action); } diff --git a/src/onebot/network/index.ts b/src/onebot/network/index.ts index 96a11b5a..7be3116f 100644 --- a/src/onebot/network/index.ts +++ b/src/onebot/network/index.ts @@ -13,12 +13,7 @@ export class OB11NetworkManager { registerAdapter(adapter: IOB11NetworkAdapter) { this.adapters.push(adapter); } - - async open() { - await Promise.all(this.adapters.map(adapter => adapter.open())); - } - - async close() { + async closeAll() { await Promise.all(this.adapters.map(adapter => adapter.close())); } } diff --git a/src/onebot/network/passive-http.ts b/src/onebot/network/passive-http.ts index 433e2d10..387984fc 100644 --- a/src/onebot/network/passive-http.ts +++ b/src/onebot/network/passive-http.ts @@ -11,9 +11,11 @@ export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter { private hasBeenClosed: boolean = false; private actionMap: Map> = new Map(); private port: number; + token: string; - constructor(port: number) { + constructor(port: number,token: string) { this.port = port; + this.token = token; } registerAction, P, R>(action: T) { diff --git a/src/onebot/network/passive-websocket.ts b/src/onebot/network/passive-websocket.ts index 2ed2c5a0..be96aced 100644 --- a/src/onebot/network/passive-websocket.ts +++ b/src/onebot/network/passive-websocket.ts @@ -10,10 +10,11 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter { wsClientsMutex = new Mutex(); isOpen: boolean = false; hasBeenClosed: boolean = false; - + heartbeatInterval:number = 0; private actionMap: Map> = new Map(); - constructor(ip: string, port: number, token: string) { + constructor(ip: string, port: number, heartbeatInterval: number, token: string) { + this.heartbeatInterval = heartbeatInterval; this.wsServer = new WebSocketServer({ port: port, host: ip }); this.wsServer.on('connection', async (wsClient) => { if (!this.isOpen) {