@nsshunt/stsfhirclient 1.0.64 → 1.0.66

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, _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;
   const byteToHex = [];
   for (let i = 0; i < 256; ++i) {
     byteToHex.push((i + 256).toString(16).slice(1));
@@ -5382,10 +5382,33 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           } 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 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 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,
@@ -5395,33 +5418,45 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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;
@@ -5442,49 +5477,41 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
         }
         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 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);
+          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) {
@@ -5494,7 +5521,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           }
         } 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 {
@@ -5508,7 +5535,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
         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 {
@@ -5516,7 +5543,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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 {
@@ -5524,23 +5551,21 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           }
         }
       });
-      __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 {
@@ -5548,12 +5573,12 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           }
         }
       });
-      __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 {
@@ -5561,12 +5586,12 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           }
         }
       });
-      __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 {
@@ -5574,12 +5599,12 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           }
         }
       });
-      __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 {
@@ -5587,12 +5612,12 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           }
         }
       });
-      __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 {
@@ -5600,12 +5625,12 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           }
         }
       });
-      __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 {
@@ -5613,12 +5638,12 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           }
         }
       });
-      __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 {
@@ -5666,9 +5691,9 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
   _LogDebugMessage = new WeakMap();
   _LogErrorMessage = new WeakMap();
   _HandleError = new WeakMap();
+  ___InvokeResourceAPI = new WeakMap();
   _InvokeResourceAPI = new WeakMap();
   _TestMode = new WeakMap();
-  ___InvokeResourceAPI = new WeakMap();
   _BuildQueryString = new WeakMap();
   exports2.FhirClient = FhirClient;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });