promptfoo 0.120.27 → 0.121.2

package/dist/src/{cache-jsiwsAJv.js → cache-BVeDlD87.js}

@@ -1,15 +1,14 @@
 #!/usr/bin/env node
-import { t as __exportAll } from "./chunk-DHDDz29n.js";
-import { C as getEnvString, S as getEnvInt, b as getEnvBool, o as logger_default, v as getConfigDirectoryPath } from "./logger-LSBxlt7a.js";
-import { f as REQUEST_TIMEOUT_MS, l as sleep, r as fetchWithRetries } from "./fetch-CXZI9RRr.js";
-import { r as isTransientConnectionError } from "./errors-DnGCbnx8.js";
+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-Dxpd4_sr.js";
+import { r as isTransientConnectionError } from "./errors-P6ll7XSJ.js";
 import fs from "fs";
 import path from "path";
 import { createCache } from "cache-manager";
 import { Keyv } from "keyv";
 import { KeyvFile } from "keyv-file";
 import { randomBytes } from "crypto";
-
 //#region src/cacheMigration.ts
 /**
 * Migration sunset date: After this date, skip migration entirely.
@@ -41,7 +40,7 @@ function getDirSize(dirPath) {
 			else totalSize += fs.statSync(itemPath).size;
 		}
 	} catch (err) {
-		if (err.code !== "ENOENT") logger_default.warn(`[Cache Migration] Error calculating directory size: ${err.message}`);
+		if (err.code !== "ENOENT") logger.warn(`[Cache Migration] Error calculating directory size: ${err.message}`);
 	}
 	return totalSize;
 }
@@ -56,18 +55,18 @@ function checkDiskSpace(cachePath) {
 			const stats = fs.statfsSync(cachePath);
 			const availableBytes = stats.bavail * stats.bsize;
 			const requiredBytes = cacheSize * 2 + 10 * 1024 * 1024;
-			logger_default.debug(`[Cache Migration] Disk space check: need ${(requiredBytes / 1024 / 1024).toFixed(2)}MB, have ${(availableBytes / 1024 / 1024).toFixed(2)}MB available`);
+			logger.debug(`[Cache Migration] Disk space check: need ${(requiredBytes / 1024 / 1024).toFixed(2)}MB, have ${(availableBytes / 1024 / 1024).toFixed(2)}MB available`);
 			if (availableBytes < requiredBytes) {
-				logger_default.error(`[Cache Migration] Insufficient disk space for migration. Need ${(requiredBytes / 1024 / 1024).toFixed(0)}MB, have ${(availableBytes / 1024 / 1024).toFixed(0)}MB available.`);
+				logger.error(`[Cache Migration] Insufficient disk space for migration. Need ${(requiredBytes / 1024 / 1024).toFixed(0)}MB, have ${(availableBytes / 1024 / 1024).toFixed(0)}MB available.`);
 				return false;
 			}
 			return true;
 		} else {
-			logger_default.debug("[Cache Migration] Disk space check not available on this platform, proceeding");
+			logger.debug("[Cache Migration] Disk space check not available on this platform, proceeding");
 			return true;
 		}
 	} catch (err) {
-		logger_default.warn(`[Cache Migration] Could not check disk space: ${err.message}`);
+		logger.warn(`[Cache Migration] Could not check disk space: ${err.message}`);
 		return true;
 	}
 }
@@ -93,7 +92,7 @@ function isProcessRunning(pid) {
 */
 function acquireMigrationLock(cachePath, attempt = 1) {
 	if (attempt > MAX_LOCK_ATTEMPTS) {
-		logger_default.warn(`[Cache Migration] Failed to acquire lock after ${MAX_LOCK_ATTEMPTS} attempts`);
+		logger.warn(`[Cache Migration] Failed to acquire lock after ${MAX_LOCK_ATTEMPTS} attempts`);
 		return null;
 	}
 	const lockFile = path.join(cachePath, ".migration.lock");
@@ -102,7 +101,7 @@ function acquireMigrationLock(cachePath, attempt = 1) {
 		const fd = fs.openSync(lockFile, "wx");
 		fs.writeSync(fd, process.pid.toString());
 		fs.fsyncSync(fd);
-		logger_default.debug(`[Cache Migration] Lock acquired (PID: ${process.pid})`);
+		logger.debug(`[Cache Migration] Lock acquired (PID: ${process.pid})`);
 		return fd;
 	} catch (err) {
 		if (err.code === "EEXIST") {
@@ -111,20 +110,20 @@ function acquireMigrationLock(cachePath, attempt = 1) {
 				const pid = parseInt(content, 10);
 				if (!isNaN(pid)) {
 					if (isProcessRunning(pid)) {
-						logger_default.info(`[Cache Migration] Another migration is in progress (PID: ${pid})`);
+						logger.info(`[Cache Migration] Another migration is in progress (PID: ${pid})`);
 						return null;
 					}
-					logger_default.warn(`[Cache Migration] Removing stale lock file (PID: ${pid} not found)`);
+					logger.warn(`[Cache Migration] Removing stale lock file (PID: ${pid} not found)`);
 					try {
 						fs.unlinkSync(lockFile);
 						return acquireMigrationLock(cachePath, attempt + 1);
 					} catch (unlinkErr) {
-						logger_default.error(`[Cache Migration] Failed to remove stale lock: ${unlinkErr.message}`);
+						logger.error(`[Cache Migration] Failed to remove stale lock: ${unlinkErr.message}`);
 						return null;
 					}
 				}
 			} catch (readErr) {
-				logger_default.warn(`[Cache Migration] Could not read lock file: ${readErr.message}`);
+				logger.warn(`[Cache Migration] Could not read lock file: ${readErr.message}`);
 			}
 			return null;
 		}
@@ -140,13 +139,13 @@ function releaseMigrationLock(fd, cachePath) {
 	try {
 		fs.closeSync(fd);
 	} catch (err) {
-		logger_default.warn(`[Cache Migration] Failed to close lock file: ${err.message}`);
+		logger.warn(`[Cache Migration] Failed to close lock file: ${err.message}`);
 	}
 	try {
 		fs.unlinkSync(lockFile);
-		logger_default.debug("[Cache Migration] Lock released");
+		logger.debug("[Cache Migration] Lock released");
 	} catch (err) {
-		logger_default.warn(`[Cache Migration] Failed to remove lock file: ${err.message}`);
+		logger.warn(`[Cache Migration] Failed to remove lock file: ${err.message}`);
 	}
 }
 /**
@@ -179,28 +178,28 @@ function readOldCacheEntries(cachePath) {
 	};
 	const entries = /* @__PURE__ */ new Map();
 	if (!fs.existsSync(cachePath)) {
-		logger_default.info(`[Cache Migration] No old cache directory found at ${cachePath}`);
+		logger.info(`[Cache Migration] No old cache directory found at ${cachePath}`);
 		return {
 			entries,
 			stats
 		};
 	}
 	const diskstoreDirs = fs.readdirSync(cachePath, { withFileTypes: true }).filter((dirEntry) => dirEntry.isDirectory() && dirEntry.name.startsWith("diskstore-")).map((dirEntry) => dirEntry.name);
-	logger_default.info(`[Cache Migration] Found ${diskstoreDirs.length} diskstore directories`);
+	logger.info(`[Cache Migration] Found ${diskstoreDirs.length} diskstore directories`);
 	const shouldLogProgress = diskstoreDirs.length > 100;
-	if (shouldLogProgress) logger_default.info(`[Cache Migration] Processing large cache, this may take a moment...`);
+	if (shouldLogProgress) logger.info(`[Cache Migration] Processing large cache, this may take a moment...`);
 	const now = Date.now();
 	let dirCount = 0;
 	for (const dir of diskstoreDirs) {
 		const dirPath = path.join(cachePath, dir);
 		dirCount++;
-		if (shouldLogProgress && dirCount % 100 === 0) logger_default.info(`[Cache Migration] Processed ${dirCount}/${diskstoreDirs.length} directories...`);
+		if (shouldLogProgress && dirCount % 100 === 0) logger.info(`[Cache Migration] Processed ${dirCount}/${diskstoreDirs.length} directories...`);
 		try {
 			const jsonFiles = fs.readdirSync(dirPath).filter((f) => f.endsWith(".json"));
 			for (const file of jsonFiles) {
 				const filePath = path.join(dirPath, file);
 				stats.totalFiles++;
-				if (stats.totalFiles % 1e3 === 0 && stats.totalFiles > 0) logger_default.info(`[Cache Migration] Processed ${stats.totalFiles} files...`);
+				if (stats.totalFiles % 1e3 === 0 && stats.totalFiles > 0) logger.info(`[Cache Migration] Processed ${stats.totalFiles} files...`);
 				try {
 					const content = fs.readFileSync(filePath, "utf-8");
 					const oldEntry = JSON.parse(content);
@@ -251,7 +250,7 @@ function validateCacheFile(cachePath, expectedEntryCount) {
 	if (!Array.isArray(parsed.cache)) throw new Error("Cache file has invalid structure: missing or invalid \"cache\" array");
 	if (typeof parsed.lastExpire !== "number") throw new Error("Cache file has invalid structure: missing or invalid \"lastExpire\" field");
 	if (parsed.cache.length !== expectedEntryCount) throw new Error(`Cache file entry count mismatch: expected ${expectedEntryCount}, got ${parsed.cache.length}`);
-	logger_default.debug(`[Cache Migration] Validated cache file: ${cachePath} (${expectedEntryCount} entries)`);
+	logger.debug(`[Cache Migration] Validated cache file: ${cachePath} (${expectedEntryCount} entries)`);
 }
 /**
 * Write entries in keyv-file format using atomic write operation.
@@ -275,7 +274,7 @@ function writeNewCacheFile(entries, newCachePath) {
 		}
 		fs.writeFileSync(tempFile, serialized, "utf-8");
 		fs.renameSync(tempFile, newCachePath);
-		logger_default.debug(`[Cache Migration] Atomically wrote cache file: ${newCachePath}`);
+		logger.debug(`[Cache Migration] Atomically wrote cache file: ${newCachePath}`);
 		validateCacheFile(newCachePath, entries.size);
 	} catch (err) {
 		try {
@@ -289,7 +288,7 @@ function writeNewCacheFile(entries, newCachePath) {
 */
 function createBackup(cachePath) {
 	const backupPath = `${cachePath}.backup.${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
-	logger_default.info(`[Cache Migration] Creating backup at ${backupPath}`);
+	logger.info(`[Cache Migration] Creating backup at ${backupPath}`);
 	if (fs.existsSync(cachePath)) fs.cpSync(cachePath, backupPath, { recursive: true });
 	return backupPath;
 }
@@ -317,11 +316,11 @@ function isMigrationComplete(cacheBasePath, newCacheFile) {
 	if (newCacheFile && fs.existsSync(newCacheFile)) return true;
 	if (newCacheFile) {
 		if (hasOldCacheFormat(cacheBasePath)) {
-			logger_default.warn("[Cache Migration] Marker file exists but migration appears incomplete. Old cache format found but new cache missing. Retrying migration...");
+			logger.warn("[Cache Migration] Marker file exists but migration appears incomplete. Old cache format found but new cache missing. Retrying migration...");
 			try {
 				fs.unlinkSync(markerPath);
 			} catch (err) {
-				logger_default.warn(`[Cache Migration] Failed to remove stale marker: ${err.message}`);
+				logger.warn(`[Cache Migration] Failed to remove stale marker: ${err.message}`);
 			}
 			return false;
 		}
@@ -353,7 +352,7 @@ function cleanupOldCache(cachePath) {
 		throw err;
 	}
 	const diskstoreDirs = dirEntries.filter((dirEntry) => dirEntry.isDirectory() && dirEntry.name.startsWith("diskstore-")).map((dirEntry) => dirEntry.name);
-	logger_default.info(`[Cache Migration] Cleaning up ${diskstoreDirs.length} old cache directories`);
+	logger.info(`[Cache Migration] Cleaning up ${diskstoreDirs.length} old cache directories`);
 	for (const dir of diskstoreDirs) {
 		const dirPath = path.join(cachePath, dir);
 		try {
@@ -362,7 +361,7 @@ function cleanupOldCache(cachePath) {
 				force: true
 			});
 		} catch (err) {
-			logger_default.warn(`[Cache Migration] Failed to remove ${dirPath}: ${err.message}`);
+			logger.warn(`[Cache Migration] Failed to remove ${dirPath}: ${err.message}`);
 		}
 	}
 }
@@ -372,23 +371,23 @@ function cleanupOldCache(cachePath) {
 */
 function cleanupBackup(backupPath, stats) {
 	if (stats.successCount === 0 && stats.failureCount === 0) {
-		logger_default.info(`[Cache Migration] No valid entries found (${stats.skippedExpired} expired only). Removing backup to save space.`);
+		logger.info(`[Cache Migration] No valid entries found (${stats.skippedExpired} expired only). Removing backup to save space.`);
 		try {
 			fs.rmSync(backupPath, {
 				recursive: true,
 				force: true
 			});
-			logger_default.info(`[Cache Migration] Backup removed: ${backupPath}`);
+			logger.info(`[Cache Migration] Backup removed: ${backupPath}`);
 			return true;
 		} catch (err) {
-			logger_default.warn(`[Cache Migration] Failed to remove backup ${backupPath}: ${err.message}`);
+			logger.warn(`[Cache Migration] Failed to remove backup ${backupPath}: ${err.message}`);
 			return false;
 		}
 	} else if (stats.failureCount > 0) {
-		logger_default.info(`[Cache Migration] Backup kept at ${backupPath} due to ${stats.failureCount} migration errors. You may want to investigate these failures.`);
+		logger.info(`[Cache Migration] Backup kept at ${backupPath} due to ${stats.failureCount} migration errors. You may want to investigate these failures.`);
 		return false;
 	} else {
-		logger_default.info(`[Cache Migration] Backup kept at ${backupPath} (migrated ${stats.successCount} valid entries). You can manually delete this backup if you no longer need it.`);
+		logger.info(`[Cache Migration] Backup kept at ${backupPath} (migrated ${stats.successCount} valid entries). You can manually delete this backup if you no longer need it.`);
 		return false;
 	}
 }
@@ -397,10 +396,10 @@ function cleanupBackup(backupPath, stats) {
 * Migrates cache from cache-manager v4 (cache-manager-fs-hash) to v7 (keyv-file)
 */
 function runMigration(cachePath, newCacheFilePath) {
-	logger_default.info("[Cache Migration] Starting cache migration from v4 to v7");
+	logger.info("[Cache Migration] Starting cache migration from v4 to v7");
 	const lock = acquireMigrationLock(cachePath);
 	if (lock === null) {
-		logger_default.info("[Cache Migration] Another migration is in progress, skipping");
+		logger.info("[Cache Migration] Another migration is in progress, skipping");
 		return {
 			success: true,
 			stats: {
@@ -414,7 +413,7 @@ function runMigration(cachePath, newCacheFilePath) {
 	}
 	try {
 		if (isMigrationComplete(cachePath, newCacheFilePath)) {
-			logger_default.info("[Cache Migration] Migration already completed, skipping");
+			logger.info("[Cache Migration] Migration already completed, skipping");
 			return {
 				success: true,
 				stats: {
@@ -427,7 +426,7 @@ function runMigration(cachePath, newCacheFilePath) {
 			};
 		}
 		if (!hasOldCacheFormat(cachePath)) {
-			logger_default.info("[Cache Migration] No old cache format detected, skipping migration");
+			logger.info("[Cache Migration] No old cache format detected, skipping migration");
 			markMigrationComplete(cachePath, {
 				totalFiles: 0,
 				successCount: 0,
@@ -447,7 +446,7 @@ function runMigration(cachePath, newCacheFilePath) {
 			};
 		}
 		if (!checkDiskSpace(cachePath)) {
-			logger_default.error("[Cache Migration] Insufficient disk space, aborting migration");
+			logger.error("[Cache Migration] Insufficient disk space, aborting migration");
 			return {
 				success: false,
 				stats: {
@@ -460,30 +459,30 @@ function runMigration(cachePath, newCacheFilePath) {
 			};
 		}
 		const backupPath = createBackup(cachePath);
-		logger_default.info("[Cache Migration] Reading old cache entries");
+		logger.info("[Cache Migration] Reading old cache entries");
 		const { entries, stats } = readOldCacheEntries(cachePath);
-		logger_default.info(`[Cache Migration] Read ${stats.successCount} entries (${stats.failureCount} failures, ${stats.skippedExpired} expired)`);
+		logger.info(`[Cache Migration] Read ${stats.successCount} entries (${stats.failureCount} failures, ${stats.skippedExpired} expired)`);
 		if (stats.errors.length > 0) {
-			logger_default.warn(`[Cache Migration] Encountered ${stats.errors.length} errors:`);
-			stats.errors.slice(0, 10).forEach((err) => logger_default.warn(`  - ${err}`));
-			if (stats.errors.length > 10) logger_default.warn(`  ... and ${stats.errors.length - 10} more errors`);
+			logger.warn(`[Cache Migration] Encountered ${stats.errors.length} errors:`);
+			stats.errors.slice(0, 10).forEach((err) => logger.warn(`  - ${err}`));
+			if (stats.errors.length > 10) logger.warn(`  ... and ${stats.errors.length - 10} more errors`);
 		}
 		if (entries.size > 0) {
-			logger_default.info(`[Cache Migration] Writing ${entries.size} entries to new cache file: ${newCacheFilePath}`);
+			logger.info(`[Cache Migration] Writing ${entries.size} entries to new cache file: ${newCacheFilePath}`);
 			writeNewCacheFile(entries, newCacheFilePath);
-		} else logger_default.info("[Cache Migration] No entries to migrate");
+		} else logger.info("[Cache Migration] No entries to migrate");
 		cleanupOldCache(cachePath);
 		const backupDeleted = cleanupBackup(backupPath, stats);
 		markMigrationComplete(cachePath, stats);
-		logger_default.info("[Cache Migration] Migration completed successfully");
+		logger.info("[Cache Migration] Migration completed successfully");
 		return {
 			success: true,
 			stats,
 			backupPath: backupDeleted ? void 0 : backupPath
 		};
 	} catch (err) {
-		logger_default.error(`[Cache Migration] Migration failed: ${err.message}`);
-		logger_default.error(`[Cache Migration] Stack trace: ${err.stack}`);
+		logger.error(`[Cache Migration] Migration failed: ${err.message}`);
+		logger.error(`[Cache Migration] Stack trace: ${err.stack}`);
 		return {
 			success: false,
 			stats: {
@@ -510,7 +509,6 @@ function shouldRunMigration(cachePath, newCacheFile) {
 	if (isMigrationComplete(cachePath, newCacheFile)) return false;
 	return hasOldCacheFormat(cachePath);
 }
-
 //#endregion
 //#region src/cache.ts
 var cache_exports = /* @__PURE__ */ __exportAll({
@@ -541,23 +539,23 @@ function getCache() {
 		if (cacheType === "disk" && enabled) {
 			cachePath = getEnvString("PROMPTFOO_CACHE_PATH") || path.join(getConfigDirectoryPath(), "cache");
 			if (!fs.existsSync(cachePath)) {
-				logger_default.info(`Creating cache folder at ${cachePath}.`);
+				logger.info(`Creating cache folder at ${cachePath}.`);
 				fs.mkdirSync(cachePath, { recursive: true });
 			}
 			const newCacheFile = path.join(cachePath, "cache.json");
 			if (shouldRunMigration(cachePath, newCacheFile)) {
-				logger_default.info("[Cache] Migrating cache from v4 to v7...");
+				logger.info("[Cache] Migrating cache from v4 to v7...");
 				try {
 					const result = runMigration(cachePath, newCacheFile);
 					if (result.success) {
-						logger_default.info(`[Cache] Migration completed: ${result.stats.successCount} entries migrated, ${result.stats.skippedExpired} expired`);
-						if (result.backupPath) logger_default.info(`[Cache] Backup kept at: ${result.backupPath}`);
+						logger.info(`[Cache] Migration completed: ${result.stats.successCount} entries migrated, ${result.stats.skippedExpired} expired`);
+						if (result.backupPath) logger.info(`[Cache] Backup kept at: ${result.backupPath}`);
 					} else {
-						logger_default.error(`[Cache] Migration failed: ${result.stats.errors.join(", ")}. Falling back to memory cache.`);
+						logger.error(`[Cache] Migration failed: ${result.stats.errors.join(", ")}. Falling back to memory cache.`);
 						migrationFailed = true;
 					}
 				} catch (err) {
-					logger_default.error(`[Cache] Migration error: ${err.message}. Falling back to memory cache.`);
+					logger.error(`[Cache] Migration error: ${err.message}. Falling back to memory cache.`);
 					migrationFailed = true;
 				}
 			}
@@ -568,7 +566,7 @@ function getCache() {
 				});
 				stores.push(keyv);
 			} catch (err) {
-				logger_default.warn(`[Cache] Failed to initialize disk cache: ${err.message}. Using memory cache instead.`);
+				logger.warn(`[Cache] Failed to initialize disk cache: ${err.message}. Using memory cache instead.`);
 			}
 		}
 		cacheInstance = createCache({
@@ -579,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++) {
@@ -594,7 +617,7 @@ async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent)
 		} catch (err) {
 			if (isTransientConnectionError(err) && bodyAttempt < maxBodyRetries) {
 				const backoffMs = Math.pow(2, bodyAttempt) * 1e3;
-				logger_default.debug("[Cache] Body stream failed with transient error, retrying", {
+				logger.debug("[Cache] Body stream failed with transient error, retrying", {
 					attempt: bodyAttempt + 1,
 					maxRetries: maxBodyRetries,
 					backoffMs,
@@ -608,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 = [
@@ -637,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_default.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
-				return data;
-			}
-			logger_default.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_default.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_default.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;
@@ -700,12 +714,13 @@ function disableCache() {
 	enabled = false;
 }
 async function clearCache() {
+	inflightFetchResponses.clear();
 	return getCache().clear();
 }
 function isCacheEnabled() {
 	return enabled;
 }
-
 //#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-jsiwsAJv.js.map
+
+//# sourceMappingURL=cache-BVeDlD87.js.map