@nsshunt/stsfhirclient 1.0.19 → 1.0.21

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, 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 _options2, _DUMMY_USER, _invokeMethods, _maxRetries, _sleepDuration, _NoRetryStatusCodes, _stsfhirapiroot, _agentManager, _LogDebugMessage, _LogErrorMessage, _HandleError, _InvokeResourceAPI, _TestMode, ___InvokeResourceAPI;
+var _options2, _DUMMY_USER, _invokeMethods, _maxRetries, _sleepDuration, _NoRetryStatusCodes, _stsfhirapiroot, _agentManager2, _LogDebugMessage, _LogErrorMessage, _HandleError, _InvokeResourceAPI, _TestMode, ___InvokeResourceAPI;
 import axios from "axios";
 import { Sleep } from "@nsshunt/stsutils";
 import https from "node:https";
@@ -1920,7 +1920,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     return __privateGet2(obj, member, getter);
   }
 });
-var _options, _httpAgent, _httpsAgent, _agentResetInterval, _requestCount, _SetupResetInterval, _GetAgentOptions;
+var _options, _httpAgent, _httpsAgent, _agentResetInterval, _requestCount, _SetupResetInterval, _GetAgentOptions, _url, _method, _headers, _data, _agentManager, _timeout, _withCredentials;
 var ansiStyles$1 = { exports: {} };
 var colorName;
 var hasRequiredColorName;
