@nsshunt/stsfhirclient 1.0.67 → 1.0.69

package/dist/stsfhirclient.mjs

@@ -8,43 +8,9 @@ var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value2) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value2);
 var __privateSet = (obj, member, value2, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value2) : member.set(obj, value2), value2);
-var _socketUtils, _id, _options2, _clientName, _debug, _error, _info, _SetupWSSClient, _OnSocketConnected, _options3, _DUMMY_USER, _invokeMethods, _maxRetries, _sleepDuration, _NoRetryStatusCodes, _stsfhirapiroot, _fhirSocketClient, _LogDebugMessage, _LogErrorMessage, _HandleError, _InvokeResourceAPI, _TestMode, ___InvokeResourceAPI, _BuildQueryString;
+var _socketUtils, _id, _options2, _clientName, _debug, _error, _info, _SetupWSSClient, _OnSocketConnected, _options3, _DUMMY_USER, _invokeMethods, _maxRetries, _sleepDuration, _NoRetryStatusCodes, _stsfhirapiroot, _fhirSocketClient, _LogDebugMessage, _LogErrorMessage, _HandleError, _TestMode, _BuildQueryString, _InvokeResourceAPI;
 import axios from "axios";
 import { defaultLogger, Sleep, STSAxiosConfig } from "@nsshunt/stsutils";
-const byteToHex = [];
-for (let i = 0; i < 256; ++i) {
-  byteToHex.push((i + 256).toString(16).slice(1));
-}
-function unsafeStringify(arr, offset = 0) {
-  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
-}
-let getRandomValues;
-const rnds8 = new Uint8Array(16);
-function rng() {
-  if (!getRandomValues) {
-    if (typeof crypto === "undefined" || !crypto.getRandomValues) {
-      throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
-    }
-    getRandomValues = crypto.getRandomValues.bind(crypto);
-  }
-  return getRandomValues(rnds8);
-}
-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();
-  }
-  options = options || {};
-  const rnds = options.random ?? ((_a = options.rng) == null ? void 0 : _a.call(options)) ?? rng();
-  if (rnds.length < 16) {
-    throw new Error("Random bytes length must be >= 16");
-  }
-  rnds[6] = rnds[6] & 15 | 64;
-  rnds[8] = rnds[8] & 63 | 128;
-  return unsafeStringify(rnds);
-}
 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;
@@ -5019,6 +4985,40 @@ EstablishSocketConnect_fn = function(name, socketIoCustomPath, onConnectCallBack
     }
   });
 };
