@velajs/cloudflare 1.22.1 → 1.23.0

package/dist/index.js

@@ -1,8 +1,7 @@
-import { C as roomToDurableId, _ as resolveCloudflareRoot, a as durableObjectLive, c as liveInvalidateToRoom, d as WsServerHolder, f as DoPitrUnavailableError, g as __decorate, h as readDoPitrBookmark, i as durableObjectCursorLog, m as isDoPitrUnavailable, n as isValidExpiry, p as armDoPitr, r as DoCursorLog, t as isCanonicalBoundedText, v as assertCloudflareEnvironment, x as durableObjectRoomName, y as registerCloudflareEnvironment } from "./nonce-validation-LE0vFk-7.js";
+import { C as durableObjectRoomName, T as roomToDurableId, _ as readDoPitrBookmark, a as durableObjectLive, b as assertCloudflareEnvironment, c as liveInvalidateToRoom, g as isDoPitrUnavailable, h as armDoPitr, i as durableObjectCursorLog, m as DoPitrUnavailableError, n as isValidExpiry, p as WsServerHolder, r as DoCursorLog, t as isCanonicalBoundedText, v as __decorate, x as registerCloudflareEnvironment, y as resolveCloudflareRoot } from "./nonce-validation-Bcqf3FvY.js";
 import { getConnInfo } from "hono/cloudflare-workers";
-import { CRON_METADATA, ConfigurableModuleBuilder, Controller, Get, Inject, Injectable, InjectionToken, Module, PipelineRunner, Req, VelaFactory, buildEntrypointExecutionContext, createParamDecorator, defineMetadata, defineProvider, getMetadata, getTrustedRequestIdentity, registerEntrypointKind, runInEntrypointScope, shouldFilterCatch } from "@velajs/vela";
-import { ComponentManager } from "@velajs/vela/internal";
-import { ConnectedSocket, DEFAULT_WS_MAX_FRAME_BYTES, MessageBody, SubscribeMessage, WS_GATEWAY_METADATA, WS_SERVER, WebSocketGateway, WebSocketServer, WsDispatcher, WsException, assertBroadcastCommandFits, authenticateWebSocketUpgrade, resolveGatewayRoomId, resolveGatewayRoomParam, resolveMaxFrameBytes } from "@velajs/vela/websocket";
+import { CRON_METADATA, ConfigurableModuleBuilder, Controller, Get, Inject, Injectable, InjectionToken, Module, PipelineRunner, Req, VelaFactory, buildEntrypointExecutionContext, createParamDecorator, defineMetadata, defineProvider, getEntrypointModuleId, getMetadata, getTrustedRequestIdentity, parseCron, registerEntrypointKind, resolveEntrypoint, resolveErrorReporter, resolveScopedComponentsAsync, runInEntrypointScope, shouldFilterCatch } from "@velajs/vela";
+import { ConnectedSocket, DEFAULT_WS_MAX_FRAME_BYTES, MessageBody, SubscribeMessage, WS_GATEWAY_METADATA, WS_SERVER, WebSocketGateway, WebSocketServer, WsDispatcher, WsException, assertBroadcastCommandFits, authenticateWebSocketUpgrade, readWsEntrypointMeta, resolveGatewayRoomId, resolveGatewayRoomParam, resolveMaxFrameBytes } from "@velajs/vela/websocket";
 import { STORAGE_SIGNED_URL_PURPOSE, joinStoragePath, signUrl, verifySignedUrl } from "@velajs/vela/storage";
 //#region src/websocket/websocket-routing.ts
 const MAX_IDENTITY_FIELD_BYTES = 2048;
