@steadybrew/postgresjs 4.5.0-rc1 → 4.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steadybrew/postgresjs",
-  "version": "4.5.0-rc1",
+  "version": "4.5.1",
   "description": "PostgreSQL client for Node.js and Deno, independently maintained by Steady Brew",
   "type": "module",
   "module": "src/index.js",
@@ -32,10 +32,10 @@
     "build:deno": "node transpile.deno.js",
     "build:cf": "node transpile.cf.js",
     "test": "npm run test:startup && npm run test:esm && npm run test:cjs && npm run test:deno",
-    "test:esm": "node tests-startup/run.js --integration && node tests/index.js",
+    "test:esm": "node tests-startup/run.js --integration && node tests/index.js && node tests-startup/run.js --reports",
     "test:startup": "node tests-startup/run.js",
     "test:tracing": "node tests-tracing/run.js",
-    "test:cjs": "npm run build:cjs && node tests-startup/run.js --integration --cjs && cd cjs/tests && node index.js && cd ../../",
+    "test:cjs": "npm run build:cjs && node tests-startup/run.js --integration --cjs && cd cjs/tests && node index.js && cd ../../ && node tests-startup/run.js --reports --cjs",
     "test:deno": "npm run test:deno-socket && npm run build:deno && cd deno/tests && deno run --no-lock --allow-all --unsafely-ignore-certificate-errors index.js && cd ../../",
     "lint": "eslint src && eslint tests && eslint tests-startup --ext .js,.mjs",
     "prepare": "npm run build",
@@ -45,6 +45,7 @@
   },
   "files": [
     "/UNLICENSE",
+    "/docs/api.md",
     "/cf/src",
     "/cf/polyfills.js",
     "/cjs/src",

package/src/connection.js

@@ -104,6 +104,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     , hostIndex = 0
     , length = 0
     , rows = 0
+    , copyPaused = false
     , serverSignature = null
     , nextWriteTimer = null
     , incomings = null
@@ -462,6 +463,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     query = results = errorResponse = chunk = nextWriteTimer = barrier = null
     result = new Result()
     rows = 0
+    copyPaused = false
     nonce = serverSignature = null
   }
 
@@ -684,6 +686,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
 
   function errored(err) {
     stream && (stream.destroy(err), stream = null)
+    resumeCopy()
     query && queryError(query, err)
   }
 
@@ -800,7 +803,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
         query.prepared && retryRoutines.has(errorResponse.routine) && delete statements[query.signature]
         query.retried
           ? errored(query.retried)
-          : query.prepared && retryRoutines.has(errorResponse.routine) && query.owner === connection.owner && !barrier
+          : query.prepared && retryRoutines.has(errorResponse.routine) && query.owner === connection.owner && !barrier && !query.cancelled
             && (x[5] !== 69 || endsAbortedState.test(query.string))
             ? retry(query, errorResponse)
             : errored(errorResponse)
@@ -814,6 +817,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
 
     query = results = errorResponse = null
     result = new Result()
+    rows = 0
 
     dispatch('ready')
   }