@@ -3561,10 +3561,12 @@ class AgentManager {
     __privateAdd2(this, _agentResetInterval, null);
     __privateAdd2(this, _requestCount, 0);
     __privateAdd2(this, _SetupResetInterval, () => {
-      __privateSet2(this, _agentResetInterval, setTimeout(() => {
-        this.ResetAgent();
-        __privateGet2(this, _SetupResetInterval).call(this);
-      }, __privateGet2(this, _options).agentResetInterval).unref());
+      if (__privateGet2(this, _options).agentResetInterval && __privateGet2(this, _options).agentResetInterval > 0) {
+        __privateSet2(this, _agentResetInterval, setTimeout(() => {
+          this.ResetAgent();
+          __privateGet2(this, _SetupResetInterval).call(this);
+        }, __privateGet2(this, _options).agentResetInterval).unref());
+      }
     });
     __privateAdd2(this, _GetAgentOptions, (https2) => {
       let options;
@@ -3600,6 +3602,22 @@ class AgentManager {
       __privateGet2(this, _SetupResetInterval).call(this);
     }
   }
+  get agentResetInterval() {
+    return __privateGet2(this, _options).agentResetInterval;
+  }
+  set agentResetInterval(val) {
+    if (__privateGet2(this, _agentResetInterval)) {
+      clearTimeout(__privateGet2(this, _agentResetInterval));
+    }
+    __privateGet2(this, _options).agentResetInterval = val;
+    __privateGet2(this, _SetupResetInterval).call(this);
+  }
+  get agentResetCount() {
+    return __privateGet2(this, _options).agentResetCount;
+  }
+  set agentResetCount(val) {
+    __privateGet2(this, _options).agentResetCount = val;
+  }
   IncRequestCount() {
     __privateWrapper(this, _requestCount)._++;
     if (__privateGet2(this, _options).agentResetCount) {
@@ -3672,6 +3690,103 @@ _agentResetInterval = /* @__PURE__ */ new WeakMap();
 _requestCount = /* @__PURE__ */ new WeakMap();
 _SetupResetInterval = /* @__PURE__ */ new WeakMap();
 _GetAgentOptions = /* @__PURE__ */ new WeakMap();
+class STSAxiosConfig {
+  /*
+  headers = {
+      'Content-Type': 'application/json', 
+      'Authorization': 'Bearer ' + accesss_token,
+      'x-sts_user_id': DUMMY_USER
+  }
+  */
+  constructor(url, method, headers, timeout) {
+    __privateAdd2(this, _url);
+    __privateAdd2(this, _method);
+    __privateAdd2(this, _headers);
+    __privateAdd2(this, _data);
+    __privateAdd2(this, _agentManager);
+    __privateAdd2(this, _timeout);
+    __privateAdd2(this, _withCredentials);
+    __privateSet2(this, _url, url);
+    __privateSet2(this, _method, method);
+    if (headers !== void 0) {
+      __privateSet2(this, _headers, headers);
+    }
+    if (timeout !== void 0) {
+      __privateSet2(this, _timeout, timeout);
+    }
+  }
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  withData(data) {
+    __privateSet2(this, _data, data);
+    return this;
+  }
+  // 'Content-Type': 'application/json'
+  withAuthHeaders(accesssToken, stsUserId) {
+    __privateSet2(this, _headers, {
+      "Content-Type": "application/json",
+      "Authorization": "Bearer " + accesssToken
+    });
+    if (stsUserId) {
+      __privateGet2(this, _headers)["x-sts_user_id"] = stsUserId;
+    }
+    return this;
+  }
+  withHeaders(headers) {
+    __privateSet2(this, _headers, headers);
+    return this;
+  }
+  withDefaultHeaders() {
+    __privateSet2(this, _headers, {
+      "Content-Type": "application/json"
+    });
+    return this;
+  }
+  withCredentials() {
+    __privateSet2(this, _withCredentials, true);
+    return this;
+  }
+  withTimeout(timeout) {
+    __privateSet2(this, _timeout, timeout);
+    return this;
+  }
+  withAgentManager(agentManager) {
+    __privateSet2(this, _agentManager, agentManager);
+    return this;
+  }
+  get config() {
+    const retVal = {
+      url: __privateGet2(this, _url),
+      method: __privateGet2(this, _method)
+    };
+    if (__privateGet2(this, _headers)) {
+      retVal.headers = __privateGet2(this, _headers);
+    }
+    if (__privateGet2(this, _agentManager) !== void 0) {
+      if (__privateGet2(this, _agentManager).IsHttps(__privateGet2(this, _url))) {
+        retVal.httpsAgent = __privateGet2(this, _agentManager).GetAgent(__privateGet2(this, _url));
+      } else {
+        retVal.httpAgent = __privateGet2(this, _agentManager).GetAgent(__privateGet2(this, _url));
+      }
+    }
+    if (__privateGet2(this, _data) !== void 0) {
+      retVal.data = __privateGet2(this, _data);
+    }
+    if (__privateGet2(this, _timeout) !== void 0) {
+      retVal.timeout = __privateGet2(this, _timeout);
+    }
+    if (__privateGet2(this, _withCredentials) !== void 0 && __privateGet2(this, _withCredentials) === true) {
+      retVal.withCredentials = true;
+    }
+    return retVal;
+  }
+}
+_url = /* @__PURE__ */ new WeakMap();
+_method = /* @__PURE__ */ new WeakMap();
+_headers = /* @__PURE__ */ new WeakMap();
+_data = /* @__PURE__ */ new WeakMap();
+_agentManager = /* @__PURE__ */ new WeakMap();
+_timeout = /* @__PURE__ */ new WeakMap();
+_withCredentials = /* @__PURE__ */ new WeakMap();
 class FhirClient {
   constructor(options) {
     __privateAdd(this, _options2);
@@ -3686,7 +3801,7 @@ class FhirClient {
     ]);
     __privateAdd(this, _stsfhirapiroot, "/stsfhir/r5");
     // Default value
-    __privateAdd(this, _agentManager, null);
+    __privateAdd(this, _agentManager2, null);
     // eslint-disable-next-line  @typescript-eslint/no-explicit-any
     __privateAdd(this, _LogDebugMessage, (message) => {
       __privateGet(this, _options2).logger.debug(message);
@@ -3749,9 +3864,9 @@ class FhirClient {
                 __privateGet(this, _options2).clientTelemetryEvents.AuthenticationErrorInc();
               }
             }
-            if (isNode && __privateGet(this, _agentManager)) {
+            if (isNode && __privateGet(this, _agentManager2)) {
               console.error(chalk$2.red(`#InvokeResourceAPI(): Resetting https agent (to null).`));
-              __privateGet(this, _agentManager).ResetAgent();
+              __privateGet(this, _agentManager2).ResetAgent();
             }
             performRetry = true;
           }
@@ -3810,30 +3925,11 @@ class FhirClient {
           }
         }
         const accessToken = await __privateGet(this, _options2).GetAccessToken();
-        const headers = {
-          "Content-Type": "application/json",
-          "Authorization": `Bearer ${accessToken}`,
-          "x-sts_user_id": __privateGet(this, _DUMMY_USER)
-        };
-        const requestConfig = {
-          url,
-          method: httpVerb,
-          headers
-        };
-        if (isNode && __privateGet(this, _agentManager)) {
-          if (__privateGet(this, _agentManager).IsHttps(url)) {
-            requestConfig.httpsAgent = __privateGet(this, _agentManager).GetAgent(url);
-          } else {
-            requestConfig.httpAgent = __privateGet(this, _agentManager).GetAgent(url);
-          }
+        const requestConfig = new STSAxiosConfig(url, httpVerb).withAuthHeaders(accessToken, __privateGet(this, _DUMMY_USER)).withData(filters ? filters : domainResource ? domainResource : void 0);
+        if (isNode && __privateGet(this, _agentManager2)) {
+          requestConfig.withAgentManager(__privateGet(this, _agentManager2));
         }
-        if (filters) {
-          requestConfig.data = filters;
-        } else if (domainResource) {
-          requestConfig.data = domainResource;
-        }
-        const retVal = await axios(requestConfig);
-        return retVal;
+        return await axios(requestConfig.config);
       } catch (error) {
         const responseCode = __privateGet(this, _HandleError).call(this, error);
         errorCb(responseCode, error);
@@ -3929,23 +4025,11 @@ class FhirClient {
     __publicField(this, "GetLatency", async () => {
       const url = `${__privateGet(this, _options2).fhirEndpoint}${__privateGet(this, _stsfhirapiroot)}/latency`;
       try {
-        const headers = {
-          "Content-Type": "application/json"
-        };
-        const requestConfig = {
-          url,
-          method: "get",
-          headers
-        };
-        if (isNode && __privateGet(this, _agentManager)) {
-          if (__privateGet(this, _agentManager).IsHttps(url)) {
-            requestConfig.httpsAgent = __privateGet(this, _agentManager).GetAgent(url);
-          } else {
-            requestConfig.httpAgent = __privateGet(this, _agentManager).GetAgent(url);
-          }
+        const requestConfig = new STSAxiosConfig(url, "get").withDefaultHeaders();
+        if (isNode && __privateGet(this, _agentManager2)) {
+          requestConfig.withAgentManager(__privateGet(this, _agentManager2));
         }
-        const retVal = await axios(requestConfig);
-        return retVal;
+        return await axios(requestConfig.config);
       } catch (error) {
         __privateGet(this, _HandleError).call(this, error);
       }
@@ -3956,11 +4040,11 @@ class FhirClient {
     }
     if (isNode) {
       if (__privateGet(this, _options2).agentOptions) {
-        __privateSet(this, _agentManager, new AgentManager({
+        __privateSet(this, _agentManager2, new AgentManager({
           agentOptions: __privateGet(this, _options2).agentOptions
         }));
       } else {
-        __privateSet(this, _agentManager, new AgentManager({}));
+        __privateSet(this, _agentManager2, new AgentManager({}));
       }
     }
   }
@@ -3975,7 +4059,7 @@ _maxRetries = new WeakMap();
 _sleepDuration = new WeakMap();
 _NoRetryStatusCodes = new WeakMap();
 _stsfhirapiroot = new WeakMap();
-_agentManager = new WeakMap();
+_agentManager2 = new WeakMap();
 _LogDebugMessage = new WeakMap();
 _LogErrorMessage = new WeakMap();
 _HandleError = new WeakMap();