@nsshunt/stsfhirclient 1.1.3 → 1.1.4

package/dist/stsfhirclient.umd.js

@@ -1,18 +1,7 @@
 (function(global, factory) {
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("axios"), require("@nsshunt/stsutils")) : typeof define === "function" && define.amd ? define(["exports", "axios", "@nsshunt/stsutils"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["@nsshunt/stsfhirclient"] = {}, global.axios, global.stsutils));
 })(this, (function(exports2, axios, stsutils) {
-  "use strict";var __defProp = Object.defineProperty;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-
-  var _socketUtils, _id, _options2, _clientName, _debug, _error, _info, _SetupWSSClient, _OnSocketConnected, _options3, _DUMMY_USER, _stsfhirapiroot, _fhirSocketClient, _LogDebugMessage, _HandleError, _BuildQueryString, _InvokeResourceAPI;
+  "use strict";
   const isNode$1 = Object.prototype.toString.call(typeof process !== "undefined" ? process : 0) === "[object process]";
   function getDefaultExportFromCjs(x) {
     return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
@@ -4830,25 +4819,23 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
     io: lookup,
     connect: lookup
   });
-  var __typeError2 = (msg) => {
-    throw TypeError(msg);
-  };
-  var __accessCheck2 = (obj, member, msg) => member.has(obj) || __typeError2("Cannot " + msg);
-  var __privateGet2 = (obj, member, getter) => (__accessCheck2(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-  var __privateAdd2 = (obj, member, value2) => member.has(obj) ? __typeError2("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value2);
-  var __privateSet2 = (obj, member, value2, setter) => (__accessCheck2(obj, member, "write to private field"), member.set(obj, value2), value2);
-  var __privateMethod = (obj, member, method) => (__accessCheck2(obj, member, "access private method"), method);
-  var _options, _sockets, _SocketIoClientHelper_instances, LogDebugMessage_fn, LogErrorMessage_fn, EstablishSocketConnect_fn;
   const isNode = Object.prototype.toString.call(typeof process !== "undefined" ? process : 0) === "[object process]";
   class SocketIoClientHelper {
+    #options;
+    #sockets = {};
     constructor(options) {
-      __privateAdd2(this, _SocketIoClientHelper_instances);
-      __privateAdd2(this, _options);
-      __privateAdd2(this, _sockets, {});
-      __privateSet2(this, _options, options);
+      this.#options = options;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    #LogDebugMessage(message) {
+      if (this.#options.logger) this.#options.logger.debug(message);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    #LogErrorMessage(message) {
+      if (this.#options.logger) this.#options.logger.error(message);
     }
     get sockets() {
-      return __privateGet2(this, _sockets);
+      return this.#sockets;
     }
     SetupClientSideSocket(name, address, socketIoCustomPath, onConnectCallBack, socketEventsCallBack, errorCallBack) {
       this.sockets[name] = {
@@ -4857,7 +4844,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
         socket: null,
         errorCallBack
       };
-      __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack);
+      this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack);
       return this.sockets[name].socket;
     }
     GetSocket(name) {
@@ -4866,127 +4853,117 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
     GetSocketDetail(name) {
       return this.sockets[name];
     }
-  }
-  _options = /* @__PURE__ */ new WeakMap();
-  _sockets = /* @__PURE__ */ new WeakMap();
-  _SocketIoClientHelper_instances = /* @__PURE__ */ new WeakSet();
-  LogDebugMessage_fn = function(message) {
-    if (__privateGet2(this, _options).logger) __privateGet2(this, _options).logger.debug(message);
-  };
-  LogErrorMessage_fn = function(message) {
-    if (__privateGet2(this, _options).logger) __privateGet2(this, _options).logger.error(message);
-  };
-  EstablishSocketConnect_fn = function(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack) {
-    const socketDetail = this.sockets[name];
-    if (socketDetail.socket !== null) {
-      if (socketDetail.socket.connected === true) {
-        socketDetail.socket.disconnect();
+    #EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack) {
+      const socketDetail = this.sockets[name];
+      if (socketDetail.socket !== null) {
+        if (socketDetail.socket.connected === true) {
+          socketDetail.socket.disconnect();
+        }
+        socketDetail.socket = null;
+        if (isNode) {
+          setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
+        } else {
+          setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
+        }
+        return;
       }
-      socketDetail.socket = null;
+      let socketOptions;
       if (isNode) {
-        setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
+        socketOptions = {
+          transports: ["websocket"]
+        };
+        if (this.#options.agentManager) {
+          socketOptions.agent = this.#options.agentManager.GetAgent(socketDetail.address);
+        }
       } else {
-        setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
+        socketOptions = {
+          transports: ["websocket"]
+        };
       }
-      return;
-    }
-    let socketOptions;
-    if (isNode) {
-      socketOptions = {
-        transports: ["websocket"]
-      };
-      if (__privateGet2(this, _options).agentManager) {
-        socketOptions.agent = __privateGet2(this, _options).agentManager.GetAgent(socketDetail.address);
+      if (socketIoCustomPath && socketIoCustomPath.localeCompare("") !== 0) {
+        socketOptions.path = socketIoCustomPath;
       }
-    } else {
-      socketOptions = {
-        transports: ["websocket"]
-      };
-    }
-    if (socketIoCustomPath && socketIoCustomPath.localeCompare("") !== 0) {
-      socketOptions.path = socketIoCustomPath;
-    }
-    socketDetail.socket = lookup(socketDetail.address, socketOptions);
-    socketDetail.socket.io.on("error", (err) => {
-      __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, `SocketIoClientHelper(): socketDetail.socket.io.on('error'): [${err}]`);
-    });
-    socketDetail.socket.io.on("reconnect_error", (err) => {
-      __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, `SocketIoClientHelper(): socketDetail.socket.io.on('reconnect_error'): [${err}]`);
-    });
-    socketDetail.socket.io.on("reconnect", (attempt) => {
-      __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, `SocketIoClientHelper(): socketDetail.socket.io.on('reconnect'): Number: [${attempt}]`);
-    });
-    socketDetail.socket.on("connect_error", (err) => {
-      __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, `SocketIoClientHelper(): socketDetail.socket.on('connect_error'): [${err}]`);
-    });
-    socketDetail.socket.on("connect_timeout", () => {
-      __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, `SocketIoClientHelper(): socketDetail.socket.on('connect_timeout')`);
-    });
-    socketDetail.socket.on("connect", () => {
-      if (socketDetail.socket) {
-        __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, `SocketIoClientHelper(): Socket: [${socketDetail.socket.id}]: connected`);
-        if (onConnectCallBack) {
-          setTimeout(() => {
-            onConnectCallBack(socketDetail.socket);
-          }, 0);
-        }
-        if (socketEventsCallBack) {
-          socketEventsCallBack(socketDetail.socket);
+      socketDetail.socket = lookup(socketDetail.address, socketOptions);
+      socketDetail.socket.io.on("error", (err) => {
+        this.#LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.io.on('error'): [${err}]`);
+      });
+      socketDetail.socket.io.on("reconnect_error", (err) => {
+        this.#LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.io.on('reconnect_error'): [${err}]`);
+      });
+      socketDetail.socket.io.on("reconnect", (attempt) => {
+        this.#LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.io.on('reconnect'): Number: [${attempt}]`);
+      });
+      socketDetail.socket.on("connect_error", (err) => {
+        this.#LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.on('connect_error'): [${err}]`);
+      });
+      socketDetail.socket.on("connect_timeout", () => {
+        this.#LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.on('connect_timeout')`);
+      });
+      socketDetail.socket.on("connect", () => {
+        if (socketDetail.socket) {
+          this.#LogDebugMessage(`SocketIoClientHelper(): Socket: [${socketDetail.socket.id}]: connected`);
+          if (onConnectCallBack) {
+            setTimeout(() => {
+              onConnectCallBack(socketDetail.socket);
+            }, 0);
+          }
+          if (socketEventsCallBack) {
+            socketEventsCallBack(socketDetail.socket);
+          }
+        } else {
+          const errorMessage = "SocketIoClientHelper(): Could not get socket object from socket.io";
+          this.#LogErrorMessage(errorMessage);
+          socketDetail.errorCallBack(new Error(errorMessage));
         }
-      } else {
-        const errorMessage = "SocketIoClientHelper(): Could not get socket object from socket.io";
-        __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, errorMessage);
-        socketDetail.errorCallBack(new Error(errorMessage));
-      }
-    });
-    socketDetail.socket.on("disconnect", (reason) => {
-      var _a;
-      __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): socket disconnect: " + reason);
-      switch (reason) {
-        case "io server disconnect":
-          {
-            __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): The server disconnected using disconnectSockets, i.e. normal safe shutdown from explicit disconnection by the server.");
-            __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): The connection will be re-established when the server becomes available.");
-            const socketDetail2 = this.sockets[name];
-            socketDetail2.socket = null;
-            if (isNode) {
-              if (__privateGet2(this, _options).agentManager) {
-                __privateGet2(this, _options).agentManager.ResetAgent();
+      });
+      socketDetail.socket.on("disconnect", (reason) => {
+        this.#LogDebugMessage("SocketIoClientHelper(): socket disconnect: " + reason);
+        switch (reason) {
+          case "io server disconnect":
+            {
+              this.#LogDebugMessage("SocketIoClientHelper(): The server disconnected using disconnectSockets, i.e. normal safe shutdown from explicit disconnection by the server.");
+              this.#LogDebugMessage("SocketIoClientHelper(): The connection will be re-established when the server becomes available.");
+              const socketDetail2 = this.sockets[name];
+              socketDetail2.socket = null;
+              if (isNode) {
+                if (this.#options.agentManager) {
+                  this.#options.agentManager.ResetAgent();
+                }
+                setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
+              } else {
+                setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
               }
-              setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
-            } else {
-              setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
             }
-          }
-          break;
-        case "io client disconnect":
-          __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): The client disconnected using disconnectSockets, i.e. normal safe disconnection from explicit disconnection by the client.");
-          __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): The connection will not be re-established automatically.");
-          break;
-        case "transport close":
-        case "ping timeout":
-        case "transport error":
-          {
-            __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, `SocketIoClientHelper(): Server unexpectedly disconnected. Reason: [${reason}]`);
-            __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): The connection will be re-established when the server becomes available.");
-            const socketDetail2 = this.sockets[name];
-            if (socketDetail2.socket) {
-              socketDetail2.socket.disconnect();
-            }
-            socketDetail2.socket = null;
-            if (isNode) {
-              if (__privateGet2(this, _options).agentManager) {
-                (_a = __privateGet2(this, _options).agentManager) == null ? void 0 : _a.ResetAgent();
+            break;
+          case "io client disconnect":
+            this.#LogDebugMessage("SocketIoClientHelper(): The client disconnected using disconnectSockets, i.e. normal safe disconnection from explicit disconnection by the client.");
+            this.#LogDebugMessage("SocketIoClientHelper(): The connection will not be re-established automatically.");
+            break;
+          case "transport close":
+          case "ping timeout":
+          case "transport error":
+            {
+              this.#LogDebugMessage(`SocketIoClientHelper(): Server unexpectedly disconnected. Reason: [${reason}]`);
+              this.#LogDebugMessage("SocketIoClientHelper(): The connection will be re-established when the server becomes available.");
+              const socketDetail2 = this.sockets[name];
+              if (socketDetail2.socket) {
+                socketDetail2.socket.disconnect();
+              }
+              socketDetail2.socket = null;
+              if (isNode) {
+                if (this.#options.agentManager) {
+                  this.#options.agentManager?.ResetAgent();
+                }
+                setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
+              } else {
+                setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
               }
-              setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
-            } else {
-              setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
             }
-          }
-          break;
-      }
-    });
-  };
+            break;
+        }
+      });
+    }
+  }
   const byteToHex = [];
   for (let i = 0; i < 256; ++i) {
     byteToHex.push((i + 256).toString(16).slice(1));
@@ -5007,13 +4984,9 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
   }
   const randomUUID = typeof crypto !== "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
   const native = { randomUUID };
