decocms 2.388.2 → 2.388.3

package/dist/server/node_modules/pg/lib/native/query.js

@@ -1,15 +1,16 @@
 'use strict'
 
-var EventEmitter = require('events').EventEmitter
-var util = require('util')
-var utils = require('../utils')
+const EventEmitter = require('events').EventEmitter
+const util = require('util')
+const utils = require('../utils')
 
-var NativeQuery = (module.exports = function (config, values, callback) {
+const NativeQuery = (module.exports = function (config, values, callback) {
   EventEmitter.call(this)
   config = utils.normalizeQueryConfig(config, values, callback)
   this.text = config.text
   this.values = config.values
   this.name = config.name
+  this.queryMode = config.queryMode
   this.callback = config.callback
   this.state = 'new'
   this._arrayMode = config.rowMode === 'array'
@@ -18,7 +19,7 @@ var NativeQuery = (module.exports = function (config, values, callback) {
   // then emit them as they come in
   // without setting singleRowMode to true
   // this has almost no meaning because libpq
-  // reads all rows into memory befor returning any
+  // reads all rows into memory before returning any
   this._emitRowEvents = false
   this.on(
     'newListener',
@@ -30,8 +31,7 @@ var NativeQuery = (module.exports = function (config, values, callback) {
 
 util.inherits(NativeQuery, EventEmitter)
 
-var errorFieldMap = {
-  /* eslint-disable quote-props */
+const errorFieldMap = {
   sqlState: 'code',
   statementPosition: 'position',
   messagePrimary: 'message',
@@ -48,10 +48,10 @@ var errorFieldMap = {
 
 NativeQuery.prototype.handleError = function (err) {
   // copy pq error fields into the error object
-  var fields = this.native.pq.resultErrorFields()
+  const fields = this.native.pq.resultErrorFields()
   if (fields) {
-    for (var key in fields) {
-      var normalizedFieldName = errorFieldMap[key] || key
+    for (const key in fields) {
+      const normalizedFieldName = errorFieldMap[key] || key
       err[normalizedFieldName] = fields[key]
     }
   }
@@ -84,11 +84,11 @@ NativeQuery.prototype._getPromise = function () {
 
 NativeQuery.prototype.submit = function (client) {
   this.state = 'running'
-  var self = this
+  const self = this
   this.native = client.native
   client.native.arrayMode = this._arrayMode
 
-  var after = function (err, rows, results) {
+  let after = function (err, rows, results) {
     client.native.arrayMode = false
     setImmediate(function () {
       self.emit('_done')
@@ -129,13 +129,11 @@ NativeQuery.prototype.submit = function (client) {
   // named query
   if (this.name) {
     if (this.name.length > 63) {
-      /* eslint-disable no-console */
       console.error('Warning! Postgres only supports 63 characters for query names.')
       console.error('You supplied %s (%s)', this.name, this.name.length)
       console.error('This can cause conflicts and silent errors executing queries')
-      /* eslint-enable no-console */
     }
-    var values = (this.values || []).map(utils.prepareValue)
+    const values = (this.values || []).map(utils.prepareValue)
 
     // check if the client has already executed this named query
     // if so...just execute it again - skip the planning phase
@@ -157,8 +155,10 @@ NativeQuery.prototype.submit = function (client) {
       const err = new Error('Query values must be an array')
       return after(err)
     }
-    var vals = this.values.map(utils.prepareValue)
+    const vals = this.values.map(utils.prepareValue)
     client.native.query(this.text, vals, after)
+  } else if (this.queryMode === 'extended') {
+    client.native.query(this.text, [], after)
   } else {
     client.native.query(this.text, after)
   }

package/dist/server/node_modules/pg/lib/query.js

@@ -16,6 +16,7 @@ class Query extends EventEmitter {
     this.rows = config.rows
     this.types = config.types
     this.name = config.name
+    this.queryMode = config.queryMode
     this.binary = config.binary
     // use unique portal name each time
     this.portal = config.portal || ''
@@ -28,12 +29,14 @@ class Query extends EventEmitter {
 
     // potential for multiple results
     this._results = this._result
-    this.isPreparedStatement = false
     this._canceledDueToError = false
-    this._promise = null
   }
 
   requiresPreparation() {
+    if (this.queryMode === 'extended') {
+      return true
+    }
+
     // named queries must always be prepared
     if (this.name) {
       return true
@@ -62,7 +65,7 @@ class Query extends EventEmitter {
       if (!Array.isArray(this._results)) {
         this._results = [this._result]
       }
-      this._result = new Result(this._rowMode, this.types)
+      this._result = new Result(this._rowMode, this._result._types)
       this._results.push(this._result)
     }
   }
@@ -109,7 +112,7 @@ class Query extends EventEmitter {
   // if a named prepared statement is created with empty query text
   // the backend will send an emptyQuery message but *not* a command complete message
   // since we pipeline sync immediately after execute we don't need to do anything here
-  // unless we have rows specified, in which case we did not pipeline the intial sync call
+  // unless we have rows specified, in which case we did not pipeline the initial sync call
   handleEmptyQuery(connection) {
     if (this.rows) {
       connection.sync()
@@ -137,8 +140,7 @@ class Query extends EventEmitter {
     if (this.callback) {
       try {
         this.callback(null, this._results)
-      }
-      catch(err) {
+      } catch (err) {
         process.nextTick(() => {
           throw err
         })
@@ -159,7 +161,21 @@ class Query extends EventEmitter {
       return new Error('Query values must be an array')
     }
     if (this.requiresPreparation()) {
-      this.prepare(connection)
+      // If we're using the extended query protocol we fire off several separate commands
+      // to the backend. On some versions of node & some operating system versions
+      // the network stack writes each message separately instead of buffering them together
+      // causing the client & network to send more slowly. Corking & uncorking the stream
+      // allows node to buffer up the messages internally before sending them all off at once.
+      // note: we're checking for existence of cork/uncork because some versions of streams
+      // might not have this (cloudflare?)
+      connection.stream.cork && connection.stream.cork()
+      try {
+        this.prepare(connection)
+      } finally {
+        // while unlikely for this.prepare to throw, if it does & we don't uncork this stream
+        // this client becomes unresponsive, so put in finally block "just in case"
+        connection.stream.uncork && connection.stream.uncork()
+      }
     } else {
       connection.query(this.text)
     }
@@ -191,10 +207,6 @@ class Query extends EventEmitter {
 
   // http://developer.postgresql.org/pgdocs/postgres/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY
   prepare(connection) {
-    // prepared statements need sync to be called after each command
-    // complete or when an error is encountered
-    this.isPreparedStatement = true
-
     // TODO refactor this poor encapsulation
     if (!this.hasBeenParsed(connection)) {
       connection.parse({
@@ -232,7 +244,6 @@ class Query extends EventEmitter {
     connection.sendCopyFail('No source stream defined')
   }
 
-  // eslint-disable-next-line no-unused-vars
   handleCopyData(msg, connection) {
     // noop
   }

package/dist/server/node_modules/pg/lib/result.js

@@ -1,8 +1,8 @@
 'use strict'
 
-var types = require('pg-types')
+const types = require('pg-types')
 
-var matchRegexp = /^([A-Za-z]+)(?: (\d+))?(?: (\d+))?/
+const matchRegexp = /^([A-Za-z]+)(?: (\d+))?(?: (\d+))?/
 
 // result object returned from query
 // in the 'end' event and also
@@ -26,7 +26,7 @@ class Result {
 
   // adds a command complete message
   addCommandComplete(msg) {
-    var match
+    let match
     if (msg.text) {
       // pure javascript
       match = matchRegexp.exec(msg.text)
@@ -37,7 +37,7 @@ class Result {
     if (match) {
       this.command = match[1]
       if (match[3]) {
-        // COMMMAND OID ROWS
+        // COMMAND OID ROWS
         this.oid = parseInt(match[2], 10)
         this.rowCount = parseInt(match[3], 10)
       } else if (match[2]) {
@@ -48,9 +48,9 @@ class Result {
   }
 
   _parseRowAsArray(rowData) {
-    var row = new Array(rowData.length)
-    for (var i = 0, len = rowData.length; i < len; i++) {
-      var rawValue = rowData[i]
+    const row = new Array(rowData.length)
+    for (let i = 0, len = rowData.length; i < len; i++) {
+      const rawValue = rowData[i]
       if (rawValue !== null) {
         row[i] = this._parsers[i](rawValue)
       } else {
@@ -61,12 +61,15 @@ class Result {
   }
 
   parseRow(rowData) {
-    var row = { ... this._prebuiltEmptyResultObject }
-    for (var i = 0, len = rowData.length; i < len; i++) {
-      var rawValue = rowData[i]
-      var field = this.fields[i].name
+    const row = { ...this._prebuiltEmptyResultObject }
+    for (let i = 0, len = rowData.length; i < len; i++) {
+      const rawValue = rowData[i]
+      const field = this.fields[i].name
       if (rawValue !== null) {
-        row[field] = this._parsers[i](rawValue)
+        const v = this.fields[i].format === 'binary' ? Buffer.from(rawValue) : rawValue
+        row[field] = this._parsers[i](v)
+      } else {
+        row[field] = null
       }
     }
     return row
@@ -85,22 +88,21 @@ class Result {
     if (this.fields.length) {
       this._parsers = new Array(fieldDescriptions.length)
     }
-    for (var i = 0; i < fieldDescriptions.length; i++) {
-      var desc = fieldDescriptions[i]
+
+    const row = {}
+
+    for (let i = 0; i < fieldDescriptions.length; i++) {
+      const desc = fieldDescriptions[i]
+      row[desc.name] = null
+
       if (this._types) {
         this._parsers[i] = this._types.getTypeParser(desc.dataTypeID, desc.format || 'text')
       } else {
         this._parsers[i] = types.getTypeParser(desc.dataTypeID, desc.format || 'text')
       }
     }
-    this._createPrebuiltEmptyResultObject()
-  }
-  _createPrebuiltEmptyResultObject() {
-    var row = {}
-    for (var i = 0; i < this.fields.length; i++) {
-      row[this.fields[i].name] = null
-    }
-    this._prebuiltEmptyResultObject = { ... row }
+
+    this._prebuiltEmptyResultObject = { ...row }
   }
 }
 

package/dist/server/node_modules/pg/lib/stream.js

@@ -1,28 +1,83 @@
+const { getStream, getSecureStream } = getStreamFuncs()
+
+module.exports = {
+  /**
+   * Get a socket stream compatible with the current runtime environment.
+   * @returns {Duplex}
+   */
+  getStream,
+  /**
+   * Get a TLS secured socket, compatible with the current environment,
+   * using the socket and other settings given in `options`.
+   * @returns {Duplex}
+   */
+  getSecureStream,
+}
+
 /**
- * Get a socket stream compatible with the current runtime environment.
- * @returns {Duplex}
+ * The stream functions that work in Node.js
  */
-module.exports.getStream = function getStream(ssl) {
-  const net = require('net')
-  if (typeof net.Socket === 'function') {
+function getNodejsStreamFuncs() {
+  function getStream(ssl) {
+    const net = require('net')
     return new net.Socket()
-  } else {
-    const { CloudflareSocket } = require('pg-cloudflare')
-    return new CloudflareSocket(ssl)
+  }
+
+  function getSecureStream(options) {
+    const tls = require('tls')
+    return tls.connect(options)
+  }
+  return {
+    getStream,
+    getSecureStream,
   }
 }
 
 /**
- * Get a TLS secured socket, compatible with the current environment,
- * using the socket and other settings given in `options`.
- * @returns {Duplex}
+ * The stream functions that work in Cloudflare Workers
  */
-module.exports.getSecureStream = function getSecureStream(options) {
-  var tls = require('tls')
-  if (tls.connect) {
-    return tls.connect(options)
-  } else {
+function getCloudflareStreamFuncs() {
+  function getStream(ssl) {
+    const { CloudflareSocket } = require('pg-cloudflare')
+    return new CloudflareSocket(ssl)
+  }
+
+  function getSecureStream(options) {
     options.socket.startTls(options)
     return options.socket
   }
+  return {
+    getStream,
+    getSecureStream,
+  }
+}
+
+/**
+ * Are we running in a Cloudflare Worker?
+ *
+ * @returns true if the code is currently running inside a Cloudflare Worker.
+ */
+function isCloudflareRuntime() {
+  // Since 2022-03-21 the `global_navigator` compatibility flag is on for Cloudflare Workers
+  // which means that `navigator.userAgent` will be defined.
+  // eslint-disable-next-line no-undef
+  if (typeof navigator === 'object' && navigator !== null && typeof navigator.userAgent === 'string') {
+    // eslint-disable-next-line no-undef
+    return navigator.userAgent === 'Cloudflare-Workers'
+  }
+  // In case `navigator` or `navigator.userAgent` is not defined then try a more sneaky approach
+  if (typeof Response === 'function') {
+    const resp = new Response(null, { cf: { thing: true } })
+    if (typeof resp.cf === 'object' && resp.cf !== null && resp.cf.thing) {
+      return true
+    }
+  }
+  return false
+}
+
+function getStreamFuncs() {
+  if (isCloudflareRuntime()) {
+    return getCloudflareStreamFuncs()
+  }
+  return getNodejsStreamFuncs()
 }

package/dist/server/node_modules/pg/lib/type-overrides.js

@@ -1,6 +1,6 @@
 'use strict'
 
-var types = require('pg-types')
+const types = require('pg-types')
 
 function TypeOverrides(userTypes) {
   this._types = userTypes || types

package/dist/server/node_modules/pg/lib/utils.js

@@ -2,8 +2,11 @@
 
 const defaults = require('./defaults')
 
+const util = require('util')
+const { isDate } = util.types || util // Node 8 doesn't have `util.types`
+
 function escapeElement(elementRepresentation) {
-  var escaped = elementRepresentation.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
+  const escaped = elementRepresentation.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
 
   return '"' + escaped + '"'
 }
@@ -12,8 +15,8 @@ function escapeElement(elementRepresentation) {
 // uses comma separator so won't work for types like box that use
 // a different array separator.
 function arrayString(val) {
-  var result = '{'
-  for (var i = 0; i < val.length; i++) {
+  let result = '{'
+  for (let i = 0; i < val.length; i++) {
     if (i > 0) {
       result = result + ','
     }
@@ -21,8 +24,17 @@ function arrayString(val) {
       result = result + 'NULL'
     } else if (Array.isArray(val[i])) {
       result = result + arrayString(val[i])
-    } else if (val[i] instanceof Buffer) {
-      result += '\\\\x' + val[i].toString('hex')
+    } else if (ArrayBuffer.isView(val[i])) {
+      let item = val[i]
+      if (!(item instanceof Buffer)) {
+        const buf = Buffer.from(item.buffer, item.byteOffset, item.byteLength)
+        if (buf.length === item.byteLength) {
+          item = buf
+        } else {
+          item = buf.slice(item.byteOffset, item.byteOffset + item.byteLength)
+        }
+      }
+      result += '\\\\x' + item.toString('hex')
     } else {
       result += escapeElement(prepareValue(val[i]))
     }
@@ -35,32 +47,33 @@ function arrayString(val) {
 // to their 'raw' counterparts for use as a postgres parameter
 // note: you can override this function to provide your own conversion mechanism
 // for complex types, etc...
-var prepareValue = function (val, seen) {
+const prepareValue = function (val, seen) {
   // null and undefined are both null for postgres
   if (val == null) {
     return null
   }
-  if (val instanceof Buffer) {
-    return val
-  }
-  if (ArrayBuffer.isView(val)) {
-    var buf = Buffer.from(val.buffer, val.byteOffset, val.byteLength)
-    if (buf.length === val.byteLength) {
-      return buf
+  if (typeof val === 'object') {
+    if (val instanceof Buffer) {
+      return val
     }
-    return buf.slice(val.byteOffset, val.byteOffset + val.byteLength) // Node.js v4 does not support those Buffer.from params
-  }
-  if (val instanceof Date) {
-    if (defaults.parseInputDatesAsUTC) {
-      return dateToStringUTC(val)
-    } else {
-      return dateToString(val)
+    if (ArrayBuffer.isView(val)) {
+      const buf = Buffer.from(val.buffer, val.byteOffset, val.byteLength)
+      if (buf.length === val.byteLength) {
+        return buf
+      }
+      return buf.slice(val.byteOffset, val.byteOffset + val.byteLength) // Node.js v4 does not support those Buffer.from params
     }
-  }
-  if (Array.isArray(val)) {
-    return arrayString(val)
-  }
-  if (typeof val === 'object') {
+    if (isDate(val)) {
+      if (defaults.parseInputDatesAsUTC) {
+        return dateToStringUTC(val)
+      } else {
+        return dateToString(val)
+      }
+    }
+    if (Array.isArray(val)) {
+      return arrayString(val)
+    }
+
     return prepareObject(val, seen)
   }
   return val.toString()
@@ -79,35 +92,27 @@ function prepareObject(val, seen) {
   return JSON.stringify(val)
 }
 
-function pad(number, digits) {
-  number = '' + number
-  while (number.length < digits) {
-    number = '0' + number
-  }
-  return number
-}
-
 function dateToString(date) {
-  var offset = -date.getTimezoneOffset()
+  let offset = -date.getTimezoneOffset()
 
-  var year = date.getFullYear()
-  var isBCYear = year < 1
+  let year = date.getFullYear()
+  const isBCYear = year < 1
   if (isBCYear) year = Math.abs(year) + 1 // negative years are 1 off their BC representation
 
-  var ret =
-    pad(year, 4) +
+  let ret =
+    String(year).padStart(4, '0') +
     '-' +
-    pad(date.getMonth() + 1, 2) +
+    String(date.getMonth() + 1).padStart(2, '0') +
     '-' +
-    pad(date.getDate(), 2) +
+    String(date.getDate()).padStart(2, '0') +
     'T' +
-    pad(date.getHours(), 2) +
+    String(date.getHours()).padStart(2, '0') +
     ':' +
-    pad(date.getMinutes(), 2) +
+    String(date.getMinutes()).padStart(2, '0') +
     ':' +
-    pad(date.getSeconds(), 2) +
+    String(date.getSeconds()).padStart(2, '0') +
     '.' +
-    pad(date.getMilliseconds(), 3)
+    String(date.getMilliseconds()).padStart(3, '0')
 
   if (offset < 0) {
     ret += '-'
@@ -116,30 +121,30 @@ function dateToString(date) {
     ret += '+'
   }
 
-  ret += pad(Math.floor(offset / 60), 2) + ':' + pad(offset % 60, 2)
+  ret += String(Math.floor(offset / 60)).padStart(2, '0') + ':' + String(offset % 60).padStart(2, '0')
   if (isBCYear) ret += ' BC'
   return ret
 }
 
 function dateToStringUTC(date) {
-  var year = date.getUTCFullYear()
-  var isBCYear = year < 1
+  let year = date.getUTCFullYear()
+  const isBCYear = year < 1
   if (isBCYear) year = Math.abs(year) + 1 // negative years are 1 off their BC representation
 
-  var ret =
-    pad(year, 4) +
+  let ret =
+    String(year).padStart(4, '0') +
     '-' +
-    pad(date.getUTCMonth() + 1, 2) +
+    String(date.getUTCMonth() + 1).padStart(2, '0') +
     '-' +
-    pad(date.getUTCDate(), 2) +
+    String(date.getUTCDate()).padStart(2, '0') +
     'T' +
-    pad(date.getUTCHours(), 2) +
+    String(date.getUTCHours()).padStart(2, '0') +
     ':' +
-    pad(date.getUTCMinutes(), 2) +
+    String(date.getUTCMinutes()).padStart(2, '0') +
     ':' +
-    pad(date.getUTCSeconds(), 2) +
+    String(date.getUTCSeconds()).padStart(2, '0') +
     '.' +
-    pad(date.getUTCMilliseconds(), 3)
+    String(date.getUTCMilliseconds()).padStart(3, '0')
 
   ret += '+00:00'
   if (isBCYear) ret += ' BC'
@@ -168,11 +173,19 @@ const escapeIdentifier = function (str) {
 }
 
 const escapeLiteral = function (str) {
-  var hasBackslash = false
-  var escaped = "'"
+  let hasBackslash = false
+  let escaped = "'"
+
+  if (str == null) {
+    return "''"
+  }
+
+  if (typeof str !== 'string') {
+    return "''"
+  }
 
-  for (var i = 0; i < str.length; i++) {
-    var c = str[i]
+  for (let i = 0; i < str.length; i++) {
+    const c = str[i]
     if (c === "'") {
       escaped += c + c
     } else if (c === '\\') {

package/dist/server/node_modules/pg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "8.11.3",
+  "version": "8.20.0",
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "database",
@@ -19,27 +19,38 @@
   },
   "author": "Brian Carlson <brian.m.carlson@gmail.com>",
   "main": "./lib",
+  "exports": {
+    ".": {
+      "import": "./esm/index.mjs",
+      "require": "./lib/index.js",
+      "default": "./lib/index.js"
+    },
+    "./package.json": {
+      "default": "./package.json"
+    },
+    "./lib/*": "./lib/*.js",
+    "./lib/*.js": "./lib/*.js"
+  },
   "dependencies": {
-    "buffer-writer": "2.0.0",
-    "packet-reader": "1.0.0",
-    "pg-connection-string": "^2.6.2",
-    "pg-pool": "^3.6.1",
-    "pg-protocol": "^1.6.0",
-    "pg-types": "^2.1.0",
-    "pgpass": "1.x"
+    "pg-connection-string": "^2.12.0",
+    "pg-pool": "^3.13.0",
+    "pg-protocol": "^1.13.0",
+    "pg-types": "2.2.0",
+    "pgpass": "1.0.5"
   },
   "devDependencies": {
+    "@cloudflare/vitest-pool-workers": "0.8.23",
     "@cloudflare/workers-types": "^4.20230404.0",
     "async": "2.6.4",
-    "bluebird": "3.5.2",
+    "bluebird": "3.7.2",
     "co": "4.6.0",
     "pg-copy-streams": "0.3.0",
     "typescript": "^4.0.3",
-    "workerd": "^1.20230419.0",
-    "wrangler": "^2.16.0"
+    "vitest": "~3.0.9",
+    "wrangler": "^3.x"
   },
   "optionalDependencies": {
-    "pg-cloudflare": "^1.1.1"
+    "pg-cloudflare": "^1.3.0"
   },
   "peerDependencies": {
     "pg-native": ">=3.0.1"
@@ -54,11 +65,12 @@
   },
   "files": [
     "lib",
+    "esm",
     "SPONSORS.md"
   ],
   "license": "MIT",
   "engines": {
-    "node": ">= 8.0.0"
+    "node": ">= 16.0.0"
   },
-  "gitHead": "a84ebb3fe85edafb1b358965bdb5e3de58b12c5d"
+  "gitHead": "c9070cc8d526fca65780cedc25c1966b57cf7532"
 }