+const byteToHex = [];
+for (let i = 0; i < 256; ++i) {
+  byteToHex.push((i + 256).toString(16).slice(1));
+}
+function unsafeStringify(arr, offset = 0) {
+  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
+}
+let getRandomValues;
+const rnds8 = new Uint8Array(16);
+function rng() {
+  if (!getRandomValues) {
+    if (typeof crypto === "undefined" || !crypto.getRandomValues) {
+      throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
+    }
+    getRandomValues = crypto.getRandomValues.bind(crypto);
+  }
+  return getRandomValues(rnds8);
+}
+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();
+  }
+  options = options || {};
+  const rnds = options.random ?? ((_a = options.rng) == null ? void 0 : _a.call(options)) ?? rng();
+  if (rnds.length < 16) {
+    throw new Error("Random bytes length must be >= 16");
+  }
+  rnds[6] = rnds[6] & 15 | 64;
+  rnds[8] = rnds[8] & 63 | 128;
+  return unsafeStringify(rnds);
+}
 class FhirSocketClient {
   constructor(options) {
     __privateAdd(this, _socketUtils);
@@ -5345,6 +5345,75 @@ _error = new WeakMap();
 _info = new WeakMap();
 _SetupWSSClient = new WeakMap();
 _OnSocketConnected = new WeakMap();
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function getJitteredDelay(base, jitter) {
+  const random = Math.floor(Math.random() * jitter);
+  return base + random;
+}
+function createRetryAxiosClient(retryConfig) {
+  const {
+    maxRetries = 3,
+    retryDelayMs = 300,
+    retryJitterMs = 100,
+    retryMethods = ["get", "head", "put", "delete", "options"],
+    // post, patch
+    retryStatusCodes = [408, 429, 500, 502, 503, 504],
+    retryErrorCodes = [
+      "ECONNRESET",
+      "ETIMEDOUT",
+      "EAI_AGAIN",
+      "ECONNREFUSED",
+      "ENOTFOUND",
+      "EHOSTUNREACH",
+      "EPIPE"
+    ],
+    maxRetryDurationMs = 1e4,
+    onRetryAttempt,
+    stsAxiosConfig
+  } = retryConfig || {};
+  const instance = axios.create();
+  instance.interceptors.request.use((config) => {
+    const now = Date.now();
+    config.metadata = {
+      startTime: now,
+      __retryCount: 0
+    };
+    if (stsAxiosConfig) {
+      Object.assign(config, stsAxiosConfig.config);
+    }
+    return config;
+  });
+  instance.interceptors.response.use(
+    (response) => response,
+    async (error) => {
+      var _a;
+      const config = error.config;
+      if (!config || !config.method || !config.metadata) {
+        return Promise.reject(error);
+      }
+      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 code = error.code;
+      const isRetryable = retryMethods.includes(method) && (retryErrorCodes.includes(code || "") || retryStatusCodes.includes(status || 0));
+      if (config.metadata.__retryCount < maxRetries && isRetryable && elapsed < maxRetryDurationMs) {
+        config.metadata.__retryCount += 1;
+        const delayBase = retryDelayMs * Math.pow(2, config.metadata.__retryCount - 1);
+        const jitteredDelay = getJitteredDelay(delayBase, retryJitterMs);
+        if (onRetryAttempt) {
+          onRetryAttempt(config.metadata.__retryCount, error, jitteredDelay);
+        }
+        await sleep(jitteredDelay);
+        return instance(config);
+      }
+      return Promise.reject(error);
+    }
+  );
+  return instance;
+}
 class FhirClient {
   constructor(options) {
     __privateAdd(this, _options3);
@@ -5360,15 +5429,12 @@ class FhirClient {
     __privateAdd(this, _stsfhirapiroot, "/stsfhir/r5");
     // Default value
     __privateAdd(this, _fhirSocketClient);
-    // eslint-disable-next-line  @typescript-eslint/no-explicit-any
     __privateAdd(this, _LogDebugMessage, (message) => {
       __privateGet(this, _options3).logger.debug(message);
     });
-    // eslint-disable-next-line  @typescript-eslint/no-explicit-any
     __privateAdd(this, _LogErrorMessage, (message) => {
       __privateGet(this, _options3).logger.error(message);
     });
-    // eslint-disable-next-line  @typescript-eslint/no-explicit-any
     __privateAdd(this, _HandleError, (error) => {
       __privateGet(this, _LogDebugMessage).call(this, chalk.red(`HandleError(): Error: [${error}]`));
       let responseCode = 500;
@@ -5383,73 +5449,6 @@ class FhirClient {
       }
       return responseCode;
     });
-    __privateAdd(this, _InvokeResourceAPI, async (url2, httpVerb, domainResource, filters, searchParams, errorCb) => {
-      const id = v4();
-      __privateGet(this, _invokeMethods)[id] = {
-        id,
-        retries: 0,
-        testFailIndexBefore: 1,
-        url: url2,
-        httpVerb,
-        domainResource,
-        filters,
-        searchParams,
-        errorCb
-      };
-      const InvokeAPI = async (id2) => {
-        const metadataRecord = __privateGet(this, _invokeMethods)[id2];
-        let performRetry = false;
-        const returnData = await __privateGet(this, ___InvokeResourceAPI).call(this, metadataRecord, (statusCode, error) => {
-          console.error(chalk.red(`#InvokeResourceAPI(): Error: [${error}], Attempt: [${metadataRecord.retries + 1}]`));
-          const noRetryIndex = __privateGet(this, _NoRetryStatusCodes).indexOf(statusCode);
-          if (noRetryIndex === -1) {
-            if (statusCode === StatusCodes.UNAUTHORIZED) {
-              console.error(chalk.red(`#InvokeResourceAPI(): Authentication error, resetting access_token (to null).`));
-              __privateGet(this, _options3).ResetAccessToken();
-              if (__privateGet(this, _options3).clientTelemetryEvents) {
-                __privateGet(this, _options3).clientTelemetryEvents.AuthenticationErrorInc();
-              }
-            }
-            if (isNode$1 && __privateGet(this, _options3).agentManager) {
-              console.error(chalk.red(`#InvokeResourceAPI(): Resetting https agent (to null).`));
-              __privateGet(this, _options3).agentManager.ResetAgent();
-            }
-            performRetry = true;
-          }
-        });
-        return {
-          response: returnData,
-          retry: performRetry
-        };
-      };
-      let retVal = null;
-      while (__privateGet(this, _invokeMethods)[id].retries < __privateGet(this, _maxRetries)) {
-        retVal = await InvokeAPI(id);
-        if (retVal.retry === false) {
-          delete __privateGet(this, _invokeMethods)[id];
-          break;
-        } else {
-          console.log(`Going to retry. Current attempts: [${__privateGet(this, _invokeMethods)[id].retries + 1}]`);
-          console.log(`Sleeping: [${__privateGet(this, _sleepDuration)[__privateGet(this, _invokeMethods)[id].retries]}]`);
-          await Sleep(__privateGet(this, _sleepDuration)[__privateGet(this, _invokeMethods)[id].retries]);
-          __privateGet(this, _invokeMethods)[id].retries++;
-          if (__privateGet(this, _options3).clientTelemetryEvents) {
-            __privateGet(this, _options3).clientTelemetryEvents.RetryInc();
-          }
-        }
-      }
-      if (retVal) {
-        if (retVal.retry === true) {
-          errorCb(new Error(`#InvokeResourceAPI(): Max retries exceeded. Max Retries: [${__privateGet(this, _invokeMethods)[id].retries}]`));
-          delete __privateGet(this, _invokeMethods)[id];
-          return null;
-        } else {
-          return retVal.response;
-        }
-      } else {
-        return null;
-      }
-    });
     __privateAdd(this, _TestMode, (metaData, errorCb) => {
       const { id, url: url2, httpVerb, filters, retries } = metaData;
       if (retries < 1) {
@@ -5462,37 +5461,54 @@ class FhirClient {
       }
       return false;
     });
-    __privateAdd(this, ___InvokeResourceAPI, async (metaData, errorCb) => {
-      try {
-        const { url: url2, httpVerb, domainResource, filters } = metaData;
-        if (__privateGet(this, _options3).testingMode) {
-          if (__privateGet(this, _TestMode).call(this, metaData, errorCb)) {
-            return null;
-          }
-        }
-        const accessToken = await __privateGet(this, _options3).GetAccessToken();
-        const requestConfig = new 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 await axios(requestConfig.config);
-      } catch (error) {
-        const responseCode = __privateGet(this, _HandleError).call(this, error);
-        errorCb(responseCode, error);
-        return null;
+    __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 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);
       }
+      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)}`);
+        }
+        //stsAxiosConfig: requestConfig
+      });
+      return await api(url2, requestConfig.config);
     });
-    __publicField(this, "GetResource", async (resource, id, filters, errorCb) => {
+    __publicField(this, "GetResource", async (resource, id, filters) => {
       if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-        const retVal = await __privateGet(this, _fhirSocketClient).GetResource(resource, id);
-        if (retVal.status === StatusCodes.OK) {
-          return retVal.value;
-        } else {
-          return null;
+        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, null, errorCb);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "get", null, filters);
         if (response) {
           return response.data;
         } else {
@@ -5500,21 +5516,23 @@ class FhirClient {
         }
       }
     });
-    __privateAdd(this, _BuildQueryString, (baseUrl, queryParams) => {
-      const url2 = new URL(baseUrl);
-      const searchParams = new URLSearchParams(queryParams);
-      url2.search = searchParams.toString();
-      return url2.toString();
-    });
-    __publicField(this, "GetResources", async (resource, filters, searchParams, errorCb) => {
+    __publicField(this, "GetResources", async (resource, filters, searchParams) => {
       if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-        return __privateGet(this, _fhirSocketClient).GetResources(resource, searchParams);
+        try {
+          return __privateGet(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 = `${__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, searchParams, errorCb);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "get", null, filters);
         if (response) {
           return response.data;
         } else {
@@ -5522,36 +5540,54 @@ class FhirClient {
         }
       }
     });
-    __publicField(this, "CreateResource", async (resource, domainResource, errorCb) => {
+    __publicField(this, "CreateResource", async (resource, domainResource) => {
       if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-        const retVal = await __privateGet(this, _fhirSocketClient).CreateResource(resource, domainResource);
-        if (retVal.status === StatusCodes.CREATED) {
-          return retVal.value;
-        } else {
-          errorCb(new Error(`CreateResource(): Invalid response status code: [${retVal.status}] expected: [${StatusCodes.CREATED}]`));
-          return null;
+        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;
         }
       } else {
         const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "post", domainResource, null, null, errorCb);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "post", domainResource, null);
         if (response) {
           if (response.status === StatusCodes.CREATED) {
             return response.data;
           } else {
-            errorCb(new Error(`CreateResource(): Invalid response status code: [${response.status}] expected: [${StatusCodes.CREATED}]`));
-            return null;
+            throw new Error(`CreateResource(): Invalid response status code: [${response.status}] expected: [${StatusCodes.CREATED}]`);
           }
         } else {
           return null;
         }
       }
     });
-    __publicField(this, "UpdateResource", async (resource, domainResource, errorCb) => {
+    __publicField(this, "UpdateResource", async (resource, domainResource) => {
       if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-        return __privateGet(this, _fhirSocketClient).UpdateResource(resource, domainResource);
+        try {
+          return __privateGet(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 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}/${domainResource.id}`;
-        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "put", domainResource, null, null, errorCb);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "put", domainResource, null);
         if (response) {
           return response.data;
         } else {
@@ -5559,12 +5595,20 @@ class FhirClient {
         }
       }
     });
-    __publicField(this, "UpdateResources", async (resource, domainResources, errorCb) => {
+    __publicField(this, "UpdateResources", async (resource, domainResources) => {
       if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-        return __privateGet(this, _fhirSocketClient).UpdateResources(resource, domainResources);
+        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;
+        }
       } else {
         const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "put", domainResources, null, null, errorCb);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "put", domainResources, null);
         if (response) {
           return response.data;
         } else {
@@ -5572,12 +5616,20 @@ class FhirClient {
         }
       }
     });
-    __publicField(this, "PatchResource", async (resource, domainResource, errorCb) => {
+    __publicField(this, "PatchResource", async (resource, domainResource) => {
       if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-        return __privateGet(this, _fhirSocketClient).PatchResource(resource, domainResource);
+        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;
+        }
       } 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, null, errorCb);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "patch", domainResource, null);
         if (response) {
           return response.data;
         } else {
@@ -5585,12 +5637,20 @@ class FhirClient {
         }
       }
     });
-    __publicField(this, "PatchResources", async (resource, domainResources, errorCb) => {
+    __publicField(this, "PatchResources", async (resource, domainResources) => {
       if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-        return __privateGet(this, _fhirSocketClient).PatchResources(resource, domainResources);
+        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;
+        }
       } else {
         const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "patch", domainResources, null, null, errorCb);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "patch", domainResources, null);
         if (response) {
           return response.data;
         } else {
@@ -5598,12 +5658,20 @@ class FhirClient {
         }
       }
     });
-    __publicField(this, "DeleteResource", async (resource, id, errorCb) => {
+    __publicField(this, "DeleteResource", async (resource, id) => {
       if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-        return __privateGet(this, _fhirSocketClient).DeleteResource(resource, id);
+        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;
+        }
       } else {
         const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}/${id}`;
-        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "delete", null, null, null, errorCb);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "delete", null, null);
         if (response) {
           return response.data;
         } else {
@@ -5611,12 +5679,20 @@ class FhirClient {
         }
       }
     });
-    __publicField(this, "DeleteResources", async (resource, domainResources, errorCb) => {
+    __publicField(this, "DeleteResources", async (resource, domainResources) => {
       if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
-        return __privateGet(this, _fhirSocketClient).DeleteResources(resource, domainResources);
+        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;
+        }
       } else {
         const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "delete", domainResources, null, null, errorCb);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "delete", domainResources, null);
         if (response) {
           return response.data;
         } else {
@@ -5631,7 +5707,17 @@ class FhirClient {
         if (isNode$1 && __privateGet(this, _options3).agentManager) {
           requestConfig.withAgentManager(__privateGet(this, _options3).agentManager);
         }
-        return await axios(requestConfig.config);
+        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);
       } catch (error) {
         __privateGet(this, _HandleError).call(this, error);
       }
@@ -5664,10 +5750,9 @@ _fhirSocketClient = new WeakMap();
 _LogDebugMessage = new WeakMap();
 _LogErrorMessage = new WeakMap();
 _HandleError = new WeakMap();
-_InvokeResourceAPI = new WeakMap();
 _TestMode = new WeakMap();
-___InvokeResourceAPI = new WeakMap();
 _BuildQueryString = new WeakMap();
+_InvokeResourceAPI = new WeakMap();
 export {
   FhirClient
 };