github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-22 01:36:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix: use correct callback on websocket error

Browse source 
the error event of the websocket occurs if the connection is already closed.
Therefore, the disconnect call does nothing and the transporter won't throw the disconnected event.

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
This commit is contained in:
Tilman Vatteroth 2023-03-26 11:31:05 +02:00
parent c746495e5f
commit a78ac5f097
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
commons/src/message-transporters/websocket-transporter.ts
View file

@ -5,14 +5,13 @@
*/ */
import { ConnectionState, MessageTransporter } from './message-transporter.js' import { ConnectionState, MessageTransporter } from './message-transporter.js'
import { Message, MessageType } from './message.js' import { Message, MessageType } from './message.js'
import WebSocket, { CloseEvent, ErrorEvent, MessageEvent } from 'isomorphic-ws' import WebSocket, { MessageEvent } from 'isomorphic-ws'
export class WebsocketTransporter extends MessageTransporter { export class WebsocketTransporter extends MessageTransporter {
private websocket: WebSocket | undefined private websocket: WebSocket | undefined
private messageCallback: undefined | ((event: MessageEvent) => void) private messageCallback: undefined | ((event: MessageEvent) => void)
private errorCallback: undefined | ((event: ErrorEvent) => void) private closeCallback: undefined | (() => void)
private closeCallback: undefined | ((event: CloseEvent) => void)
constructor() { constructor() {
super() super()
@ -41,10 +40,8 @@ export class WebsocketTransporter extends MessageTransporter {
if (this.messageCallback) { if (this.messageCallback) {
this.websocket.removeEventListener('message', this.messageCallback) this.websocket.removeEventListener('message', this.messageCallback)
} }
if (this.errorCallback) {
this.websocket.removeEventListener('error', this.errorCallback)
}
if (this.closeCallback) { if (this.closeCallback) {
this.websocket.removeEventListener('error', this.closeCallback)
this.websocket.removeEventListener('close', this.closeCallback) this.websocket.removeEventListener('close', this.closeCallback)
} }
} }
@ -52,11 +49,10 @@ export class WebsocketTransporter extends MessageTransporter {
private bindWebsocketEvents(websocket: WebSocket) { private bindWebsocketEvents(websocket: WebSocket) {
this.messageCallback = this.processMessageEvent.bind(this) this.messageCallback = this.processMessageEvent.bind(this)
this.errorCallback = this.disconnect.bind(this)
this.closeCallback = this.onDisconnecting.bind(this) this.closeCallback = this.onDisconnecting.bind(this)
websocket.addEventListener('message', this.messageCallback) websocket.addEventListener('message', this.messageCallback)
websocket.addEventListener('error', this.errorCallback) websocket.addEventListener('error', this.closeCallback)
websocket.addEventListener('close', this.closeCallback) websocket.addEventListener('close', this.closeCallback)
} }
@ -72,6 +68,11 @@ export class WebsocketTransporter extends MessageTransporter {
this.websocket?.close() this.websocket?.close()
} }
protected onDisconnecting() {
this.undbindEventsFromPreviousWebsocket()
super.onDisconnecting()
}
public sendMessage(content: Message<MessageType>): void { public sendMessage(content: Message<MessageType>): void {
if (this.websocket?.readyState !== WebSocket.OPEN) { if (this.websocket?.readyState !== WebSocket.OPEN) {
throw new Error("Can't send message over non-open socket") throw new Error("Can't send message over non-open socket")