promptfoo 0.121.1 → 0.121.3

package/dist/src/{blobs-BAU-dXan.js → blobs-B1JriOyi.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { o as logger, v as getConfigDirectoryPath } from "./logger-KkObSCzq.js";
-import { g as getDb, n as blobReferencesTable, t as blobAssetsTable } from "./tables-D36WTqKX.js";
+import { s as logger, x as getConfigDirectoryPath } from "./logger-BcJBzSSA.js";
+import { g as getDb, n as blobReferencesTable, t as blobAssetsTable } from "./tables-DmzvLbeZ.js";
 import * as fs$1 from "node:fs";
 import * as path$1 from "node:path";
 import * as fsPromises$1 from "node:fs/promises";
@@ -234,4 +234,4 @@ async function recordBlobReference(hash, refContext) {
 //#endregion
 export { BLOB_MAX_SIZE as a, storeBlob as i, getBlobUrl as n, BLOB_MIN_SIZE as o, recordBlobReference as r, getBlobByHash as t };
 
-//# sourceMappingURL=blobs-BAU-dXan.js.map
+//# sourceMappingURL=blobs-B1JriOyi.js.map

package/dist/src/{blobs-qTYm-1PY.js → blobs-BUWmKWzo.js}

@@ -1,5 +1,5 @@
-import { g as getConfigDirectoryPath, i as logger } from "./logger-DLcq4dWf.js";
-import { h as getDb, n as blobReferencesTable, t as blobAssetsTable } from "./tables-xKANLRBD.js";
+import { a as logger, y as getConfigDirectoryPath } from "./logger-BnkjG2jt.js";
+import { h as getDb, n as blobReferencesTable, t as blobAssetsTable } from "./tables-BEIFz2tM.js";
 import * as fs$1 from "node:fs";
 import * as path$1 from "node:path";
 import * as fsPromises$1 from "node:fs/promises";
@@ -233,4 +233,4 @@ async function recordBlobReference(hash, refContext) {
 //#endregion
 export { BLOB_MAX_SIZE as a, storeBlob as i, getBlobUrl as n, BLOB_MIN_SIZE as o, recordBlobReference as r, getBlobByHash as t };
 
-//# sourceMappingURL=blobs-qTYm-1PY.js.map
+//# sourceMappingURL=blobs-BUWmKWzo.js.map

package/dist/src/{blobs-DvS-O6be.cjs → blobs-C6j0bvFz.cjs}

@@ -1,5 +1,5 @@
-const require_logger = require("./logger-Cp1GPUjj.cjs");
-const require_tables = require("./tables-C7K-XKWp.cjs");
+const require_logger = require("./logger-D5iKBpu_.cjs");
+const require_tables = require("./tables-BdZQEpRz.cjs");
 let node_fs = require("node:fs");
 node_fs = require_logger.__toESM(node_fs);
 let node_fs_promises = require("node:fs/promises");
@@ -262,4 +262,4 @@ Object.defineProperty(exports, "storeBlob", {
 	}
 });
 
-//# sourceMappingURL=blobs-DvS-O6be.cjs.map
+//# sourceMappingURL=blobs-C6j0bvFz.cjs.map

package/dist/src/{blobs-Bpg5rH6i.js → blobs-DXTl6J3H.js}

@@ -1,5 +1,5 @@
-import { g as getConfigDirectoryPath, i as logger } from "./logger-CT3IKMKA.js";
-import { n as blobReferencesTable, p as getDb, t as blobAssetsTable } from "./tables-5EvT_Bwn.js";
+import { a as logger, y as getConfigDirectoryPath } from "./logger-DO8_zM18.js";
+import { n as blobReferencesTable, p as getDb, t as blobAssetsTable } from "./tables-kC7R5kiK.js";
 import * as path$1 from "node:path";
 import * as fs$1 from "node:fs";
 import * as fsPromises$1 from "node:fs/promises";
@@ -230,4 +230,4 @@ async function recordBlobReference(hash, refContext) {
 //#endregion
 export { BLOB_MIN_SIZE as a, BLOB_MAX_SIZE as i, recordBlobReference as n, storeBlob as r, getBlobByHash as t };
 
-//# sourceMappingURL=blobs-Bpg5rH6i.js.map
+//# sourceMappingURL=blobs-DXTl6J3H.js.map

package/dist/src/{cache-COish3-W.cjs → cache-C5yFZ4gC.cjs}

@@ -1,5 +1,5 @@
-const require_logger = require("./logger-Cp1GPUjj.cjs");
-const require_fetch = require("./fetch-BxUk8odA.cjs");
+const require_logger = require("./logger-D5iKBpu_.cjs");
+const require_fetch = require("./fetch-BnR9wSnm.cjs");
 let fs = require("fs");
 fs = require_logger.__toESM(fs);
 let path = require("path");
@@ -608,6 +608,31 @@ function getCache() {
 	}
 	return cacheInstance;
 }
+const inflightFetchResponses = /* @__PURE__ */ new Map();
+function serializeFetchResponse(data, status, statusText, headers, latencyMs) {
+	return JSON.stringify({
+		data,
+		status,
+		statusText,
+		headers,
+		latencyMs
+	});
+}
+function deserializeFetchResponse(response, cached, cache, cacheKey) {
+	const parsedResponse = JSON.parse(response);
+	return {
+		cached,
+		data: parsedResponse.data,
+		status: parsedResponse.status,
+		statusText: parsedResponse.statusText,
+		headers: parsedResponse.headers,
+		latencyMs: parsedResponse.latencyMs,
+		deleteFromCache: async () => {
+			await cache.del(cacheKey);
+			require_logger.logger.debug(`Evicted from cache: ${cacheKey}`);
+		}
+	};
+}
 async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent) {
 	const maxBodyRetries = isIdempotent ? 2 : 0;
 	for (let bodyAttempt = 0; bodyAttempt <= maxBodyRetries; bodyAttempt++) {
@@ -637,6 +662,35 @@ async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent)
 	}
 	throw new Error("Exhausted body retries without returning or throwing");
 }
