Skip to content

Fix provider destroy function to properly cleanup connections (#394) #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fabiorush wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix provider destroy function to properly cleanup connections (#394) #425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions js-pkg/client/src/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,10 +588,12 @@ export class YSweetProvider {

private websocketClose(event: CloseEvent) {
this.emit(EVENT_CONNECTION_CLOSE, event)
this.setStatus(STATUS_ERROR)
this.clearHeartbeat()
this.clearConnectionTimeout()
this.connect()
if (this.status !== STATUS_OFFLINE) {
this.setStatus(STATUS_ERROR)
this.clearHeartbeat()
this.clearConnectionTimeout()
this.connect()
}

// Remove all awareness states except for our own.
awarenessProtocol.removeAwarenessStates(
Expand All @@ -605,11 +607,12 @@ export class YSweetProvider {

private websocketError(event: Event) {
this.emit(EVENT_CONNECTION_ERROR, event)
this.setStatus(STATUS_ERROR)
this.clearHeartbeat()
this.clearConnectionTimeout()

this.connect()
if (this.status !== STATUS_OFFLINE) {
this.setStatus(STATUS_ERROR)
this.clearHeartbeat()
this.clearConnectionTimeout()
this.connect()
}
}

public emit(eventName: YSweetEvent | YWebsocketEvent, data: any = null): void {
Expand All @@ -635,6 +638,16 @@ export class YSweetProvider {
}

public destroy() {
// Set status to OFFLINE first to prevent websocketClose from reconnecting
this.setStatus(STATUS_OFFLINE)
this.clearHeartbeat()
this.clearConnectionTimeout()

// Wake any pending reconnection attempts so they exit immediately
if (this.reconnectSleeper) {
this.reconnectSleeper.wake()
}

if (this.websocket) {
this.websocket.close()
}
Expand Down