@cloudflare/vitest-pool-workers 0.15.1 → 0.16.0

package/dist/pool/index.mjs

@@ -461,7 +461,7 @@ var MetricsRegistry = class {
 };
 
 //#endregion
-//#region ../workers-utils/dist/chunk-A4F3D336.mjs
+//#region ../workers-utils/dist/chunk-XXCQEG76.mjs
 var UserError = class extends Error {
 	static {
 		__name(this, "UserError");
@@ -470,7 +470,7 @@ var UserError = class extends Error {
 	constructor(message, options) {
 		super(message, options);
 		Object.setPrototypeOf(this, new.target.prototype);
-		this.telemetryMessage = options?.telemetryMessage === true ? message : options?.telemetryMessage;
+		this.telemetryMessage = typeof options?.telemetryMessage === "string" ? options.telemetryMessage : options?.telemetryMessage ? message : void 0;
 	}
 };
 var DeprecationError = class extends UserError {
@@ -483,13 +483,14 @@ ${message}`, options);
 	}
 };
 var FatalError = class extends UserError {
-	constructor(message, code, options) {
-		super(message, options);
-		this.code = code;
-	}
 	static {
 		__name(this, "FatalError");
 	}
+	code;
+	constructor(message, options) {
+		super(message, options);
+		this.code = options.code;
+	}
 };
 var CommandLineArgsError = class extends UserError {
 	static {
@@ -497,10 +498,6 @@ var CommandLineArgsError = class extends UserError {
 	}
 };
 var JsonFriendlyFatalError = class extends FatalError {
-	constructor(message, code, options) {
-		super(message, code, options);
-		this.code = code;
-	}
 	static {
 		__name(this, "JsonFriendlyFatalError");
 	}
@@ -515,9 +512,9 @@ var MissingConfigError = class extends Error {
 		this.telemetryMessage = `Missing config value for ${key}`;
 	}
 };
-function createFatalError(message, isJson, code, telemetryMessage) {
-	if (isJson) return new JsonFriendlyFatalError(JSON.stringify(message), code, telemetryMessage);
-	else return new FatalError(`${message}`, code, telemetryMessage);
+function createFatalError(message, isJson, options) {
+	if (isJson) return new JsonFriendlyFatalError(JSON.stringify(message), options);
+	return new FatalError(`${message}`, options);
 }
 __name(createFatalError, "createFatalError");
 function createScanner(text, ignoreTrivia = false) {
@@ -2537,7 +2534,8 @@ function readFileSyncToBuffer(file2) {
 		const { message } = err;
 		throw new ParseError({
 			text: `Could not read file: ${file2}`,
-			notes: [{ text: message.replace(file2, resolve(file2)) }]
+			notes: [{ text: message.replace(file2, resolve(file2)) }],
+			telemetryMessage: false
 		});
 	}
 }
@@ -2829,7 +2827,10 @@ function findRedirectedWranglerConfig(cwd, userConfigPath) {
 		const deployConfig = parseJSONC(deployConfigFile, deployConfigPath);
 		redirectedConfigPath = deployConfig.configPath && path.resolve(path.dirname(deployConfigPath), deployConfig.configPath);
 	} catch (e) {
-		throw new UserError(`Failed to parse the deploy configuration file at ${path.relative(".", deployConfigPath)}`, { cause: e });
+		throw new UserError(`Failed to parse the deploy configuration file at ${path.relative(".", deployConfigPath)}`, {
+			cause: e,
+			telemetryMessage: false
+		});
 	}
 	if (!redirectedConfigPath) throw new UserError(esm_default`
 			A deploy configuration file was found at "${path.relative(".", deployConfigPath)}".
@@ -2838,17 +2839,17 @@ function findRedirectedWranglerConfig(cwd, userConfigPath) {
 			\`\`\`
 			${deployConfigFile}
 			\`\`\`
-		`);
+		`, { telemetryMessage: false });
 	if (!existsSync(redirectedConfigPath)) throw new UserError(esm_default`
 				There is a deploy configuration at "${path.relative(".", deployConfigPath)}".
 				But the redirected configuration path it points to, "${path.relative(".", redirectedConfigPath)}", does not exist.
-			`);
+			`, { telemetryMessage: false });
 	if (userConfigPath) {
 		if (path.join(path.dirname(userConfigPath), PATH_TO_DEPLOY_CONFIG) !== deployConfigPath) throw new UserError(esm_default`
 					Found both a user configuration file at "${path.relative(".", userConfigPath)}"
 					and a deploy configuration file at "${path.relative(".", deployConfigPath)}".
 					But these do not share the same base path so it is not clear which should be used.
-				`);
+				`, { telemetryMessage: false });
 	}
 	return {
 		configPath: redirectedConfigPath,
@@ -7199,7 +7200,7 @@ function getBooleanEnvironmentVariableFactory(options) {
 		switch (process.env[options.variableName]?.toLowerCase()) {
 			case "true": return true;
 			case "false": return false;
-			default: throw new UserError(`Expected ${options.variableName} to be "true" or "false", but got ${JSON.stringify(process.env[options.variableName])}`);
+			default: throw new UserError(`Expected ${options.variableName} to be "true" or "false", but got ${JSON.stringify(process.env[options.variableName])}`, { telemetryMessage: false });
 		}
 	};
 }
@@ -7225,7 +7226,7 @@ function getProcessEnv(variableName, choices) {
 }
 __name(getProcessEnv, "getProcessEnv");
 function assertOneOf(choices, value) {
-	if (Array.isArray(choices) && !choices.includes(value)) throw new UserError(`Expected ${JSON.stringify(value)} to be one of ${JSON.stringify(choices)}`);
+	if (Array.isArray(choices) && !choices.includes(value)) throw new UserError(`Expected ${JSON.stringify(value)} to be one of ${JSON.stringify(choices)}`, { telemetryMessage: false });
 }
 __name(assertOneOf, "assertOneOf");
 var getC3CommandFromEnv = getEnvironmentVariableFactory({
@@ -7249,7 +7250,7 @@ var getCloudflareComplianceRegion = /* @__PURE__ */ __name((complianceConfig) =>
 			The compliance region has been set to different values in two places:
 			 - \`CLOUDFLARE_COMPLIANCE_REGION\` environment variable: \`${complianceRegionFromEnv}\`
 			 - \`compliance_region\` configuration property: \`${complianceConfig.compliance_region}\`
-			`);
+			`, { telemetryMessage: false });
 	return complianceRegionFromEnv || complianceConfig?.compliance_region || "public";
 }, "getCloudflareComplianceRegion");
 var getCloudflareApiBaseUrlFromEnv = getEnvironmentVariableFactory({
@@ -7787,7 +7788,7 @@ function applyPythonConfig(config, args) {
 			type: "PythonModule",
 			globs: ["**/*.py"]
 		});
-		if (!config.compatibility_flags.includes("python_workers")) throw new UserError("The `python_workers` compatibility flag is required to use Python.");
+		if (!config.compatibility_flags.includes("python_workers")) throw new UserError("The `python_workers` compatibility flag is required to use Python.", { telemetryMessage: false });
 	}
 }
 __name(applyPythonConfig, "applyPythonConfig");
@@ -8083,7 +8084,6 @@ var validateStreamingTailConsumers = /* @__PURE__ */ __name((diagnostics, field,
 function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDispatchNamespace, preserveOriginalMain, envName = "top level", topLevelEnv, useServiceEnvironments, rawConfig) {
 	deprecated(diagnostics, rawEnv, "node_compat", `The "node_compat" field is no longer supported as of Wrangler v4. Instead, use the \`nodejs_compat\` compatibility flag. This includes the functionality from legacy \`node_compat\` polyfills and natively implemented Node.js APIs. See https://developers.cloudflare.com/workers/runtime-apis/nodejs for more information.`, true, "Removed", "error");
 	experimental(diagnostics, rawEnv, "unsafe");
-	experimental(diagnostics, rawEnv, "secrets");
 	const route = normalizeAndValidateRoute(diagnostics, topLevelEnv, rawEnv);
 	const account_id = inheritableInWranglerEnvironments(diagnostics, useServiceEnvironments, topLevelEnv, mutateEmptyStringAccountIDValue(diagnostics, rawEnv), "account_id", isString, void 0, void 0);
 	const routes = validateRoutes(diagnostics, topLevelEnv, rawEnv);
@@ -9583,6 +9583,7 @@ var validatePreviewsConfig = /* @__PURE__ */ __name((envName) => (diagnostics, f
 		"secrets_store_secrets",
 		"artifacts",
 		"unsafe_hello_world",
+		"flagship",
 		"worker_loaders",
 		"ratelimits",
 		"vpc_services",
@@ -9618,6 +9619,7 @@ var validatePreviewsConfig = /* @__PURE__ */ __name((envName) => (diagnostics, f
 	isValid2 = validateBindingArray(envName, validateSecretsStoreSecretBinding)(diagnostics, `${field}.secrets_store_secrets`, previews.secrets_store_secrets, void 0) && isValid2;
 	isValid2 = validateBindingArray(envName, validateArtifactsBinding)(diagnostics, `${field}.artifacts`, previews.artifacts, void 0) && isValid2;
 	isValid2 = validateBindingArray(envName, validateHelloWorldBinding)(diagnostics, `${field}.unsafe_hello_world`, previews.unsafe_hello_world, void 0) && isValid2;
+	isValid2 = validateBindingArray(envName, validateFlagshipBinding)(diagnostics, `${field}.flagship`, previews.flagship, void 0) && isValid2;
 	isValid2 = validateBindingArray(envName, validateWorkerLoaderBinding)(diagnostics, `${field}.worker_loaders`, previews.worker_loaders, void 0) && isValid2;
 	isValid2 = validateBindingArray(envName, validateRateLimitBinding)(diagnostics, `${field}.ratelimits`, previews.ratelimits, void 0) && isValid2;
 	isValid2 = validateBindingArray(envName, validateVpcServiceBinding)(diagnostics, `${field}.vpc_services`, previews.vpc_services, void 0) && isValid2;
@@ -9786,7 +9788,7 @@ function isDockerfile(imagePath, configPath) {
 	const baseDir = configPath ? path.dirname(configPath) : process.cwd();
 	const maybeDockerfile = path.resolve(baseDir, imagePath);
 	if (fs.existsSync(maybeDockerfile)) {
-		if (isDirectory$1(maybeDockerfile)) throw new UserError(`${imagePath} is a directory, you should specify a path to the Dockerfile`);
+		if (isDirectory$1(maybeDockerfile)) throw new UserError(`${imagePath} is a directory, you should specify a path to the Dockerfile`, { telemetryMessage: false });
 		return true;
 	}
 	const errorPrefix = `The image "${imagePath}" does not appear to be a valid path to a Dockerfile, or a valid image registry path:
@@ -9794,12 +9796,12 @@ function isDockerfile(imagePath, configPath) {
 	try {
 		new URL(`https://${imagePath}`);
 	} catch (e2) {
-		if (e2 instanceof Error) throw new UserError(errorPrefix + e2.message);
+		if (e2 instanceof Error) throw new UserError(errorPrefix + e2.message, { telemetryMessage: false });
 		throw e2;
 	}
 	const imageParts = imagePath.split("/");
-	if (!imageParts[imageParts.length - 1]?.includes(":")) throw new UserError(errorPrefix + `If this is an image registry path, it needs to include at least a tag ':' (e.g: docker.io/httpd:1)`);
-	if (imagePath.includes("://")) throw new UserError(errorPrefix + `Image reference should not include the protocol part (e.g: docker.io/httpd:1, not https://docker.io/httpd:1)`);
+	if (!imageParts[imageParts.length - 1]?.includes(":")) throw new UserError(errorPrefix + `If this is an image registry path, it needs to include at least a tag ':' (e.g: docker.io/httpd:1)`, { telemetryMessage: false });
+	if (imagePath.includes("://")) throw new UserError(errorPrefix + `Image reference should not include the protocol part (e.g: docker.io/httpd:1, not https://docker.io/httpd:1)`, { telemetryMessage: false });
 	return false;
 }
 __name(isDockerfile, "isDockerfile");
@@ -9836,7 +9838,7 @@ var supportedPagesConfigFields = [
 ];
 function validatePagesConfig(config, envNames, projectName) {
 	if (!config.pages_build_output_dir) throw new FatalError(`Attempting to validate Pages configuration file, but "pages_build_output_dir" field was not found.
-		"pages_build_output_dir" is required for Pages projects.`);
+		"pages_build_output_dir" is required for Pages projects.`, { telemetryMessage: false });
 	const diagnostics = new Diagnostics(`Running configuration file validation for Pages:`);
 	validateMainField(config, diagnostics);
 	validateProjectName(projectName, diagnostics);
@@ -9902,7 +9904,7 @@ function getGoArch() {
 cloudflared supports: x64 (amd64), arm64, arm
 
 You can manually install cloudflared and set the CLOUDFLARED_PATH environment variable.
-Download instructions: https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/`);
+Download instructions: https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/`, { telemetryMessage: "tunnel cloudflared unsupported architecture" });
 	}
 }
 __name(getGoArch, "getGoArch");
@@ -9916,7 +9918,7 @@ function getGoOS() {
 cloudflared supports: darwin (macOS), linux, win32 (Windows)
 
 You can manually install cloudflared and set the CLOUDFLARED_PATH environment variable.
-Download instructions: https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/`);
+Download instructions: https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/`, { telemetryMessage: "tunnel cloudflared unsupported platform" });
 	}
 }
 __name(getGoOS, "getGoOS");
@@ -9970,7 +9972,7 @@ The update service did not return results for ${goOS}/${goArch},
 and the fallback query also failed.
 
 You can manually install cloudflared from:
-https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/`);
+https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/`, { telemetryMessage: "tunnel cloudflared version lookup failed" });
 	const version = fallback.version;
 	const filename = getAssetFilename(goOS, goArch);
 	return {
@@ -10045,7 +10047,7 @@ You can try:
 		errorMessage += `  3. Manually installing cloudflared: https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/
 `;
 		errorMessage += `  4. Setting CLOUDFLARED_PATH to point to your cloudflared binary`;
-		throw new UserError(errorMessage);
+		throw new UserError(errorMessage, { telemetryMessage: "tunnel cloudflared validation failed" });
 	}
 }
 __name(validateBinary, "validateBinary");
@@ -10139,14 +10141,14 @@ async function downloadCloudflared(versionInfo, binPath, options) {
 Network error: ${e2 instanceof Error ? e2.message : String(e2)}
 
 Please check your internet connection and try again.
-If you're behind a proxy, make sure it's configured correctly.`);
+If you're behind a proxy, make sure it's configured correctly.`, { telemetryMessage: "tunnel cloudflared download network failed" });
 	}
 	if (!response.ok) throw new UserError(`[cloudflared] Failed to download cloudflared from ${url}
 
 HTTP ${response.status}: ${response.statusText}
 
 You can manually download cloudflared from:
-https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/`);
+https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/`, { telemetryMessage: "tunnel cloudflared download response failed" });
 	try {
 		if (compressed) await downloadAndExtractTarball(response, checksum, binPath, cacheDir);
 		else await downloadBinary(response, checksum, binPath);
@@ -10159,7 +10161,7 @@ https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-
 
 Error: ${e2 instanceof Error ? e2.message : String(e2)}
 
-Please ensure you have write permissions to: ${cacheDir}`);
+Please ensure you have write permissions to: ${cacheDir}`, { telemetryMessage: "tunnel cloudflared save failed" });
 	}
 	if (process.platform !== "win32") chmodSync(binPath, 493);
 	logger?.log(`cloudflared ${version} installed`);
