Fix end timeout race condition

porsager · porsager · commit 60dc30f92285 · 2020-02-12T21:14:25.000+01:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -97,7 +97,9 @@ function Connection(options = {}) {
   }
 
   function destroy() {
-    error(errors.connection('DESTROYED', options))
+    const err = errors.connection('DESTROYED', options)
+    backend.query && backend.query.reject(err)
+    error(err)
     socket.destroy()
   }
 
diff --git a/lib/index.js b/lib/index.js
@@ -354,13 +354,10 @@ function Postgres(a, b) {
 
     let destroy
 
-    if (timeout === 0)
-      return ended = Promise.all(all.map(c => c.destroy())).then(() => undefined)
-
     return ended = Promise.race([
       Promise.resolve(arrayTypesPromise).then(() => Promise.all(all.map(c => c.end())))
     ].concat(
-      timeout > 0
+      timeout === 0 || timeout > 0
         ? new Promise(r => destroy = setTimeout(() => (all.map(c => c.destroy()), r()), timeout * 1000))
         : []
     ))
diff --git a/tests/index.js b/tests/index.js
@@ -425,6 +425,13 @@ t('Connection destroyed', async() => {
   return ['CONNECTION_DESTROYED', await sql``.catch(x => x.code)]
 })
 
+t('Connection destroyed with query before', async() => {
+  const sql = postgres(options)
+  let error = sql`select pg_sleep(0.2)`.catch(err => err.code)
+  sql.end({ timeout: 0 })
+  return ['CONNECTION_DESTROYED', await error]
+})
+
 t('Message not supported', async() => {
   await sql`create table test (x int)`
   return ['MESSAGE_NOT_SUPPORTED', await sql`copy test to stdout`.catch(x => x.code)]

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,9 @@ function Connection(options = {}) {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`function destroy() {`
`100`		`- error(errors.connection('DESTROYED', options))`
	`100`	`+ const err = errors.connection('DESTROYED', options)`
	`101`	`+ backend.query && backend.query.reject(err)`
	`102`	`+ error(err)`
`101`	`103`	`socket.destroy()`
`102`	`104`	`}`
`103`	`105`