Wait for real close event

porsager · porsager · commit 7e418cdaa371 · 2022-05-15T21:43:56.000+02:00
diff --git a/cjs/src/connection.js b/cjs/src/connection.js
@@ -391,7 +391,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     return ending || (
       !connection.reserved && onend(connection),
       !connection.reserved && !initial && !query && sent.length === 0
-        ? Promise.resolve(terminate())
+        ? (terminate(), new Promise(r => socket && socket.readyState !== 'closed' ? socket.once('close', r) : r()))
         : ending = new Promise(r => ended = r)
     )
   }
diff --git a/deno/src/connection.js b/deno/src/connection.js
@@ -395,7 +395,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     return ending || (
       !connection.reserved && onend(connection),
       !connection.reserved && !initial && !query && sent.length === 0
-        ? Promise.resolve(terminate())
+        ? (terminate(), new Promise(r => socket && socket.readyState !== 'closed' ? socket.once('close', r) : r()))
         : ending = new Promise(r => ended = r)
     )
   }
diff --git a/src/connection.js b/src/connection.js
@@ -391,7 +391,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     return ending || (
       !connection.reserved && onend(connection),
       !connection.reserved && !initial && !query && sent.length === 0
-        ? Promise.resolve(terminate())
+        ? (terminate(), new Promise(r => socket && socket.readyState !== 'closed' ? socket.once('close', r) : r()))
         : ending = new Promise(r => ended = r)
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose`
`391`	`391`	`return ending \|\| (`
`392`	`392`	`!connection.reserved && onend(connection),`
`393`	`393`	`!connection.reserved && !initial && !query && sent.length === 0`
`394`		`- ? Promise.resolve(terminate())`
	`394`	`+ ? (terminate(), new Promise(r => socket && socket.readyState !== 'closed' ? socket.once('close', r) : r()))`
`395`	`395`	`: ending = new Promise(r => ended = r)`
`396`	`396`	`)`
`397`	`397`	`}`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose`
`395`	`395`	`return ending \|\| (`
`396`	`396`	`!connection.reserved && onend(connection),`
`397`	`397`	`!connection.reserved && !initial && !query && sent.length === 0`
`398`		`- ? Promise.resolve(terminate())`
	`398`	`+ ? (terminate(), new Promise(r => socket && socket.readyState !== 'closed' ? socket.once('close', r) : r()))`
`399`	`399`	`: ending = new Promise(r => ended = r)`
`400`	`400`	`)`
`401`	`401`	`}`