-  function v4(options, buf, offset) {
-    var _a;
-    if (native.randomUUID && true && !options) {
-      return native.randomUUID();
-    }
+  function _v4(options, buf, offset) {
     options = options || {};
-    const rnds = options.random ?? ((_a = options.rng) == null ? void 0 : _a.call(options)) ?? rng();
+    const rnds = options.random ?? options.rng?.() ?? rng();
     if (rnds.length < 16) {
       throw new Error("Random bytes length must be >= 16");
     }
@@ -5021,332 +4994,329 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
     rnds[8] = rnds[8] & 63 | 128;
     return unsafeStringify(rnds);
   }
+  function v4(options, buf, offset) {
+    if (native.randomUUID && true && !options) {
+      return native.randomUUID();
+    }
+    return _v4(options);
+  }
   class FhirSocketClient {
+    #socketUtils;
+    #id = v4();
+    #options;
+    #clientName;
     constructor(options) {
-      __privateAdd(this, _socketUtils);
-      __privateAdd(this, _id, v4());
-      __privateAdd(this, _options2);
-      __privateAdd(this, _clientName);
-      __privateAdd(this, _debug, (message) => stsutils.defaultLogger.debug(message));
-      __privateAdd(this, _error, (error) => stsutils.defaultLogger.error(error));
-      __privateAdd(this, _info, (message) => stsutils.defaultLogger.info(message));
-      __privateAdd(this, _SetupWSSClient, async (clientName, joinRooms) => {
-        console.log(chalk.yellow(`FhirSocketClient:#SetupWSSClient(): ID: [${__privateGet(this, _id)}] clientName: [${clientName}] Starting ...`));
-        const cstr = `${__privateGet(this, _options2).fhirServerEndpoint}/nsstsfhir/`;
-        console.log(chalk.yellow(`FhirSocketClient:#SetupWSSClient(): Socket connection string: [${cstr}]`));
-        __privateGet(this, _socketUtils).SetupClientSideSocket(
-          __privateGet(this, _options2).socketClientName,
-          // 'ststestrunner',
-          cstr,
-          // `https://stscore.stsmda.org:3005/nsstsfhir/` this.#options.ststccendpoint, stsfhir as the namespace
-          __privateGet(this, _options2).socketIoCustomPath,
-          // '/stsfhirsocket/socket.io/',
-          // Connected Callback
-          (socket2) => __privateGet(this, _OnSocketConnected).call(this, socket2, clientName, joinRooms),
-          // Events Registration
-          (socket2) => {
-          },
-          // Error Callback
-          (error) => __privateGet(this, _error).call(this, `FhirSocketClient:#SetupWSSClient(): Error clientName: [${clientName}]: SetupClientSideSocket call back: Error: [${error}]`)
-        );
-        console.log(chalk.yellow(`FhirSocketClient:#SetupWSSClient(): ID: [${__privateGet(this, _id)}] clientName: [${clientName}] Started`));
-      });
-      // Handle connection logic separately
-      __privateAdd(this, _OnSocketConnected, (socket, clientName, joinRooms) => {
-        __privateGet(this, _debug).call(this, chalk.green(`FhirSocketClient:#OnSocketConnected(): ID: [${__privateGet(this, _id)}] clientName: [${clientName}]: --> connected`));
-        if (joinRooms.length > 0) {
-          socket.emit("__STSjoinRoom", joinRooms);
-        }
-      });
-      __publicField(this, "WaitForSocketConnected", async () => {
-        const socket = __privateGet(this, _socketUtils).GetSocket(__privateGet(this, _options2).socketClientName);
-        if (socket && socket.connected === true) {
-          return;
+      this.#options = options;
+      this.#socketUtils = new SocketIoClientHelper(this.#options.socketIoClientHelperOptions);
+      const clientName = v4();
+      this.#clientName = clientName;
+      this.#SetupWSSClient(clientName, []);
+    }
+    #debug = (message) => stsutils.defaultLogger.debug(message);
+    #error = (error) => stsutils.defaultLogger.error(error);
+    #info = (message) => stsutils.defaultLogger.info(message);
+    #SetupWSSClient = async (clientName, joinRooms) => {
+      console.log(chalk.yellow(`FhirSocketClient:#SetupWSSClient(): ID: [${this.#id}] clientName: [${clientName}] Starting ...`));
+      const cstr = `${this.#options.fhirServerEndpoint}/nsstsfhir/`;
+      console.log(chalk.yellow(`FhirSocketClient:#SetupWSSClient(): Socket connection string: [${cstr}]`));
+      this.#socketUtils.SetupClientSideSocket(
+        this.#options.socketClientName,
+        // 'ststestrunner',
+        cstr,
+        // `https://stscore.stsmda.org:3005/nsstsfhir/` this.#options.ststccendpoint, stsfhir as the namespace
+        this.#options.socketIoCustomPath,
+        // '/stsfhirsocket/socket.io/',
+        // Connected Callback
+        (socket2) => this.#OnSocketConnected(socket2, clientName, joinRooms),
+        // Events Registration
+        (socket2) => {
+        },
+        // Error Callback
+        (error) => this.#error(`FhirSocketClient:#SetupWSSClient(): Error clientName: [${clientName}]: SetupClientSideSocket call back: Error: [${error}]`)
+      );
+      console.log(chalk.yellow(`FhirSocketClient:#SetupWSSClient(): ID: [${this.#id}] clientName: [${clientName}] Started`));
+    };
+    // Handle connection logic separately
+    #OnSocketConnected = (socket, clientName, joinRooms) => {
+      this.#debug(chalk.green(`FhirSocketClient:#OnSocketConnected(): ID: [${this.#id}] clientName: [${clientName}]: --> connected`));
+      if (joinRooms.length > 0) {
+        socket.emit("__STSjoinRoom", joinRooms);
+      }
+    };
+    WaitForSocketConnected = async () => {
+      const socket = this.#socketUtils.GetSocket(this.#options.socketClientName);
+      if (socket && socket.connected === true) {
+        return;
+      }
+      console.log(chalk.yellow(`FhirSocketClient:#WaitForSocketConnected(): ID: [${this.#id}] clientName: [${this.#clientName}] Waiting for connection ...`));
+      let connected = false;
+      let attempts = 0;
+      while (!connected) {
+        attempts++;
+        if (attempts % 10 === 0) {
+          console.log(chalk.yellow(`FhirSocketClient:#WaitForSocketConnected(): ID: [${this.#id}] clientName: [${this.#clientName}] waiting for connection attempts: [${attempts}].`));
         }
-        console.log(chalk.yellow(`FhirSocketClient:#WaitForSocketConnected(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Waiting for connection ...`));
-        let connected = false;
-        let attempts = 0;
-        while (!connected) {
-          attempts++;
-          if (attempts % 10 === 0) {
-            console.log(chalk.yellow(`FhirSocketClient:#WaitForSocketConnected(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] waiting for connection attempts: [${attempts}].`));
-          }
-          const socketRetVal = __privateGet(this, _socketUtils).GetSocket(__privateGet(this, _options2).socketClientName);
-          if (socketRetVal && socketRetVal.connected === true) {
-            connected = true;
-            console.log(chalk.yellow(`FhirSocketClient:#WaitForSocketConnected(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Connection completed after: [${attempts}] attempts.`));
-            break;
-          }
-          await stsutils.Sleep(100);
+        const socketRetVal = this.#socketUtils.GetSocket(this.#options.socketClientName);
+        if (socketRetVal && socketRetVal.connected === true) {
+          connected = true;
+          console.log(chalk.yellow(`FhirSocketClient:#WaitForSocketConnected(): ID: [${this.#id}] clientName: [${this.#clientName}] Connection completed after: [${attempts}] attempts.`));
+          break;
         }
-      });
-      __publicField(this, "CreateResource", async (resource, domainResource) => {
-        await this.WaitForSocketConnected();
-        const promCreate = () => {
-          const request = {
-            headers: {
-              "x-sts_user_id": "someuser"
-            },
-            params: {},
-            query: {},
-            body: domainResource
-          };
-          return new Promise((resolve, reject) => {
-            this.socket.timeout(__privateGet(this, _options2).timeout).emit("createFhirResource", resource, request, (err, res) => {
-              if (err) {
-                __privateGet(this, _error).call(this, `FhirSocketClient:CreateResource(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
-                reject(err);
-              } else {
-                resolve(res);
-              }
-            });
-          });
+        await stsutils.Sleep(100);
+      }
+    };
+    get socket() {
+      return this.#socketUtils.GetSocket(this.#options.socketClientName);
+    }
+    CreateResource = async (resource, domainResource) => {
+      await this.WaitForSocketConnected();
+      const promCreate = () => {
+        const request = {
+          headers: {
+            "x-sts_user_id": "someuser"
+          },
+          params: {},
+          query: {},
+          body: domainResource
         };
-        return promCreate();
-      });
-      __publicField(this, "CreateResources", async (resource, domainResources) => {
-        await this.WaitForSocketConnected();
-        const promCreate = () => {
-          const request = {
-            headers: {
-              "x-sts_user_id": "someuser"
-            },
-            params: {},
-            query: {},
-            body: domainResources
-          };
-          return new Promise((resolve, reject) => {
-            this.socket.timeout(__privateGet(this, _options2).timeout).emit("createFhirResources", resource, request, (err, res) => {
-              if (err) {
-                __privateGet(this, _error).call(this, `FhirSocketClient:CreateResources(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
-                reject(err);
-              } else {
-                resolve(res);
-              }
-            });
+        return new Promise((resolve, reject) => {
+          this.socket.timeout(this.#options.timeout).emit("createFhirResource", resource, request, (err, res) => {
+            if (err) {
+              this.#error(`FhirSocketClient:CreateResource(): ID: [${this.#id}] clientName: [${this.#clientName}] Error: [${err}]`);
+              reject(err);
+            } else {
+              resolve(res);
+            }
           });
+        });
+      };
+      return promCreate();
+    };
+    CreateResources = async (resource, domainResources) => {
+      await this.WaitForSocketConnected();
+      const promCreate = () => {
+        const request = {
+          headers: {
+            "x-sts_user_id": "someuser"
+          },
+          params: {},
+          query: {},
+          body: domainResources
         };
-        return (await promCreate()).value;
-      });
-      __publicField(this, "GetResource", async (resource, resourceId) => {
-        await this.WaitForSocketConnected();
-        const promGet = () => {
-          const request = {
-            headers: {
-              "x-sts_user_id": "someuser"
-            },
-            params: {},
-            query: {
-              fhirResource: resourceId
-            },
-            body: {}
-          };
-          return new Promise((resolve, reject) => {
-            this.socket.timeout(__privateGet(this, _options2).timeout).emit("getFhirResource", resource, request, (err, res) => {
-              if (err) {
-                __privateGet(this, _error).call(this, `FhirSocketClient:GetResource(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
-                reject(err);
-              } else {
-                resolve(res);
-              }
-            });
+        return new Promise((resolve, reject) => {
+          this.socket.timeout(this.#options.timeout).emit("createFhirResources", resource, request, (err, res) => {
+            if (err) {
+              this.#error(`FhirSocketClient:CreateResources(): ID: [${this.#id}] clientName: [${this.#clientName}] Error: [${err}]`);
+              reject(err);
+            } else {
+              resolve(res);
+            }
           });
+        });
+      };
+      return (await promCreate()).value;
+    };
+    GetResource = async (resource, resourceId) => {
+      await this.WaitForSocketConnected();
+      const promGet = () => {
+        const request = {
+          headers: {
+            "x-sts_user_id": "someuser"
+          },
+          params: {},
+          query: {
+            fhirResource: resourceId
+          },
+          body: {}
         };
-        return promGet();
-      });
-      __publicField(this, "GetResources", async (resource, searchParams) => {
-        await this.WaitForSocketConnected();
-        const promGet = () => {
-          const request = {
-            headers: {
-              "x-sts_user_id": "someuser"
-            },
-            params: {},
-            query: searchParams ? searchParams : {},
-            body: {}
-          };
-          return new Promise((resolve, reject) => {
-            this.socket.timeout(__privateGet(this, _options2).timeout).emit("getFhirResources", resource, request, (err, res) => {
-              if (err) {
-                __privateGet(this, _error).call(this, `FhirSocketClient:GetResources(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
-                reject(err);
-              } else {
-                resolve(res);
-              }
-            });
+        return new Promise((resolve, reject) => {
+          this.socket.timeout(this.#options.timeout).emit("getFhirResource", resource, request, (err, res) => {
+            if (err) {
+              this.#error(`FhirSocketClient:GetResource(): ID: [${this.#id}] clientName: [${this.#clientName}] Error: [${err}]`);
+              reject(err);
+            } else {
+              resolve(res);
+            }
           });
+        });
+      };
+      return promGet();
+    };
+    GetResources = async (resource, searchParams) => {
+      await this.WaitForSocketConnected();
+      const promGet = () => {
+        const request = {
+          headers: {
+            "x-sts_user_id": "someuser"
+          },
+          params: {},
+          query: searchParams ? searchParams : {},
+          body: {}
         };
-        return (await promGet()).value;
-      });
-      __publicField(this, "UpdateResource", async (resource, domainResource) => {
-        await this.WaitForSocketConnected();
-        const promCreate = () => {
-          const request = {
-            headers: {
-              "x-sts_user_id": "someuser"
-            },
-            params: {},
-            query: {
-              fhirResource: domainResource.id
-            },
-            body: domainResource
-          };
-          return new Promise((resolve, reject) => {
-            this.socket.timeout(__privateGet(this, _options2).timeout).emit("updateFhirResource", resource, request, (err, res) => {
-              if (err) {
-                __privateGet(this, _error).call(this, `FhirSocketClient:UpdateResource(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
-                reject(err);
-              } else {
-                resolve(res);
-              }
-            });
+        return new Promise((resolve, reject) => {
+          this.socket.timeout(this.#options.timeout).emit("getFhirResources", resource, request, (err, res) => {
+            if (err) {
+              this.#error(`FhirSocketClient:GetResources(): ID: [${this.#id}] clientName: [${this.#clientName}] Error: [${err}]`);
+              reject(err);
+            } else {
+              resolve(res);
+            }
           });
+        });
+      };
+      return (await promGet()).value;
+    };
+    UpdateResource = async (resource, domainResource) => {
+      await this.WaitForSocketConnected();
+      const promCreate = () => {
+        const request = {
+          headers: {
+            "x-sts_user_id": "someuser"
+          },
+          params: {},
+          query: {
+            fhirResource: domainResource.id
+          },
+          body: domainResource
         };
-        return (await promCreate()).value;
-      });
-      __publicField(this, "UpdateResources", async (resource, domainResources) => {
-        await this.WaitForSocketConnected();
-        const promCreate = () => {
-          const request = {
-            headers: {
-              "x-sts_user_id": "someuser"
-            },
-            params: {},
-            query: {},
-            body: domainResources
-          };
-          return new Promise((resolve, reject) => {
-            this.socket.timeout(__privateGet(this, _options2).timeout).emit("updateFhirResources", resource, request, (err, res) => {
-              if (err) {
-                __privateGet(this, _error).call(this, `FhirSocketClient:UpdateResources(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
-                reject(err);
-              } else {
-                resolve(res);
-              }
-            });
+        return new Promise((resolve, reject) => {
+          this.socket.timeout(this.#options.timeout).emit("updateFhirResource", resource, request, (err, res) => {
+            if (err) {
+              this.#error(`FhirSocketClient:UpdateResource(): ID: [${this.#id}] clientName: [${this.#clientName}] Error: [${err}]`);
+              reject(err);
+            } else {
+              resolve(res);
+            }
           });
+        });
+      };
+      return (await promCreate()).value;
+    };
+    UpdateResources = async (resource, domainResources) => {
+      await this.WaitForSocketConnected();
+      const promCreate = () => {
+        const request = {
+          headers: {
+            "x-sts_user_id": "someuser"
+          },
+          params: {},
+          query: {},
+          body: domainResources
         };
-        return (await promCreate()).value;
-      });
-      __publicField(this, "PatchResource", async (resource, domainResource) => {
-        await this.WaitForSocketConnected();
-        const promCreate = () => {
-          const request = {
-            headers: {
-              "x-sts_user_id": "someuser"
-            },
-            params: {},
-            query: {
-              fhirResource: domainResource.id
-            },
-            body: domainResource
-          };
-          return new Promise((resolve, reject) => {
-            this.socket.timeout(__privateGet(this, _options2).timeout).emit("patchFhirResource", resource, request, (err, res) => {
-              if (err) {
-                __privateGet(this, _error).call(this, `FhirSocketClient:PatchResource(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
-                reject(err);
-              } else {
-                resolve(res);
-              }
-            });
+        return new Promise((resolve, reject) => {
+          this.socket.timeout(this.#options.timeout).emit("updateFhirResources", resource, request, (err, res) => {
+            if (err) {
+              this.#error(`FhirSocketClient:UpdateResources(): ID: [${this.#id}] clientName: [${this.#clientName}] Error: [${err}]`);
+              reject(err);
+            } else {
+              resolve(res);
+            }
           });
+        });
+      };
+      return (await promCreate()).value;
+    };
+    PatchResource = async (resource, domainResource) => {
+      await this.WaitForSocketConnected();
+      const promCreate = () => {
+        const request = {
+          headers: {
+            "x-sts_user_id": "someuser"
+          },
+          params: {},
+          query: {
+            fhirResource: domainResource.id
+          },
+          body: domainResource
         };
-        return (await promCreate()).value;
-      });
-      __publicField(this, "PatchResources", async (resource, domainResources) => {
-        await this.WaitForSocketConnected();
-        const promCreate = () => {
-          const request = {
-            headers: {
-              "x-sts_user_id": "someuser"
-            },
-            params: {},
-            query: {},
-            body: domainResources
-          };
-          return new Promise((resolve, reject) => {
-            this.socket.timeout(__privateGet(this, _options2).timeout).emit("patchFhirResources", resource, request, (err, res) => {
-              if (err) {
-                __privateGet(this, _error).call(this, `FhirSocketClient:PatchResources(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
-                reject(err);
-              } else {
-                resolve(res);
-              }
-            });
+        return new Promise((resolve, reject) => {
+          this.socket.timeout(this.#options.timeout).emit("patchFhirResource", resource, request, (err, res) => {
+            if (err) {
+              this.#error(`FhirSocketClient:PatchResource(): ID: [${this.#id}] clientName: [${this.#clientName}] Error: [${err}]`);
+              reject(err);
+            } else {
+              resolve(res);
+            }
           });
+        });
+      };
+      return (await promCreate()).value;
+    };
+    PatchResources = async (resource, domainResources) => {
+      await this.WaitForSocketConnected();
+      const promCreate = () => {
+        const request = {
+          headers: {
+            "x-sts_user_id": "someuser"
+          },
+          params: {},
+          query: {},
+          body: domainResources
         };
-        return (await promCreate()).value;
-      });
-      __publicField(this, "DeleteResource", async (resource, resourceId) => {
-        await this.WaitForSocketConnected();
-        const promCreate = () => {
-          const request = {
-            headers: {
-              "x-sts_user_id": "someuser"
-            },
-            params: {},
-            query: {
-              fhirResource: resourceId
-            },
-            body: {}
-          };
-          return new Promise((resolve, reject) => {
-            this.socket.timeout(__privateGet(this, _options2).timeout).emit("deleteFhirResource", resource, request, (err, res) => {
-              if (err) {
-                __privateGet(this, _error).call(this, `FhirSocketClient:DeleteResource(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
-                reject(err);
-              } else {
-                resolve(res);
-              }
-            });
+        return new Promise((resolve, reject) => {
+          this.socket.timeout(this.#options.timeout).emit("patchFhirResources", resource, request, (err, res) => {
+            if (err) {
+              this.#error(`FhirSocketClient:PatchResources(): ID: [${this.#id}] clientName: [${this.#clientName}] Error: [${err}]`);
+              reject(err);
+            } else {
+              resolve(res);
+            }
           });
+        });
+      };
+      return (await promCreate()).value;
+    };
+    DeleteResource = async (resource, resourceId) => {
+      await this.WaitForSocketConnected();
+      const promCreate = () => {
+        const request = {
+          headers: {
+            "x-sts_user_id": "someuser"
+          },
+          params: {},
+          query: {
+            fhirResource: resourceId
+          },
+          body: {}
         };
-        return (await promCreate()).value;
-      });
-      __publicField(this, "DeleteResources", async (resource, domainResource) => {
-        await this.WaitForSocketConnected();
-        const prom = () => {
-          const delRequest = {
-            headers: {
-              "x-sts_user_id": "someuser"
-            },
-            params: {},
-            query: {},
-            body: domainResource
-          };
-          return new Promise((resolve, reject) => {
-            this.socket.timeout(__privateGet(this, _options2).timeout).emit("deleteFhirResources", resource, delRequest, (err, res) => {
-              if (err) {
-                __privateGet(this, _error).call(this, `FhirSocketClient:DeleteResources(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
-                reject(err);
-              } else {
-                resolve(res);
-              }
-            });
+        return new Promise((resolve, reject) => {
+          this.socket.timeout(this.#options.timeout).emit("deleteFhirResource", resource, request, (err, res) => {
+            if (err) {
+              this.#error(`FhirSocketClient:DeleteResource(): ID: [${this.#id}] clientName: [${this.#clientName}] Error: [${err}]`);
+              reject(err);
+            } else {
+              resolve(res);
+            }
           });
+        });
+      };
+      return (await promCreate()).value;
+    };
+    DeleteResources = async (resource, domainResource) => {
+      await this.WaitForSocketConnected();
+      const prom = () => {
+        const delRequest = {
+          headers: {
+            "x-sts_user_id": "someuser"
+          },
+          params: {},
+          query: {},
+          body: domainResource
         };
-        return (await prom()).value;
-      });
-      __privateSet(this, _options2, options);
-      __privateSet(this, _socketUtils, new SocketIoClientHelper(__privateGet(this, _options2).socketIoClientHelperOptions));
-      const clientName = v4();
-      __privateSet(this, _clientName, clientName);
-      __privateGet(this, _SetupWSSClient).call(this, clientName, []);
-    }
-    get socket() {
-      return __privateGet(this, _socketUtils).GetSocket(__privateGet(this, _options2).socketClientName);
-    }
+        return new Promise((resolve, reject) => {
+          this.socket.timeout(this.#options.timeout).emit("deleteFhirResources", resource, delRequest, (err, res) => {
+            if (err) {
+              this.#error(`FhirSocketClient:DeleteResources(): ID: [${this.#id}] clientName: [${this.#clientName}] Error: [${err}]`);
+              reject(err);
+            } else {
+              resolve(res);
+            }
+          });
+        });
+      };
+      return (await prom()).value;
+    };
   }
-  _socketUtils = new WeakMap();
-  _id = new WeakMap();
-  _options2 = new WeakMap();
-  _clientName = new WeakMap();
-  _debug = new WeakMap();
-  _error = new WeakMap();
-  _info = new WeakMap();
-  _SetupWSSClient = new WeakMap();
-  _OnSocketConnected = new WeakMap();
   function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
@@ -5390,7 +5360,6 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
     instance.interceptors.response.use(
       (response) => response,
       async (error) => {
-        var _a;
         const config = error.config;
         if (!config || !config.method || !config.metadata) {
           return Promise.reject(error);
@@ -5398,7 +5367,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
         const now = Date.now();
         const elapsed = now - config.metadata.startTime;
         const method = config.method.toLowerCase();
-        const status = (_a = error.response) == null ? void 0 : _a.status;
+        const status = error.response?.status;
         const code = error.code;
         const isRetryable = retryMethods.includes(method) && (retryErrorCodes.includes(code || "") || retryStatusCodes.includes(status || 0));
         if (config.metadata.__retryCount < maxRetries && isRetryable && elapsed < maxRetryDurationMs) {
@@ -5417,317 +5386,307 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
     return instance;
   }
   class FhirClient {
+    #options;
+    #DUMMY_USER = "USR_user01@stsmda.com.au";
+    //@@ needs to come from headers ??
+    #stsfhirapiroot = "/stsfhirv2/r5";
+    // Default value
+    #fhirSocketClient = void 0;
     constructor(options) {
-      __privateAdd(this, _options3);
-      __privateAdd(this, _DUMMY_USER, "USR_user01@stsmda.com.au");
-      //@@ needs to come from headers ??
-      __privateAdd(this, _stsfhirapiroot, "/stsfhirv2/r5");
-      // Default value
-      __privateAdd(this, _fhirSocketClient);
-      __privateAdd(this, _LogDebugMessage, (message) => {
-        __privateGet(this, _options3).logger.debug(message);
-      });
-      __privateAdd(this, _HandleError, (error) => {
-        __privateGet(this, _LogDebugMessage).call(this, chalk.red(`HandleError(): Error: [${error}]`));
-        let responseCode = 500;
-        if (axios.isAxiosError(error)) {
-          const axiosError = error;
-          if (axiosError.response) {
-            responseCode = axiosError.response.status;
-            __privateGet(this, _LogDebugMessage).call(this, chalk.red(`AXIOS Error Response.Status = [${axiosError.response.status}]`));
-          } else {
-            __privateGet(this, _LogDebugMessage).call(this, chalk.red(`AXIOS Error = [${axiosError}]`));
-          }
+      this.#options = options;
+      if (this.#options.stsfhirapiroot !== void 0) {
+        this.#stsfhirapiroot = this.#options.stsfhirapiroot;
+      }
+      if (this.#options.useSocketClient === true && this.#options.socketClientOptions) {
+        this.#fhirSocketClient = new FhirSocketClient(this.#options.socketClientOptions);
+      }
+    }
+    get options() {
+      return this.#options;
+    }
+    #LogDebugMessage = (message) => {
+      this.#options.logger.debug(message);
+    };
+    #HandleError = (error) => {
+      this.#LogDebugMessage(chalk.red(`HandleError(): Error: [${error}]`));
+      let responseCode = 500;
+      if (axios.isAxiosError(error)) {
+        const axiosError = error;
+        if (axiosError.response) {
+          responseCode = axiosError.response.status;
+          this.#LogDebugMessage(chalk.red(`AXIOS Error Response.Status = [${axiosError.response.status}]`));
+        } else {
+          this.#LogDebugMessage(chalk.red(`AXIOS Error = [${axiosError}]`));
         }
-        return responseCode;
-      });
-      __privateAdd(this, _BuildQueryString, (baseUrl, queryParams) => {
-        const url2 = new URL(baseUrl);
-        const searchParams = new URLSearchParams(queryParams);
-        url2.search = searchParams.toString();
-        return url2.toString();
-      });
-      __privateAdd(this, _InvokeResourceAPI, async (url2, httpVerb, domainResource, filters) => {
-        const accessToken = await __privateGet(this, _options3).GetAccessToken();
-        const requestConfig = new stsutils.STSAxiosConfig(url2, httpVerb).withAuthHeaders(accessToken, __privateGet(this, _DUMMY_USER)).withData(filters ? filters : domainResource ? domainResource : void 0);
-        if (isNode$1 && __privateGet(this, _options3).agentManager) {
-          requestConfig.withAgentManager(__privateGet(this, _options3).agentManager);
+      }
+      return responseCode;
+    };
+    #BuildQueryString = (baseUrl, queryParams) => {
+      const url2 = new URL(baseUrl);
+      const searchParams = new URLSearchParams(queryParams);
+      url2.search = searchParams.toString();
+      return url2.toString();
+    };
+    #InvokeResourceAPI = async (url2, httpVerb, domainResource, filters) => {
+      const accessToken = await this.#options.GetAccessToken();
+      const requestConfig = new stsutils.STSAxiosConfig(url2, httpVerb).withAuthHeaders(accessToken, this.#DUMMY_USER).withData(filters ? filters : domainResource ? domainResource : void 0);
+      if (isNode$1 && this.#options.agentManager) {
+        requestConfig.withAgentManager(this.#options.agentManager);
+      }
+      const api = createRetryAxiosClient({
+        maxRetries: 4,
+        retryDelayMs: 300,
+        retryJitterMs: 150,
+        maxRetryDurationMs: 5e3,
+        onRetryAttempt: (attempt, error, delayMs) => {
+          console.warn(`Retry #${attempt} after ${delayMs}ms due to ${error.code || error.response?.status}`);
         }
-        const api = createRetryAxiosClient({
-          maxRetries: 4,
-          retryDelayMs: 300,
-          retryJitterMs: 150,
-          maxRetryDurationMs: 5e3,
-          onRetryAttempt: (attempt, error, delayMs) => {
-            var _a;
-            console.warn(`Retry #${attempt} after ${delayMs}ms due to ${error.code || ((_a = error.response) == null ? void 0 : _a.status)}`);
-          }
-          // Below works also ...
-          //stsAxiosConfig: requestConfig
-        });
-        return await api(url2, requestConfig.config);
+        // Below works also ...
+        //stsAxiosConfig: requestConfig
       });
-      __publicField(this, "GetResource", async (resource, id, filters) => {
-        if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-          try {
-            const retVal = await __privateGet(this, _fhirSocketClient).GetResource(resource, id);
-            if (retVal.status === StatusCodes.OK) {
-              return retVal.value;
-            } else {
-              const errorResponse = new Error(`GetResource(): Invalid response status code: [${retVal.status}] expected: [${StatusCodes.OK}]`);
-              errorResponse.response = {
-                status: retVal.status
-              };
-              throw errorResponse;
-            }
-          } catch (error) {
-            const errorResponse = new Error(`GetResource(): Error: [${error}]`);
-            errorResponse.response = {
-              status: StatusCodes.INTERNAL_SERVER_ERROR
-            };
-            throw errorResponse;
-          }
-        } else {
-          const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}/${id}`;
-          const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "get", null, filters);
-          if (response) {
-            return response.data;
+      return await api(url2, requestConfig.config);
+    };
+    GetResource = async (resource, id, filters) => {
+      if (this.#options.useSocketClient === true && this.#fhirSocketClient) {
+        try {
+          const retVal = await this.#fhirSocketClient.GetResource(resource, id);
+          if (retVal.status === StatusCodes.OK) {
+            return retVal.value;
           } else {
-            return null;
-          }
-        }
-      });
-      __publicField(this, "GetResources", async (resource, filters, searchParams) => {
-        if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-          try {
-            return __privateGet(this, _fhirSocketClient).GetResources(resource, searchParams);
-          } catch (error) {
-            const errorResponse = new Error(`GetResources(): Error: [${error}]`);
+            const errorResponse = new Error(`GetResource(): Invalid response status code: [${retVal.status}] expected: [${StatusCodes.OK}]`);
             errorResponse.response = {
-              status: StatusCodes.INTERNAL_SERVER_ERROR
+              status: retVal.status
             };
             throw errorResponse;
           }
+        } catch (error) {
+          const errorResponse = new Error(`GetResource(): Error: [${error}]`);
+          errorResponse.response = {
+            status: StatusCodes.INTERNAL_SERVER_ERROR
+          };
+          throw errorResponse;
+        }
+      } else {
+        const url2 = `${this.#options.fhirEndpoint}${this.#stsfhirapiroot}/${resource}/${id}`;
+        const response = await this.#InvokeResourceAPI(url2, "get", null, filters);
+        if (response) {
+          return response.data;
         } else {
-          let url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-          if (searchParams) {
-            url2 = __privateGet(this, _BuildQueryString).call(this, url2, searchParams);
-          }
-          const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "get", null, filters);
-          if (response) {
-            return response.data;
-          } else {
-            return null;
-          }
+          return null;
         }
-      });
-      __publicField(this, "CreateResource", async (resource, domainResource) => {
-        if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-          try {
-            const retVal = await __privateGet(this, _fhirSocketClient).CreateResource(resource, domainResource);
-            if (retVal.status === StatusCodes.CREATED) {
-              return retVal.value;
-            } else {
-              const errorResponse = new Error(`CreateResource(): Invalid response status code: [${retVal.status}] expected: [${StatusCodes.CREATED}]`);
-              errorResponse.response = {
-                status: retVal.status
-              };
-              throw errorResponse;
-            }
-          } catch (error) {
-            const errorResponse = new Error(`CreateResource(): Error: [${error}]`);
-            errorResponse.response = {
-              status: StatusCodes.INTERNAL_SERVER_ERROR
-            };
-            throw errorResponse;
-          }
+      }
+    };
+    GetResources = async (resource, filters, searchParams) => {
+      if (this.#options.useSocketClient === true && this.#fhirSocketClient) {
+        try {
+          return this.#fhirSocketClient.GetResources(resource, searchParams);
+        } catch (error) {
+          const errorResponse = new Error(`GetResources(): Error: [${error}]`);
+          errorResponse.response = {
+            status: StatusCodes.INTERNAL_SERVER_ERROR
+          };
+          throw errorResponse;
+        }
+      } else {
+        let url2 = `${this.#options.fhirEndpoint}${this.#stsfhirapiroot}/${resource}`;
+        if (searchParams) {
+          url2 = this.#BuildQueryString(url2, searchParams);
+        }
+        const response = await this.#InvokeResourceAPI(url2, "get", null, filters);
+        if (response) {
+          return response.data;
         } else {
-          const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-          const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "post", domainResource, null);
-          if (response) {
-            if (response.status === StatusCodes.CREATED) {
-              return response.data;
-            } else {
-              throw new Error(`CreateResource(): Invalid response status code: [${response.status}] expected: [${StatusCodes.CREATED}]`);
-            }
-          } else {
-            return null;
-          }
+          return null;
         }
-      });
-      __publicField(this, "UpdateResource", async (resource, domainResource) => {
-        if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-          try {
-            return __privateGet(this, _fhirSocketClient).UpdateResource(resource, domainResource);
-          } catch (error) {
-            const errorResponse = new Error(`UpdateResource(): Error: [${error}]`);
+      }
+    };
+    CreateResource = async (resource, domainResource) => {
+      if (this.#options.useSocketClient === true && this.#fhirSocketClient) {
+        try {
+          const retVal = await this.#fhirSocketClient.CreateResource(resource, domainResource);
+          if (retVal.status === StatusCodes.CREATED) {
+            return retVal.value;
+          } else {
+            const errorResponse = new Error(`CreateResource(): Invalid response status code: [${retVal.status}] expected: [${StatusCodes.CREATED}]`);
             errorResponse.response = {
-              status: StatusCodes.INTERNAL_SERVER_ERROR
+              status: retVal.status
             };
             throw errorResponse;
           }
-        } else {
-          const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}/${domainResource.id}`;
-          const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "put", domainResource, null);
-          if (response) {
+        } catch (error) {
+          const errorResponse = new Error(`CreateResource(): Error: [${error}]`);
+          errorResponse.response = {
+            status: StatusCodes.INTERNAL_SERVER_ERROR
+          };
+          throw errorResponse;
+        }
+      } else {
+        const url2 = `${this.#options.fhirEndpoint}${this.#stsfhirapiroot}/${resource}`;
+        const response = await this.#InvokeResourceAPI(url2, "post", domainResource, null);
+        if (response) {
+          if (response.status === StatusCodes.CREATED) {
             return response.data;
           } else {
-            return null;
+            throw new Error(`CreateResource(): Invalid response status code: [${response.status}] expected: [${StatusCodes.CREATED}]`);
           }
+        } else {
+          return null;
         }
-      });
-      __publicField(this, "UpdateResources", async (resource, domainResources) => {
-        if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-          try {
-            return __privateGet(this, _fhirSocketClient).UpdateResources(resource, domainResources);
-          } catch (error) {
-            const errorResponse = new Error(`UpdateResources(): Error: [${error}]`);
-            errorResponse.response = {
-              status: StatusCodes.INTERNAL_SERVER_ERROR
-            };
-            throw errorResponse;
-          }
+      }
+    };
+    UpdateResource = async (resource, domainResource) => {
+      if (this.#options.useSocketClient === true && this.#fhirSocketClient) {
+        try {
+          return this.#fhirSocketClient.UpdateResource(resource, domainResource);
+        } catch (error) {
+          const errorResponse = new Error(`UpdateResource(): Error: [${error}]`);
+          errorResponse.response = {
+            status: StatusCodes.INTERNAL_SERVER_ERROR
+          };
+          throw errorResponse;
+        }
+      } else {
+        const url2 = `${this.#options.fhirEndpoint}${this.#stsfhirapiroot}/${resource}/${domainResource.id}`;
+        const response = await this.#InvokeResourceAPI(url2, "put", domainResource, null);
+        if (response) {
+          return response.data;
         } else {
-          const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-          const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "put", domainResources, null);
-          if (response) {
-            return response.data;
-          } else {
-            return null;
-          }
+          return null;
         }
-      });
-      __publicField(this, "PatchResource", async (resource, domainResource) => {
-        if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-          try {
-            return __privateGet(this, _fhirSocketClient).PatchResource(resource, domainResource);
-          } catch (error) {
-            const errorResponse = new Error(`PatchResource(): Error: [${error}]`);
-            errorResponse.response = {
-              status: StatusCodes.INTERNAL_SERVER_ERROR
-            };
-            throw errorResponse;
-          }
+      }
+    };
+    UpdateResources = async (resource, domainResources) => {
+      if (this.#options.useSocketClient === true && this.#fhirSocketClient) {
+        try {
+          return this.#fhirSocketClient.UpdateResources(resource, domainResources);
+        } catch (error) {
+          const errorResponse = new Error(`UpdateResources(): Error: [${error}]`);
+          errorResponse.response = {
+            status: StatusCodes.INTERNAL_SERVER_ERROR
+          };
+          throw errorResponse;
+        }
+      } else {
+        const url2 = `${this.#options.fhirEndpoint}${this.#stsfhirapiroot}/${resource}`;
+        const response = await this.#InvokeResourceAPI(url2, "put", domainResources, null);
+        if (response) {
+          return response.data;
         } else {
-          const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}/${domainResource.id}`;
-          const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "patch", domainResource, null);
-          if (response) {
-            return response.data;
-          } else {
-            return null;
-          }
+          return null;
         }
-      });
-      __publicField(this, "PatchResources", async (resource, domainResources) => {
-        if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-          try {
-            return __privateGet(this, _fhirSocketClient).PatchResources(resource, domainResources);
-          } catch (error) {
-            const errorResponse = new Error(`PatchResources(): Error: [${error}]`);
-            errorResponse.response = {
-              status: StatusCodes.INTERNAL_SERVER_ERROR
-            };
-            throw errorResponse;
-          }
+      }
+    };
+    PatchResource = async (resource, domainResource) => {
+      if (this.#options.useSocketClient === true && this.#fhirSocketClient) {
+        try {
+          return this.#fhirSocketClient.PatchResource(resource, domainResource);
+        } catch (error) {
+          const errorResponse = new Error(`PatchResource(): Error: [${error}]`);
+          errorResponse.response = {
+            status: StatusCodes.INTERNAL_SERVER_ERROR
+          };
+          throw errorResponse;
+        }
+      } else {
+        const url2 = `${this.#options.fhirEndpoint}${this.#stsfhirapiroot}/${resource}/${domainResource.id}`;
+        const response = await this.#InvokeResourceAPI(url2, "patch", domainResource, null);
+        if (response) {
+          return response.data;
         } else {
-          const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-          const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "patch", domainResources, null);
-          if (response) {
-            return response.data;
-          } else {
-            return null;
-          }
+          return null;
         }
-      });
-      __publicField(this, "DeleteResource", async (resource, id) => {
-        if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-          try {
-            return __privateGet(this, _fhirSocketClient).DeleteResource(resource, id);
-          } catch (error) {
-            const errorResponse = new Error(`DeleteResource(): Error: [${error}]`);
-            errorResponse.response = {
-              status: StatusCodes.INTERNAL_SERVER_ERROR
-            };
-            throw errorResponse;
-          }
+      }
+    };
+    PatchResources = async (resource, domainResources) => {
+      if (this.#options.useSocketClient === true && this.#fhirSocketClient) {
+        try {
+          return this.#fhirSocketClient.PatchResources(resource, domainResources);
+        } catch (error) {
+          const errorResponse = new Error(`PatchResources(): Error: [${error}]`);
+          errorResponse.response = {
+            status: StatusCodes.INTERNAL_SERVER_ERROR
+          };
+          throw errorResponse;
+        }
+      } else {
+        const url2 = `${this.#options.fhirEndpoint}${this.#stsfhirapiroot}/${resource}`;
+        const response = await this.#InvokeResourceAPI(url2, "patch", domainResources, null);
+        if (response) {
+          return response.data;
         } else {
-          const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}/${id}`;
-          const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "delete", null, null);
-          if (response) {
-            return response.data;
-          } else {
-            return null;
-          }
+          return null;
         }
-      });
-      __publicField(this, "DeleteResources", async (resource, domainResources) => {
-        if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-          try {
-            return __privateGet(this, _fhirSocketClient).DeleteResources(resource, domainResources);
-          } catch (error) {
-            const errorResponse = new Error(`DeleteResources(): Error: [${error}]`);
-            errorResponse.response = {
-              status: StatusCodes.INTERNAL_SERVER_ERROR
-            };
-            throw errorResponse;
-          }
+      }
+    };
+    DeleteResource = async (resource, id) => {
+      if (this.#options.useSocketClient === true && this.#fhirSocketClient) {
+        try {
+          return this.#fhirSocketClient.DeleteResource(resource, id);
+        } catch (error) {
+          const errorResponse = new Error(`DeleteResource(): Error: [${error}]`);
+          errorResponse.response = {
+            status: StatusCodes.INTERNAL_SERVER_ERROR
+          };
+          throw errorResponse;
+        }
+      } else {
+        const url2 = `${this.#options.fhirEndpoint}${this.#stsfhirapiroot}/${resource}/${id}`;
+        const response = await this.#InvokeResourceAPI(url2, "delete", null, null);
+        if (response) {
+          return response.data;
         } else {
-          const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-          const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "delete", domainResources, null);
-          if (response) {
-            return response.data;
-          } else {
-            return null;
-          }
+          return null;
         }
-      });
-      __publicField(this, "GetLatency", async () => {
-        const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/latency`;
+      }
+    };
+    DeleteResources = async (resource, domainResources) => {
+      if (this.#options.useSocketClient === true && this.#fhirSocketClient) {
         try {
-          const requestConfig = new stsutils.STSAxiosConfig(url2, "get").withDefaultHeaders();
-          if (isNode$1 && __privateGet(this, _options3).agentManager) {
-            requestConfig.withAgentManager(__privateGet(this, _options3).agentManager);
-          }
-          const api = createRetryAxiosClient({
-            maxRetries: 4,
-            retryDelayMs: 300,
-            retryJitterMs: 150,
-            maxRetryDurationMs: 5e3,
-            onRetryAttempt: (attempt, error, delayMs) => {
-              var _a;
-              console.warn(`Retry #${attempt} after ${delayMs}ms due to ${error.code || ((_a = error.response) == null ? void 0 : _a.status)}`);
-            }
-          });
-          return await api(url2, requestConfig.config);
+          return this.#fhirSocketClient.DeleteResources(resource, domainResources);
         } catch (error) {
-          __privateGet(this, _HandleError).call(this, error);
+          const errorResponse = new Error(`DeleteResources(): Error: [${error}]`);
+          errorResponse.response = {
+            status: StatusCodes.INTERNAL_SERVER_ERROR
+          };
+          throw errorResponse;
         }
-      });
-      __publicField(this, "Terminate", () => {
-        if (__privateGet(this, _fhirSocketClient)) {
-          __privateGet(this, _fhirSocketClient).socket.disconnect();
+      } else {
+        const url2 = `${this.#options.fhirEndpoint}${this.#stsfhirapiroot}/${resource}`;
+        const response = await this.#InvokeResourceAPI(url2, "delete", domainResources, null);
+        if (response) {
+          return response.data;
+        } else {
+          return null;
         }
-      });
-      __privateSet(this, _options3, options);
-      if (__privateGet(this, _options3).stsfhirapiroot !== void 0) {
-        __privateSet(this, _stsfhirapiroot, __privateGet(this, _options3).stsfhirapiroot);
       }
-      if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _options3).socketClientOptions) {
-        __privateSet(this, _fhirSocketClient, new FhirSocketClient(__privateGet(this, _options3).socketClientOptions));
+    };
+    GetLatency = async () => {
+      const url2 = `${this.#options.fhirEndpoint}${this.#stsfhirapiroot}/latency`;
+      try {
+        const requestConfig = new stsutils.STSAxiosConfig(url2, "get").withDefaultHeaders();
+        if (isNode$1 && this.#options.agentManager) {
+          requestConfig.withAgentManager(this.#options.agentManager);
+        }
+        const api = createRetryAxiosClient({
+          maxRetries: 4,
+          retryDelayMs: 300,
+          retryJitterMs: 150,
+          maxRetryDurationMs: 5e3,
+          onRetryAttempt: (attempt, error, delayMs) => {
+            console.warn(`Retry #${attempt} after ${delayMs}ms due to ${error.code || error.response?.status}`);
+          }
+        });
+        return await api(url2, requestConfig.config);
+      } catch (error) {
+        this.#HandleError(error);
       }
-    }
-    get options() {
-      return __privateGet(this, _options3);
-    }
+    };
+    Terminate = () => {
+      if (this.#fhirSocketClient) {
+        this.#fhirSocketClient.socket.disconnect();
+      }
+    };
   }
-  _options3 = new WeakMap();
-  _DUMMY_USER = new WeakMap();
-  _stsfhirapiroot = new WeakMap();
-  _fhirSocketClient = new WeakMap();
-  _LogDebugMessage = new WeakMap();
-  _HandleError = new WeakMap();
-  _BuildQueryString = new WeakMap();
-  _InvokeResourceAPI = new WeakMap();
   exports2.FhirClient = FhirClient;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 }));