From 33d2f24fcf7f7bfffc5375c446d2a23b1bf3d842 Mon Sep 17 00:00:00 2001
From: Pratik Dulal <pratikdulal0@gmail.com>
Date: Sun, 9 Aug 2026 11:48:35 +0545
Subject: [PATCH] fix(pg-cloudflare): safely end closed sockets

---
 packages/pg-cloudflare/src/index.ts        |  2 +-
 packages/pg-esm-test/pg-cloudflare.test.js | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/pg-cloudflare/src/index.ts b/packages/pg-cloudflare/src/index.ts
index 9b1e517ba..357131911 100644
--- a/packages/pg-cloudflare/src/index.ts
+++ b/packages/pg-cloudflare/src/index.ts
@@ -107,7 +107,7 @@ export class CloudflareSocket extends EventEmitter {
   end(data = Buffer.alloc(0), encoding: BufferEncoding = 'utf8', callback: (...args: unknown[]) => void = () => {}) {
     log('ending CF socket')
     this.write(data, encoding, (err) => {
-      this._cfSocket!.close()
+      this._cfSocket?.close()
       if (callback) callback(err)
     })
     return this
diff --git a/packages/pg-esm-test/pg-cloudflare.test.js b/packages/pg-esm-test/pg-cloudflare.test.js
index a42620253..c140f0bb1 100644
--- a/packages/pg-esm-test/pg-cloudflare.test.js
+++ b/packages/pg-esm-test/pg-cloudflare.test.js
@@ -6,4 +6,16 @@ describe('pg-cloudflare', () => {
   it('should export CloudflareSocket constructor', () => {
     assert.ok(new CloudflareSocket())
   })
+
+  it('should safely end after the underlying socket has closed', async () => {
+    const socket = new CloudflareSocket()
+    const underlyingSocket = { closed: Promise.resolve() }
+    socket._cfSocket = underlyingSocket
+    socket._addClosedHandler()
+
+    await underlyingSocket.closed
+    assert.equal(socket._cfSocket, null)
+
+    assert.doesNotThrow(() => socket.end())
+  })
 })