@nsshunt/ststestrunner 1.0.63 → 1.0.64

package/dist/ststestrunner.mjs

@@ -17,7 +17,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     return __privateGet(obj, member, getter);
   }
 });
-var _runner, _workerInstance, _logMessageDataSet, _publishTelemetryTimeout, _publishTelemetryCount, _maxBufferSize, _publishTelemetryTimeoutVal, _color, _randomPastelColour, _TestCase01_instances, GetRandomHexColor_fn, _GetRandomPastelColor, _debug2, _GenLogMessage, _SetupTimeout, _PublishTelemetryData, _ForcePublishTelemetryData, _PublishTelemetry, _OutputLogMessage, _options4, _agentManager, _randomDataRecordset, _runner2, _workerInstance2, _fhirClient, _accesssToken, _clientId, _clientSecret, _publishTelemetryCount2, _maxBufferSize2, _publishTelemetryTimeout2, _publishTelemetryTimeoutVal2, _originRegex, _LogMessage, _PublishTelemetryData2, _ForcePublishTelemetryData2, _SetupTimeout2, _OutputLogMessage2, _debug3, _debug4, _error2, _GetPersonRecord, _runner3, _workerInstance3, _logMessageDataSet2, _publishTelemetryTimeout3, _publishTelemetryCount3, _maxBufferSize3, _publishTelemetryTimeoutVal3, _color2, _randomPastelColour2, _TestStartUp_instances, GetRandomHexColor_fn2, _GetRandomPastelColor2, _debug5, _GenLogMessage2, _SetupTimeout3, _PublishTelemetryData3, _ForcePublishTelemetryData3, _PublishTelemetry2, _OutputLogMessage3, _runner4, _workerInstance4, _logMessageDataSet3, _publishTelemetryTimeout4, _publishTelemetryCount4, _maxBufferSize4, _publishTelemetryTimeoutVal4, _color3, _randomPastelColour3, _TestShutDown_instances, GetRandomHexColor_fn3, _GetRandomPastelColor3, _debug6, _GenLogMessage3, _SetupTimeout4, _PublishTelemetryData4, _ForcePublishTelemetryData4, _PublishTelemetry3, _OutputLogMessage4, _options5, _id2, _clientName2, _wm, _socketUtils2, _debug7, _error3, _info2, _GetKeyPayloadData, _LogPayloadEventRetVal, _EmitStateChange, _SetupRunnerEventHandlers, _HandleAddRunner, _SetupWSSClient2, _OnSocketConnected2, _RegisterSocketEvents, _EmitEvent, _GetSocketEventHandlers;
+var _runner, _workerInstance, _logMessageDataSet, _publishTelemetryTimeout, _publishTelemetryCount, _maxBufferSize, _publishTelemetryTimeoutVal, _color, _randomPastelColour, _TestCase01_instances, GetRandomHexColor_fn, _GetRandomPastelColor, _debug2, _GenLogMessage, _SetupTimeout, _PublishTelemetryData, _ForcePublishTelemetryData, _PublishTelemetry, _OutputLogMessage, _options4, _randomDataRecordset, _runner2, _workerInstance2, _fhirClient, _accesssToken, _clientId, _clientSecret, _publishTelemetryCount2, _maxBufferSize2, _publishTelemetryTimeout2, _publishTelemetryTimeoutVal2, _originRegex, _LogMessage, _PublishTelemetryData2, _ForcePublishTelemetryData2, _SetupTimeout2, _OutputLogMessage2, _ResetAgent, _CheckResetAgent, _debug3, _debug4, _error2, _GetPersonRecord, _runner3, _workerInstance3, _logMessageDataSet2, _publishTelemetryTimeout3, _publishTelemetryCount3, _maxBufferSize3, _publishTelemetryTimeoutVal3, _color2, _randomPastelColour2, _TestStartUp_instances, GetRandomHexColor_fn2, _GetRandomPastelColor2, _debug5, _GenLogMessage2, _SetupTimeout3, _PublishTelemetryData3, _ForcePublishTelemetryData3, _PublishTelemetry2, _OutputLogMessage3, _runner4, _workerInstance4, _logMessageDataSet3, _publishTelemetryTimeout4, _publishTelemetryCount4, _maxBufferSize4, _publishTelemetryTimeoutVal4, _color3, _randomPastelColour3, _TestShutDown_instances, GetRandomHexColor_fn3, _GetRandomPastelColor3, _debug6, _GenLogMessage3, _SetupTimeout4, _PublishTelemetryData4, _ForcePublishTelemetryData4, _PublishTelemetry3, _OutputLogMessage4, _options5, _id2, _clientName2, _wm, _socketUtils2, _debug7, _error3, _info2, _GetKeyPayloadData, _LogPayloadEventRetVal, _EmitStateChange, _SetupRunnerEventHandlers, _HandleAddRunner, _SetupWSSClient2, _OnSocketConnected2, _RegisterSocketEvents, _EmitEvent, _GetSocketEventHandlers;
 import { defaultLogger, Sleep, STSAxiosConfig, AgentManager } from "@nsshunt/stsutils";
 import "@nsshunt/stsobservability";
 import http from "node:http";
