Skip to content

fix: WebSocket readyState should not revert from CLOSED to CLOSING #4752

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
mcollina wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: WebSocket readyState should not revert from CLOSED to CLOSING #4752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09a6cb9
fix: WebSocket readyState should not revert from CLOSED to CLOSING
mcollina Jan 22, 2026
e8ba25f
fix: use setImmediate for WebSocket close event task queuing
mcollina Jan 27, 2026
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
4 changes: 3 additions & 1 deletion lib/web/websocket/connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,9 @@ function failWebsocketConnection (handler, code, reason, cause) {

if (isConnecting(handler.readyState)) {
// If the connection was not established, we must still emit an 'error' and 'close' events
handler.onSocketClose()
// Use queueMicrotask to ensure the close event fires after readyState is set to CLOSING
// See: https://websockets.spec.whatwg.org/#closeWebSocket
queueMicrotask(() => handler.onSocketClose())
} else if (handler.socket?.destroyed === false) {
handler.socket.destroy()
}
Expand Down
9 changes: 8 additions & 1 deletion lib/web/websocket/websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ class WebSocket extends EventTarget {

this.#handler.socket.destroy()
},
onSocketClose: () => this.#onSocketClose(),
// Queue a task for the close event
// See: https://websockets.spec.whatwg.org/#closeWebSocket
onSocketClose: () => setImmediate(() => this.#onSocketClose()),
onPing: (body) => {
if (channels.ping.hasSubscribers) {
channels.ping.publish({
Expand Down Expand Up @@ -554,6 +556,11 @@ class WebSocket extends EventTarget {
* @see https://datatracker.ietf.org/doc/html/rfc6455#section-7.1.4
*/
#onSocketClose () {
// Guard against the close event firing twice
if (isClosed(this.#handler.readyState)) {
return
}

// If the TCP connection was closed after the
// WebSocket closing handshake was completed, the WebSocket connection
// is said to have been closed _cleanly_.
Expand Down
Loading
Loading