refactor(vitest-pool-workers): reset ratelimit bindings by name instead of globalThis

Removes the globalThis[Symbol.for(...)] bridge between the ratelimit
extension module and reset(). The Ratelimit class already exposes a public
reset() method; reset() now calls it directly on each configured ratelimit
binding, using binding names read from the parsed wrangler config
(pool/index.ts) via a new __VITEST_POOL_WORKERS_RATELIMIT_BINDING_NAMES
module. This avoids walking `env` (which would touch RPC/entrypoint
bindings like SELF) and avoids the miniflare wrapped-binding module
entirely, so it needs no changes to the ratelimit plugin.

Also fixes formatting on the existing changeset file (oxfmt).

Author: matingathani

.changeset/vitest-pool-workers-reset-ratelimit.md

@@ -4,4 +4,3 @@
 ---
 
 `reset()` from `cloudflare:test` now resets ratelimit binding state between tests. Previously, `RATE_LIMITERS` bindings retained their in-memory bucket counts across test boundaries, causing later tests in the same file to see stale rate-limit exhaustion state.
-

packages/miniflare/src/plugins/ratelimit/index.ts

@@ -25,11 +25,6 @@ export const RATELIMIT_PLUGIN_NAME = "ratelimit";
 const SERVICE_RATELIMIT_PREFIX = `${RATELIMIT_PLUGIN_NAME}`;
 const SERVICE_RATELIMIT_MODULE = `cloudflare-internal:${SERVICE_RATELIMIT_PREFIX}:module`;
 
-// Reserved binding name exposing a `resetAll()` hook for all ratelimit
-// bindings in this worker. Used by vitest-pool-workers' `reset()`; not part
-// of the public API.
-export const RATELIMIT_CONTROL_BINDING_NAME = "__MINIFLARE_RATELIMIT_CONTROL__";
-
 function buildJsonBindings(bindings: Record<string, any>): Worker_Binding[] {
 	return Object.entries(bindings).map(([name, value]) => ({
 		name,
@@ -57,13 +52,6 @@ export const RATELIMIT_PLUGIN: Plugin<typeof RatelimitOptionsSchema> = {
 				},
 			})
 		);
-		bindings.push({
-			name: RATELIMIT_CONTROL_BINDING_NAME,
-			wrapped: {
-				moduleName: SERVICE_RATELIMIT_MODULE,
-				innerBindings: buildJsonBindings({ control: true }),
-			},
-		});
 		return bindings;
 	},
 	getNodeBindings(options: z.infer<typeof RatelimitOptionsSchema>) {

packages/miniflare/src/workers/ratelimit/ratelimit.worker.ts

@@ -92,33 +92,7 @@ class Ratelimit {
 	}
 }
 
