Fix subscribe stream close

porsager · porsager · commit 19c96845ef76 · 2022-09-30T17:43:41.000+02:00
diff --git a/cjs/src/subscribe.js b/cjs/src/subscribe.js
@@ -36,12 +36,12 @@ module.exports = Subscribe;function Subscribe(postgres, options) {
 
   sql.end = async() => {
     ended = true
-    stream && (await new Promise(r => (stream.once('end', r), stream.end())))
+    stream && (await new Promise(r => (stream.once('close', r), stream.end())))
     return end()
   }
 
   sql.close = async() => {
-    stream && (await new Promise(r => (stream.once('end', r), stream.end())))
+    stream && (await new Promise(r => (stream.once('close', r), stream.end())))
     return close()
   }
 
diff --git a/deno/src/subscribe.js b/deno/src/subscribe.js
@@ -37,12 +37,12 @@ export default function Subscribe(postgres, options) {
 
   sql.end = async() => {
     ended = true
-    stream && (await new Promise(r => (stream.once('end', r), stream.end())))
+    stream && (await new Promise(r => (stream.once('close', r), stream.end())))
     return end()
   }
 
   sql.close = async() => {
-    stream && (await new Promise(r => (stream.once('end', r), stream.end())))
+    stream && (await new Promise(r => (stream.once('close', r), stream.end())))
     return close()
   }
 
diff --git a/src/subscribe.js b/src/subscribe.js
@@ -36,12 +36,12 @@ export default function Subscribe(postgres, options) {
 
   sql.end = async() => {
     ended = true
-    stream && (await new Promise(r => (stream.once('end', r), stream.end())))
+    stream && (await new Promise(r => (stream.once('close', r), stream.end())))
     return end()
   }
 
   sql.close = async() => {
-    stream && (await new Promise(r => (stream.once('end', r), stream.end())))
+    stream && (await new Promise(r => (stream.once('close', r), stream.end())))
     return close()
   }
 

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ module.exports = Subscribe;function Subscribe(postgres, options) {`
`36`	`36`
`37`	`37`	`sql.end = async() => {`
`38`	`38`	`ended = true`
`39`		`- stream && (await new Promise(r => (stream.once('end', r), stream.end())))`
	`39`	`+ stream && (await new Promise(r => (stream.once('close', r), stream.end())))`
`40`	`40`	`return end()`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`sql.close = async() => {`
`44`		`- stream && (await new Promise(r => (stream.once('end', r), stream.end())))`
	`44`	`+ stream && (await new Promise(r => (stream.once('close', r), stream.end())))`
`45`	`45`	`return close()`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,12 @@ export default function Subscribe(postgres, options) {`
`37`	`37`
`38`	`38`	`sql.end = async() => {`
`39`	`39`	`ended = true`
`40`		`- stream && (await new Promise(r => (stream.once('end', r), stream.end())))`
	`40`	`+ stream && (await new Promise(r => (stream.once('close', r), stream.end())))`
`41`	`41`	`return end()`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`sql.close = async() => {`
`45`		`- stream && (await new Promise(r => (stream.once('end', r), stream.end())))`
	`45`	`+ stream && (await new Promise(r => (stream.once('close', r), stream.end())))`
`46`	`46`	`return close()`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ export default function Subscribe(postgres, options) {`
`36`	`36`
`37`	`37`	`sql.end = async() => {`
`38`	`38`	`ended = true`
`39`		`- stream && (await new Promise(r => (stream.once('end', r), stream.end())))`
	`39`	`+ stream && (await new Promise(r => (stream.once('close', r), stream.end())))`
`40`	`40`	`return end()`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`sql.close = async() => {`
`44`		`- stream && (await new Promise(r => (stream.once('end', r), stream.end())))`
	`44`	`+ stream && (await new Promise(r => (stream.once('close', r), stream.end())))`
`45`	`45`	`return close()`
`46`	`46`	`}`
`47`	`47`