+async function prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format) {
+	const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
+	const response = result.resp;
+	const responseText = result.respText;
+	const fetchLatencyMs = result.fetchLatencyMs;
+	const headers = Object.fromEntries(response.headers.entries());
+	try {
+		const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
+		const serializedResponse = serializeFetchResponse(parsedData, response.status, response.statusText, headers, fetchLatencyMs);
+		if (!response.ok) return {
+			response: responseText === "" ? serializeFetchResponse(`Empty Response: ${response.status}: ${response.statusText}`, response.status, response.statusText, headers, fetchLatencyMs) : serializedResponse,
+			cacheable: false
+		};
+		if (format === "json" && parsedData?.error) {
+			require_logger.logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
+			return {
+				response: serializedResponse,
+				cacheable: false
+			};
+		}
+		require_logger.logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${serializedResponse}`);
+		return {
+			response: serializedResponse,
+			cacheable: true
+		};
+	} catch (err) {
+		throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
+	}
+}
 async function fetchWithCache(url, options = {}, timeout = require_fetch.REQUEST_TIMEOUT_MS, format = "json", bust = false, maxRetries) {
 	const method = (options.method ?? (url instanceof Request ? url.method : "GET")).toUpperCase();
 	const isIdempotent = [
@@ -666,61 +720,23 @@ async function fetchWithCache(url, options = {}, timeout = require_fetch.REQUEST
 	delete copy.headers;
 	const cacheKey = `fetch:v2:${url}:${JSON.stringify(copy)}`;
 	const cache = await getCache();
-	let cached = true;
-	let errorResponse = null;
-	let fetchLatencyMs;
-	const cachedResponse = await cache.wrap(cacheKey, async () => {
-		cached = false;
-		const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
-		const response = result.resp;
-		const responseText = result.respText;
-		fetchLatencyMs = result.fetchLatencyMs;
-		const headers = Object.fromEntries(response.headers.entries());
-		try {
-			const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
-			const data = JSON.stringify({
-				data: parsedData,
-				status: response.status,
-				statusText: response.statusText,
-				headers,
-				latencyMs: fetchLatencyMs
-			});
-			if (!response.ok) {
-				if (responseText == "") errorResponse = JSON.stringify({
-					data: `Empty Response: ${response.status}: ${response.statusText}`,
-					status: response.status,
-					statusText: response.statusText,
-					headers,
-					latencyMs: fetchLatencyMs
-				});
-				else errorResponse = data;
-				return;
-			}
-			if (!data) return;
-			if (format === "json" && parsedData?.error) {
-				require_logger.logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
-				return data;
-			}
-			require_logger.logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${data}`);
-			return data;
-		} catch (err) {
-			throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
-		}
-	});
-	if (cached && cachedResponse) require_logger.logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
-	const parsedResponse = JSON.parse(cachedResponse ?? errorResponse);
-	return {
-		cached,
-		data: parsedResponse.data,
-		status: parsedResponse.status,
-		statusText: parsedResponse.statusText,
-		headers: parsedResponse.headers,
-		latencyMs: parsedResponse.latencyMs,
-		deleteFromCache: async () => {
-			await cache.del(cacheKey);
-			require_logger.logger.debug(`Evicted from cache: ${cacheKey}`);
-		}
-	};
+	const cachedResponse = await cache.get(cacheKey);
+	if (cachedResponse != null) {
+		require_logger.logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
+		return deserializeFetchResponse(cachedResponse, true, cache, cacheKey);
+	}
+	let inflightResponse = inflightFetchResponses.get(cacheKey);
+	if (!inflightResponse) {
+		inflightResponse = (async () => {
+			const preparedResponse = await prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format);
+			if (preparedResponse.cacheable) await cache.set(cacheKey, preparedResponse.response);
+			return preparedResponse.response;
+		})().finally(() => {
+			inflightFetchResponses.delete(cacheKey);
+		});
+		inflightFetchResponses.set(cacheKey, inflightResponse);
+	}
+	return deserializeFetchResponse(await inflightResponse, false, cache, cacheKey);
 }
 function enableCache() {
 	enabled = true;
@@ -729,6 +745,7 @@ function disableCache() {
 	enabled = false;
 }
 async function clearCache() {
+	inflightFetchResponses.clear();
 	return getCache().clear();
 }
 function isCacheEnabled() {
@@ -796,4 +813,4 @@ Object.defineProperty(exports, "isTransientConnectionError", {
 	}
 });
 
-//# sourceMappingURL=cache-COish3-W.cjs.map
+//# sourceMappingURL=cache-C5yFZ4gC.cjs.map

package/dist/src/{cache-8XhNqPKW.js → cache-CaT5tPgo.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./chunk-DEq-mXcV.js";
-import { _ as getEnvBool, b as getEnvString, g as getConfigDirectoryPath, i as logger, y as getEnvInt } from "./logger-CT3IKMKA.js";
-import { d as sleep, n as fetchWithRetries, p as REQUEST_TIMEOUT_MS } from "./fetch-60Gzydls.js";
+import { C as getEnvString, S as getEnvInt, a as logger, b as getEnvBool, y as getConfigDirectoryPath } from "./logger-DO8_zM18.js";
+import { d as sleep, n as fetchWithRetries, p as REQUEST_TIMEOUT_MS } from "./fetch-CVAtKnI3.js";
 import fs from "fs";
 import path from "path";
 import { createCache } from "cache-manager";
@@ -607,6 +607,31 @@ function getCache() {
 	}
 	return cacheInstance;
 }
+const inflightFetchResponses = /* @__PURE__ */ new Map();
+function serializeFetchResponse(data, status, statusText, headers, latencyMs) {
+	return JSON.stringify({
+		data,
+		status,
+		statusText,
+		headers,
+		latencyMs
+	});
+}
+function deserializeFetchResponse(response, cached, cache, cacheKey) {
+	const parsedResponse = JSON.parse(response);
+	return {
+		cached,
+		data: parsedResponse.data,
+		status: parsedResponse.status,
+		statusText: parsedResponse.statusText,
+		headers: parsedResponse.headers,
+		latencyMs: parsedResponse.latencyMs,
+		deleteFromCache: async () => {
+			await cache.del(cacheKey);
+			logger.debug(`Evicted from cache: ${cacheKey}`);
+		}
+	};
+}
 async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent) {
 	const maxBodyRetries = isIdempotent ? 2 : 0;
 	for (let bodyAttempt = 0; bodyAttempt <= maxBodyRetries; bodyAttempt++) {
@@ -636,6 +661,35 @@ async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent)
 	}
 	throw new Error("Exhausted body retries without returning or throwing");
 }
