Skip to content
Open
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
6 changes: 4 additions & 2 deletions packages/pg-cloudflare/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,11 @@ export class CloudflareSocket extends EventEmitter {
return this
}

destroy(reason: string) {
log('destroying CF socket', reason)
destroy(error?: Error) {
log('destroying CF socket', error)
this.destroyed = true
// Like net.Socket#destroy(error): 'error' with the reason, then 'close'.
if (error) queueMicrotask(() => this.emit('error', error))
return this.end()
}

Expand Down
41 changes: 41 additions & 0 deletions packages/pg-esm-test/pg-cloudflare.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,47 @@ describe('pg-cloudflare', () => {
await promise
})

it('should emit the destroy error before close', async () => {
const socket = new CloudflareSocket()
socket._cfSocket = {
closed: new Promise(() => {}),
close: async () => {},
}
socket._addClosedHandler()

const events = []
const error = new Error('timeout expired')
socket.on('error', (emitted) => events.push(emitted))
await new Promise((resolve) => {
socket.once('close', () => {
events.push('close')
resolve()
})
socket.destroy(error)
})

assert.ok(socket.destroyed)
assert.deepEqual(events, [error, 'close'])
})

it('should not emit an error when destroyed without one', async () => {
const socket = new CloudflareSocket()
socket._cfSocket = {
closed: new Promise(() => {}),
close: async () => {},
}
socket._addClosedHandler()

const errors = []
socket.on('error', (error) => errors.push(error))
await new Promise((resolve) => {
socket.once('close', resolve)
socket.destroy()
})

assert.deepEqual(errors, [])
})

it('should emit close when ending a socket whose closed promise never settles', async () => {
const socket = new CloudflareSocket()
socket._cfSocket = {
Expand Down
Loading