@nsshunt/stsfhirclient 2.0.16 → 2.0.18

package/dist/stsfhirclient.cjs

@@ -9201,7 +9201,8 @@ function createRetryAxiosClient(retryConfig) {
 	], maxRetryDurationMs = 1e4, onRetryAttempt, stsAxiosConfig } = retryConfig || {};
 	const instance = axios.default.create();
 	instance.interceptors.request.use((config) => {
-		config.metadata = {
+		const retryConfig = config;
+		if (!retryConfig.metadata) retryConfig.metadata = {
 			startTime: Date.now(),
 			__retryCount: 0
 		};
@@ -9214,13 +9215,15 @@ function createRetryAxiosClient(retryConfig) {
 		const elapsed = Date.now() - config.metadata.startTime;
 		const method = config.method.toLowerCase();
 		const status = error.response?.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) {
+		const code = error.code ?? "";
+		const isRetryableMethod = retryMethods.includes(method);
+		const isRetryableStatus = retryStatusCodes.includes(status ?? 0);
+		const isRetryableCode = retryErrorCodes.includes(code);
+		if (isRetryableMethod && (isRetryableStatus || isRetryableCode) && config.metadata.__retryCount < maxRetries && elapsed < maxRetryDurationMs) {
 			config.metadata.__retryCount += 1;
-			const jitteredDelay = getJitteredDelay(retryDelayMs * Math.pow(2, config.metadata.__retryCount - 1), retryJitterMs);
-			if (onRetryAttempt) onRetryAttempt(config.metadata.__retryCount, error, jitteredDelay);
-			await sleep(jitteredDelay);
+			const delayMs = getJitteredDelay(retryDelayMs * Math.pow(2, config.metadata.__retryCount - 1), retryJitterMs);
+			onRetryAttempt?.(config.metadata.__retryCount, error, delayMs);
+			await sleep(delayMs);
 			return instance(config);
 		}
 		return Promise.reject(error);
@@ -9276,6 +9279,7 @@ var FhirRESTClient = class {
 			maxRetryDurationMs: 5e3,
 			onRetryAttempt: (attempt, error, delayMs) => {
 				this.LogWarning("#InvokeResourceAPI", `Retry #${attempt} after ${delayMs}ms due to ${error.code || error.response?.status}`);
+				if (this.#options.onRetryAttempt) this.#options.onRetryAttempt(attempt, error, delayMs);
 			}
 		})(url, requestConfig.config);
 	};
@@ -15459,6 +15463,7 @@ exports.FhirSocketClientAllInOne = FhirSocketClientAllInOne;
 exports.FhirSocketClientIndividual = FhirSocketClientIndividual;
 exports.GetAboveHierarchy = GetAboveHierarchy;
 exports.STSFhirValidator = STSFhirValidator;
+exports.createRetryAxiosClient = createRetryAxiosClient;
 exports.fhirRT = fhirRT;
 exports.fhirSP = fhirSP;
 exports.fhirSPRefOnly = fhirSPRefOnly;