@nsshunt/stsfhirclient 2.0.32 → 2.0.34

package/dist/stsfhirclient.cjs

@@ -9166,6 +9166,68 @@ function splitUnderBase(pathname, basePath) {
 	return pathname.slice(basePath.length).split("/").filter(Boolean);
 }
 //#endregion
+//#region src/retryAxiosClient.ts
+function sleep(ms) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function getJitteredDelay(base, jitter) {
+	return base + Math.floor(Math.random() * jitter);
+}
+function createRetryAxiosClient(retryConfig) {
+	const { maxRetries = 3, retryDelayMs = 300, retryJitterMs = 100, retryMethods = [
+		"get",
+		"head",
+		"put",
+		"delete",
+		"options"
+	], retryStatusCodes = [
+		408,
+		429,
+		500,
+		502,
+		503,
+		504
+	], retryErrorCodes = [
+		"ECONNRESET",
+		"ETIMEDOUT",
+		"EAI_AGAIN",
+		"ECONNREFUSED",
+		"ENOTFOUND",
+		"EHOSTUNREACH",
+		"EPIPE"
+	], maxRetryDurationMs = 1e4, onRetryAttempt, stsAxiosConfig } = retryConfig || {};
+	const instance = axios.default.create();
+	instance.interceptors.request.use((config) => {
+		const retryConfig = config;
+		if (!retryConfig.metadata) retryConfig.metadata = {
+			startTime: Date.now(),
+			__retryCount: 0
+		};
+		if (stsAxiosConfig) Object.assign(config, stsAxiosConfig.config);
+		return config;
+	});
+	instance.interceptors.response.use((response) => response, async (error) => {
+		const config = error.config;
+		if (!config || !config.method || !config.metadata) return Promise.reject(error);
+		const elapsed = Date.now() - config.metadata.startTime;
+		const method = config.method.toLowerCase();
+		const status = error.response?.status;
+		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 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);
+	});
+	return instance;
+}
+//#endregion
 //#region node_modules/chalk/source/vendor/ansi-styles/index.js
 var ANSI_BACKGROUND_OFFSET = 10;
 var wrapAnsi16 = (offset = 0) => (code) => `\u001B[${code + offset}m`;
@@ -9561,7 +9623,16 @@ var FhirRESTClient = class {
 		requestConfig.withAuthHeaders(accessToken, this.#options.user).withHeaders(headers);
 		if (resource) requestConfig.withData(resource);
 		if (this.#options.agentManager) requestConfig.withAgentManager(this.#options.agentManager);
-		return await (0, axios.default)(requestConfig.config);
+		return await createRetryAxiosClient({
+			maxRetries: 4,
+			retryDelayMs: 300,
+			retryJitterMs: 150,
+			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);
 	};
 	ProcessBatchOrTransactionResources = async (bundle) => {
 		try {
@@ -13150,48 +13221,9 @@ var SocketIoClient = class extends import_tiny_emitter.TinyEmitter {
 	}
 };
 //#endregion
-//#region node_modules/uuid/dist/stringify.js
-var byteToHex = [];
-for (let i = 0; i < 256; ++i) byteToHex.push((i + 256).toString(16).slice(1));
-function unsafeStringify(arr, offset = 0) {
-	return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
-}
-//#endregion
-//#region node_modules/uuid/dist/rng.js
-var getRandomValues;
-var rnds8 = new Uint8Array(16);
-function rng() {
-	if (!getRandomValues) {
-		if (typeof crypto === "undefined" || !crypto.getRandomValues) throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
-		getRandomValues = crypto.getRandomValues.bind(crypto);
-	}
-	return getRandomValues(rnds8);
-}
-var native_default = { randomUUID: typeof crypto !== "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto) };
-//#endregion
-//#region node_modules/uuid/dist/v4.js
-function _v4(options, buf, offset) {
-	options = options || {};
-	const rnds = options.random ?? options.rng?.() ?? rng();
-	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;
-	if (buf) {
-		offset = offset || 0;
-		if (offset < 0 || offset + 16 > buf.length) throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`);
-		for (let i = 0; i < 16; ++i) buf[offset + i] = rnds[i];
-		return buf;
-	}
-	return unsafeStringify(rnds);
-}
-function v4(options, buf, offset) {
-	if (native_default.randomUUID && !buf && !options) return native_default.randomUUID();
-	return _v4(options, buf, offset);
-}
-//#endregion
 //#region src/cv2/fhirSocketClient.ts
 var FhirSocketClient = class extends SocketIoClient {
-	id = v4();
+	id = globalThis.crypto.randomUUID();
 	options;
 	accessToken = "";
 	constructor(clientName, options) {
@@ -13696,68 +13728,6 @@ var FhirSocketClientIndividual = class extends FhirSocketClient {
 	};
 };
 //#endregion
-//#region src/retryAxiosClient.ts
-function sleep(ms) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}
-function getJitteredDelay(base, jitter) {
-	return base + Math.floor(Math.random() * jitter);
-}
-function createRetryAxiosClient(retryConfig) {
-	const { maxRetries = 3, retryDelayMs = 300, retryJitterMs = 100, retryMethods = [
-		"get",
-		"head",
-		"put",
-		"delete",
-		"options"
-	], retryStatusCodes = [
-		408,
-		429,
-		500,
-		502,
-		503,
-		504
-	], retryErrorCodes = [
-		"ECONNRESET",
-		"ETIMEDOUT",
-		"EAI_AGAIN",
-		"ECONNREFUSED",
-		"ENOTFOUND",
-		"EHOSTUNREACH",
-		"EPIPE"
-	], maxRetryDurationMs = 1e4, onRetryAttempt, stsAxiosConfig } = retryConfig || {};
-	const instance = axios.default.create();
-	instance.interceptors.request.use((config) => {
-		const retryConfig = config;
-		if (!retryConfig.metadata) retryConfig.metadata = {
-			startTime: Date.now(),
-			__retryCount: 0
-		};
-		if (stsAxiosConfig) Object.assign(config, stsAxiosConfig.config);
-		return config;
-	});
-	instance.interceptors.response.use((response) => response, async (error) => {
-		const config = error.config;
-		if (!config || !config.method || !config.metadata) return Promise.reject(error);
-		const elapsed = Date.now() - config.metadata.startTime;
-		const method = config.method.toLowerCase();
-		const status = error.response?.status;
-		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 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);
-	});
-	return instance;
-}
-//#endregion
 exports.FhirRESTClient = FhirRESTClient;
 exports.FhirRouteError = FhirRouteError;
 exports.FhirSocketClient = FhirSocketClient;