@@ -1046,8 +1050,9 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
 
   function mismatchReason(x, xs) {
     return (
+      (x === 'read-write' && xs.in_hot_standby === 'on' && 'is a standby') ||
       (x === 'read-write' && xs.default_transaction_read_only === 'on' && 'is read-only') ||
-      (x === 'read-only' && xs.default_transaction_read_only === 'off' && 'is read-write') ||
+      (x === 'read-only' && xs.in_hot_standby === 'off' && xs.default_transaction_read_only === 'off' && 'is read-write') ||
       (x === 'primary' && xs.in_hot_standby === 'on' && 'is a standby') ||
       (x === 'standby' && xs.in_hot_standby === 'off' && 'is a primary') ||
       (x === 'prefer-standby' && xs.in_hot_standby === 'off' && standbyPass() && 'is a primary') ||
@@ -1146,7 +1151,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
 
   function CopyOutResponse() {
     stream = new Stream.Readable({
-      read() { socket.resume() }
+      read() { copyPaused = false; socket.resume() }
     })
     query.resolve(stream)
     connection.owner && connection.owner.next()
@@ -1156,7 +1161,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   function CopyBothResponse() {
     stream = new Stream.Duplex({
       autoDestroy: true,
-      read() { socket.resume() },
+      read() { copyPaused = false; socket.resume() },
       /* c8 ignore next 11 */
       write(chunk, encoding, callback) {
         socket.write(b().d().raw(chunk).end(), callback)
@@ -1176,12 +1181,23 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   }
 
   function CopyData(x) {
-    stream && (stream.push(x.subarray(5)) || socket.pause())
+    if (stream && !stream.push(x.subarray(5))) {
+      copyPaused = true
+      socket.pause()
+    }
   }
 
   function CopyDone() {
     stream && stream.push(null)
     stream = null
+    resumeCopy()
+  }
+
+  function resumeCopy() {
+    if (copyPaused) {
+      copyPaused = false
+      socket.resume()
+    }
   }
 
   function NoticeResponse(x) {

package/src/errors.js

@@ -1,8 +1,8 @@
 export class PostgresError extends Error {
   constructor(x) {
-    super(x.message)
+    super(typeof x === 'string' ? x : x.message)
     this.name = this.constructor.name
-    Object.assign(this, x)
+    typeof x === 'string' || Object.assign(this, x)
   }
 }
 

package/src/index.js

@@ -702,8 +702,8 @@ function parseOptions(a, b) {
     ...Object.entries(defaults).reduce(
       (acc, [k, d]) => {
         const value = k in o ? o[k] : k in query
-          ? (query[k] === 'disable' || query[k] === 'false' ? false : query[k])
-          : env['PG' + k.toUpperCase()] || d
+          ? off(query[k])
+          : env['PG' + k.toUpperCase()] ? off(env['PG' + k.toUpperCase()]) : d
         acc[k] = typeof value === 'string' && ints.includes(k)
           ? +value
           : value
@@ -736,6 +736,10 @@ function parseOptions(a, b) {
   return options
 }
 
+function off(x) {
+  return x === 'disable' || x === 'false' ? false : x
+}
+
 function tsa(o, url, env) {
   const x = o.target_session_attrs || url.searchParams.get('target_session_attrs') || env.PGTARGETSESSIONATTRS
   if (!x || ['read-write', 'read-only', 'primary', 'standby', 'prefer-standby'].includes(x))

package/src/query.js

@@ -55,6 +55,7 @@ export class Query extends Promise {
     if (!this.canceller || this.settled)
       return Promise.resolve()
 
+    Promise.prototype.then.call(this, undefined, () => undefined)
     const cancelled = this.canceller(this)
     this.canceller = null
     cancelled.catch(() => undefined)

package/src/types.js

@@ -346,14 +346,14 @@ function arrayParserLoop(s, x, parser, typarray) {
 export const toCamel = x => {
   let str = x[0]
   for (let i = 1; i < x.length; i++)
-    str += x[i] === '_' ? x[++i].toUpperCase() : x[i]
+    str += x[i] === '_' && i + 1 < x.length ? x[++i].toUpperCase() : x[i]
   return str
 }
 
 export const toPascal = x => {
   let str = x[0].toUpperCase()
   for (let i = 1; i < x.length; i++)
-    str += x[i] === '_' ? x[++i].toUpperCase() : x[i]
+    str += x[i] === '_' && i + 1 < x.length ? x[++i].toUpperCase() : x[i]
   return str
 }
 

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { Readable, Writable } from 'node:stream'
+import { Duplex, Readable, Writable } from 'node:stream'
 
 /**
  * Establish a connection to a PostgreSQL server.
@@ -45,6 +45,8 @@ interface BaseOptions<T extends Record<string, postgres.PostgresType>> {
    * @default false
   */
   ssl: 'require' | 'allow' | 'prefer' | 'verify-full' | boolean | object;
+  /** Set to 'direct' to start TLS immediately with ALPN instead of sending an SSLRequest first */
+  sslnegotiation: 'direct' | 'postgres' | null;
   /**
    * Max number of connections
    * @default 10
@@ -126,6 +128,8 @@ interface BaseOptions<T extends Record<string, postgres.PostgresType>> {
   backoff: boolean | ((attemptNum: number) => number);
   max_lifetime: number | null;
   keep_alive: number | null;
+  /** Function, sync or async, returning the socket-like duplex stream to connect through; it receives the parsed options */
+  socket?: (options: postgres.ParsedOptions) => Duplex | Promise<Duplex>;
 }
 
 
@@ -203,6 +207,8 @@ type Return<T, K extends readonly any[]> =
 
 declare namespace postgres {
   class PostgresError extends Error {
+    constructor(message: string);
+    constructor(fields: Partial<Omit<PostgresError, 'name' | 'stack' | 'cause'>>);
     name: 'PostgresError';
     severity_local: string;
     severity: string;