+async function prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format) {
+	const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
+	const response = result.resp;
+	const responseText = result.respText;
+	const fetchLatencyMs = result.fetchLatencyMs;
+	const headers = Object.fromEntries(response.headers.entries());
+	try {
+		const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
+		const serializedResponse = serializeFetchResponse(parsedData, response.status, response.statusText, headers, fetchLatencyMs);
+		if (!response.ok) return {
+			response: responseText === "" ? serializeFetchResponse(`Empty Response: ${response.status}: ${response.statusText}`, response.status, response.statusText, headers, fetchLatencyMs) : serializedResponse,
+			cacheable: false
+		};
+		if (format === "json" && parsedData?.error) {
+			logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
+			return {
+				response: serializedResponse,
+				cacheable: false
+			};
+		}
+		logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${serializedResponse}`);
+		return {
+			response: serializedResponse,
+			cacheable: true
+		};
+	} catch (err) {
+		throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
+	}
+}
 async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, format = "json", bust = false, maxRetries) {
 	const method = (options.method ?? (url instanceof Request ? url.method : "GET")).toUpperCase();
 	const isIdempotent = [
@@ -665,61 +719,23 @@ async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, f
 	delete copy.headers;
 	const cacheKey = `fetch:v2:${url}:${JSON.stringify(copy)}`;
 	const cache = await getCache();
-	let cached = true;
-	let errorResponse = null;
-	let fetchLatencyMs;
-	const cachedResponse = await cache.wrap(cacheKey, async () => {
-		cached = false;
-		const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
-		const response = result.resp;
-		const responseText = result.respText;
-		fetchLatencyMs = result.fetchLatencyMs;
-		const headers = Object.fromEntries(response.headers.entries());
-		try {
-			const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
-			const data = JSON.stringify({
-				data: parsedData,
-				status: response.status,
-				statusText: response.statusText,
-				headers,
-				latencyMs: fetchLatencyMs
-			});
-			if (!response.ok) {
-				if (responseText == "") errorResponse = JSON.stringify({
-					data: `Empty Response: ${response.status}: ${response.statusText}`,
-					status: response.status,
-					statusText: response.statusText,
-					headers,
-					latencyMs: fetchLatencyMs
-				});
-				else errorResponse = data;
-				return;
-			}
-			if (!data) return;
-			if (format === "json" && parsedData?.error) {
-				logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
-				return data;
-			}
-			logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${data}`);
-			return data;
-		} catch (err) {
-			throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
-		}
-	});
-	if (cached && cachedResponse) logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
-	const parsedResponse = JSON.parse(cachedResponse ?? errorResponse);
-	return {
-		cached,
-		data: parsedResponse.data,
-		status: parsedResponse.status,
-		statusText: parsedResponse.statusText,
-		headers: parsedResponse.headers,
-		latencyMs: parsedResponse.latencyMs,
-		deleteFromCache: async () => {
-			await cache.del(cacheKey);
-			logger.debug(`Evicted from cache: ${cacheKey}`);
-		}
-	};
+	const cachedResponse = await cache.get(cacheKey);
+	if (cachedResponse != null) {
+		logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
+		return deserializeFetchResponse(cachedResponse, true, cache, cacheKey);
+	}
+	let inflightResponse = inflightFetchResponses.get(cacheKey);
+	if (!inflightResponse) {
+		inflightResponse = (async () => {
+			const preparedResponse = await prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format);
+			if (preparedResponse.cacheable) await cache.set(cacheKey, preparedResponse.response);
+			return preparedResponse.response;
+		})().finally(() => {
+			inflightFetchResponses.delete(cacheKey);
+		});
+		inflightFetchResponses.set(cacheKey, inflightResponse);
+	}
+	return deserializeFetchResponse(await inflightResponse, false, cache, cacheKey);
 }
 function enableCache() {
 	enabled = true;
@@ -728,6 +744,7 @@ function disableCache() {
 	enabled = false;
 }
 async function clearCache() {
+	inflightFetchResponses.clear();
 	return getCache().clear();
 }
 function isCacheEnabled() {
@@ -736,4 +753,4 @@ function isCacheEnabled() {
 //#endregion
 export { isCacheEnabled as a, isTransientConnectionError as c, getCache as i, disableCache as n, NON_TRANSIENT_HTTP_STATUSES as o, fetchWithCache as r, isNonTransientHttpStatus as s, cache_exports as t };
 
-//# sourceMappingURL=cache-8XhNqPKW.js.map
+//# sourceMappingURL=cache-CaT5tPgo.js.map

package/dist/src/cache-CyCanoMu.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+import "./logger-BcJBzSSA.js";
+import "./fetch-DoVRJZhJ.js";
+import "./cloud-z8KZpUoa.js";
+import { o as getCache, s as isCacheEnabled } from "./cache-DSqR6ezl.js";
+export { getCache, isCacheEnabled };

package/dist/src/{cache-CG0SlR1d.js → cache-DSqR6ezl.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { t as __exportAll } from "./chunk-DRamLcfz.js";
-import { C as getEnvString, S as getEnvInt, b as getEnvBool, o as logger, v as getConfigDirectoryPath } from "./logger-KkObSCzq.js";
-import { f as REQUEST_TIMEOUT_MS, l as sleep, r as fetchWithRetries } from "./fetch-BMv0O527.js";
+import { C as getEnvBool, E as getEnvString, T as getEnvInt, s as logger, x as getConfigDirectoryPath } from "./logger-BcJBzSSA.js";
+import { f as REQUEST_TIMEOUT_MS, l as sleep, r as fetchWithRetries } from "./fetch-DoVRJZhJ.js";
 import { r as isTransientConnectionError } from "./errors-P6ll7XSJ.js";
 import fs from "fs";
 import path from "path";
@@ -577,6 +577,31 @@ function getCache() {
 	}
 	return cacheInstance;
 }
+const inflightFetchResponses = /* @__PURE__ */ new Map();
+function serializeFetchResponse(data, status, statusText, headers, latencyMs) {
+	return JSON.stringify({
+		data,
+		status,
+		statusText,
+		headers,
+		latencyMs
+	});
+}
+function deserializeFetchResponse(response, cached, cache, cacheKey) {
+	const parsedResponse = JSON.parse(response);
+	return {
+		cached,
+		data: parsedResponse.data,
+		status: parsedResponse.status,
+		statusText: parsedResponse.statusText,
+		headers: parsedResponse.headers,
+		latencyMs: parsedResponse.latencyMs,
+		deleteFromCache: async () => {
+			await cache.del(cacheKey);
+			logger.debug(`Evicted from cache: ${cacheKey}`);
+		}
+	};
+}
 async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent) {
 	const maxBodyRetries = isIdempotent ? 2 : 0;
 	for (let bodyAttempt = 0; bodyAttempt <= maxBodyRetries; bodyAttempt++) {
@@ -606,6 +631,35 @@ async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent)
 	}
 	throw new Error("Exhausted body retries without returning or throwing");
 }
+async function prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format) {
+	const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
+	const response = result.resp;
+	const responseText = result.respText;
+	const fetchLatencyMs = result.fetchLatencyMs;
+	const headers = Object.fromEntries(response.headers.entries());
+	try {
+		const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
+		const serializedResponse = serializeFetchResponse(parsedData, response.status, response.statusText, headers, fetchLatencyMs);
+		if (!response.ok) return {
+			response: responseText === "" ? serializeFetchResponse(`Empty Response: ${response.status}: ${response.statusText}`, response.status, response.statusText, headers, fetchLatencyMs) : serializedResponse,
+			cacheable: false
+		};
+		if (format === "json" && parsedData?.error) {
+			logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
+			return {
+				response: serializedResponse,
+				cacheable: false
+			};
+		}
+		logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${serializedResponse}`);
+		return {
+			response: serializedResponse,
+			cacheable: true
+		};
+	} catch (err) {
+		throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
+	}
+}
 async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, format = "json", bust = false, maxRetries) {
 	const method = (options.method ?? (url instanceof Request ? url.method : "GET")).toUpperCase();
 	const isIdempotent = [
@@ -635,61 +689,23 @@ async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, f
 	delete copy.headers;
 	const cacheKey = `fetch:v2:${url}:${JSON.stringify(copy)}`;
 	const cache = await getCache();
-	let cached = true;
-	let errorResponse = null;
-	let fetchLatencyMs;
-	const cachedResponse = await cache.wrap(cacheKey, async () => {
-		cached = false;
-		const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
-		const response = result.resp;
-		const responseText = result.respText;
-		fetchLatencyMs = result.fetchLatencyMs;
-		const headers = Object.fromEntries(response.headers.entries());
-		try {
-			const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
-			const data = JSON.stringify({
-				data: parsedData,
-				status: response.status,
-				statusText: response.statusText,
-				headers,
-				latencyMs: fetchLatencyMs
-			});
-			if (!response.ok) {
-				if (responseText == "") errorResponse = JSON.stringify({
-					data: `Empty Response: ${response.status}: ${response.statusText}`,
-					status: response.status,
-					statusText: response.statusText,
-					headers,
-					latencyMs: fetchLatencyMs
-				});
-				else errorResponse = data;
-				return;
-			}
-			if (!data) return;
-			if (format === "json" && parsedData?.error) {
-				logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
-				return data;
-			}
-			logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${data}`);
-			return data;
-		} catch (err) {
-			throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
-		}
-	});
-	if (cached && cachedResponse) logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
-	const parsedResponse = JSON.parse(cachedResponse ?? errorResponse);
-	return {
-		cached,
-		data: parsedResponse.data,
-		status: parsedResponse.status,
-		statusText: parsedResponse.statusText,
-		headers: parsedResponse.headers,
-		latencyMs: parsedResponse.latencyMs,
-		deleteFromCache: async () => {
-			await cache.del(cacheKey);
-			logger.debug(`Evicted from cache: ${cacheKey}`);
-		}
-	};
+	const cachedResponse = await cache.get(cacheKey);
+	if (cachedResponse != null) {
+		logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
+		return deserializeFetchResponse(cachedResponse, true, cache, cacheKey);
+	}
+	let inflightResponse = inflightFetchResponses.get(cacheKey);
+	if (!inflightResponse) {
+		inflightResponse = (async () => {
+			const preparedResponse = await prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format);
+			if (preparedResponse.cacheable) await cache.set(cacheKey, preparedResponse.response);
+			return preparedResponse.response;
+		})().finally(() => {
+			inflightFetchResponses.delete(cacheKey);
+		});
+		inflightFetchResponses.set(cacheKey, inflightResponse);
+	}
+	return deserializeFetchResponse(await inflightResponse, false, cache, cacheKey);
 }
 function enableCache() {
 	enabled = true;
@@ -698,6 +714,7 @@ function disableCache() {
 	enabled = false;
 }
 async function clearCache() {
+	inflightFetchResponses.clear();
 	return getCache().clear();
 }
 function isCacheEnabled() {
@@ -706,4 +723,4 @@ function isCacheEnabled() {
 //#endregion
 export { fetchWithCache as a, enableCache as i, clearCache as n, getCache as o, disableCache as r, isCacheEnabled as s, cache_exports as t };
 
-//# sourceMappingURL=cache-CG0SlR1d.js.map
+//# sourceMappingURL=cache-DSqR6ezl.js.map

package/dist/src/cache-Df_QFDNu.cjs

@@ -0,0 +1,5 @@
+require("./logger-D5iKBpu_.cjs");
+require("./fetch-BnR9wSnm.cjs");
+const require_cache = require("./cache-C5yFZ4gC.cjs");
+exports.getCache = require_cache.getCache;
+exports.isCacheEnabled = require_cache.isCacheEnabled;