@cloudflare/vitest-pool-workers 0.16.10 → 0.16.12

package/dist/worker/lib/cloudflare/test-internal.mjs

@@ -320,11 +320,11 @@ function createProxyPrototypeClass(superClass, getUnknownPrototypeKey) {
 }
 /**
 * Only properties and methods declared on the prototype can be accessed over
-* RPC. This function gets a property from the prototype if it's defined, and
-* throws a helpful error message if not. Note we need to distinguish between a
-* property that returns `undefined` and something not being defined at all.
+* RPC. This function throws a helpful error message if a property isn't
+* defined. Note we need to distinguish between a property that returns
+* `undefined` and something not being defined at all.
 */
-function getRPCProperty(ctor, instance, key) {
+function assertRPCPropertyAccessible(ctor, instance, key) {
 	if (!Reflect.has(ctor.prototype, key)) {
 		const quotedKey = JSON.stringify(key);
 		const instanceHasKey = Reflect.has(instance, key);
@@ -338,6 +338,9 @@ function getRPCProperty(ctor, instance, key) {
 		else message = `The RPC receiver does not implement ${quotedKey}.`;
 		throw new TypeError(message);
 	}
+}
+function getRPCProperty(ctor, instance, key) {
+	assertRPCPropertyAccessible(ctor, instance, key);
 	return Reflect.get(ctor.prototype, key, instance);
 }
 /**
@@ -358,7 +361,7 @@ function getRPCProperty(ctor, instance, key) {
 */
 function getRPCPropertyCallableThenable(key, property, queueOwner) {
 	const fn = async function(...args) {
-		return enqueueRPCInvocation(queueOwner, async (release) => {
+		return enqueueInvocation(queueOwner, async (release) => {
 			try {
 				const maybeFn = await property;
 				if (typeof maybeFn === "function") return maybeFn(...args);
@@ -373,18 +376,19 @@ function getRPCPropertyCallableThenable(key, property, queueOwner) {
 	fn.finally = (onFinally) => property.finally(onFinally);
 	return fn;
 }
-const rpcInvocationQueues = /* @__PURE__ */ new WeakMap();
+const invocationQueues = /* @__PURE__ */ new WeakMap();
 /**
-* Preserve the order in which dynamically-wrapped RPC methods begin executing.
+* Preserve the order in which async wrapper invocations begin executing.
 *
-* Resolving a property like `stub.method` may need to import user modules or
-* instantiate wrapper objects. If several calls are fired synchronously, those
-* async steps can otherwise complete out of order before the actual user method
-* is invoked. The queue is released as soon as invocation starts, so async RPC
-* completions can still run concurrently.
+* Resolving a property like `stub.method`, or ensuring a Durable Object handler
+* instance, may need to import user modules or instantiate wrapper objects. If
+* several calls are fired synchronously, those async steps can otherwise
+* complete out of order before the actual user code is invoked. The queue is
+* released as soon as invocation starts, so async completions can still run
+* concurrently.
 */
-async function enqueueRPCInvocation(owner, callback) {
-	const previous = rpcInvocationQueues.get(owner) ?? Promise.resolve();
+async function enqueueInvocation(owner, callback) {
+	const previous = invocationQueues.get(owner) ?? Promise.resolve();
 	let releaseStarted;
 	const started = new Promise((resolve) => {
 		releaseStarted = resolve;
@@ -394,7 +398,7 @@ async function enqueueRPCInvocation(owner, callback) {
 		if (releaseStartedFn !== void 0) releaseStartedFn();
 	};
 	const result = previous.catch(() => {}).then(() => callback(release));
-	rpcInvocationQueues.set(owner, started);
+	invocationQueues.set(owner, started);
 	return result;
 }
 function getEntrypointState(instance) {
@@ -429,7 +433,7 @@ async function getWorkerEntrypointExport(env$2, entrypoint) {
 	const mainModule = await importModule(mainPath);
 	const entrypointValue = typeof mainModule === "object" && mainModule !== null && entrypoint in mainModule && mainModule[entrypoint];
 	if (!entrypointValue) {
-		const message = `${mainPath} does not export a ${entrypoint} entrypoint. \`@cloudflare/vitest-pool-workers\` does not support service workers or named entrypoints for \`SELF\`.\nIf you're using service workers, please migrate to the modules format: https://developers.cloudflare.com/workers/reference/migrate-to-module-workers.`;
+		const message = `${mainPath} does not export a ${entrypoint} entrypoint. \`@cloudflare/vitest-pool-workers\` does not support service workers or named entrypoints for \`SELF\`.\nIf you're using service workers, please migrate to the modules format: https://developers.cloudflare.com/workers/reference/migrate-to-module-workers/`;
 		throw new TypeError(message);
 	}
 	return {
@@ -502,7 +506,9 @@ async function getDurableObjectRPCProperty(wrapper, className, key) {
 		const message = `Expected ${className} exported by ${mainPath} be a subclass of \`DurableObject\` for RPC`;
 		throw new TypeError(message);
 	}
-	const value = getRPCProperty(instanceCtor, instance, key);
+	assertRPCPropertyAccessible(instanceCtor, instance, key);
+	if (Object.hasOwn(instance, key)) throw new TypeError(`The RPC receiver does not implement the method ${JSON.stringify(key)}.`);
+	const value = Reflect.get(instance, key, instance);
 	if (typeof value === "function") return value.bind(instance);
 	else return value;
 }
@@ -547,13 +553,19 @@ function createDurableObjectWrapper(className) {
 	for (const key of DURABLE_OBJECT_KEYS) {
 		if (key === "fetch") continue;
 		Wrapper.prototype[key] = async function(...args) {
-			const { mainPath, instance } = await this[kEnsureInstance]();
-			const maybeFn = instance[key];
-			if (typeof maybeFn === "function") return maybeFn.apply(instance, args);
-			else {
-				const message = `${className} exported by ${mainPath} does not define a \`${key}()\` method`;
-				throw new TypeError(message);
-			}
+			return enqueueInvocation(this, async (release) => {
+				try {
+					const { mainPath, instance } = await this[kEnsureInstance]();
+					const maybeFn = instance[key];
+					if (typeof maybeFn === "function") return maybeFn.apply(instance, args);
+					else {
+						const message = `${className} exported by ${mainPath} does not define a \`${key}()\` method`;
+						throw new TypeError(message);
+					}
+				} finally {
+					release();
+				}
+			});
 		};
 	}
 	return Wrapper;