Merge pull request #1 from porsager/master

Merge latest changes from base repo

Author: davojan

README.md

@@ -4,7 +4,7 @@
 - 🚯 1250 LOC - 0 dependencies
 - 🏷 ES6 Tagged Template Strings at the core
 - 🏄‍♀️ Simple surface API
-- 💬 Chat on [Gitter](https://badges.gitter.im/porsager/postgres.svg)
+- 💬 Chat on [Gitter](https://gitter.im/porsager/postgres)
 
 <br>
 
@@ -33,10 +33,10 @@ module.exports = sql
 // other.js
 const sql = require('./db.js')
 
-await sql`
+const users = await sql`
   select name, age from users
 `
-// > [{ name: 'Murray', age: 68 }, { name: 'Walter', age 78 }]
+// users: [{ name: 'Murray', age: 68 }, { name: 'Walter', age: 78 }]
 ```
 
 ## Connection options `postgres([url], [options])`
@@ -440,7 +440,7 @@ sql.begin(async sql => {
 
   return [user, account]
 })
-.then(([user, account])) => {
+.then(([user, account]) => {
   // great success - COMMIT succeeded
 })
 .catch(() => {

lib/connection.js

@@ -38,7 +38,7 @@ function Connection(options = {}) {
       , connection = { send, end, destroy }
 
   const socket = postgresSocket(options, {
-    ready: () => socket.write(frontend.connect(options)),
+    ready,
     data,
     error,
     close
@@ -66,8 +66,8 @@ function Connection(options = {}) {
         ? socket.write(frontend.Close())
         : socket.write(frontend.Execute(backend.query.cursor.rows))
     }).catch(err => {
-      socket.write(frontend.Close())
       backend.query.reject(err)
+      socket.write(frontend.Close())
     })
   }
 
@@ -96,7 +96,7 @@ function Connection(options = {}) {
       ended = () => resolve(socket.end())
     })
 
-    process.nextTick(() => ready && ended())
+    process.nextTick(() => (ready || !backend.query) && ended())
 
     return promise
   }
@@ -114,26 +114,31 @@ function Connection(options = {}) {
   }
 
   function send(query, { sig, str, args = [] }) {
-    query.str = str
-    query.args = args
-    query.result = []
-    query.result.count = null
-    idle_timeout && clearTimeout(timer)
-
-    typeof options.debug === 'function' && options.debug(id, str, args)
-    const buffer = query.simple
-      ? simple(str, query)
-      : sig in statements
-        ? prepared(statements[sig], args, query)
-        : prepare(sig, str, args, query)
-
-    ready
-      ? (backend.query = query, ready = false)
-      : queries.push(query)
-
-    open
-      ? socket.write(buffer)
-      : (messages.push(buffer), connect())
+    try {
+      query.str = str
+      query.args = args
+      query.result = []
+      query.result.count = null
+      idle_timeout && clearTimeout(timer)
+
+      typeof options.debug === 'function' && options.debug(id, str, args)
+      const buffer = query.simple
+        ? simple(str, query)
+        : sig in statements
+          ? prepared(statements[sig], args, query)
+          : prepare(sig, str, args, query)
+
+      ready
+        ? (backend.query = query, ready = false)
+        : queries.push(query)
+
+      open
+        ? socket.write(buffer)
+        : (messages.push(buffer), connect())
+    } catch (err) {
+      query.reject(err)
+      idle()
+    }
   }
 
   function connect() {
@@ -174,8 +179,10 @@ function Connection(options = {}) {
   }
 
   function idle() {
-    clearTimeout(timer)
-    timer = setTimeout(socket.end, idle_timeout * 1000)
+    if (idle_timeout && !backend.query && queries.length === 0) {
+      clearTimeout(timer)
+      timer = setTimeout(socket.end, idle_timeout * 1000)
+    }
   }
 
   function onready(err) {
@@ -200,7 +207,7 @@ function Connection(options = {}) {
     }
 
     backend.query = backend.error = null
-    idle_timeout && queries.length === 0 && idle()
+    idle()
 
     if (!open) {
       messages.forEach(socket.write)
@@ -244,7 +251,6 @@ function Connection(options = {}) {
 function postgresSocket(options, {
   error,
   close,
-  ready,
   data
 }) {
   let socket
@@ -295,6 +301,15 @@ function postgresSocket(options, {
     socket.once('close', onclose)
   }
 
+  function ready() {
+    try {
+      socket.write(frontend.connect(options))
+    } catch (e) {
+      error(e)
+      socket.end()
+    }
+  }
+
   const x = {
     write: x => {
       buffer = buffer ? Buffer.concat([buffer, x]) : Buffer.from(x)
@@ -307,7 +322,7 @@ function postgresSocket(options, {
       return Promise.resolve()
     },
     end: () => {
-      return new Promise(r => socket ? socket.end(r) : r())
+      return new Promise(r => socket && !closed ? (socket.once('close', r), socket.end()) : r())
     },
     connect
   }

lib/index.js

@@ -201,7 +201,7 @@ function Postgres(a, b) {
   function nested(first, rest) {
     const o = Object.create(notPromise)
     o.first = first
-    o.rest = rest.flat()
+    o.rest = rest.reduce((acc, val) => acc.concat(val), [])
     return o
   }
 
@@ -354,7 +354,7 @@ function Postgres(a, b) {
       onclose: () => {
         Object.entries(listeners).forEach(([channel, fns]) => {
           delete listeners[channel]
-          Promise.allSettled(fns.map(fn => listen(channel, fn)))
+          Promise.all(fns.map(fn => listen(channel, fn).catch(() => { /* noop */ })))
         })
       }
     },

lib/types.js

@@ -10,7 +10,7 @@ const types = module.exports.types = {
   },
   number: {
     to: 0,
-    from: [21, 23, 26, 700],
+    from: [21, 23, 26, 700, 701],
     serialize: x => '' + x,
     parse: x => +x
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postgres",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "description": "Fastest full featured PostgreSQL client for Node.js",
   "main": "lib/index.js",
   "types": "types/index.d.ts",

tests/index.js

@@ -3,6 +3,7 @@
 const { t, not, ot } = require('./test.js') // eslint-disable-line
 const cp = require('child_process')
 const path = require('path')
+const net = require('net')
 
 /** @type {import('../types')} */
 const postgres = require('../lib')
@@ -47,7 +48,7 @@ t('Connects with no options', async() => {
   const sql = postgres()
 
   const result = (await sql`select 1 as x`)[0].x
-  sql.end()
+  await sql.end()
 
   return [1, result]
 })
@@ -990,6 +991,7 @@ t('connect_timeout works', async() => {
       throw e
     end = Date.now()
   })
+  server.close()
   return [connect_timeout, Math.floor((end - start) / 100) / 10]
 })
 
@@ -1065,13 +1067,37 @@ t('Insert array in sql()', async() => {
 })
 
 t('Automatically creates prepared statements', async() => {
-  const sql = postgres({ no_prepare: false })
+  const sql = postgres({ ...options, no_prepare: false })
   const result = await sql`select * from pg_prepared_statements`
   return [result[0].statement, 'select * from pg_prepared_statements']
 })
 
 t('no_prepare: true disables prepared transactions', async() => {
-  const sql = postgres({ no_prepare: true })
+  const sql = postgres({ ...options, no_prepare: true })
   const result = await sql`select * from pg_prepared_statements`
   return [0, result.count]
 })
+
+t('Catches connection config errors', async() => {
+  const sql = postgres({ ...options, user: { toString: () => { throw new Error('wat') } }, database: 'prut' })
+
+  return [
+    'wat',
+    await sql`select 1`.catch((e) => e.message)
+  ]
+})
+
+t('Catches connection config errors with end', async() => {
+  const sql = postgres({ ...options, user: { toString: () => { throw new Error('wat') } }, database: 'prut' })
+
+  return [
+    'wat',
+    await sql`select 1`.catch((e) => e.message),
+    await sql.end()
+  ]
+})
+
+t('Catches query format errors', async() => [
+  'wat',
+  await sql.unsafe({ toString: () => { throw new Error('wat') } }).catch((e) => e.message)
+])

tests/test.js

@@ -63,8 +63,13 @@ function exit() {
     }
   })
 
-  ignored && console.error('⚠️', ignored, 'ignored test' + (ignored === 1 ? '' : 's', '\n'))
-  !only && success && !ignored
-    ? console.log('All good')
-    : process.exit(1) // eslint-disable-line
+  only
+    ? console.error('⚠️', 'Not all tests were run')
+    : ignored
+      ? console.error('⚠️', ignored, 'ignored test' + (ignored === 1 ? '' : 's', '\n'))
+      : success
+        ? console.log('All good')
+        : console.error('⚠️', 'Not good')
+
+  !process.exitCode && (!success || only || ignored) && (process.exitCode = 1)
 }