.eslintrc

@@ -2,7 +2,7 @@
   "plugins": ["prettier"],
   "parser": "@typescript-eslint/parser",
   "extends": ["plugin:prettier/recommended", "prettier/@typescript-eslint"],
-  "ignorePatterns": ["node_modules", "coverage", "packages/pg-protocol/dist/**/*"],
+  "ignorePatterns": ["node_modules", "coverage", "packages/pg-protocol/dist/**/*", "packages/pg-query-stream/dist/**/*"],
   "parserOptions": {
     "ecmaVersion": 2017,
     "sourceType": "module"

.travis.yml

@@ -43,6 +43,38 @@ matrix:
         postgresql: '9.5'
       dist: precise
 
+    # Run tests/paths with client certificate authentication
+    - node_js: lts/*
+      env:
+        - CC=clang CXX=clang++ npm_config_clang=1 PGUSER=postgres PGDATABASE=postgres
+          PGSSLMODE=verify-full
+          PGSSLROOTCERT=$TRAVIS_BUILD_DIR/packages/pg/test/tls/test-server-ca.crt
+          PGSSLCERT=$TRAVIS_BUILD_DIR/packages/pg/test/tls/test-client.crt
+          PGSSLKEY=$TRAVIS_BUILD_DIR/packages/pg/test/tls/test-client.key
+          PG_CLIENT_CERT_TEST=1
+      before_script:
+        - chmod go= packages/pg/test/tls/test-client.key
+        - |
+          sudo sed -i \
+            -e '/^ssl_cert_file =/d' \
+            -e '/^ssl_key_file =/d' \
+            /etc/postgresql/10/main/postgresql.conf
+
+          cat <<'travis ci breaks heredoc' | sudo tee -a /etc/postgresql/10/main/postgresql.conf > /dev/null
+            ssl_cert_file = 'test-server.crt'
+            ssl_key_file = 'test-server.key'
+            ssl_ca_file = 'test-client-ca.crt'
+
+        - printf 'hostssl all all %s cert\n' 127.0.0.1/32 ::1/128 | sudo tee /etc/postgresql/10/main/pg_hba.conf > /dev/null
+        - sudo make -C packages/pg/test/tls install DESTDIR=/var/ramfs/postgresql/10/main
+        - sudo systemctl restart postgresql@10-main
+        - yarn build
+      script:
+        - cd packages/pg
+        - node test/integration/connection-pool/tls-tests.js
+        - npm install --no-save pg-native
+        - node test/integration/connection-pool/tls-tests.js native
+
     # different PostgreSQL versions on Node LTS
     - node_js: lts/erbium
       addons:
@@ -57,6 +89,10 @@ matrix:
       addons:
         postgresql: '9.6'
 
+    # only run lint on latest Node LTS
+    - node_js: lts/*
+      script: yarn lint
+
     # PostgreSQL 9.2 only works on precise
     - node_js: lts/carbon
       addons:

.yarnrc

@@ -0,0 +1 @@
+--install.ignore-engines true

CHANGELOG.md

@@ -4,6 +4,12 @@ For richer information consult the commit log on github with referenced pull req
 
 We do not include break-fix version release in this file.
 
+### pg@8.5.0
+
+- Fix bug forwarding [ssl key](https://github.com/brianc/node-postgres/pull/2394).
+- Convert pg-query-stream internals to [typescript](https://github.com/brianc/node-postgres/pull/2376).
+- Performance [improvements](https://github.com/brianc/node-postgres/pull/2286).
+
 ### pg@8.4.0
 
 - Switch to optional peer dependencies & remove [semver](https://github.com/brianc/node-postgres/commit/a02dfac5ad2e2abf0dc3a9817f953938acdc19b1) package which has been a small thorn in the side of a few users.

SPONSORS.md

@@ -8,6 +8,7 @@ node-postgres is made possible by the helpful contributors from the community as
 - [Nafundi](https://nafundi.com)
 - [CrateDB](https://crate.io/)
 - [BitMEX](https://www.bitmex.com/app/trade/XBTUSD)
+- [Dataform](https://dataform.co/)
 
 # Supporters
 
@@ -32,3 +33,4 @@ node-postgres is made possible by the helpful contributors from the community as
 - Simple Analytics
 - Trevor Linton
 - Ian Walter
+- @Guido4000

package.json

@@ -10,22 +10,22 @@
     "packages/*"
   ],
   "scripts": {
-    "test": "yarn lint && yarn lerna exec yarn test",
-    "build": "yarn lerna exec --scope pg-protocol yarn build",
+    "test": "yarn lerna exec yarn test",
+    "build": "tsc --build",
+    "build:watch": "tsc --build --watch",
     "pretest": "yarn build",
-    "lint": "if [ -x ./node_modules/.bin/prettier ]; then eslint '*/**/*.{js,ts,tsx}'; fi;"
+    "lint": "eslint '*/**/*.{js,ts,tsx}'"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^2.27.0",
-    "@typescript-eslint/parser": "^2.27.0",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
+    "@typescript-eslint/eslint-plugin": "^4.4.0",
+    "@typescript-eslint/parser": "^4.4.0",
+    "eslint": "^7.11.0",
+    "eslint-config-prettier": "^6.12.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.2",
-    "lerna": "^3.19.0"
-  },
-  "optionalDependencies": {
-    "prettier": "2.0.4"
+    "eslint-plugin-prettier": "^3.1.4",
+    "lerna": "^3.19.0",
+    "prettier": "2.1.2",
+    "typescript": "^4.0.3"
   },
   "prettier": {
     "semi": false,

packages/pg-cursor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-cursor",
-  "version": "2.4.2",
+  "version": "2.5.0",
   "description": "Query cursor extension for node-postgres",
   "main": "index.js",
   "directories": {
@@ -17,6 +17,6 @@
   "license": "MIT",
   "devDependencies": {
     "mocha": "^7.1.2",
-    "pg": "^8.4.2"
+    "pg": "^8.5.0"
   }
 }

packages/pg-protocol/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-protocol",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "The postgres client/server binary protocol, implemented in TypeScript",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,13 +13,17 @@
     "chunky": "^0.0.0",
     "mocha": "^7.1.2",
     "ts-node": "^8.5.4",
-    "typescript": "^3.7.3"
+    "typescript": "^4.0.3"
   },
   "scripts": {
     "test": "mocha dist/**/*.test.js",
     "build": "tsc",
     "build:watch": "tsc --watch",
     "prepublish": "yarn build",
     "pretest": "yarn build"
-  }
+  },
+  "files": [
+    "/dist/*{js,ts,map}",
+    "/src"
+  ]
 }

