@nsshunt/stsfhirclient 1.0.66 → 1.0.68

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, _InvokeResourceAPI, _TestMode, _BuildQueryString;
+var _socketUtils, _id, _options2, _clientName, _debug, _error, _info, _SetupWSSClient, _OnSocketConnected, _options3, _DUMMY_USER, _invokeMethods, _maxRetries, _sleepDuration, _NoRetryStatusCodes, _stsfhirapiroot, _fhirSocketClient, _LogDebugMessage, _LogErrorMessage, _HandleError, _TestMode, _InvokeResourceAPI, _BuildQueryString;
 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;
@@ -5380,134 +5446,39 @@ class FhirClient {
         } else {
           __privateGet(this, _LogDebugMessage).call(this, chalk.red(`AXIOS Error = [${axiosError}]`));
         }
-        return responseCode;
-      } else if (error.responseCode) {
-        return error.responseCode;
-      } else {
-        return responseCode;
-      }
-    });
-    __privateAdd(this, ___InvokeResourceAPI, async (metaData) => {
-      try {
-        const { url: url2, httpVerb, domainResource, filters } = metaData;
-        if (__privateGet(this, _options3).testingMode) {
-          await __privateGet(this, _TestMode).call(this, metaData);
-        }
-        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) {
-        throw {
-          responseCode: __privateGet(this, _HandleError).call(this, error),
-          error
-        };
       }
+      return responseCode;
     });
