Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion lib/web/websocket/websocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const { channels } = require('../../core/diagnostics')
* @property {Set<number>} closeState
* @property {import('../fetch/index').Fetch} controller
* @property {boolean} [wasEverConnected=false]
* @property {boolean} [closeEventFired=false]
*/

// https://websockets.spec.whatwg.org/#interface-definition
Expand Down Expand Up @@ -102,7 +103,8 @@ class WebSocket extends EventTarget {
socket: null,
closeState: new Set(),
controller: null,
wasEverConnected: false
wasEverConnected: false,
closeEventFired: false
}

#url
Expand Down Expand Up @@ -554,6 +556,12 @@ class WebSocket extends EventTarget {
* @see https://datatracker.ietf.org/doc/html/rfc6455#section-7.1.4
*/
#onSocketClose () {
// Prevent duplicate close events
if (this.#handler.closeEventFired) {
return
}
this.#handler.closeEventFired = true

// 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
26 changes: 26 additions & 0 deletions test/websocket/issue-4628.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
'use strict'

const { tspl } = require('@matteo.collina/tspl')
const { test } = require('node:test')
const { WebSocket } = require('../..')

test('closing before connection is established should only fire error and close events once', async (t) => {
t = tspl(t, { plan: 2 })

const ws = new WebSocket('wss://example.com/')

ws.addEventListener('error', () => {
t.ok(true, 'error event fired')
})

ws.addEventListener('close', () => {
t.ok(true, 'close event fired')
})

// Close immediately before connection is established
setTimeout(() => {
ws.close()
}, 10)

await t.completed
})
Loading