-// Module-level set tracking all live instances, so a dedicated "control"
-// wrapped binding (see plugins/ratelimit/index.ts) can reset all of them.
-const instances = new Set<Ratelimit>();
-
-interface RatelimitControlConfig {
-	control: true;
-}
-
-function isControlConfig(
-	config: RatelimitConfig | RatelimitControlConfig
-): config is RatelimitControlConfig {
-	return "control" in config;
-}
-
-// create a new Ratelimit, or the control binding used internally to reset all
-// live instances (see vitest-pool-workers' reset())
-export default function (env: RatelimitConfig | RatelimitControlConfig) {
-	if (isControlConfig(env)) {
-		return {
-			resetAll(): void {
-				for (const instance of instances) {
-					instance.reset();
-				}
-			},
-		};
-	}
-	const instance = new Ratelimit(env);
-	instances.add(instance);
-	return instance;
+// create a new Ratelimit
+export default function (env: RatelimitConfig) {
+	return new Ratelimit(env);
 }

packages/vitest-pool-workers/src/pool/index.ts

@@ -411,6 +411,10 @@ async function buildProjectWorkerOptions(
 	runnerWorker.durableObjects ??= {};
 	const durableObjectClassNames = getDurableObjectClasses(runnerWorker);
 
+	// Ratelimit binding names, so reset() can call `.reset()` on each of them
+	// directly without needing to know their names ahead of time itself.
+	const ratelimitBindingNames = Object.keys(runnerWorker.ratelimits ?? {});
+
 	const workflowClassNames = getWorkflowClasses(
 		runnerWorker,
 		relativeWranglerConfigPath
@@ -537,6 +541,14 @@ async function buildProjectWorkerOptions(
 			path: path.join(modulesRoot, "__VITEST_POOL_WORKERS_DEFINES"),
 			contents: defines,
 		},
+		{
+			type: "ESModule",
+			path: path.join(
+				modulesRoot,
+				"__VITEST_POOL_WORKERS_RATELIMIT_BINDING_NAMES"
+			),
+			contents: `export default ${JSON.stringify(ratelimitBindingNames)};`,
+		},
 		// The native workerd provided nodejs modules don't always support everything Vitest needs.
 		// As a short-term fix, inject polyfills into the worker bundle that override the native modules.
 		{

packages/vitest-pool-workers/src/pool/module-fallback.ts

@@ -9,6 +9,15 @@ import * as cjsModuleLexer from "cjs-module-lexer";
 import { ModuleRuleTypeSchema, Response } from "miniflare";
 import { workerdBuiltinModules } from "../shared/builtin-modules";
 import { isFileNotFoundError } from "./helpers";
+
+// Root-registered virtual modules injected via `runnerWorker.modules` that
+// may be imported from files other than the root worker entrypoint (e.g.
+// `reset.ts`, compiled into `test-internal.mjs`, not the root `index.mjs`).
+// Like `node:*`/`cloudflare:*` builtins, these only exist at the root, so a
+// non-root referrer's bare import needs redirecting there too.
+const poolInternalModules = new Set([
+	"__VITEST_POOL_WORKERS_RATELIMIT_BINDING_NAMES",
+]);
 import type { ModuleRuleType, Request, Worker_Module } from "miniflare";
 import type { Vite } from "vitest/node";
 
@@ -332,7 +341,10 @@ async function resolve(
 	// *import*ing `node:*`/`cloudflare:*` modules, but not when *require()*ing
 	// them. For the sake of consistency (and a nice return type on this function)
 	// we return a redirect for `import`s too.
-	if (referrerDir !== "/" && workerdBuiltinModules.has(specifier)) {
+	if (
+		referrerDir !== "/" &&
+		(workerdBuiltinModules.has(specifier) || poolInternalModules.has(specifier))
+	) {
 		return `/${specifier}`;
 	}
 

packages/vitest-pool-workers/src/worker/reset.ts

@@ -1,3 +1,4 @@
+import ratelimitBindingNames from "__VITEST_POOL_WORKERS_RATELIMIT_BINDING_NAMES";
 import { env } from "cloudflare:workers";
 import workerdUnsafe from "workerd:unsafe";
 import type { DurableObjectEvictionOptions } from "workerd:unsafe";
@@ -6,18 +7,17 @@ const DEFAULT_EVICTION_OPTIONS: DurableObjectEvictionOptions = {
 	webSockets: "hibernate",
 };
 
-// Matches RATELIMIT_CONTROL_BINDING_NAME in miniflare's ratelimit plugin.
-const RATELIMIT_CONTROL_BINDING_NAME = "__MINIFLARE_RATELIMIT_CONTROL__";
-
 export async function reset(): Promise<void> {
 	await workerdUnsafe.deleteAllDurableObjects();
 
-	// Only present when the worker has at least one ratelimit binding
-	// configured (see miniflare's ratelimit plugin `getBindings()`).
-	const ratelimitControl = env[RATELIMIT_CONTROL_BINDING_NAME] as unknown as
-		| { resetAll?: () => void }
-		| undefined;
-	ratelimitControl?.resetAll?.();
+	// Ratelimit bindings expose a `reset()` method directly (see
+	// `ratelimit.worker.ts`). Binding names come from the parsed wrangler
+	// config (see `pool/index.ts`), so we never need to guess or enumerate
+	// unrelated bindings in `env`.
+	for (const name of ratelimitBindingNames) {
+		const binding = env[name] as unknown as { reset?: () => void };
+		binding.reset?.();
+	}
 }
 
 export async function abortAllDurableObjects(): Promise<void> {

packages/vitest-pool-workers/src/worker/types-ambient.d.ts

@@ -44,6 +44,10 @@ declare module "__VITEST_POOL_WORKERS_DEFINES" {
 	const defines: Record<string, unknown>;
 	export default defines;
 }
+declare module "__VITEST_POOL_WORKERS_RATELIMIT_BINDING_NAMES" {
+	const names: string[];
+	export default names;
+}
 
 declare module "node:vm" {
 	export function _setUnsafeEval(newUnsafeEval: UnsafeEval): void;

packages/vitest-pool-workers/tsdown.config.ts

@@ -58,6 +58,7 @@ const commonOptions: UserConfig = {
 		// Virtual/runtime modules
 		"__VITEST_POOL_WORKERS_DEFINES",
 		"__VITEST_POOL_WORKERS_USER_OBJECT",
+		"__VITEST_POOL_WORKERS_RATELIMIT_BINDING_NAMES",
 		// Runtime dependencies and peer dependencies (derived from package.json)
 		...runtimeDepPatterns,
 	],