@nsshunt/stsfhirclient 1.0.65 → 1.0.66

package/dist/stsfhirclient.mjs

@@ -8,7 +8,7 @@ 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, ___InvokeResourceAPI, _InvokeResourceAPI, _TestMode, _BuildQueryString;
 import axios from "axios";
 import { defaultLogger, Sleep, STSAxiosConfig } from "@nsshunt/stsutils";
 const byteToHex = [];
@@ -5380,10 +5380,33 @@ 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;
       }
-      return responseCode;
     });
-    __privateAdd(this, _InvokeResourceAPI, async (url2, httpVerb, domainResource, filters, searchParams, errorCb) => {
+    __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
+        };
+      }
+    });
+    __privateAdd(this, _InvokeResourceAPI, async (url2, httpVerb, domainResource, filters, searchParams) => {
       const id = v4();
       __privateGet(this, _invokeMethods)[id] = {
         id,
@@ -5393,33 +5416,45 @@ class FhirClient {
         httpVerb,
         domainResource,
         filters,
-        searchParams,
-        errorCb
+        searchParams
       };
       const InvokeAPI = async (id2) => {
         const metadataRecord = __privateGet(this, _invokeMethods)[id2];
         let performRetry = false;
-        const returnData = await __privateGet(this, ___InvokeResourceAPI).call(this, metadataRecord, (statusCode, error) => {
+        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}]`));
-          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 (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;
               }
             }
-            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
+          retry: performRetry,
+          responseCode,
+          originalError
         };
       };
       let retVal = null;
@@ -5440,49 +5475,41 @@ class FhirClient {
       }
       if (retVal) {
         if (retVal.retry === true) {
-          errorCb(new Error(`#InvokeResourceAPI(): Max retries exceeded. Max Retries: [${__privateGet(this, _invokeMethods)[id].retries}]`));
+          const retries = __privateGet(this, _invokeMethods)[id].retries;
           delete __privateGet(this, _invokeMethods)[id];
-          return null;
+          throw {
+            responseCode: retVal.responseCode,
+            error: new Error(`#InvokeResourceAPI(): Max retries exceeded. Max Retries: [${retries}], Original Error: [${retVal.originalError}]`)
+          };
         } else {
           return retVal.response;
         }
       } else {
-        return null;
-      }
-    });
-    __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;
+        throw {
+          responseCode: 500,
+          error: new Error(`#InvokeResourceAPI(): Null returned from API call.`)
+        };
       }
-      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;
-          }
+    __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}]`)
+          });
         }
-        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);
+        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}]`)
+          });
         }
-        return await axios(requestConfig.config);
-      } catch (error) {
-        const responseCode = __privateGet(this, _HandleError).call(this, error);
-        errorCb(responseCode, error);
-        return null;
-      }
+        resolve(false);
+      });
     });
-    __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) {
@@ -5492,7 +5519,7 @@ class FhirClient {
         }
       } 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, null);
         if (response) {
           return response.data;
         } else {
@@ -5506,7 +5533,7 @@ class FhirClient {
       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);
       } else {
@@ -5514,7 +5541,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, errorCb);
+        const response = await __privateGet(this, _InvokeResourceAPI).call(this, url2, "get", null, filters, searchParams);
         if (response) {
           return response.data;
         } else {
@@ -5522,23 +5549,21 @@ 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;
         }
       } 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, 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;
           }
         } else {
@@ -5546,12 +5571,12 @@ class FhirClient {
         }
       }
     });
-    __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);
       } 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, null);
         if (response) {
           return response.data;
         } else {
@@ -5559,12 +5584,12 @@ 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);
       } 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, null);
         if (response) {
           return response.data;
         } else {
@@ -5572,12 +5597,12 @@ 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);
       } 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, null);
         if (response) {
           return response.data;
         } else {
@@ -5585,12 +5610,12 @@ 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);
       } 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, null);
         if (response) {
           return response.data;
         } else {
@@ -5598,12 +5623,12 @@ 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);
       } 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, null);
         if (response) {
           return response.data;
         } else {
@@ -5611,12 +5636,12 @@ 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);
       } 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, null);
         if (response) {
           return response.data;
         } else {
@@ -5664,9 +5689,9 @@ _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