@@ -10174,7 +10176,7 @@ async function downloadAndExtractTarball(response, expectedChecksum, binPath, ca
 		if (actualSha256 !== expectedChecksum) throw new UserError(`[cloudflared] SHA256 mismatch for downloaded cloudflared tarball.
 
 Expected: ${expectedChecksum}
-Actual:   ${actualSha256}`);
+Actual:   ${actualSha256}`, { telemetryMessage: "tunnel cloudflared tarball checksum mismatch" });
 	}
 	writeFileSync(tempTarPath, buffer);
 	try {
@@ -10200,7 +10202,7 @@ async function downloadBinary(response, expectedChecksum, binPath) {
 		if (actualSha256 !== expectedChecksum) throw new UserError(`[cloudflared] SHA256 mismatch for downloaded cloudflared binary.
 
 Expected: ${expectedChecksum}
-Actual:   ${actualSha256}`);
+Actual:   ${actualSha256}`, { telemetryMessage: "tunnel cloudflared binary checksum mismatch" });
 	}
 	writeFileAtomic(binPath, buffer);
 }
@@ -10211,7 +10213,7 @@ async function getCloudflaredPath(options) {
 	if (envPath) {
 		if (!existsSync(envPath)) throw new UserError(`CLOUDFLARED_PATH is set to "${envPath}" but the file does not exist.
 
-Please ensure the path points to a valid cloudflared binary.`);
+Please ensure the path points to a valid cloudflared binary.`, { telemetryMessage: "tunnel cloudflared env path missing" });
 		logger?.debug(`Using cloudflared from CLOUDFLARED_PATH: ${envPath}`);
 		return envPath;
 	}
@@ -10237,7 +10239,7 @@ Please ensure the path points to a valid cloudflared binary.`);
 You can install it manually from:
 https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/
 
-Then either add it to your PATH or set CLOUDFLARED_PATH.`);
+Then either add it to your PATH or set CLOUDFLARED_PATH.`, { telemetryMessage: "tunnel cloudflared download declined" });
 	if (existsSync(binPath)) {
 		const cacheDir = removeCloudflaredCache(versionInfo.version);
 		if (cacheDir) logger?.log(`Removed cloudflared cache: ${cacheDir}`);
@@ -10443,7 +10445,7 @@ ${stderrOutput || "(no output)"}
 
 The local dev server started at ${origin.href}.
 ` + (isQuickTunnelRateLimited ? "Cloudflare Quick Tunnel creation was rate limited. Try again in a few minutes, or use a named tunnel if you need more reliable access." : `Check the cloudflared output above for more details, and verify that ${origin.href} is reachable from this machine if this keeps happening.`);
-	if (isQuickTunnelRateLimited) return new UserError(errorMessage);
+	if (isQuickTunnelRateLimited) return new UserError(errorMessage, { telemetryMessage: false });
 	return new Error(errorMessage);
 }
 __name(createTunnelStartupError, "createTunnelStartupError");
@@ -13132,6 +13134,13 @@ const RUNNER_OBJECT_BINDING = "__VITEST_POOL_WORKERS_RUNNER_OBJECT";
 async function buildProjectWorkerOptions(project, customOptions, main) {
 	const relativeWranglerConfigPath = maybeApply((v) => path.relative("", v), customOptions.wrangler?.configPath);
 	const runnerWorker = customOptions.miniflare ?? {};
+	const wranglerWorkerName = getWranglerWorkerName(relativeWranglerConfigPath);
+	if (wranglerWorkerName && runnerWorker.serviceBindings) {
+		for (const [key, sb] of Object.entries(runnerWorker.serviceBindings)) if (typeof sb === "object" && sb !== null && "name" in sb && sb.name === wranglerWorkerName) runnerWorker.serviceBindings[key] = {
+			...sb,
+			name: kCurrentWorker
+		};
+	}
 	runnerWorker.name = getRunnerName(project);
 	runnerWorker.compatibilityFlags ??= [];
 	runnerWorker.compatibilityFlags.push("no_handle_cross_request_promise_resolution");