Fix graceful end

porsager · porsager · commit 95651b613c06 · 2019-11-23T01:04:23.000+01:00
diff --git a/cjs/connection.js b/cjs/connection.js
@@ -24,7 +24,7 @@ module.exports = function Connection(options = {}) {
 
   const queries = Queue()
       , statements = new Map()
-      , connection = { send, end, ready: false, active: false }
+      , connection = { send, end, destroy, ready: false, active: false }
 
   const socket = postgresSocket(options, {
     data,
@@ -62,16 +62,19 @@ module.exports = function Connection(options = {}) {
   }
 
   function end() {
-    return new Promise((resolve) => {
-      ended = function() {
-        socket.end()
-        resolve()
-      }
+    clearTimeout(timer)
+    const promise = new Promise((resolve) => {
+      ended = () => resolve(socket.end())
     })
+
+    if (!backend.query && queries.length === 0)
+      ended()
+
+    return promise
   }
 
   function destroy() {
-    error(errors.connection('DESTROYED'))
+    error(errors.connection('DESTROYED', options))
     socket.destroy()
   }
 
@@ -171,9 +174,14 @@ function postgresSocket(options, {
   return {
     ready: false,
     write: x => socket.write(x),
+    destroy: () => {
+      ended = true
+      socket.destroy()
+      return Promise.resolve()
+    },
     end: () => {
       ended = true
-      socket.end()
+      return new Promise(r => socket.end(r))
     },
     connect
   }
diff --git a/cjs/index.js b/cjs/index.js
@@ -289,16 +289,16 @@ module.exports = function Postgres(url, options) {
     let c
     let destroy
 
+    if (timeout === 0)
+      return ended = Promise.all(all.map(c => c.destroy()))
+
     return ended = Promise.race([
-      Promise.all(timeout === 0
-        ? all.map(c => c.destroy())
-        : all.map(c => c.end())
-      )
-      .concat(timeout > 0
-        ? Promise.resolve(r => destroy = setTimeout(() => all.map(c => c.destroy()), timeout * 1000))
+      all.map(c => c.end())
+    ].concat(
+      timeout > 0
+        ? new Promise(r => destroy = setTimeout(() => (all.map(c => c.destroy()), r()), timeout * 1000))
         : []
-      )
-    ])
+    ))
     .then(() => clearTimeout(destroy))
   }
 
diff --git a/cjs/package.json b/cjs/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "postgres",
-  "version": "0.0.2",
+  "name": "peegee",
+  "version": "0.0.3",
   "description": "Fastest full featured PostgreSQL client for Node.js",
   "main": "index.js",
-  
+  "type": "commonjs",
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "node cjs/transpile.js"
@@ -24,5 +24,8 @@
     "db",
     "pg",
     "database"
-  ]
+  ],
+  "dependencies": {
+    "wtfnode": "0.8.0"
+  }
 }
diff --git a/cjs/transpile.js b/cjs/transpile.js
@@ -16,6 +16,6 @@ fs.readdirSync(path.join('lib')).forEach(name =>
 fs.writeFileSync(
   path.join('cjs', 'package.json'),
   fs.readFileSync('package.json', 'utf8')
-    .replace('"type": "module",', '')
+    .replace('"type": "module"', '"type": "commonjs"')
     .replace('"main": "lib/index.js"', '"main": "index.js"')
 )
diff --git a/lib/connection.js b/lib/connection.js
@@ -24,7 +24,7 @@ export default function Connection(options = {}) {
 
   const queries = Queue()
       , statements = new Map()
-      , connection = { send, end, ready: false, active: false }
+      , connection = { send, end, destroy, ready: false, active: false }
 
   const socket = postgresSocket(options, {
     data,
@@ -62,16 +62,19 @@ export default function Connection(options = {}) {
   }
 
   function end() {
-    return new Promise((resolve) => {
-      ended = function() {
-        socket.end()
-        resolve()
-      }
+    clearTimeout(timer)
+    const promise = new Promise((resolve) => {
+      ended = () => resolve(socket.end())
     })
+
+    if (!backend.query && queries.length === 0)
+      ended()
+
+    return promise
   }
 
   function destroy() {
-    error(errors.connection('DESTROYED'))
+    error(errors.connection('DESTROYED', options))
     socket.destroy()
   }
 
@@ -171,9 +174,14 @@ function postgresSocket(options, {
   return {
     ready: false,
     write: x => socket.write(x),
+    destroy: () => {
+      ended = true
+      socket.destroy()
+      return Promise.resolve()
+    },
     end: () => {
       ended = true
-      socket.end()
+      return new Promise(r => socket.end(r))
     },
     connect
   }
diff --git a/lib/index.js b/lib/index.js
@@ -289,16 +289,16 @@ export default function Postgres(url, options) {
     let c
     let destroy
 
+    if (timeout === 0)
+      return ended = Promise.all(all.map(c => c.destroy()))
+
     return ended = Promise.race([
-      Promise.all(timeout === 0
-        ? all.map(c => c.destroy())
-        : all.map(c => c.end())
-      )
-      .concat(timeout > 0
-        ? Promise.resolve(r => destroy = setTimeout(() => all.map(c => c.destroy()), timeout * 1000))
+      all.map(c => c.end())
+    ].concat(
+      timeout > 0
+        ? new Promise(r => destroy = setTimeout(() => (all.map(c => c.destroy()), r()), timeout * 1000))
         : []
-      )
-    ])
+    ))
     .then(() => clearTimeout(destroy))
   }
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ fs.readdirSync(path.join('lib')).forEach(name =>`
`16`	`16`	`fs.writeFileSync(`
`17`	`17`	`path.join('cjs', 'package.json'),`
`18`	`18`	`fs.readFileSync('package.json', 'utf8')`
`19`		`- .replace('"type": "module",', '')`
	`19`	`+ .replace('"type": "module"', '"type": "commonjs"')`
`20`	`20`	`.replace('"main": "lib/index.js"', '"main": "index.js"')`
`21`	`21`	`)`