@@ -123,7 +122,7 @@ registerEntrypointKind({
 });
 function invoke(instance, methodName, args) {
 	const method = Reflect.get(instance, methodName);
-	if (typeof method !== "function") throw new Error(`Method '${methodName}' is not a function on ${instance.constructor.name}`);
+	if (typeof method !== "function") throw new Error(`Method '${String(methodName)}' is not a function on ${instance.constructor.name}`);
 	return Reflect.apply(method, instance, args);
 }
 function entrypointString(meta, property) {
@@ -132,6 +131,12 @@ function entrypointString(meta, property) {
 	if (typeof value !== "string") throw new Error(`Invalid entrypoint metadata: ${property} must be a string.`);
 	return value;
 }
+/** Wait for every matching handler, even when one fails before its siblings. */
+async function settleEntrypoints(work) {
+	const errors = (await Promise.allSettled(work)).flatMap((outcome) => outcome.status === "rejected" ? [outcome.reason] : []);
+	if (errors.length === 1) throw errors[0];
+	if (errors.length > 1) throw new AggregateError(errors, "Multiple entrypoint handlers failed.");
+}
 /**
 * Wraps VelaApplication with Cloudflare-specific handlers:
 * - `fetch` — HTTP request handler (from Hono)
@@ -162,20 +167,20 @@ function entrypointString(meta, property) {
 * ```
 */
 var CloudflareApplication = class {
-	app;
 	env;
-	wsGatewayRoutes = [];
+	#wsGatewayRoutes = [];
+	#app;
 	constructor(app, env) {
-		this.app = app;
 		this.env = env;
+		this.#app = app;
 		this.get = app.get.bind(app);
 	}
 	fetch = async (request, env, ctx) => {
 		assertCloudflareEnvironment(this.env, env);
-		return this.app.fetch(request, env, ctx);
+		return this.#app.fetch(request, env, ctx);
 	};
 	getHonoApp() {
-		return this.app.getHonoApp();
+		return this.#app.getHonoApp();
 	}
 	/**
 	* Resolve a provider from the application's DI container (delegates to
@@ -191,7 +196,7 @@ var CloudflareApplication = class {
 	*/
 	get;
 	get entrypoints() {
-		return this.app.entrypoints;
+		return this.#app.entrypoints;
 	}
 	/**
 	* Serve a pre-built OpenAPI document (and optionally a Scalar UI) on the
@@ -214,24 +219,34 @@ var CloudflareApplication = class {
 	* ```
 	*/
 	mountOpenApi(options) {
-		this.app.mountOpenApi(options);
+		this.#app.mountOpenApi(options);
 		return this;
 	}
 	/**
-	* @internal — scans instances for `@WebSocketGateway({ path, binding })`
-	* upgrade routes. Queue/scheduled handlers are NOT scanned anymore: they
-	* come from `app.entrypoints` (`cf:queue` / `cf:scheduled` / `cf:vela-cron`
-	* kinds) at dispatch time.
+	* @internal Upgrade routes come from validated gateway entrypoints, including
+	* request-scoped gateways without a bootstrap instance. Retain the instance
+	* scan for legacy applications that only declare forwarding metadata.
 	*/
 	scanInstances(instances) {
+		const routes = /* @__PURE__ */ new Map();
+		for (const ep of this.#app.entrypoints.ofKind("websocket")) {
+			if (typeof ep.meta !== "object" || ep.meta === null || !("dispatcher" in ep.meta)) continue;
+			const meta = readWsEntrypointMeta(ep.meta);
+			if (meta.options.binding) routes.set(meta.path, {
+				path: meta.path,
+				binding: meta.options.binding,
+				options: { ...meta.options }
+			});
+		}
 		for (const instance of instances) {
 			if (!instance || typeof instance !== "object") continue;
-			this.wsGatewayRoutes.push(...collectWsGatewayRoutes(instance));
+			for (const route of collectWsGatewayRoutes(instance)) if (!routes.has(route.path)) routes.set(route.path, route);
 		}
+		this.#wsGatewayRoutes.splice(0, this.#wsGatewayRoutes.length, ...routes.values());
 	}
-	/** @internal — upgrade routes discovered from `@WebSocketGateway({ path, binding })`. */
+	/** @internal — upgrade routes discovered from the application's gateways. */
 	getWsGatewayRoutes() {
-		return this.wsGatewayRoutes;
+		return [...this.#wsGatewayRoutes];
 	}
 	/**
 	* Handle Cloudflare scheduled (cron) events.
@@ -241,18 +256,13 @@ var CloudflareApplication = class {
 	*/
 	async scheduled(event, env, ctx) {
 		assertCloudflareEnvironment(this.env, env);
-		const handlers = [...this.app.entrypoints.ofKind("cf:scheduled").map((ep) => ({
+		await settleEntrypoints([...this.#app.entrypoints.ofKind("cf:scheduled").map((ep) => ({
 			ep,
 			cron: entrypointString(ep.meta, "cron")
-		})), ...this.app.entrypoints.ofKind("cf:vela-cron").map((ep) => ({
+		})), ...this.#app.entrypoints.ofKind("cf:vela-cron").map((ep) => ({
 			ep,
 			cron: entrypointString(ep.meta, "expression")
-		}))].filter((h) => h.cron === event.cron);
-		await Promise.all(handlers.map(({ ep }) => this.dispatchEntrypoint(ep, [
-			event,
-			env,
-			ctx
-		])));
+		}))].filter((h) => h.cron === event.cron).map(({ ep }) => this.dispatchEntrypoint(ep, event, env, ctx)));
 	}
 	/**
 	* Run one entrypoint handler inside a fresh request scope, through the
@@ -262,33 +272,61 @@ var CloudflareApplication = class {
 	* guard has no business rejecting a queue batch. Unclaimed errors rethrow
 	* so the platform's retry semantics stay intact.
 	*/
-	async dispatchEntrypoint(ep, args) {
+	async dispatchEntrypoint(ep, payload, env, platformContext) {
 		const targetClass = ep.token;
 		if (typeof targetClass !== "function") throw new Error("Entrypoint token must be a class.");
-		const methodName = String(ep.methodName);
-		const context = buildEntrypointExecutionContext(ep.kind, targetClass, methodName, args[0]);
-		await runInEntrypointScope(this.app.getContainer(), async (scope) => {
-			const instance = scope.resolve(ep.token);
-			if (typeof instance !== "object" || instance === null) throw new Error("Entrypoint must resolve to an object.");
-			const guards = ComponentManager.resolveGuards(ComponentManager.getScopedComponents("guard", targetClass, methodName), scope);
-			const interceptors = ComponentManager.resolveInterceptors(ComponentManager.getScopedComponents("interceptor", targetClass, methodName), scope);
-			const filters = ComponentManager.resolveFilters([...ComponentManager.getScopedComponents("filter", targetClass, methodName)].reverse(), scope);
-			try {
-				await PipelineRunner.run({
-					context,
-					guards,
-					interceptors,
-					resolveArgs: async () => args,
-					invoke: async (resolved) => invoke(instance, methodName, resolved)
-				});
-			} catch (error) {
-				for (const filter of filters) if (shouldFilterCatch(filter, error)) {
-					await filter.catch(error, context);
-					return;
+		if (ep.methodName === void 0) throw new Error("Entrypoint must declare a handler method.");
+		const methodName = ep.methodName;
+		const reportContext = {
+			edge: ep.kind === "cf:queue" ? "queue" : "schedule",
+			source: `${targetClass.name}.${String(methodName)}`
+		};
+		let reported;
+		try {
+			await runInEntrypointScope(this.#app.getContainer(), async (scope, lifetime) => {
+				const moduleId = getEntrypointModuleId(scope, ep);
+				const context = buildEntrypointExecutionContext(ep.kind, targetClass, methodName, payload, moduleId, scope);
+				const invocationContext = { waitUntil(promise) {
+					lifetime.waitUntil(promise);
+					platformContext.waitUntil(promise);
+				} };
+				let filters = [];
+				try {
+					filters = (await resolveScopedComponentsAsync("filter", targetClass, methodName, scope, moduleId)).toReversed();
+					const guards = await resolveScopedComponentsAsync("guard", targetClass, methodName, scope, moduleId);
+					const interceptors = await resolveScopedComponentsAsync("interceptor", targetClass, methodName, scope, moduleId);
+					await PipelineRunner.run({
+						context,
+						guards,
+						interceptors,
+						resolveArgs: async () => [
+							payload,
+							env,
+							invocationContext
+						],
+						invoke: async (args) => {
+							const instance = await resolveEntrypoint(scope, ep);
+							if (typeof instance !== "object" || instance === null) throw new Error("Entrypoint must resolve to an object.");
+							return invoke(instance, methodName, args);
+						}
+					});
+				} catch (error) {
+					resolveErrorReporter(scope).report(error, reportContext);
+					for (const filter of filters) if (shouldFilterCatch(filter, error)) {
+						await filter.catch(error, context);
+						return;
+					}
+					reported = { error };
+					throw error;
 				}
-				throw error;
+			});
+		} catch (error) {
+			if (!reported || reported.error !== error) {
+				const completionError = reported && error instanceof AggregateError && error.errors[0] === reported.error ? error.errors[1] : error;
+				resolveErrorReporter(this.#app.getContainer()).report(completionError, reportContext);
 			}
-		});
+			throw error;
+		}
 	}
 	/**
 	* Handle Cloudflare Queue consumer events.
@@ -298,15 +336,10 @@ var CloudflareApplication = class {
 	*/
 	async queue(batch, env, ctx) {
 		assertCloudflareEnvironment(this.env, env);
-		const handlers = this.app.entrypoints.ofKind("cf:queue").filter((ep) => entrypointString(ep.meta, "queueName") === batch.queue);
-		await Promise.all(handlers.map((ep) => this.dispatchEntrypoint(ep, [
-			batch,
-			env,
-			ctx
-		])));
+		await settleEntrypoints(this.#app.entrypoints.ofKind("cf:queue").filter((ep) => entrypointString(ep.meta, "queueName") === batch.queue).map((ep) => this.dispatchEntrypoint(ep, batch, env, ctx)));
 	}
 	async close(signal) {
-		return this.app.close(signal);
+		return this.#app.close(signal);
 	}
 };
 //#endregion
@@ -846,6 +879,13 @@ registerEntrypointKind({
 	metaKey: SCHEDULED_METADATA_KEY,
 	level: "method"
 });
+function parseScheduledMetadata(value) {
+	if (typeof value !== "object" || value === null || !("cron" in value) || typeof value.cron !== "string" || !("methodName" in value) || typeof value.methodName !== "string" || !parseCron(value.cron, { dialect: "cloudflare" })) throw new TypeError("Invalid Cloudflare scheduled metadata");
+	return {
+		cron: value.cron,
+		methodName: value.methodName
+	};
+}
 /**
 * Marks a method as a scheduled (cron) handler.
 *
@@ -861,8 +901,9 @@ registerEntrypointKind({
 * ```
 */
 function Scheduled(cron) {
+	if (!parseCron(cron, { dialect: "cloudflare" })) throw new TypeError(`Invalid Cloudflare cron expression: ${cron}`);
 	return (target, propertyKey, _descriptor) => {
-		const existing = getMetadata(SCHEDULED_METADATA_KEY, target.constructor) ?? [];
+		const existing = getScheduledMetadata(target);
 		existing.push({
 			cron,
 			methodName: String(propertyKey)
@@ -870,6 +911,13 @@ function Scheduled(cron) {
 		defineMetadata(SCHEDULED_METADATA_KEY, existing, target.constructor);
 	};
 }
+function getScheduledMetadata(target) {
+	const ctor = typeof target === "function" ? target : target.constructor;
+	const value = getMetadata(SCHEDULED_METADATA_KEY, ctor);
+	if (value === void 0) return [];
+	if (!Array.isArray(value)) throw new TypeError("Invalid Cloudflare scheduled metadata list");
+	return value.map(parseScheduledMetadata);
+}
 //#endregion
 //#region src/decorators/queue-consumer.ts
 const QUEUE_CONSUMER_METADATA_KEY = "cloudflare:queue-consumer";
@@ -1018,6 +1066,6 @@ function durableObjectNonceStore(options) {
 	} };
 }
 //#endregion
-export { CloudflareApplication, CloudflareWebSocketModule, ConnectedSocket, DoCursorLog, DoPitrUnavailableError, Env, FlagshipFlagDriver, KVCacheStore, KvFlagDriver, MessageBody, QueueConsumer, R2StorageDriver, STORAGE_OPTIONS, Scheduled, StorageController, StorageManagerService, StorageModule, StorageService, SubscribeMessage, WebSocketGateway, WebSocketServer, WsException, armDoPitr, broadcastToRoom, cloudflareAdapter, cloudflareRateLimitStore, createCloudflareApp, createCloudflareWorker, durableObjectCursorLog, durableObjectLive, durableObjectNonceStore, durableObjectRoomName, flagshipFlagDriver, isDoPitrUnavailable, kvFlagDriver, liveInvalidateToRoom, readDoPitrBookmark };
+export { CloudflareApplication, CloudflareWebSocketModule, ConnectedSocket, DoCursorLog, DoPitrUnavailableError, Env, FlagshipFlagDriver, KVCacheStore, KvFlagDriver, MessageBody, QueueConsumer, R2StorageDriver, STORAGE_OPTIONS, Scheduled, StorageController, StorageManagerService, StorageModule, StorageService, SubscribeMessage, WebSocketGateway, WebSocketServer, WsException, armDoPitr, broadcastToRoom, cloudflareAdapter, cloudflareRateLimitStore, createCloudflareApp, createCloudflareWorker, durableObjectCursorLog, durableObjectLive, durableObjectNonceStore, durableObjectRoomName, flagshipFlagDriver, isDoPitrUnavailable, kvFlagDriver, liveInvalidateToRoom, parseScheduledMetadata, readDoPitrBookmark };
 
 //# sourceMappingURL=index.js.map