@nsshunt/stsfhirclient 1.0.68 → 1.0.70

package/dist/stsfhirclient.umd.js

@@ -12,7 +12,7 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 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, _invokeMethods, _maxRetries, _sleepDuration, _NoRetryStatusCodes, _stsfhirapiroot, _fhirSocketClient, _LogDebugMessage, _LogErrorMessage, _HandleError, _TestMode, _InvokeResourceAPI, _BuildQueryString;
+  var _socketUtils, _id, _options2, _clientName, _debug, _error, _info, _SetupWSSClient, _OnSocketConnected, _options3, _DUMMY_USER, _stsfhirapiroot, _fhirSocketClient, _LogDebugMessage, _HandleError, _BuildQueryString, _InvokeResourceAPI;
   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;
@@ -5421,22 +5421,12 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
       __privateAdd(this, _options3);
       __privateAdd(this, _DUMMY_USER, "USR_user01@stsmda.com.au");
       //@@ needs to come from headers ??
-      __privateAdd(this, _invokeMethods, {});
-      __privateAdd(this, _maxRetries, 5);
-      __privateAdd(this, _sleepDuration, [50, 100, 200, 500, 1e3, 2e3, 5e3]);
-      __privateAdd(this, _NoRetryStatusCodes, [
-        StatusCodes.NOT_FOUND,
-        StatusCodes.CONFLICT
-      ]);
       __privateAdd(this, _stsfhirapiroot, "/stsfhir/r5");
       // Default value
       __privateAdd(this, _fhirSocketClient);
       __privateAdd(this, _LogDebugMessage, (message) => {
         __privateGet(this, _options3).logger.debug(message);
       });
-      __privateAdd(this, _LogErrorMessage, (message) => {
-        __privateGet(this, _options3).logger.error(message);
-      });
       __privateAdd(this, _HandleError, (error) => {
         __privateGet(this, _LogDebugMessage).call(this, chalk.red(`HandleError(): Error: [${error}]`));
         let responseCode = 500;
@@ -5451,17 +5441,11 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
         }
         return responseCode;
       });
-      __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 (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, _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();
@@ -5478,19 +5462,28 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
             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);
       });
       __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 {
-            const errorResponse = new Error(`CreateResource(): Invalid response status code: [${retVal.status}] expected: [${StatusCodes.OK}]`);
+          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: retVal.status
+              status: StatusCodes.INTERNAL_SERVER_ERROR
             };
             throw errorResponse;
           }
@@ -5504,15 +5497,17 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           }
         }
       });
-      __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) => {
         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) {
@@ -5528,13 +5523,21 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
       });
       __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 {
-            const errorResponse = new Error(`CreateResource(): Invalid response status code: [${retVal.status}] expected: [${StatusCodes.CREATED}]`);
+          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: retVal.status
+              status: StatusCodes.INTERNAL_SERVER_ERROR
             };
             throw errorResponse;
           }
@@ -5554,7 +5557,15 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
       });
       __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);
@@ -5567,7 +5578,15 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
       });
       __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);
@@ -5580,7 +5599,15 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
       });
       __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);
@@ -5593,7 +5620,15 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
       });
       __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);
@@ -5606,7 +5641,15 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
       });
       __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);
@@ -5619,7 +5662,15 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
       });
       __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);
@@ -5637,7 +5688,17 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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);
         }
@@ -5661,18 +5722,12 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
   }
   _options3 = new WeakMap();
   _DUMMY_USER = new WeakMap();
-  _invokeMethods = new WeakMap();
-  _maxRetries = new WeakMap();
-  _sleepDuration = new WeakMap();
-  _NoRetryStatusCodes = new WeakMap();
   _stsfhirapiroot = new WeakMap();
   _fhirSocketClient = new WeakMap();
   _LogDebugMessage = new WeakMap();
-  _LogErrorMessage = new WeakMap();
   _HandleError = new WeakMap();
-  _TestMode = new WeakMap();
-  _InvokeResourceAPI = new WeakMap();
   _BuildQueryString = new WeakMap();
+  _InvokeResourceAPI = new WeakMap();
   exports2.FhirClient = FhirClient;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });