@cloudflare/vitest-pool-workers 0.16.4 → 0.16.6

package/dist/pool/index.mjs

@@ -461,7 +461,7 @@ var MetricsRegistry = class {
 };
 
 //#endregion
-//#region ../workers-utils/dist/chunk-XXCQEG76.mjs
+//#region ../workers-utils/dist/chunk-GMTGAG26.mjs
 var UserError = class extends Error {
 	static {
 		__name(this, "UserError");
@@ -2858,8 +2858,15 @@ function findRedirectedWranglerConfig(cwd, userConfigPath) {
 	};
 }
 __name(findRedirectedWranglerConfig, "findRedirectedWranglerConfig");
+function isRedirectedConfig(config) {
+	return config.configPath !== void 0 && config.configPath !== config.userConfigPath;
+}
+__name(isRedirectedConfig, "isRedirectedConfig");
 function isRedirectedRawConfig(rawConfig, configPath, userConfigPath) {
-	return configPath !== void 0 && configPath !== userConfigPath;
+	return isRedirectedConfig({
+		configPath,
+		userConfigPath
+	});
 }
 __name(isRedirectedRawConfig, "isRedirectedRawConfig");
 function configFormat(configPath) {
@@ -7707,9 +7714,9 @@ function normalizeAndValidateConfig(rawConfig, configPath, userConfigPath, args,
 	if (useServiceEnvironments) diagnostics.warnings.push("Service environments are deprecated, and will be removed in the future. DO NOT USE IN PRODUCTION.");
 	const isDispatchNamespace = typeof args["dispatch-namespace"] === "string" && args["dispatch-namespace"].trim() !== "";
 	const topLevelEnv = normalizeAndValidateEnvironment(diagnostics, configPath, rawConfig, isDispatchNamespace, preserveOriginalMain);
-	const isRedirectedConfig = isRedirectedRawConfig(rawConfig, configPath, userConfigPath);
+	const isRedirectedConfig2 = isRedirectedRawConfig(rawConfig, configPath, userConfigPath);
 	const definedEnvironments = Object.keys(rawConfig.env ?? {});
-	if (isRedirectedConfig && definedEnvironments.length > 0) diagnostics.errors.push(dedent`
+	if (isRedirectedConfig2 && definedEnvironments.length > 0) diagnostics.errors.push(dedent`
 				Redirected configurations cannot include environments but the following have been found:\n${definedEnvironments.map((env) => `	- ${env}`).join("\n")}
 
 
@@ -7720,7 +7727,7 @@ function normalizeAndValidateConfig(rawConfig, configPath, userConfigPath, args,
 	const envName = args.env ?? getCloudflareEnv();
 	assert(envName === void 0 || typeof envName === "string");
 	let activeEnv = topLevelEnv;
-	if (envName) if (isRedirectedConfig) {
+	if (envName) if (isRedirectedConfig2) {
 		if (!isPagesConfig(rawConfig) && rawConfig.targetEnvironment && rawConfig.targetEnvironment !== envName) {
 			const via = args.env !== void 0 ? "via the `--env/-e` CLI argument" : "via the CLOUDFLARE_ENV environment variable";
 			throw new Error(dedent`
@@ -7752,9 +7759,9 @@ Consider adding an environment configuration section to the ${configFileName(con
 	const config = {
 		configPath,
 		userConfigPath,
-		topLevelName: isRedirectedConfig ? rawConfig.topLevelName : rawConfig.name,
-		definedEnvironments: isRedirectedConfig ? rawConfig.definedEnvironments : definedEnvironments,
-		targetEnvironment: isRedirectedConfig ? rawConfig.targetEnvironment : envName,
+		topLevelName: isRedirectedConfig2 ? rawConfig.topLevelName : rawConfig.name,
+		definedEnvironments: isRedirectedConfig2 ? rawConfig.definedEnvironments : definedEnvironments,
+		targetEnvironment: isRedirectedConfig2 ? rawConfig.targetEnvironment : envName,
 		pages_build_output_dir: normalizeAndValidatePagesBuildOutputDir(configPath, rawConfig.pages_build_output_dir),
 		legacy_env: !useServiceEnvironments,
 		send_metrics: rawConfig.send_metrics,
@@ -8083,7 +8090,7 @@ var validateStreamingTailConsumers = /* @__PURE__ */ __name((diagnostics, field,
 }, "validateStreamingTailConsumers");
 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");
+	if (topLevelEnv === void 0 || rawConfig?.unsafe === void 0) experimental(diagnostics, rawEnv, "unsafe");
 	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);
@@ -8246,9 +8253,11 @@ var validateDefines = /* @__PURE__ */ __name((envName) => (diagnostics, field, v
 	if (configDefines.length > 0) {
 		if (typeof value === "object" && value !== null) {
 			const configEnvDefines = config === void 0 ? [] : Object.keys(value);
-			for (const varName of configDefines) if (!(varName in value)) diagnostics.warnings.push(`"define.${varName}" exists at the top level, but not on "${fieldPath}".
-This is not what you probably want, since "define" configuration is not inherited by environments.
-Please add "define.${varName}" to "env.${envName}".`);
+			const missingDefines = configDefines.filter((varName) => !(varName in value));
+			if (missingDefines.length > 0) diagnostics.warnings.push(`The following define entries exist at the top level, but not on "${fieldPath}".
+This is probably not what you want, since "define" configuration is not inherited by environments.
+Please add these entries to "env.${envName}.define":
+` + missingDefines.map((varName) => `- ${varName}`).join("\n"));
 			for (const varName of configEnvDefines) if (!configDefines.includes(varName)) diagnostics.warnings.push(`"${varName}" exists on "env.${envName}", but not on the top level.
 This is not what you probably want, since "define" configuration within environments can only override existing top level "define" configuration
 Please remove "${fieldPath}.${varName}", or add "define.${varName}".`);
@@ -8272,9 +8281,11 @@ var validateVars = /* @__PURE__ */ __name((envName) => (diagnostics, field, valu
 	const configVars = Object.keys(config?.vars ?? {});
 	if (configVars.length > 0) {
 		if (typeof value === "object" && value !== null) {
-			for (const varName of configVars) if (!(varName in value)) diagnostics.warnings.push(`"vars.${varName}" exists at the top level, but not on "${fieldPath}".
-This is not what you probably want, since "vars" configuration is not inherited by environments.
-Please add "vars.${varName}" to "env.${envName}".`);
+			const missingVars = configVars.filter((varName) => !(varName in value));
+			if (missingVars.length > 0) diagnostics.warnings.push(`The following vars exist at the top level, but not on "${fieldPath}".
+This is probably not what you want, since "vars" configuration is not inherited by environments.
+Please add these vars to "env.${envName}.vars":
+` + missingVars.map((varName) => `- ${varName}`).join("\n"));
 		}
 	}
 	return isValid2;
@@ -10295,27 +10306,36 @@ function startTunnel(options) {
 	const timeoutMs = options.timeoutMs ?? TUNNEL_STARTUP_TIMEOUT_MS;
 	const reminderIntervalMs = options.reminderIntervalMs ?? DEFAULT_TUNNEL_REMINDER_INTERVAL_MS;
 	const defaultExpiryMs = options.expiryMs ?? DEFAULT_TUNNEL_EXPIRY_MS;
+	const isNamedTunnel = options.token !== void 0;
 	const timeFormatter = new Intl.DateTimeFormat(void 0, { timeStyle: "short" });
-	const readyPromise = spawnCloudflared([
+	const readyPromise = spawnCloudflared(isNamedTunnel ? [
+		"tunnel",
+		"--no-autoupdate",
+		"run"
+	] : [
 		"tunnel",
 		"--no-autoupdate",
 		"--url",
 		options.origin.href
 	], {
 		stdio: "pipe",
+		env: options.token ? { TUNNEL_TOKEN: options.token } : void 0,
 		skipVersionCheck: true,
 		logger
 	}).then((process2) => {
 		cloudflaredProcess = process2;
 		if (disposed) terminateCloudflared(process2);
 		return process2;
-	}).then((process2) => waitForQuickTunnelReady(process2, timeoutMs, {
-		logger,
-		origin: options.origin
-	})).then((result) => {
+	}).then((process2) => {
+		if (isNamedTunnel) return { mode: "named" };
+		return waitForQuickTunnelReady(process2, timeoutMs, {
+			logger,
+			origin: options.origin
+		});
+	}).then((result) => {
 		expiresAt = Date.now() + defaultExpiryMs;
 		scheduleExpiryTimeout();
-		scheduleReminder(result.publicUrl.origin);
+		scheduleReminder(result.mode === "quick" ? result.publicUrl.origin : void 0);
 		return result;
 	});
 	function disposeTunnel() {
@@ -10341,7 +10361,7 @@ function startTunnel(options) {
 				if (disposed) return;
 				const remainingMs = expiresAt - Date.now();
 				if (remainingMs <= 0) return;
-				logger?.log(`The tunnel is still open at ${publicURL}. It expires in ${formatTunnelDuration(remainingMs)}. ${options.extendHint ?? ""}`);
+				logger?.log(`${publicURL ? `The tunnel is still open at ${publicURL}.` : "The tunnel is still open."} It expires in ${formatTunnelDuration(remainingMs)}. ${options.extendHint ?? ""}`);
 			}, reminderIntervalMs);
 			reminderInterval.unref?.();
 		}
@@ -10375,6 +10395,7 @@ function startTunnel(options) {
 	__name(extendExpiry, "extendExpiry");
 	return {
 		ready: /* @__PURE__ */ __name(() => readyPromise, "ready"),
+		isOpen: /* @__PURE__ */ __name(() => !disposed, "isOpen"),
 		dispose: disposeTunnel,
 		extendExpiry
 	};
@@ -10420,7 +10441,10 @@ function waitForQuickTunnelReady(cloudflared, timeoutMs, options) {
 			if (match && !resolved) {
 				resolved = true;
 				clearTimeout(timeoutId);
-				resolve$2({ publicUrl: new URL(match[0]) });
+				resolve$2({
+					mode: "quick",
+					publicUrl: new URL(match[0])
+				});
 			}
 		});
 		cloudflared.on("error", (error) => {
@@ -13049,6 +13073,7 @@ const ignoreMessages = [
 	"disconnected: operation canceled",
 	"disconnected: worker_do_not_log; Request failed due to internal error",
 	"disconnected: WebSocket was aborted",
+	"disconnected: WebSocket peer disconnected",
 	"CODE_MOVED for unknown code block",
 	"broken.outputGateBroken; jsg.Error: Instance dispose"
 ];