packages/pg-protocol/src/buffer-writer.ts

@@ -5,7 +5,7 @@ export class Writer {
   private offset: number = 5
   private headerPosition: number = 0
   constructor(private size = 256) {
-    this.buffer = Buffer.alloc(size)
+    this.buffer = Buffer.allocUnsafe(size)
   }
 
   private ensure(size: number): void {
@@ -15,7 +15,7 @@ export class Writer {
       // exponential growth factor of around ~ 1.5
       // https://stackoverflow.com/questions/2269063/buffer-growth-strategy
       var newSize = oldBuffer.length + (oldBuffer.length >> 1) + size
-      this.buffer = Buffer.alloc(newSize)
+      this.buffer = Buffer.allocUnsafe(newSize)
       oldBuffer.copy(this.buffer)
     }
   }

packages/pg-protocol/src/outbound-serializer.test.ts

@@ -110,6 +110,10 @@ describe('serializer', () => {
       var expectedBuffer = new BufferList()
         .addCString('bang') // portal name
         .addCString('woo') // statement name
+        .addInt16(4)
+        .addInt16(0)
+        .addInt16(0)
+        .addInt16(0)
         .addInt16(0)
         .addInt16(4)
         .addInt32(1)
@@ -125,6 +129,31 @@ describe('serializer', () => {
     })
   })
 
+  it('with custom valueMapper', function () {
+    const actual = serialize.bind({
+      portal: 'bang',
+      statement: 'woo',
+      values: ['1', 'hi', null, 'zing'],
+      valueMapper: () => null,
+    })
+    var expectedBuffer = new BufferList()
+      .addCString('bang') // portal name
+      .addCString('woo') // statement name
+      .addInt16(4)
+      .addInt16(0)
+      .addInt16(0)
+      .addInt16(0)
+      .addInt16(0)
+      .addInt16(4)
+      .addInt32(-1)
+      .addInt32(-1)
+      .addInt32(-1)
+      .addInt32(-1)
+      .addInt16(0)
+      .join(true, 'B')
+    assert.deepEqual(actual, expectedBuffer)
+  })
+
   it('with named statement, portal, and buffer value', function () {
     const actual = serialize.bind({
       portal: 'bang',

packages/pg-protocol/src/serializer.ts

@@ -101,56 +101,66 @@ const parse = (query: ParseOpts): Buffer => {
   return writer.flush(code.parse)
 }
 
+type ValueMapper = (param: any, index: number) => any
+
 type BindOpts = {
   portal?: string
   binary?: boolean
   statement?: string
   values?: any[]
+  // optional map from JS value to postgres value per parameter
+  valueMapper?: ValueMapper
+}
+
+const paramWriter = new Writer()
+
+// make this a const enum so typescript will inline the value
+const enum ParamType {
+  STRING = 0,
+  BINARY = 1,
+}
+
+const writeValues = function (values: any[], valueMapper?: ValueMapper): void {
+  for (let i = 0; i < values.length; i++) {
+    const mappedVal = valueMapper ? valueMapper(values[i], i) : values[i]
+    if (mappedVal == null) {
+      // add the param type (string) to the writer
+      writer.addInt16(ParamType.STRING)
+      // write -1 to the param writer to indicate null
+      paramWriter.addInt32(-1)
+    } else if (mappedVal instanceof Buffer) {
+      // add the param type (binary) to the writer
+      writer.addInt16(ParamType.BINARY)
+      // add the buffer to the param writer
+      paramWriter.addInt32(mappedVal.length)
+      paramWriter.add(mappedVal)
+    } else {
+      // add the param type (string) to the writer
+      writer.addInt16(ParamType.STRING)
+      paramWriter.addInt32(Buffer.byteLength(mappedVal))
+      paramWriter.addString(mappedVal)
+    }
+  }
 }
 
 const bind = (config: BindOpts = {}): Buffer => {
   // normalize config
   const portal = config.portal || ''
   const statement = config.statement || ''
   const binary = config.binary || false
-  var values = config.values || emptyArray
-  var len = values.length
+  const values = config.values || emptyArray
+  const len = values.length
 
-  var useBinary = false
-  // TODO(bmc): all the loops in here aren't nice, we can do better
-  for (var j = 0; j < len; j++) {
-    useBinary = useBinary || values[j] instanceof Buffer
-  }
+  writer.addCString(portal).addCString(statement)
+  writer.addInt16(len)
 
-  var buffer = writer.addCString(portal).addCString(statement)
-  if (!useBinary) {
-    buffer.addInt16(0)
-  } else {
-    buffer.addInt16(len)
-    for (j = 0; j < len; j++) {
-      buffer.addInt16(values[j] instanceof Buffer ? 1 : 0)
-    }
-  }
-  buffer.addInt16(len)
-  for (var i = 0; i < len; i++) {
-    var val = values[i]
-    if (val === null || typeof val === 'undefined') {
-      buffer.addInt32(-1)
-    } else if (val instanceof Buffer) {
-      buffer.addInt32(val.length)
-      buffer.add(val)
-    } else {
-      buffer.addInt32(Buffer.byteLength(val))
-      buffer.addString(val)
-    }
-  }
+  writeValues(values, config.valueMapper)
 
-  if (binary) {
-    buffer.addInt16(1) // format codes to use binary
-    buffer.addInt16(1)
-  } else {
-    buffer.addInt16(0) // format codes to use text
-  }
+  writer.addInt16(len)
+  writer.add(paramWriter.flush())
+
+  // format code
+  writer.addInt16(binary ? ParamType.BINARY : ParamType.STRING)
   return writer.flush(code.bind)
 }
 

packages/pg-protocol/tsconfig.json

@@ -9,6 +9,7 @@
     "moduleResolution": "node",
     "sourceMap": true,
     "outDir": "dist",
+    "incremental": true,
     "baseUrl": ".",
     "declaration": true,
     "paths": {

packages/pg-query-stream/package.json

@@ -1,10 +1,11 @@
 {
   "name": "pg-query-stream",
-  "version": "3.3.2",
+  "version": "3.4.0",
   "description": "Postgres query result returned as readable stream",
-  "main": "index.js",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "test": "mocha"
+    "test": "mocha -r ts-node/register test/**/*.ts"
   },
   "repository": {
     "type": "git",
@@ -16,22 +17,32 @@
     "query",
     "stream"
   ],
+  "files": [
+    "/dist/*{js,ts,map}",
+    "/src"
+  ],
   "author": "Brian M. Carlson",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/brianc/node-postgres/issues"
   },
   "devDependencies": {
+    "@types/chai": "^4.2.13",
+    "@types/mocha": "^8.0.3",
+    "@types/node": "^14.0.0",
+    "@types/pg": "^7.14.5",
     "JSONStream": "~0.7.1",
     "concat-stream": "~1.0.1",
     "eslint-plugin-promise": "^3.5.0",
     "mocha": "^7.1.2",
-    "pg": "^8.4.2",
+    "pg": "^8.5.0",
     "stream-spec": "~0.3.5",
     "stream-tester": "0.0.5",
-    "through": "~2.3.4"
+    "through": "~2.3.4",
+    "ts-node": "^8.5.4",
+    "typescript": "^4.0.3"
   },
   "dependencies": {
-    "pg-cursor": "^2.4.2"
+    "pg-cursor": "^2.5.0"
   }
 }