@@ -6929,41 +6929,7 @@ var __accessCheck$1 = (obj, member, msg) => member.has(obj) || __typeError$1("Ca
 var __privateGet$1 = (obj, member, getter) => (__accessCheck$1(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd$1 = (obj, member, value2) => member.has(obj) ? __typeError$1("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value2);
 var __privateSet$1 = (obj, member, value2, setter) => (__accessCheck$1(obj, member, "write to private field"), 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;
-const byteToHex$1 = [];
-for (let i = 0; i < 256; ++i) {
-  byteToHex$1.push((i + 256).toString(16).slice(1));
-}
-function unsafeStringify$1(arr, offset = 0) {
-  return (byteToHex$1[arr[offset + 0]] + byteToHex$1[arr[offset + 1]] + byteToHex$1[arr[offset + 2]] + byteToHex$1[arr[offset + 3]] + "-" + byteToHex$1[arr[offset + 4]] + byteToHex$1[arr[offset + 5]] + "-" + byteToHex$1[arr[offset + 6]] + byteToHex$1[arr[offset + 7]] + "-" + byteToHex$1[arr[offset + 8]] + byteToHex$1[arr[offset + 9]] + "-" + byteToHex$1[arr[offset + 10]] + byteToHex$1[arr[offset + 11]] + byteToHex$1[arr[offset + 12]] + byteToHex$1[arr[offset + 13]] + byteToHex$1[arr[offset + 14]] + byteToHex$1[arr[offset + 15]]).toLowerCase();
-}
-let getRandomValues$1;
-const rnds8$1 = new Uint8Array(16);
-function rng$1() {
-  if (!getRandomValues$1) {
-    if (typeof crypto === "undefined" || !crypto.getRandomValues) {
-      throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
-    }
-    getRandomValues$1 = crypto.getRandomValues.bind(crypto);
-  }
-  return getRandomValues$1(rnds8$1);
-}
-const randomUUID$1 = typeof crypto !== "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
-const native$1 = { randomUUID: randomUUID$1 };
-function v4$1(options, buf, offset) {
-  var _a2;
-  if (native$1.randomUUID && true && !options) {
-    return native$1.randomUUID();
-  }
-  options = options || {};
-  const rnds = options.random ?? ((_a2 = options.rng) == null ? void 0 : _a2.call(options)) ?? rng$1();
-  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$1(rnds);
-}
+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(x2) {
   return x2 && x2.__esModule && Object.prototype.hasOwnProperty.call(x2, "default") ? x2["default"] : x2;
@@ -11938,6 +11904,40 @@ EstablishSocketConnect_fn$1 = function(name, socketIoCustomPath, onConnectCallBa
     }
   });
 };
+const byteToHex$1 = [];
+for (let i = 0; i < 256; ++i) {
+  byteToHex$1.push((i + 256).toString(16).slice(1));
+}
+function unsafeStringify$1(arr, offset = 0) {
+  return (byteToHex$1[arr[offset + 0]] + byteToHex$1[arr[offset + 1]] + byteToHex$1[arr[offset + 2]] + byteToHex$1[arr[offset + 3]] + "-" + byteToHex$1[arr[offset + 4]] + byteToHex$1[arr[offset + 5]] + "-" + byteToHex$1[arr[offset + 6]] + byteToHex$1[arr[offset + 7]] + "-" + byteToHex$1[arr[offset + 8]] + byteToHex$1[arr[offset + 9]] + "-" + byteToHex$1[arr[offset + 10]] + byteToHex$1[arr[offset + 11]] + byteToHex$1[arr[offset + 12]] + byteToHex$1[arr[offset + 13]] + byteToHex$1[arr[offset + 14]] + byteToHex$1[arr[offset + 15]]).toLowerCase();
+}
+let getRandomValues$1;
+const rnds8$1 = new Uint8Array(16);
+function rng$1() {
+  if (!getRandomValues$1) {
+    if (typeof crypto === "undefined" || !crypto.getRandomValues) {
+      throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
+    }
+    getRandomValues$1 = crypto.getRandomValues.bind(crypto);
+  }
+  return getRandomValues$1(rnds8$1);
+}
+const randomUUID$1 = typeof crypto !== "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
+const native$1 = { randomUUID: randomUUID$1 };
+function v4$1(options, buf, offset) {
+  var _a2;
+  if (native$1.randomUUID && true && !options) {
+    return native$1.randomUUID();
+  }
+  options = options || {};
+  const rnds = options.random ?? ((_a2 = options.rng) == null ? void 0 : _a2.call(options)) ?? rng$1();
+  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$1(rnds);
+}
 class FhirSocketClient {
   constructor(options) {
     __privateAdd$1(this, _socketUtils);
@@ -12263,25 +12263,84 @@ _error = /* @__PURE__ */ new WeakMap();
 _info = /* @__PURE__ */ new WeakMap();
 _SetupWSSClient = /* @__PURE__ */ new WeakMap();
 _OnSocketConnected = /* @__PURE__ */ 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 _a2;
+      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 = (_a2 = error.response) == null ? void 0 : _a2.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$1(this, _options3);
     __privateAdd$1(this, _DUMMY_USER, "USR_user01@stsmda.com.au");
-    __privateAdd$1(this, _invokeMethods, {});
-    __privateAdd$1(this, _maxRetries, 5);
-    __privateAdd$1(this, _sleepDuration, [50, 100, 200, 500, 1e3, 2e3, 5e3]);
-    __privateAdd$1(this, _NoRetryStatusCodes, [
-      StatusCodes.NOT_FOUND,
-      StatusCodes.CONFLICT
-    ]);
     __privateAdd$1(this, _stsfhirapiroot, "/stsfhir/r5");
     __privateAdd$1(this, _fhirSocketClient);
     __privateAdd$1(this, _LogDebugMessage, (message) => {
       __privateGet$1(this, _options3).logger.debug(message);
     });
-    __privateAdd$1(this, _LogErrorMessage, (message) => {
-      __privateGet$1(this, _options3).logger.error(message);
-    });
     __privateAdd$1(this, _HandleError, (error) => {
       __privateGet$1(this, _LogDebugMessage).call(this, chalk.red(`HandleError(): Error: [${error}]`));
       let responseCode = 500;
@@ -12296,116 +12355,55 @@ class FhirClient {
       }
       return responseCode;
     });
-    __privateAdd$1(this, _InvokeResourceAPI, async (url2, httpVerb, domainResource, filters, searchParams, errorCb) => {
-      const id = v4$1();
-      __privateGet$1(this, _invokeMethods)[id] = {
-        id,
-        retries: 0,
-        testFailIndexBefore: 1,
-        url: url2,
-        httpVerb,
-        domainResource,
-        filters,
-        searchParams,
-        errorCb
-      };
-      const InvokeAPI = async (id2) => {
-        const metadataRecord = __privateGet$1(this, _invokeMethods)[id2];
-        let performRetry = false;
-        const returnData = await __privateGet$1(this, ___InvokeResourceAPI).call(this, metadataRecord, (statusCode, error) => {
-          console.error(chalk.red(`#InvokeResourceAPI(): Error: [${error}], Attempt: [${metadataRecord.retries + 1}]`));
-          const noRetryIndex = __privateGet$1(this, _NoRetryStatusCodes).indexOf(statusCode);
-          if (noRetryIndex === -1) {
-            if (statusCode === StatusCodes.UNAUTHORIZED) {
-              console.error(chalk.red(`#InvokeResourceAPI(): Authentication error, resetting access_token (to null).`));
-              __privateGet$1(this, _options3).ResetAccessToken();
-              if (__privateGet$1(this, _options3).clientTelemetryEvents) {
-                __privateGet$1(this, _options3).clientTelemetryEvents.AuthenticationErrorInc();
-              }
-            }
-            if (isNode$1 && __privateGet$1(this, _options3).agentManager) {
-              console.error(chalk.red(`#InvokeResourceAPI(): Resetting https agent (to null).`));
-              __privateGet$1(this, _options3).agentManager.ResetAgent();
-            }
-            performRetry = true;
-          }
-        });
-        return {
-          response: returnData,
-          retry: performRetry
-        };
-      };
-      let retVal = null;
-      while (__privateGet$1(this, _invokeMethods)[id].retries < __privateGet$1(this, _maxRetries)) {
-        retVal = await InvokeAPI(id);
-        if (retVal.retry === false) {
-          delete __privateGet$1(this, _invokeMethods)[id];
-          break;
-        } else {
-          console.log(`Going to retry. Current attempts: [${__privateGet$1(this, _invokeMethods)[id].retries + 1}]`);
-          console.log(`Sleeping: [${__privateGet$1(this, _sleepDuration)[__privateGet$1(this, _invokeMethods)[id].retries]}]`);
-          await Sleep(__privateGet$1(this, _sleepDuration)[__privateGet$1(this, _invokeMethods)[id].retries]);
-          __privateGet$1(this, _invokeMethods)[id].retries++;
-          if (__privateGet$1(this, _options3).clientTelemetryEvents) {
-            __privateGet$1(this, _options3).clientTelemetryEvents.RetryInc();
-          }
-        }
-      }
-      if (retVal) {
-        if (retVal.retry === true) {
-          errorCb(new Error(`#InvokeResourceAPI(): Max retries exceeded. Max Retries: [${__privateGet$1(this, _invokeMethods)[id].retries}]`));
-          delete __privateGet$1(this, _invokeMethods)[id];
-          return null;
-        } else {
-          return retVal.response;
-        }
-      } else {
-        return null;
-      }
-    });
-    __privateAdd$1(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$1(this, _BuildQueryString, (baseUrl, queryParams) => {
+      const url2 = new URL(baseUrl);
+      const searchParams = new URLSearchParams(queryParams);
+      url2.search = searchParams.toString();
+      return url2.toString();
     });
-    __privateAdd$1(this, ___InvokeResourceAPI, async (metaData, errorCb) => {
-      try {
-        const { url: url2, httpVerb, domainResource, filters } = metaData;
-        if (__privateGet$1(this, _options3).testingMode) {
-          if (__privateGet$1(this, _TestMode).call(this, metaData, errorCb)) {
-            return null;
-          }
-        }
-        const accessToken = await __privateGet$1(this, _options3).GetAccessToken();
-        const requestConfig = new STSAxiosConfig(url2, httpVerb).withAuthHeaders(accessToken, __privateGet$1(this, _DUMMY_USER)).withData(filters ? filters : domainResource ? domainResource : void 0);
-        if (isNode$1 && __privateGet$1(this, _options3).agentManager) {
-          requestConfig.withAgentManager(__privateGet$1(this, _options3).agentManager);
+    __privateAdd$1(this, _InvokeResourceAPI, async (url2, httpVerb, domainResource, filters) => {
+      const accessToken = await __privateGet$1(this, _options3).GetAccessToken();
+      const requestConfig = new STSAxiosConfig(url2, httpVerb).withAuthHeaders(accessToken, __privateGet$1(this, _DUMMY_USER)).withData(filters ? filters : domainResource ? domainResource : void 0);
+      if (isNode$1 && __privateGet$1(this, _options3).agentManager) {
+        requestConfig.withAgentManager(__privateGet$1(this, _options3).agentManager);
+      }
+      const api = createRetryAxiosClient({
+        maxRetries: 4,
+        retryDelayMs: 300,
+        retryJitterMs: 150,
+        maxRetryDurationMs: 5e3,
+        onRetryAttempt: (attempt, error, delayMs) => {
+          var _a2;
+          console.warn(`Retry #${attempt} after ${delayMs}ms due to ${error.code || ((_a2 = error.response) == null ? void 0 : _a2.status)}`);
         }
-        return await axios(requestConfig.config);
-      } catch (error) {
-        const responseCode = __privateGet$1(this, _HandleError).call(this, error);
-        errorCb(responseCode, error);
-        return null;
-      }
+        // Below works also ...
+        //stsAxiosConfig: requestConfig
+      });
+      return await api(url2, requestConfig.config);
     });
-    __publicField2(this, "GetResource", async (resource, id, filters, errorCb) => {
+    __publicField2(this, "GetResource", async (resource, id, filters) => {
       if (__privateGet$1(this, _options3).useSocketClient === true && __privateGet$1(this, _fhirSocketClient)) {
-        const retVal = await __privateGet$1(this, _fhirSocketClient).GetResource(resource, id);
-        if (retVal.status === StatusCodes.OK) {
-          return retVal.value;
-        } else {
-          return null;
+        try {
+          const retVal = await __privateGet$1(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: StatusCodes.INTERNAL_SERVER_ERROR
+          };
+          throw errorResponse;
         }
       } else {
         const url2 = `${__privateGet$1(this, _options3).fhirEndpoint}${__privateGet$1(this, _stsfhirapiroot)}/${resource}/${id}`;
-        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "get", null, filters, null, errorCb);
+        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "get", null, filters);
         if (response) {
           return response.data;
         } else {
@@ -12413,21 +12411,23 @@ class FhirClient {
         }
       }
     });
-    __privateAdd$1(this, _BuildQueryString, (baseUrl, queryParams) => {
-      const url2 = new URL(baseUrl);
-      const searchParams = new URLSearchParams(queryParams);
-      url2.search = searchParams.toString();
-      return url2.toString();
-    });
-    __publicField2(this, "GetResources", async (resource, filters, searchParams, errorCb) => {
+    __publicField2(this, "GetResources", async (resource, filters, searchParams) => {
       if (__privateGet$1(this, _options3).useSocketClient === true && __privateGet$1(this, _fhirSocketClient)) {
-        return __privateGet$1(this, _fhirSocketClient).GetResources(resource, searchParams);
+        try {
+          return __privateGet$1(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$1(this, _options3).fhirEndpoint}${__privateGet$1(this, _stsfhirapiroot)}/${resource}`;
         if (searchParams) {
           url2 = __privateGet$1(this, _BuildQueryString).call(this, url2, searchParams);
         }
-        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "get", null, filters, searchParams, errorCb);
+        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "get", null, filters);
         if (response) {
           return response.data;
         } else {
@@ -12435,36 +12435,54 @@ class FhirClient {
         }
       }
     });
-    __publicField2(this, "CreateResource", async (resource, domainResource, errorCb) => {
+    __publicField2(this, "CreateResource", async (resource, domainResource) => {
       if (__privateGet$1(this, _options3).useSocketClient === true && __privateGet$1(this, _fhirSocketClient)) {
-        const retVal = await __privateGet$1(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;
+        try {
+          const retVal = await __privateGet$1(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: StatusCodes.INTERNAL_SERVER_ERROR
+          };
+          throw errorResponse;
         }
       } else {
         const url2 = `${__privateGet$1(this, _options3).fhirEndpoint}${__privateGet$1(this, _stsfhirapiroot)}/${resource}`;
-        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "post", domainResource, null, null, errorCb);
+        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "post", domainResource, 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;
+            throw new Error(`CreateResource(): Invalid response status code: [${response.status}] expected: [${StatusCodes.CREATED}]`);
           }
         } else {
           return null;
         }
       }
     });
-    __publicField2(this, "UpdateResource", async (resource, domainResource, errorCb) => {
+    __publicField2(this, "UpdateResource", async (resource, domainResource) => {
       if (__privateGet$1(this, _options3).useSocketClient === true && __privateGet$1(this, _fhirSocketClient)) {
-        return __privateGet$1(this, _fhirSocketClient).UpdateResource(resource, domainResource);
+        try {
+          return __privateGet$1(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$1(this, _options3).fhirEndpoint}${__privateGet$1(this, _stsfhirapiroot)}/${resource}/${domainResource.id}`;
-        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "put", domainResource, null, null, errorCb);
+        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "put", domainResource, null);
         if (response) {
           return response.data;
         } else {
@@ -12472,12 +12490,20 @@ class FhirClient {
         }
       }
     });
-    __publicField2(this, "UpdateResources", async (resource, domainResources, errorCb) => {
+    __publicField2(this, "UpdateResources", async (resource, domainResources) => {
       if (__privateGet$1(this, _options3).useSocketClient === true && __privateGet$1(this, _fhirSocketClient)) {
-        return __privateGet$1(this, _fhirSocketClient).UpdateResources(resource, domainResources);
+        try {
+          return __privateGet$1(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$1(this, _options3).fhirEndpoint}${__privateGet$1(this, _stsfhirapiroot)}/${resource}`;
-        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "put", domainResources, null, null, errorCb);
+        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "put", domainResources, null);
         if (response) {
           return response.data;
         } else {
@@ -12485,12 +12511,20 @@ class FhirClient {
         }
       }
     });
-    __publicField2(this, "PatchResource", async (resource, domainResource, errorCb) => {
+    __publicField2(this, "PatchResource", async (resource, domainResource) => {
       if (__privateGet$1(this, _options3).useSocketClient === true && __privateGet$1(this, _fhirSocketClient)) {
-        return __privateGet$1(this, _fhirSocketClient).PatchResource(resource, domainResource);
+        try {
+          return __privateGet$1(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$1(this, _options3).fhirEndpoint}${__privateGet$1(this, _stsfhirapiroot)}/${resource}/${domainResource.id}`;
-        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "patch", domainResource, null, null, errorCb);
+        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "patch", domainResource, null);
         if (response) {
           return response.data;
         } else {
@@ -12498,12 +12532,20 @@ class FhirClient {
         }
       }
     });
-    __publicField2(this, "PatchResources", async (resource, domainResources, errorCb) => {
+    __publicField2(this, "PatchResources", async (resource, domainResources) => {
       if (__privateGet$1(this, _options3).useSocketClient === true && __privateGet$1(this, _fhirSocketClient)) {
-        return __privateGet$1(this, _fhirSocketClient).PatchResources(resource, domainResources);
+        try {
+          return __privateGet$1(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$1(this, _options3).fhirEndpoint}${__privateGet$1(this, _stsfhirapiroot)}/${resource}`;
-        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "patch", domainResources, null, null, errorCb);
+        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "patch", domainResources, null);
         if (response) {
           return response.data;
         } else {
@@ -12511,12 +12553,20 @@ class FhirClient {
         }
       }
     });
-    __publicField2(this, "DeleteResource", async (resource, id, errorCb) => {
+    __publicField2(this, "DeleteResource", async (resource, id) => {
       if (__privateGet$1(this, _options3).useSocketClient === true && __privateGet$1(this, _fhirSocketClient)) {
-        return __privateGet$1(this, _fhirSocketClient).DeleteResource(resource, id);
+        try {
+          return __privateGet$1(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$1(this, _options3).fhirEndpoint}${__privateGet$1(this, _stsfhirapiroot)}/${resource}/${id}`;
-        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "delete", null, null, null, errorCb);
+        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "delete", null, null);
         if (response) {
           return response.data;
         } else {
@@ -12524,12 +12574,20 @@ class FhirClient {
         }
       }
     });
-    __publicField2(this, "DeleteResources", async (resource, domainResources, errorCb) => {
+    __publicField2(this, "DeleteResources", async (resource, domainResources) => {
       if (__privateGet$1(this, _options3).useSocketClient === true && __privateGet$1(this, _fhirSocketClient)) {
-        return __privateGet$1(this, _fhirSocketClient).DeleteResources(resource, domainResources);
+        try {
+          return __privateGet$1(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$1(this, _options3).fhirEndpoint}${__privateGet$1(this, _stsfhirapiroot)}/${resource}`;
-        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "delete", domainResources, null, null, errorCb);
+        const response = await __privateGet$1(this, _InvokeResourceAPI).call(this, url2, "delete", domainResources, null);
         if (response) {
           return response.data;
         } else {
@@ -12544,7 +12602,17 @@ class FhirClient {
         if (isNode$1 && __privateGet$1(this, _options3).agentManager) {
           requestConfig.withAgentManager(__privateGet$1(this, _options3).agentManager);
         }
-        return await axios(requestConfig.config);
+        const api = createRetryAxiosClient({
+          maxRetries: 4,
+          retryDelayMs: 300,
+          retryJitterMs: 150,
+          maxRetryDurationMs: 5e3,
+          onRetryAttempt: (attempt, error, delayMs) => {
+            var _a2;
+            console.warn(`Retry #${attempt} after ${delayMs}ms due to ${error.code || ((_a2 = error.response) == null ? void 0 : _a2.status)}`);
+          }
+        });
+        return await api(url2, requestConfig.config);
       } catch (error) {
         __privateGet$1(this, _HandleError).call(this, error);
       }
@@ -12568,19 +12636,12 @@ class FhirClient {
 }
 _options3 = /* @__PURE__ */ new WeakMap();
 _DUMMY_USER = /* @__PURE__ */ new WeakMap();
-_invokeMethods = /* @__PURE__ */ new WeakMap();
-_maxRetries = /* @__PURE__ */ new WeakMap();
-_sleepDuration = /* @__PURE__ */ new WeakMap();
-_NoRetryStatusCodes = /* @__PURE__ */ new WeakMap();
 _stsfhirapiroot = /* @__PURE__ */ new WeakMap();
 _fhirSocketClient = /* @__PURE__ */ new WeakMap();
 _LogDebugMessage = /* @__PURE__ */ new WeakMap();
-_LogErrorMessage = /* @__PURE__ */ new WeakMap();
 _HandleError = /* @__PURE__ */ new WeakMap();
-_InvokeResourceAPI = /* @__PURE__ */ new WeakMap();
-_TestMode = /* @__PURE__ */ new WeakMap();
-___InvokeResourceAPI = /* @__PURE__ */ new WeakMap();
 _BuildQueryString = /* @__PURE__ */ new WeakMap();
+_InvokeResourceAPI = /* @__PURE__ */ new WeakMap();
 class TestCaseFhirBase {
   /*
   #FHIR_SOCKET_CLIENT_USE = true;
@@ -12591,8 +12652,6 @@ class TestCaseFhirBase {
   */
   constructor(workerInstance, runner) {
     __privateAdd(this, _options4);
-    //#authUtilsNode: AuthUtilsNode;
-    __privateAdd(this, _agentManager);
     __privateAdd(this, _randomDataRecordset, []);
     __privateAdd(this, _runner2);
     __privateAdd(this, _workerInstance2);
@@ -12749,6 +12808,9 @@ class TestCaseFhirBase {
         return __privateGet(this, _accesssToken);
       } catch (error) {
         const errorTime = performance.now() - startTime;
+        if (__privateGet(this, _fhirClient).options.agentManager) {
+          __privateGet(this, _fhirClient).options.agentManager.ResetAgent();
+        }
         __privateGet(this, _runner2).instrumentData.authenticationErrorCount++;
         __privateGet(this, _runner2).instrumentData.message.push(chalk$1.red(`GetAccessToken Fail Time: [${errorTime.toString()}]`));
         __privateGet(this, _runner2).instrumentData.message.push(chalk$1.red(error.toString()));
@@ -12793,10 +12855,7 @@ class TestCaseFhirBase {
       const blocksToLoad = 20;
       for (let i = 0; i < blocksToLoad; i++) {
         const recordId = `stsres_${blockNum + i}`;
-        const retVal = await __privateGet(this, _fhirClient).GetResource("Person", recordId, null, (error) => {
-          this.LogErrorMessage(`test(POST /stsresource and query using filter): ${error}`);
-          console.error(chalk$1.red(`StartTestDataLoad(): Error: [${error}]`));
-        });
+        const retVal = await __privateGet(this, _fhirClient).GetResource("Person", recordId, null);
         if (retVal) {
           const recordsetData = retVal.address;
           const zzz = recordsetData[0];
@@ -12968,9 +13027,6 @@ class TestCaseFhirBase {
           */
     }));
   }
-  get agentManager() {
-    return __privateGet(this, _agentManager);
-  }
   get accesssToken() {
     return __privateGet(this, _accesssToken);
   }
@@ -13218,7 +13274,6 @@ class TestCaseFhirBase {
           */
 }
 _options4 = new WeakMap();
-_agentManager = new WeakMap();
 _randomDataRecordset = new WeakMap();
 _runner2 = new WeakMap();
 _workerInstance2 = new WeakMap();
@@ -13236,62 +13291,42 @@ _PublishTelemetryData2 = new WeakMap();
 _ForcePublishTelemetryData2 = new WeakMap();
 _SetupTimeout2 = new WeakMap();
 _OutputLogMessage2 = new WeakMap();
-class TestCaseFhir01 extends TestCaseFhirBase {
+class TestCaseFhirQueryBase extends TestCaseFhirBase {
   constructor(workerInstance, runner) {
     super(workerInstance, runner);
-    __publicField(this, "ExecuteRunner", async () => {
-      if (this.runner.iteration % 100 === 0) {
-        this.Debug(`TestCaseFhir01(): -->> Iteration: ${this.runner.iteration}`);
+    __publicField(this, "ExecuteQuery", async () => {
+      return null;
+    });
+    __privateAdd(this, _ResetAgent, (reason) => {
+      if (this.fhirClient.options.agentManager) {
+        const resetMessage = chalk$1.rgb(50, 100, 50)`Iteration: [${this.runner.iteration} #authUtilsNode(): Agent Reset, reason: [${reason}]`;
+        this.runner.instrumentData.message.push(resetMessage);
+        console.log(resetMessage);
+        this.fhirClient.options.agentManager.ResetAgent();
       }
-      const start = performance.now();
-      const options = this.runner.options;
-      this.runner.instrumentData.activeRequestCount++;
-      if (this.runner.instrumentData.requestCount % options.agentResetMod === 0) {
-        this.runner.instrumentData.message.push(chalk$1.green(`Iteration: [${this.runner.iteration} #authUtilsNode(): Agent Reset`));
+    });
+    __privateAdd(this, _CheckResetAgent, () => {
+      if (this.runner.instrumentData.requestCount % this.runner.options.agentResetMod === 0) {
+        __privateGet(this, _ResetAgent).call(this, "agentResetMod triggered");
       }
-      const retVal = await this.GetAccessToken();
-      this.Debug(`ExecuteRunner(): RetVal: [${retVal}]`);
-      this.accesssToken = null;
-      this.runner.instrumentData.coreCount = 1;
-      this.runner.instrumentData.requestCount++;
-      this.runner.instrumentData.velocity++;
-      this.runner.instrumentData.activeRequestCount--;
-      const end = performance.now();
-      const diff = end - start;
-      this.runner.instrumentData.duration = diff;
-      await this.PublishTelemetry();
-      return true;
     });
-    if (this.agentManager) {
-      this.agentManager.agentResetCount = runner.options.agentResetMod;
-    }
-  }
-}
-class TestCaseFhir02 extends TestCaseFhirBase {
-  constructor(workerInstance, runner) {
-    super(workerInstance, runner);
     __publicField(this, "ExecuteRunner", async () => {
       if (this.runner.iteration % 100 === 0) {
-        this.Debug(`TestCaseFhir02(): -->> Iteration: ${this.runner.iteration}`);
+        this.Debug(`${this.runner.options.testType} -->> Iteration: ${this.runner.iteration}`);
       }
-      const iteration = this.runner.iteration;
-      const start = performance.now();
-      const options = this.runner.options;
       if (this.runner.iteration === 0) {
         await this.StartTestDataLoad();
       }
+      const start = performance.now();
       this.runner.instrumentData.activeRequestCount++;
-      if (this.runner.instrumentData.requestCount % options.agentResetMod === 0) {
-        this.runner.instrumentData.message.push(chalk$1.green(`Iteration: [${iteration} #authUtilsNode(): Agent Reset`));
-      }
-      const personRecord = this.GetPersonRecord(`${options.personPrefix}`, iteration);
+      __privateGet(this, _CheckResetAgent).call(this);
       try {
-        const retVal = await this.fhirClient.CreateResource("Person", personRecord, (error) => {
-          this.LogErrorMessage(`test(POST /stsresource and query using filter): ${error}`);
-          this.runner.instrumentData.errorCount++;
-        });
+        await this.ExecuteQuery();
       } catch (error) {
         this.runner.instrumentData.errorCount++;
+        const message = `TestCaseFhirQueryBase:ExecuteRunner(): TestType: [${this.runner.options.testType}], Error: [${error}]`;
+        this.LogErrorMessage(message);
+        __privateGet(this, _ResetAgent).call(this, message);
       }
       this.runner.instrumentData.coreCount = 1;
       this.runner.instrumentData.requestCount++;
@@ -13303,76 +13338,49 @@ class TestCaseFhir02 extends TestCaseFhirBase {
       await this.PublishTelemetry();
       return true;
     });
-    if (this.agentManager) {
-      this.agentManager.agentResetCount = runner.options.agentResetMod;
-    }
   }
 }
-class TestCaseFhir03 extends TestCaseFhirBase {
-  constructor(workerInstance, runner) {
-    super(workerInstance, runner);
-    __publicField(this, "ExecuteRunner", async () => {
-      if (this.runner.iteration % 100 === 0) {
-        this.Debug(`TestCaseFhir03(): -->> Iteration: ${this.runner.iteration}`);
-      }
-      const iteration = this.runner.iteration;
-      const start = performance.now();
-      const options = this.runner.options;
-      if (this.runner.iteration === 0) {
-        await this.StartTestDataLoad();
-      }
-      this.runner.instrumentData.activeRequestCount++;
-      if (this.runner.instrumentData.requestCount % options.agentResetMod === 0) {
-        this.runner.instrumentData.message.push(chalk$1.green(`Iteration: [${iteration} #authUtilsNode(): Agent Reset`));
-      }
-      const personRecord = this.GetPersonRecord(`${options.personPrefix}`, iteration);
-      const retVal = await this.fhirClient.GetResource("Person", personRecord.id, null, (error) => {
-        this.LogErrorMessage(`test(POST /stsresource and query using filter): ${error}`);
-        this.runner.instrumentData.errorCount++;
-      });
+_ResetAgent = new WeakMap();
+_CheckResetAgent = new WeakMap();
+class TestCaseFhir01 extends TestCaseFhirQueryBase {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "ExecuteQuery", async () => {
+      await this.GetAccessToken();
+      this.accesssToken = null;
+      return null;
+    });
+  }
+}
+class TestCaseFhir02 extends TestCaseFhirQueryBase {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "ExecuteQuery", async () => {
+      return await this.fhirClient.CreateResource("Person", this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration));
+    });
+  }
+}
+class TestCaseFhir03 extends TestCaseFhirQueryBase {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "ExecuteQuery", async () => {
+      const personRecord = this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration);
+      const retVal = await this.fhirClient.GetResource("Person", personRecord.id, null);
       const p1 = JSON.stringify(personRecord);
       const p2 = JSON.stringify(retVal);
-      const compareReocrds = p1.localeCompare(p2);
-      if (compareReocrds !== 0) {
+      if (p1.localeCompare(p2) !== 0) {
         this.runner.instrumentData.errorCount++;
       }
-      this.runner.instrumentData.coreCount = 1;
-      this.runner.instrumentData.requestCount++;
-      this.runner.instrumentData.velocity++;
-      this.runner.instrumentData.activeRequestCount--;
-      const end = performance.now();
-      const diff = end - start;
-      this.runner.instrumentData.duration = diff;
-      await this.PublishTelemetry();
-      return true;
+      return retVal;
     });
-    if (this.agentManager) {
-      this.agentManager.agentResetCount = runner.options.agentResetMod;
-    }
   }
 }
-class TestCaseFhir04 extends TestCaseFhirBase {
-  constructor(workerInstance, runner) {
-    super(workerInstance, runner);
-    __publicField(this, "ExecuteRunner", async () => {
-      if (this.runner.iteration % 100 === 0) {
-        this.Debug(`TestCaseFhir04(): -->> Iteration: ${this.runner.iteration}`);
-      }
-      const iteration = this.runner.iteration;
-      const start = performance.now();
-      const options = this.runner.options;
-      if (this.runner.iteration === 0) {
-        await this.StartTestDataLoad();
-      }
-      this.runner.instrumentData.activeRequestCount++;
-      if (this.runner.instrumentData.requestCount % options.agentResetMod === 0) {
-        this.runner.instrumentData.message.push(chalk$1.green(`Iteration: [${iteration} #authUtilsNode(): Agent Reset`));
-      }
-      const personRecord = this.GetPersonRecord(`${options.personPrefix}`, iteration);
-      const originalPersonRecord = await this.fhirClient.GetResource("Person", personRecord.id, null, (error) => {
-        this.LogErrorMessage(`test(POST /stsresource and query using filter): ${error}`);
-        this.runner.instrumentData.errorCount++;
-      });
+class TestCaseFhir04 extends TestCaseFhirQueryBase {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "ExecuteQuery", async () => {
+      const personRecord = this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration);
+      const originalPersonRecord = await this.fhirClient.GetResource("Person", personRecord.id, null);
       const p1 = JSON.stringify(personRecord);
       const p2 = JSON.stringify(originalPersonRecord);
       const compareRecords = p1.localeCompare(p2);
@@ -13380,132 +13388,52 @@ class TestCaseFhir04 extends TestCaseFhirBase {
         this.runner.instrumentData.errorCount++;
       }
       if (originalPersonRecord && originalPersonRecord.text) {
-        originalPersonRecord.text.div = `Updated record ${iteration}`;
-        const retVal = await this.fhirClient.UpdateResource("Person", originalPersonRecord, (error) => {
-          this.LogErrorMessage(`test(POST /stsresource and query using filter): ${error}`);
-          this.runner.instrumentData.errorCount++;
-        });
+        originalPersonRecord.text.div = `Updated record ${this.runner.iteration}`;
+        const retVal = await this.fhirClient.UpdateResource("Person", originalPersonRecord);
         const p12 = JSON.stringify(retVal);
         const p22 = JSON.stringify(originalPersonRecord);
         const compareRecords2 = p12.localeCompare(p22);
         if (compareRecords2 !== 0) {
           this.runner.instrumentData.errorCount++;
         }
+        return retVal;
       } else {
         this.runner.instrumentData.errorCount++;
+        return null;
       }
-      this.runner.instrumentData.coreCount = 1;
-      this.runner.instrumentData.requestCount++;
-      this.runner.instrumentData.velocity++;
-      this.runner.instrumentData.activeRequestCount--;
-      const end = performance.now();
-      const diff = end - start;
-      this.runner.instrumentData.duration = diff;
-      await this.PublishTelemetry();
-      return true;
     });
-    if (this.agentManager) {
-      this.agentManager.agentResetCount = runner.options.agentResetMod;
-    }
   }
 }
-class TestCaseFhir05 extends TestCaseFhirBase {
-  constructor(workerInstance, runner) {
-    super(workerInstance, runner);
-    __publicField(this, "ExecuteRunner", async () => {
-      if (this.runner.iteration % 100 === 0) {
-        this.Debug(`TestCaseFhir05(): -->> Iteration: ${this.runner.iteration}`);
-      }
-      const iteration = this.runner.iteration;
-      const start = performance.now();
-      const options = this.runner.options;
-      if (this.runner.iteration === 0) {
-        await this.StartTestDataLoad();
-      }
-      this.runner.instrumentData.activeRequestCount++;
-      if (this.runner.instrumentData.requestCount % options.agentResetMod === 0) {
-        this.runner.instrumentData.message.push(chalk$1.green(`Iteration: [${iteration} #authUtilsNode(): Agent Reset`));
-      }
-      const personRecord = this.GetPersonRecord(`${options.personPrefix}`, iteration);
+class TestCaseFhir05 extends TestCaseFhirQueryBase {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "ExecuteQuery", async () => {
+      const personRecord = this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration);
       if (personRecord && personRecord.text) {
-        personRecord.text.div = `Updated record ${iteration}`;
-        const retVal = await this.fhirClient.UpdateResource("Person", personRecord, (error) => {
-          this.LogErrorMessage(`test(POST /stsresource and query using filter): ${error}`);
-          this.runner.instrumentData.errorCount++;
-        });
+        personRecord.text.div = `Updated record ${this.runner.iteration}`;
+        const retVal = await this.fhirClient.UpdateResource("Person", personRecord);
         const p1 = JSON.stringify(retVal);
         const p2 = JSON.stringify(personRecord);
         const compareRecords = p1.localeCompare(p2);
         if (compareRecords !== 0) {
           this.runner.instrumentData.errorCount++;
         }
+        return retVal;
       } else {
         this.runner.instrumentData.errorCount++;
+        return null;
       }
-      this.runner.instrumentData.coreCount = 1;
-      this.runner.instrumentData.requestCount++;
-      this.runner.instrumentData.velocity++;
-      this.runner.instrumentData.activeRequestCount--;
-      const end = performance.now();
-      const diff = end - start;
-      this.runner.instrumentData.duration = diff;
-      await this.PublishTelemetry();
-      return true;
-    });
-    if (this.agentManager) {
-      this.agentManager.agentResetCount = runner.options.agentResetMod;
-    }
-  }
-}
-class TestCaseFhirQueryBase extends TestCaseFhirBase {
-  constructor(workerInstance, runner) {
-    super(workerInstance, runner);
-    __publicField(this, "ExecuteQuery", async (iteration, fhirClient) => {
-      return null;
-    });
-    __publicField(this, "ExecuteRunner", async () => {
-      if (this.runner.iteration % 100 === 0) {
-        this.Debug(`-->> Iteration: ${this.runner.iteration}`);
-      }
-      const start = performance.now();
-      const options = this.runner.options;
-      this.runner.instrumentData.activeRequestCount++;
-      if (this.runner.instrumentData.requestCount % options.agentResetMod === 0) {
-        this.runner.instrumentData.message.push(chalk$1.green(`Iteration: [${this.runner.iteration} #authUtilsNode(): Agent Reset`));
-      }
-      const retVal = await this.ExecuteQuery(this.runner.iteration, this.fhirClient);
-      if ((retVal == null ? void 0 : retVal.length) === 0) {
-        this.runner.instrumentData.errorCount++;
-      }
-      this.runner.instrumentData.coreCount = 1;
-      this.runner.instrumentData.requestCount++;
-      this.runner.instrumentData.velocity++;
-      this.runner.instrumentData.activeRequestCount--;
-      const end = performance.now();
-      const diff = end - start;
-      this.runner.instrumentData.duration = diff;
-      await this.PublishTelemetry();
-      return true;
     });
-    if (this.agentManager) {
-      this.agentManager.agentResetCount = runner.options.agentResetMod;
-    }
   }
 }
 class TestCaseFhir06 extends TestCaseFhirQueryBase {
   constructor() {
     super(...arguments);
-    __publicField(this, "ExecuteQuery", async (iteration, fhirClient) => {
-      if (this.runner.iteration % 100 === 0) {
-        this.Debug(`TestCaseFhir06(): -->> Iteration: ${this.runner.iteration}`);
-      }
-      const searchLetter = String.fromCharCode(65 + iteration % 26);
-      const retVal = await fhirClient.GetResources("Person", null, {
+    __publicField(this, "ExecuteQuery", async () => {
+      const searchLetter = String.fromCharCode(65 + this.runner.iteration % 26);
+      const retVal = await this.fhirClient.GetResources("Person", null, {
         given: searchLetter,
         family: searchLetter
-      }, (error) => {
-        this.LogErrorMessage(`test(POST /stsresource and query using filter): ${error}`);
-        this.runner.instrumentData.errorCount++;
       });
       return retVal;
     });
@@ -13514,16 +13442,10 @@ class TestCaseFhir06 extends TestCaseFhirQueryBase {
 class TestCaseFhir07 extends TestCaseFhirQueryBase {
   constructor() {
     super(...arguments);
-    __publicField(this, "ExecuteQuery", async (iteration, fhirClient) => {
-      if (this.runner.iteration % 100 === 0) {
-        this.Debug(`TestCaseFhir07(): -->> Iteration: ${this.runner.iteration}`);
-      }
-      const searchLetter = String.fromCharCode(65 + iteration % 26);
-      const retVal = await fhirClient.GetResources("Person", null, {
+    __publicField(this, "ExecuteQuery", async () => {
+      const searchLetter = String.fromCharCode(65 + this.runner.iteration % 26);
+      const retVal = await this.fhirClient.GetResources("Person", null, {
         given: searchLetter
-      }, (error) => {
-        this.LogErrorMessage(`test(POST /stsresource and query using filter): ${error}`);
-        this.runner.instrumentData.errorCount++;
       });
       return retVal;
     });
@@ -13532,60 +13454,27 @@ class TestCaseFhir07 extends TestCaseFhirQueryBase {
 class TestCaseFhir08 extends TestCaseFhirQueryBase {
   constructor() {
     super(...arguments);
-    __publicField(this, "ExecuteQuery", async (iteration, fhirClient) => {
-      if (this.runner.iteration % 100 === 0) {
-        this.Debug(`TestCaseFhir08(): -->> Iteration: ${this.runner.iteration}`);
-      }
-      const searchLetter = String.fromCharCode(65 + iteration % 26);
-      const retVal = await fhirClient.GetResources("Person", null, {
+    __publicField(this, "ExecuteQuery", async () => {
+      const searchLetter = String.fromCharCode(65 + this.runner.iteration % 26);
+      const retVal = await this.fhirClient.GetResources("Person", null, {
         family: searchLetter
-      }, (error) => {
-        this.LogErrorMessage(`test(POST /stsresource and query using filter): ${error}`);
-        this.runner.instrumentData.errorCount++;
       });
       return retVal;
     });
   }
 }
-class TestCaseFhir09 extends TestCaseFhirBase {
-  constructor(workerInstance, runner) {
-    super(workerInstance, runner);
-    __publicField(this, "ExecuteRunner", async () => {
-      if (this.runner.iteration % 100 === 0) {
-        this.Debug(`TestCaseFhir09(): -->> Iteration: ${this.runner.iteration}`);
-      }
-      const iteration = this.runner.iteration;
-      const start = performance.now();
-      const options = this.runner.options;
-      if (this.runner.iteration === 0) {
-        await this.StartTestDataLoad();
-      }
-      this.runner.instrumentData.activeRequestCount++;
-      if (this.runner.instrumentData.requestCount % options.agentResetMod === 0) {
-        this.runner.instrumentData.message.push(chalk$1.green(`Iteration: [${iteration} #authUtilsNode(): Agent Reset`));
-      }
-      const personRecord = this.GetPersonRecord(`${options.personPrefix}`, iteration);
+class TestCaseFhir09 extends TestCaseFhirQueryBase {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "ExecuteQuery", async () => {
+      const personRecord = this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration);
       if (personRecord.text) {
-        await this.fhirClient.DeleteResource("Person", personRecord.id, (error) => {
-          this.LogErrorMessage(`test(POST /stsresource and query using filter): ${error}`);
-          this.runner.instrumentData.errorCount++;
-        });
+        return await this.fhirClient.DeleteResource("Person", personRecord.id);
       } else {
         this.runner.instrumentData.errorCount++;
+        return null;
       }
-      this.runner.instrumentData.coreCount = 1;
-      this.runner.instrumentData.requestCount++;
-      this.runner.instrumentData.velocity++;
-      this.runner.instrumentData.activeRequestCount--;
-      const end = performance.now();
-      const diff = end - start;
-      this.runner.instrumentData.duration = diff;
-      await this.PublishTelemetry();
-      return true;
     });
-    if (this.agentManager) {
-      this.agentManager.agentResetCount = runner.options.agentResetMod;
-    }
   }
 }
 class StartUpDelFhirResources extends TestCaseFhirBase {
@@ -13603,55 +13492,52 @@ class StartUpDelFhirResources extends TestCaseFhirBase {
       this.runner.instrumentData.rx += 65e5;
       let complete = false;
       let totalRecordsDelete = 0;
-      while (!complete) {
-        const start2 = performance.now();
-        __privateGet(this, _debug3).call(this, chalk$1.magenta(`ExecuteRunner() - pre GetResources()`));
-        const retVal = await this.fhirClient.GetResources("Person", null, {
-          limit: options.batchDeleteSize,
-          prefix: options.personPrefix
-        }, (error) => {
-          this.LogErrorMessage(chalk$1.red(`ExecuteRunner():GetResources: Error: [${error}]`));
-          const duration2 = (performance.now() - start2) / 1e3;
-          __privateGet(this, _debug3).call(this, chalk$1.magenta(`ExecuteRunner() - post GetResources() - Total Duration (error): [${duration2}]`));
-        });
-        const duration = (performance.now() - start2) / 1e3;
-        __privateGet(this, _debug3).call(this, chalk$1.magenta(`ExecuteRunner() - post GetResources() - Total Duration: [${duration}]`));
-        __privateGet(this, _debug3).call(this, retVal);
-        if (retVal) {
-          __privateGet(this, _debug3).call(this, `Records already exist - going to delete ...`);
-          __privateGet(this, _debug3).call(this, retVal.length);
-          const start3 = performance.now();
-          const delRetVal = await this.fhirClient.DeleteResources("Person", retVal, (error) => {
-            this.LogErrorMessage(chalk$1.red(`test(POST /stsresource and query using filter): ${error}`));
-            const duration3 = (performance.now() - start3) / 1e3;
-            __privateGet(this, _debug3).call(this, chalk$1.magenta(`ExecuteRunner() - post DeleteResources() - Total Duration (error): [${duration3}]`));
+      try {
+        while (!complete) {
+          const start2 = performance.now();
+          __privateGet(this, _debug3).call(this, chalk$1.magenta(`ExecuteRunner() - pre GetResources()`));
+          const retVal = await this.fhirClient.GetResources("Person", null, {
+            limit: options.batchDeleteSize,
+            prefix: options.personPrefix
           });
-          const duration2 = (performance.now() - start3) / 1e3;
-          __privateGet(this, _debug3).call(this, chalk$1.magenta(`ExecuteRunner() - post DeleteResources() - Total Duration: [${duration2}]`));
-          if (delRetVal) {
-            if (delRetVal.length === 0) {
-              complete = true;
+          const duration = (performance.now() - start2) / 1e3;
+          __privateGet(this, _debug3).call(this, chalk$1.magenta(`ExecuteRunner() - post GetResources() - Total Duration: [${duration}]`));
+          __privateGet(this, _debug3).call(this, retVal);
+          if (retVal) {
+            __privateGet(this, _debug3).call(this, `Records already exist - going to delete ...`);
+            __privateGet(this, _debug3).call(this, retVal.length);
+            const start3 = performance.now();
+            const delRetVal = await this.fhirClient.DeleteResources("Person", retVal);
+            const duration2 = (performance.now() - start3) / 1e3;
+            __privateGet(this, _debug3).call(this, chalk$1.magenta(`ExecuteRunner() - post DeleteResources() - Total Duration: [${duration2}]`));
+            if (delRetVal) {
+              if (delRetVal.length === 0) {
+                complete = true;
+              } else {
+                __privateGet(this, _debug3).call(this, `Records deleted ...`);
+                __privateGet(this, _debug3).call(this, delRetVal.length);
+                totalRecordsDelete += delRetVal.length;
+                __privateGet(this, _debug3).call(this, chalk$1.red(`total records delete = ${totalRecordsDelete}`));
+              }
             } else {
-              __privateGet(this, _debug3).call(this, `Records deleted ...`);
-              __privateGet(this, _debug3).call(this, delRetVal.length);
-              totalRecordsDelete += delRetVal.length;
-              __privateGet(this, _debug3).call(this, chalk$1.red(`total records delete = ${totalRecordsDelete}`));
+              complete = true;
             }
           } else {
             complete = true;
           }
-        } else {
-          complete = true;
+          await Sleep(1);
         }
-        await Sleep(1);
+        __privateGet(this, _debug3).call(this, chalk$1.red(`total records delete = ${totalRecordsDelete}`));
+        this.runner.instrumentData.activeRequestCount--;
+        const end = performance.now();
+        const diff = end - start;
+        this.runner.instrumentData.duration = diff;
+        await this.PublishTelemetry();
+        return true;
+      } catch (error) {
+        console.error(`StartUpDelFhirResources:ExecuteRunner(): Error: [${error}]`);
+        return false;
       }
-      __privateGet(this, _debug3).call(this, chalk$1.red(`total records delete = ${totalRecordsDelete}`));
-      this.runner.instrumentData.activeRequestCount--;
-      const end = performance.now();
-      const diff = end - start;
-      this.runner.instrumentData.duration = diff;
-      await this.PublishTelemetry();
-      return true;
     });
   }
 }
@@ -15707,9 +15593,7 @@ class SetupFhirTestResources extends TestCaseFhirBase {
       const personRecord = __privateGet(this, _GetPersonRecord).call(this, options.testBlocksPrefix, options.personPrefix, this.runner.iteration, options.blockSize);
       __privateGet(this, _debug4).call(this, chalk$1.yellow(`ExecuteRunner(): Record Length: [${JSON.stringify(personRecord).length}]`));
       try {
-        const retVal = await this.fhirClient.CreateResource("Person", personRecord, (error) => {
-          this.LogErrorMessage(`ExecuteRunner():CreateResource: Error: [${error}]`);
-        });
+        const retVal = await this.fhirClient.CreateResource("Person", personRecord);
         __privateGet(this, _debug4).call(this, chalk$1.yellow(`ExecuteRunner():CreateResource: Return ID: [${retVal == null ? void 0 : retVal.id}]`));
       } catch (error) {
         __privateGet(this, _error2).call(this, chalk$1.red(`ExecuteRunner():CreateResource: Error: [${error}]`));