Ensure transactions throw if connection is closed while there is no active query - fixes porsager#658

porsager · porsager · commit 788c8191b088 · 2023-10-27T17:45:33.000+02:00
diff --git a/src/connection.js b/src/connection.js
@@ -441,7 +441,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     closedDate = performance.now()
     hadError && options.shared.retries++
     delay = (typeof backoff === 'function' ? backoff(options.shared.retries) : backoff) * 1000
-    onclose(connection)
+    onclose(connection, Errors.connection('CONNECTION_CLOSED', options, socket))
   }
 
   /* Handlers */
diff --git a/src/index.js b/src/index.js
@@ -239,7 +239,10 @@ function Postgres(a, b) {
 
     try {
       await sql.unsafe('begin ' + options.replace(/[^a-z ]/ig, ''), [], { onexecute }).execute()
-      return await scope(connection, fn)
+      return await Promise.race([
+        scope(connection, fn),
+        new Promise((_, reject) => connection.onclose = reject)
+      ])
     } catch (error) {
       throw error
     }
@@ -414,9 +417,10 @@ function Postgres(a, b) {
       : move(c, full)
   }
 
-  function onclose(c) {
+  function onclose(c, e) {
     move(c, closed)
     c.reserved = null
+    c.onclose && (c.onclose(e), c.onclose = null)
     options.onclose && options.onclose(c.id)
     queries.length && connect(c, queries.shift())
   }
diff --git a/tests/index.js b/tests/index.js
@@ -2348,6 +2348,16 @@ t('Ensure reconnect after max_lifetime with transactions', { timeout: 5 }, async
   return [true, true]
 })
 
+
+t('Ensure transactions throw if connection is closed dwhile there is no query', async() => {
+  const x = await sql.begin(async() => {
+    setTimeout(() => sql.end({ timeout: 0 }), 10)
+    await new Promise(r => setTimeout(r, 200))
+    return sql`select 1`
+  }).catch(x => x)
+  return ['CONNECTION_CLOSED', x.code]
+})
+
 t('Custom socket', {}, async() => {
   let result
   const sql = postgres({

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose`
`441`	`441`	`closedDate = performance.now()`
`442`	`442`	`hadError && options.shared.retries++`
`443`	`443`	`delay = (typeof backoff === 'function' ? backoff(options.shared.retries) : backoff) * 1000`
`444`		`- onclose(connection)`
	`444`	`+ onclose(connection, Errors.connection('CONNECTION_CLOSED', options, socket))`
`445`	`445`	`}`
`446`	`446`
`447`	`447`	`/* Handlers */`