@nsshunt/stsfhirpg 1.0.11 → 1.0.13

package/dist/stsfhirpg.cjs

@@ -5,16 +5,16 @@ const stsutils = require("@nsshunt/stsutils");
 const stsfhirclient = require("@nsshunt/stsfhirclient");
 const stsconfig = require("@nsshunt/stsconfig");
 const cluster = require("cluster");
-const require$$0$1 = require("crypto");
-const require$$0$4 = require("events");
-const require$$1 = require("util");
-const require$$0$3 = require("dns");
-const require$$0$2 = require("fs");
-const require$$0$5 = require("net");
-const require$$1$1 = require("tls");
-const require$$0$8 = require("path");
-const require$$0$7 = require("stream");
-const require$$0$6 = require("buffer");
+const require$$0 = require("crypto");
+const require$$0$3 = require("events");
+const require$$1$1 = require("util");
+const require$$0$2 = require("dns");
+const require$$0$1 = require("fs");
+const require$$0$4 = require("net");
+const require$$1$2 = require("tls");
+const require$$0$7 = require("path");
+const require$$0$6 = require("stream");
+const require$$0$5 = require("buffer");
 class LuxonError extends Error {
 }
 class InvalidDateTimeError extends LuxonError {
@@ -12553,7 +12553,7 @@ function requireUtils$1() {
   if (hasRequiredUtils$1) return utils$1;
   hasRequiredUtils$1 = 1;
   const defaults2 = requireDefaults();
-  const util2 = require$$1;
+  const util2 = require$$1$1;
   const { isDate: isDate2 } = util2.types || util2;
   function escapeElement(elementRepresentation) {
     const escaped = elementRepresentation.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
@@ -12711,7 +12711,7 @@ var hasRequiredUtilsLegacy;
 function requireUtilsLegacy() {
   if (hasRequiredUtilsLegacy) return utilsLegacy;
   hasRequiredUtilsLegacy = 1;
-  const nodeCrypto = require$$0$1;
+  const nodeCrypto = require$$0;
   function md5(string) {
     return nodeCrypto.createHash("md5").update(string, "utf-8").digest("hex");
   }
@@ -12749,7 +12749,7 @@ var hasRequiredUtilsWebcrypto;
 function requireUtilsWebcrypto() {
   if (hasRequiredUtilsWebcrypto) return utilsWebcrypto;
   hasRequiredUtilsWebcrypto = 1;
-  const nodeCrypto = require$$0$1;
+  const nodeCrypto = require$$0;
   utilsWebcrypto = {
     postgresMd5PasswordHash,
     randomBytes,
@@ -13182,7 +13182,7 @@ function requirePgConnectionString() {
     if (config.sslcert || config.sslkey || config.sslrootcert || config.sslmode) {
       config.ssl = {};
     }
-    const fs2 = config.sslcert || config.sslkey || config.sslrootcert ? require$$0$2 : null;
+    const fs2 = config.sslcert || config.sslkey || config.sslrootcert ? require$$0$1 : null;
     if (config.sslcert) {
       config.ssl.cert = fs2.readFileSync(config.sslcert).toString();
     }
@@ -13311,7 +13311,7 @@ var hasRequiredConnectionParameters;
 function requireConnectionParameters() {
   if (hasRequiredConnectionParameters) return connectionParameters;
   hasRequiredConnectionParameters = 1;
-  const dns = require$$0$3;
+  const dns = require$$0$2;
   const defaults2 = requireDefaults();
   const parse2 = requirePgConnectionString().parse;
   const val = function(key, config, envVar) {
@@ -13543,7 +13543,7 @@ var hasRequiredQuery$1;
 function requireQuery$1() {
   if (hasRequiredQuery$1) return query$1;
   hasRequiredQuery$1 = 1;
-  const { EventEmitter } = require$$0$4;
+  const { EventEmitter } = require$$0$3;
   const Result = requireResult();
   const utils2 = requireUtils$1();
   class Query extends EventEmitter {
@@ -14207,11 +14207,10 @@ function requireBufferReader() {
   hasRequiredBufferReader = 1;
   Object.defineProperty(bufferReader, "__esModule", { value: true });
   bufferReader.BufferReader = void 0;
-  const emptyBuffer = Buffer.allocUnsafe(0);
   class BufferReader {
     constructor(offset2 = 0) {
       this.offset = offset2;
-      this.buffer = emptyBuffer;
+      this.buffer = Buffer.allocUnsafe(0);
       this.encoding = "utf-8";
     }
     setBuffer(offset2, buffer) {
@@ -14621,11 +14620,11 @@ function requireStream() {
   };
   function getNodejsStreamFuncs() {
     function getStream2(ssl) {
-      const net = require$$0$5;
+      const net = require$$0$4;
       return new net.Socket();
     }
     function getSecureStream2(options) {
-      const tls = require$$1$1;
+      const tls = require$$1$2;
       return tls.connect(options);
     }
     return {
@@ -14672,7 +14671,7 @@ var hasRequiredConnection;
 function requireConnection() {
   if (hasRequiredConnection) return connection;
   hasRequiredConnection = 1;
-  const EventEmitter = require$$0$4.EventEmitter;
+  const EventEmitter = require$$0$3.EventEmitter;
   const { parse: parse2, serialize } = requireDist();
   const { getStream, getSecureStream } = requireStream();
   const flushBuffer = serialize.flush();
@@ -14744,7 +14743,7 @@ function requireConnection() {
             options.key = self2.ssl.key;
           }
         }
-        const net = require$$0$5;
+        const net = require$$0$4;
         if (net.isIP && net.isIP(host) === 0) {
           options.servername = host;
         }
@@ -14859,7 +14858,7 @@ function requireSafeBuffer() {
   if (hasRequiredSafeBuffer) return safeBuffer.exports;
   hasRequiredSafeBuffer = 1;
   (function(module2, exports$1) {
-    var buffer = require$$0$6;
+    var buffer = require$$0$5;
     var Buffer2 = buffer.Buffer;
     function copyProps(src, dst) {
       for (var key in src) {
@@ -15156,7 +15155,7 @@ var hasRequiredSplit2;
 function requireSplit2() {
   if (hasRequiredSplit2) return split2;
   hasRequiredSplit2 = 1;
-  const { Transform } = require$$0$7;
+  const { Transform } = require$$0$6;
   const { StringDecoder } = requireString_decoder();
   const kLast = /* @__PURE__ */ Symbol("last");
   const kDecoder = /* @__PURE__ */ Symbol("decoder");
@@ -15257,7 +15256,7 @@ function requireHelper() {
   if (hasRequiredHelper) return helper.exports;
   hasRequiredHelper = 1;
   (function(module2) {
-    var path = require$$0$8, Stream = require$$0$7.Stream, split = requireSplit2(), util2 = require$$1, defaultPort = 5432, isWin = process.platform === "win32", warnStream = process.stderr;
+    var path = require$$0$7, Stream = require$$0$6.Stream, split = requireSplit2(), util2 = require$$1$1, defaultPort = 5432, isWin = process.platform === "win32", warnStream = process.stderr;
     var S_IRWXG = 56, S_IRWXO = 7, S_IFMT = 61440, S_IFREG = 32768;
     function isRegFile(mode) {
       return (mode & S_IFMT) == S_IFREG;
@@ -15418,7 +15417,7 @@ var hasRequiredLib$1;
 function requireLib$1() {
   if (hasRequiredLib$1) return lib.exports;
   hasRequiredLib$1 = 1;
-  var fs2 = require$$0$2, helper2 = requireHelper();
+  var fs2 = require$$0$1, helper2 = requireHelper();
   lib.exports = function(connInfo, cb) {
     var file = helper2.getFileName();
     fs2.stat(file, function(err, stat) {
@@ -15437,9 +15436,9 @@ var hasRequiredClient$1;
 function requireClient$1() {
   if (hasRequiredClient$1) return client$1;
   hasRequiredClient$1 = 1;
-  const EventEmitter = require$$0$4.EventEmitter;
+  const EventEmitter = require$$0$3.EventEmitter;
   const utils2 = requireUtils$1();
-  const nodeUtils = require$$1;
+  const nodeUtils = require$$1$1;
   const sasl2 = requireSasl();
   const TypeOverrides = requireTypeOverrides();
   const ConnectionParameters = requireConnectionParameters();
@@ -15450,22 +15449,27 @@ function requireClient$1() {
   const activeQueryDeprecationNotice = nodeUtils.deprecate(
     () => {
     },
-    "Client.activeQuery is deprecated and will be removed in a future version."
+    "Client.activeQuery is deprecated and will be removed in pg@9.0"
   );
   const queryQueueDeprecationNotice = nodeUtils.deprecate(
     () => {
     },
-    "Client.queryQueue is deprecated and will be removed in a future version."
+    "Client.queryQueue is deprecated and will be removed in pg@9.0."
   );
   const pgPassDeprecationNotice = nodeUtils.deprecate(
     () => {
     },
-    "pgpass support is deprecated and will be removed in a future version. You can provide an async function as the password property to the Client/Pool constructor that returns a password instead. Within this funciton you can call the pgpass module in your own code."
+    "pgpass support is deprecated and will be removed in pg@9.0. You can provide an async function as the password property to the Client/Pool constructor that returns a password instead. Within this function you can call the pgpass module in your own code."
   );
   const byoPromiseDeprecationNotice = nodeUtils.deprecate(
     () => {
     },
-    "Passing a custom Promise implementation to the Client/Pool constructor is deprecated and will be removed in a future version."
+    "Passing a custom Promise implementation to the Client/Pool constructor is deprecated and will be removed in pg@9.0."
+  );
+  const queryQueueLengthDeprecationNotice = nodeUtils.deprecate(
+    () => {
+    },
+    "Calling client.query() when the client is already executing a query is deprecated and will be removed in pg@9.0. Use async/await or an external async flow control mechanism instead."
   );
   class Client extends EventEmitter {
     constructor(config) {
@@ -15637,7 +15641,7 @@ function requireClient$1() {
     _getPassword(cb) {
       const con = this.connection;
       if (typeof this.password === "function") {
-        this._Promise.resolve().then(() => this.password()).then((pass) => {
+        this._Promise.resolve().then(() => this.password(this.connectionParameters)).then((pass) => {
           if (pass !== void 0) {
             if (typeof pass !== "string") {
               con.emit("error", new TypeError("Password must be a string"));
@@ -15943,8 +15947,12 @@ function requireClient$1() {
       } else if (typeof config.submit === "function") {
         readTimeout = config.query_timeout || this.connectionParameters.query_timeout;
         result2 = query2 = config;
-        if (typeof values === "function") {
-          query2.callback = query2.callback || values;
+        if (!query2.callback) {
+          if (typeof values === "function") {
+            query2.callback = values;
+          } else if (callback) {
+            query2.callback = callback;
+          }
         }
       } else {
         readTimeout = config.query_timeout || this.connectionParameters.query_timeout;
@@ -15959,7 +15967,8 @@ function requireClient$1() {
         }
       }
       if (readTimeout) {
-        queryCallback = query2.callback;
+        queryCallback = query2.callback || (() => {
+        });
         readTimeoutTimer = setTimeout(() => {
           const error = new Error("Query read timeout");
           process.nextTick(() => {
@@ -15997,6 +16006,9 @@ function requireClient$1() {
         });
         return result2;
       }
+      if (this._queryQueue.length > 0) {
+        queryQueueLengthDeprecationNotice();
+      }
       this._queryQueue.push(query2);
       this._pulseQueryQueue();
       return result2;
@@ -16043,7 +16055,7 @@ var hasRequiredPgPool;
 function requirePgPool() {
   if (hasRequiredPgPool) return pgPool;
   hasRequiredPgPool = 1;
-  const EventEmitter = require$$0$4.EventEmitter;
+  const EventEmitter = require$$0$3.EventEmitter;
   const NOOP = function() {
   };
   const removeWhere = (list, predicate) => {
@@ -16131,6 +16143,13 @@ function requirePgPool() {
       this.ending = false;
       this.ended = false;
     }
+    _promiseTry(f) {
+      const Promise2 = this.Promise;
+      if (typeof Promise2.try === "function") {
+        return Promise2.try(f);
+      }
+      return new Promise2((resolve) => resolve(f()));
+    }
     _isFull() {
       return this._clients.length >= this.options.max;
     }
@@ -16234,9 +16253,15 @@ function requirePgPool() {
       let timeoutHit = false;
       if (this.options.connectionTimeoutMillis) {
         tid = setTimeout(() => {
-          this.log("ending client due to timeout");
-          timeoutHit = true;
-          client2.connection ? client2.connection.stream.destroy() : client2.end();
+          if (client2.connection) {
+            this.log("ending client due to timeout");
+            timeoutHit = true;
+            client2.connection.stream.destroy();
+          } else if (!client2.isConnected()) {
+            this.log("ending client due to timeout");
+            timeoutHit = true;
+            client2.end();
+          }
         }, this.options.connectionTimeoutMillis);
       }
       this.log("connecting new client");
@@ -16257,27 +16282,47 @@ function requirePgPool() {
           }
         } else {
           this.log("new client connected");
-          if (this.options.maxLifetimeSeconds !== 0) {
-            const maxLifetimeTimeout = setTimeout(() => {
-              this.log("ending client due to expired lifetime");
-              this._expired.add(client2);
-              const idleIndex = this._idle.findIndex((idleItem) => idleItem.client === client2);
-              if (idleIndex !== -1) {
-                this._acquireClient(
-                  client2,
-                  new PendingItem((err2, client3, clientRelease) => clientRelease()),
-                  idleListener,
-                  false
-                );
+          if (this.options.onConnect) {
+            this._promiseTry(() => this.options.onConnect(client2)).then(
+              () => {
+                this._afterConnect(client2, pendingItem, idleListener);
+              },
+              (hookErr) => {
+                this._clients = this._clients.filter((c) => c !== client2);
+                client2.end(() => {
+                  this._pulseQueue();
+                  if (!pendingItem.timedOut) {
+                    pendingItem.callback(hookErr, void 0, NOOP);
+                  }
+                });
               }
-            }, this.options.maxLifetimeSeconds * 1e3);
-            maxLifetimeTimeout.unref();
-            client2.once("end", () => clearTimeout(maxLifetimeTimeout));
+            );
+            return;
           }
-          return this._acquireClient(client2, pendingItem, idleListener, true);
+          return this._afterConnect(client2, pendingItem, idleListener);
         }
       });
     }
+    _afterConnect(client2, pendingItem, idleListener) {
+      if (this.options.maxLifetimeSeconds !== 0) {
+        const maxLifetimeTimeout = setTimeout(() => {
+          this.log("ending client due to expired lifetime");
+          this._expired.add(client2);
+          const idleIndex = this._idle.findIndex((idleItem) => idleItem.client === client2);
+          if (idleIndex !== -1) {
+            this._acquireClient(
+              client2,
+              new PendingItem((err, client3, clientRelease) => clientRelease()),
+              idleListener,
+              false
+            );
+          }
+        }, this.options.maxLifetimeSeconds * 1e3);
+        maxLifetimeTimeout.unref();
+        client2.once("end", () => clearTimeout(maxLifetimeTimeout));
+      }
+      return this._acquireClient(client2, pendingItem, idleListener, true);
+    }
     // acquire a client for a pending work item
     _acquireClient(client2, pendingItem, idleListener, isNew) {
       if (isNew) {
@@ -16437,14 +16482,14 @@ const __viteOptionalPeerDep_pgNative_pg_true$1 = /* @__PURE__ */ Object.freeze(/
   __proto__: null,
   default: __viteOptionalPeerDep_pgNative_pg_true
 }, Symbol.toStringTag, { value: "Module" }));
-const require$$0 = /* @__PURE__ */ getAugmentedNamespace(__viteOptionalPeerDep_pgNative_pg_true$1);
+const require$$1 = /* @__PURE__ */ getAugmentedNamespace(__viteOptionalPeerDep_pgNative_pg_true$1);
 var query = { exports: {} };
 var hasRequiredQuery;
 function requireQuery() {
   if (hasRequiredQuery) return query.exports;
   hasRequiredQuery = 1;
-  const EventEmitter = require$$0$4.EventEmitter;
-  const util2 = require$$1;
+  const EventEmitter = require$$0$3.EventEmitter;
+  const util2 = require$$1$1;
   const utils2 = requireUtils$1();
   const NativeQuery = query.exports = function(config, values, callback) {
     EventEmitter.call(this);
@@ -16583,17 +16628,23 @@ var hasRequiredClient;
 function requireClient() {
   if (hasRequiredClient) return client.exports;
   hasRequiredClient = 1;
+  const nodeUtils = require$$1$1;
   var Native;
   try {
-    Native = require$$0;
+    Native = require$$1;
   } catch (e) {
     throw e;
   }
   const TypeOverrides = requireTypeOverrides();
-  const EventEmitter = require$$0$4.EventEmitter;
-  const util2 = require$$1;
+  const EventEmitter = require$$0$3.EventEmitter;
+  const util2 = require$$1$1;
   const ConnectionParameters = requireConnectionParameters();
   const NativeQuery = requireQuery();
+  const queryQueueLengthDeprecationNotice = nodeUtils.deprecate(
+    () => {
+    },
+    "Calling client.query() when the client is already executing a query is deprecated and will be removed in pg@9.0. Use async/await or an external async flow control mechanism instead."
+  );
   const Client = client.exports = function(config) {
     EventEmitter.call(this);
     config = config || {};
@@ -16715,7 +16766,8 @@ function requireClient() {
       }
     }
     if (readTimeout) {
-      queryCallback = query2.callback;
+      queryCallback = query2.callback || (() => {
+      });
       readTimeoutTimer = setTimeout(() => {
         const error = new Error("Query read timeout");
         process.nextTick(() => {
@@ -16749,6 +16801,9 @@ function requireClient() {
       });
       return result2;
     }
+    if (this._queryQueue.length > 0) {
+      queryQueueLengthDeprecationNotice();
+    }
     this._queryQueue.push(query2);
     this._pulseQueryQueue();
     return result2;
@@ -16766,6 +16821,7 @@ function requireClient() {
       });
     }
     this.native.end(function() {
+      self2._connected = false;
       self2._errorAllQueries(new Error("Connection terminated"));
       process.nextTick(() => {
         self2.emit("end");
@@ -16816,6 +16872,9 @@ function requireClient() {
   Client.prototype.getTypeParser = function(oid, format) {
     return this._types.getTypeParser(oid, format);
   };
+  Client.prototype.isConnected = function() {
+    return this._connected;
+  };
   return client.exports;
 }
 var native;
@@ -17075,7 +17134,7 @@ class PGPoolManager extends tinyEmitterExports.TinyEmitter {
     return this.#pools[this.#GetPoolKey(0)].pool.connect();
   }
   async connectReadOnly() {
-    const poolIndex = require$$0$1.randomInt(0, Object.keys(this.#pools).length);
+    const poolIndex = require$$0.randomInt(0, Object.keys(this.#pools).length);
     return this.#pools[this.#GetPoolKey(poolIndex)].pool.connect();
   }
   //@@ make event using TinyEmitter