From 7a73d57d22c4227f3c970ff47ef57bdd63e6f394 Mon Sep 17 00:00:00 2001
From: CheckPickerUpper <194722943+CheckPickerUpper@users.noreply.github.com>
Date: Mon, 5 Oct 2026 00:36:36 -0400
Subject: [PATCH] Preserve original LISTEN subscription ownership across
 reconnects

---
 src/index.js              | 20 +++++-----
 tests/index.js            | 18 +--------
 tests/listen-reconnect.js | 80 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 26 deletions(-)
 create mode 100644 tests/listen-reconnect.js

diff --git a/src/index.js b/src/index.js
index c7fba3da..ba980895 100644
--- a/src/index.js
+++ b/src/index.js
@@ -145,8 +145,10 @@ function Postgres(a, b) {
   }
 
   async function listen(name, fn, onlisten) {
-    const listener = { fn, onlisten }
+    return listenSubscription(name, { fn, onlisten })
+  }
 
+  async function listenSubscription(name, listener) {
     const sql = listen.sql || (listen.sql = Postgres({
       ...options,
       max: 1,
@@ -156,7 +158,7 @@ function Postgres(a, b) {
       onclose() {
         Object.entries(listen.channels).forEach(([name, { listeners }]) => {
           delete listen.channels[name]
-          Promise.all(listeners.map(l => listen(name, l.fn, l.onlisten).catch(() => { /* noop */ })))
+          Promise.all(listeners.map(l => listenSubscription(name, l).catch(() => { /* noop */ })))
         })
       },
       onnotify(c, x) {
@@ -169,16 +171,14 @@ function Postgres(a, b) {
 
     if (exists) {
       channels[name].listeners.push(listener)
-      const result = await channels[name].result
-      listener.onlisten && listener.onlisten()
-      return { state: result.state, unlisten }
+    } else {
+      channels[name] = { result: sql`listen ${
+        sql.unsafe('"' + name.replace(/"/g, '""') + '"')
+      }`, listeners: [listener] }
     }
-
-    channels[name] = { result: sql`listen ${
-      sql.unsafe('"' + name.replace(/"/g, '""') + '"')
-    }`, listeners: [listener] }
     const result = await channels[name].result
-    listener.onlisten && listener.onlisten()
+    if (name in channels && channels[name].listeners.includes(listener))
+      listener.onlisten && listener.onlisten()
     return { state: result.state, unlisten }
 
     async function unlisten() {
diff --git a/tests/index.js b/tests/index.js
index 845c6ce0..a71a0d19 100644
--- a/tests/index.js
+++ b/tests/index.js
@@ -6,6 +6,7 @@ import fs from 'fs'
 import crypto from 'crypto'
 
 import postgres from '../src/index.js'
+import { listenReconnectTests } from './listen-reconnect.js'
 const delay = ms => new Promise(r => setTimeout(r, ms))
 
 const rel = x => new URL(x, import.meta.url)
@@ -817,22 +818,7 @@ t('double listen', async() => {
   return [2, count]
 })
 
-t('multiple listeners work after a reconnect', async() => {
-  const sql = postgres(options)
-      , xs = []
-
-  const s1 = await sql.listen('test', x => xs.push('1', x))
-  await sql.listen('test', x => xs.push('2', x))
-  await sql.notify('test', 'a')
-  await delay(50)
-  await sql`select pg_terminate_backend(${ s1.state.pid })`
-  await delay(200)
-  await sql.notify('test', 'b')
-  await delay(50)
-  sql.end()
-
-  return ['1a2a1b2b', xs.join('')]
-})
+listenReconnectTests({ postgres, options })
 
 t('listen and notify with weird name', async() => {
   const sql = postgres(options)
diff --git a/tests/listen-reconnect.js b/tests/listen-reconnect.js
new file mode 100644
index 00000000..9a6dc362
--- /dev/null
+++ b/tests/listen-reconnect.js
@@ -0,0 +1,80 @@
+import { t } from './test.js'
+
+/** Registers native subscription ownership regressions.
+ * @param inputs The public postgres constructor and real database connection options.
+ * @returns No value; the existing test runner owns both scenarios.
+ */
+export function listenReconnectTests({ postgres, options }) {
+  // @behavior original-listen-unsubscribe-after-reconnect
+  // @boundary before=two-listeners at=reconnect-and-unsubscribe after=one-listener-until-last-unsubscribe
+  // @red original-listen-unsubscribe-after-reconnect Recreated identities retain the removed callback and LISTEN registration.
+  // @green original-listen-unsubscribe-after-reconnect Original handles release reconnected registrations separately.
+  t('Given two listeners reconnect, When original handles unsubscribe, Then only retained listeners receive notifications', async() => {
+    const sql = postgres(options)
+        , xs = []
+        , arrivals = {}
+        , a = new Promise(r => arrivals.a = r)
+        , b = new Promise(r => arrivals.b = r)
+        , c = new Promise(r => arrivals.c = r)
+        , ready = {}
+        , reconnected = new Promise(r => ready.reconnected = r)
+    let registrations = 0
+
+    try {
+      const s1 = await sql.listen('test', x => xs.push('1', x), () => {
+        if (++registrations === 2) ready.reconnected()
+      })
+      const s2 = await sql.listen('test', x => {
+        xs.push('2', x)
+        arrivals[x]()
+      })
+      await sql.notify('test', 'a')
+      await a
+      await sql`select pg_terminate_backend(${ s1.state.pid })`
+      await reconnected
+      await sql.notify('test', 'b')
+      await b
+      await s1.unlisten()
+      await sql.notify('test', 'c')
+      // The retained user callback is a positive notification barrier after unsubscribe.
+      await c
+      await s2.unlisten()
+      const [{ available }] = await sql`select 1 as available`
+      const [{ retained }] = await sql`
+        select count(*)::int as retained from pg_stat_activity
+        where pid = ${ s2.state.pid } and query ilike 'listen %'
+      `
+      return ['1a2a1b2b2c:1:0', xs.join('') + ':' + available + ':' + retained]
+    } finally { await sql.end() }
+  })
+
+  // @behavior unsubscribe-during-listen-reconnect
+  // @boundary before=two-reconnecting-listeners at=close-before-ready after=only-retained-listener-ready-and-notified
+  // @red unsubscribe-during-listen-reconnect Recreated identities or unguarded ready callbacks resurrect the closed subscription.
+  // @green unsubscribe-during-listen-reconnect Stable ownership and current membership preserve only the retained listener.
+  t('Given listeners reconnect, When a pending subscription closes, Then only the retained listener becomes ready and receives notifications', async() => {
+    const sql = postgres(options)
+        , callbacks = []
+        , resolvers = {}
+        , released = new Promise(r => resolvers.released = r)
+        , received = new Promise(r => resolvers.received = r)
+    let firstRegistrations = 0
+        , secondRegistrations = 0
+
+    try {
+      const first = await sql.listen('pending_unsubscribe', () => {
+        callbacks.push('first')
+        resolvers.received()
+      }, () => {
+        if (++firstRegistrations === 2) second.unlisten().then(resolvers.released)
+      })
+      const second = await sql.listen('pending_unsubscribe', () => callbacks.push('second'), () => secondRegistrations++)
+      await sql`select pg_terminate_backend(${ first.state.pid })`
+      // The first ready callback closes the second handle while its shared LISTEN await is still pending.
+      await released
+      await sql.notify('pending_unsubscribe', 'after-unsubscribe')
+      await received
+      return ['first:1', callbacks.join(',') + ':' + secondRegistrations]
+    } finally { await sql.end() }
+  })
+}