@cloudflare/vitest-pool-workers 0.16.4 → 0.16.5

package/dist/pool/index.mjs

@@ -8083,7 +8083,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 +8246,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 +8274,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 +10299,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 +10354,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 +10388,7 @@ function startTunnel(options) {
 	__name(extendExpiry, "extendExpiry");
 	return {
 		ready: /* @__PURE__ */ __name(() => readyPromise, "ready"),
+		isOpen: /* @__PURE__ */ __name(() => !disposed, "isOpen"),
 		dispose: disposeTunnel,
 		extendExpiry
 	};
@@ -10420,7 +10434,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) => {