-    __privateAdd(this, _InvokeResourceAPI, async (url2, httpVerb, domainResource, filters, searchParams) => {
-      const id = v4();
-      __privateGet(this, _invokeMethods)[id] = {
-        id,
-        retries: 0,
-        testFailIndexBefore: 1,
-        url: url2,
-        httpVerb,
-        domainResource,
-        filters,
-        searchParams
-      };
-      const InvokeAPI = async (id2) => {
-        const metadataRecord = __privateGet(this, _invokeMethods)[id2];
-        let performRetry = false;
-        let returnData = null;
-        let responseCode = null;
-        let originalError;
-        try {
-          returnData = await __privateGet(this, ___InvokeResourceAPI).call(this, metadataRecord);
-        } catch (error) {
-          console.error(chalk.red(`#InvokeResourceAPI(): Error: [${error}], Attempt: [${metadataRecord.retries + 1}]`));
-          if (error) {
-            originalError = error;
-            if (error.responseCode) {
-              responseCode = error.responseCode;
-              const noRetryIndex = __privateGet(this, _NoRetryStatusCodes).indexOf(error.responseCode);
-              if (noRetryIndex === -1) {
-                if (error.responseCode === 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,
-          responseCode,
-          originalError
-        };
-      };
-      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();
-          }
-        }
+    __privateAdd(this, _TestMode, (metaData, errorCb) => {
+      const { id, url: url2, httpVerb, filters, retries } = metaData;
+      if (retries < 1) {
+        errorCb(401, new Error(`Testing Error Only. Error Code: [401], Message ID: [${id}, url: [${url2}], httpVerb: [${httpVerb}], filters: [${filters}], Retries: [${retries}]`));
+        return true;
       }
-      if (retVal) {
-        if (retVal.retry === true) {
-          const retries = __privateGet(this, _invokeMethods)[id].retries;
-          delete __privateGet(this, _invokeMethods)[id];
-          throw {
-            responseCode: retVal.responseCode,
-            error: new Error(`#InvokeResourceAPI(): Max retries exceeded. Max Retries: [${retries}], Original Error: [${retVal.originalError}]`)
-          };
-        } else {
-          return retVal.response;
-        }
-      } else {
-        throw {
-          responseCode: 500,
-          error: new Error(`#InvokeResourceAPI(): Null returned from API call.`)
-        };
+      if (retries < 2) {
+        errorCb(500, new Error(`Testing Error Only. Error Code: [500], Message ID: [${id}, url: [${url2}], httpVerb: [${httpVerb}], filters: [${filters}], Retries: [${retries}]`));
+        return true;
       }
+      return false;
     });
-    __privateAdd(this, _TestMode, async (metaData) => {
-      return new Promise((resolve, reject) => {
-        const { id, url: url2, httpVerb, filters, retries } = metaData;
-        if (retries < 1) {
-          reject({
-            responseCode: 401,
-            error: new Error(`Testing Error Only. Error Code: [401], Message ID: [${id}, url: [${url2}], httpVerb: [${httpVerb}], filters: [${filters}], Retries: [${retries}]`)
-          });
-        }
-        if (retries < 2) {
-          reject({
-            responseCode: 500,
-            error: new Error(`Testing Error Only. Error Code: [500], Message ID: [${id}, url: [${url2}], httpVerb: [${httpVerb}], filters: [${filters}], Retries: [${retries}]`)
-          });
+    __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)}`);
         }
-        resolve(false);
+        //stsAxiosConfig: requestConfig
       });
+      return await api(url2, requestConfig.config);
     });
     __publicField(this, "GetResource", async (resource, id, filters) => {
       if (__privateGet(this, _options3).useSocketClient === true && __privateGet(this, _fhirSocketClient)) {
@@ -5515,11 +5486,15 @@ class FhirClient {
         if (retVal.status === StatusCodes.OK) {
           return retVal.value;
         } else {
-          return null;
+          const errorResponse = new Error(`CreateResource(): Invalid response status code: [${retVal.status}] expected: [${StatusCodes.OK}]`);
+          errorResponse.response = {
+            status: retVal.status
+          };
+          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);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "get", null, filters);
         if (response) {
           return response.data;
         } else {
@@ -5541,7 +5516,7 @@ class FhirClient {
         if (searchParams) {
           url2 = __privateGet(this, _BuildQueryString).call(this, url2, searchParams);
         }
-        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "get", null, filters, searchParams);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "get", null, filters);
         if (response) {
           return response.data;
         } else {
@@ -5555,16 +5530,20 @@ class FhirClient {
         if (retVal.status === StatusCodes.CREATED) {
           return retVal.value;
         } else {
-          return null;
+          const errorResponse = new Error(`CreateResource(): Invalid response status code: [${retVal.status}] expected: [${StatusCodes.CREATED}]`);
+          errorResponse.response = {
+            status: retVal.status
+          };
+          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);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, 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;
@@ -5576,7 +5555,7 @@ class FhirClient {
         return __privateGet(this, _fhirSocketClient).UpdateResource(resource, domainResource);
       } 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);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "put", domainResource, null);
         if (response) {
           return response.data;
         } else {
@@ -5589,7 +5568,7 @@ class FhirClient {
         return __privateGet(this, _fhirSocketClient).UpdateResources(resource, domainResources);
       } else {
         const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "put", domainResources, null, null);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "put", domainResources, null);
         if (response) {
           return response.data;
         } else {
@@ -5602,7 +5581,7 @@ class FhirClient {
         return __privateGet(this, _fhirSocketClient).PatchResource(resource, domainResource);
       } 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);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "patch", domainResource, null);
         if (response) {
           return response.data;
         } else {
@@ -5615,7 +5594,7 @@ class FhirClient {
         return __privateGet(this, _fhirSocketClient).PatchResources(resource, domainResources);
       } else {
         const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "patch", domainResources, null, null);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "patch", domainResources, null);
         if (response) {
           return response.data;
         } else {
@@ -5628,7 +5607,7 @@ class FhirClient {
         return __privateGet(this, _fhirSocketClient).DeleteResource(resource, id);
       } 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);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "delete", null, null);
         if (response) {
           return response.data;
         } else {
@@ -5641,7 +5620,7 @@ class FhirClient {
         return __privateGet(this, _fhirSocketClient).DeleteResources(resource, domainResources);
       } else {
         const url2 = `${__privateGet(this, _options3).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/${resource}`;
-        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "delete", domainResources, null, null);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "delete", domainResources, null);
         if (response) {
           return response.data;
         } else {
@@ -5689,9 +5668,8 @@ _fhirSocketClient = new WeakMap();
 _LogDebugMessage = new WeakMap();
 _LogErrorMessage = new WeakMap();
 _HandleError = new WeakMap();
-___InvokeResourceAPI = new WeakMap();
-_InvokeResourceAPI = new WeakMap();
 _TestMode = new WeakMap();
+_InvokeResourceAPI = new WeakMap();
 _BuildQueryString = new WeakMap();
 export {
   FhirClient