appflare 0.2.29 → 0.2.31

package/cli/templates/handlers/generators/registration/modules/realtime/durable-object.ts

@@ -1,144 +1,144 @@
-export const realtimeDurableObjectModule = `
-export class AppflareRealtimeDurableObject {
-	private readonly subscriptions = new Map<string, RealtimeSubscription>();
-	private readonly sockets = new Map<string, WebSocket>();
-
-	public constructor(_state: unknown) {}
-
-	public async fetch(request: Request): Promise<Response> {
-		const url = new URL(request.url);
-
-		if (request.method === "POST" && url.pathname === "/subscribe") {
-			const payload = (await request.json().catch(() => null)) as RealtimeSubscription | null;
-			if (!payload?.token || !payload.queryName ) {
-				return new Response(JSON.stringify({ message: "Invalid subscription payload" }), {
-					status: 400,
-					headers: { "content-type": "application/json" },
-				});
-			}
-
-			this.subscriptions.set(payload.token, payload);
-			return new Response(JSON.stringify({ ok: true }), {
-				status: 200,
-				headers: { "content-type": "application/json" },
-			});
-		}
-
-		if (request.method === "POST" && url.pathname === "/subscriptions") {
-			return new Response(
-				JSON.stringify({ subscriptions: Array.from(this.subscriptions.values()) }),
-				{
-					status: 200,
-					headers: { "content-type": "application/json" },
-				},
-			);
-		}
-
-		if (request.method === "POST" && url.pathname === "/unsubscribe") {
-			const payload = (await request.json().catch(() => null)) as {
-				token?: unknown;
-				authToken?: unknown;
-			} | null;
-			const token = typeof payload?.token === "string" ? payload.token : "";
-			const authToken =
-				typeof payload?.authToken === "string" ? payload.authToken : "";
-
-			if (!token ) {
-				return new Response(
-					JSON.stringify({ message: "token is required" }),
-					{
-						status: 400,
-						headers: { "content-type": "application/json" },
-					},
-				);
-			}
-
-			const existing = this.subscriptions.get(token);
-			if (!existing || existing.authToken !== authToken) {
-				return new Response(JSON.stringify({ message: "Subscription not found" }), {
-					status: 404,
-					headers: { "content-type": "application/json" },
-				});
-			}
-
-			const socket = this.sockets.get(token);
-			if (socket && socket.readyState === 1) {
-				socket.close();
-			}
-
-			this.sockets.delete(token);
-			this.subscriptions.delete(token);
-
-			return new Response(JSON.stringify({ ok: true }), {
-				status: 200,
-				headers: { "content-type": "application/json" },
-			});
-		}
-
-		if (request.method === "POST" && url.pathname === "/emit") {
-			const payload = (await request.json().catch(() => null)) as RealtimeEmitPayload | null;
-			if (!payload?.token || !payload.event) {
-				return new Response(JSON.stringify({ message: "Invalid emit payload" }), {
-					status: 400,
-					headers: { "content-type": "application/json" },
-				});
-			}
-
-			const socket = this.sockets.get(payload.token);
-			if (socket && socket.readyState === 1) {
-				socket.send(
-					JSON.stringify({
-						event: payload.event,
-						payload: payload.payload,
-					}),
-				);
-			}
-
-			return new Response(JSON.stringify({ ok: true }), {
-				status: 200,
-				headers: { "content-type": "application/json" },
-			});
-		}
-
-		if (request.method === "GET" && (url.pathname === "/ws" || url.pathname.endsWith("/ws"))) {
-			const token = url.searchParams.get("token") ?? "";
-			const authToken = url.searchParams.get("authToken") ?? "";
-			const subscription = this.subscriptions.get(token);
-			if (!subscription) {
-				return new Response("Unauthorized", { status: 401 });
-			}
-
-			const pair = new WebSocketPair();
-			const [clientSocket, serverSocket] = Object.values(pair);
-			serverSocket.accept();
-			this.sockets.set(token, serverSocket);
-
-			const release = () => {
-				this.sockets.delete(token);
-			};
-
-			serverSocket.addEventListener("close", release);
-			serverSocket.addEventListener("error", release);
-			serverSocket.addEventListener("message", (event) => {
-				if (String(event.data ?? "").trim() === "ping") {
-					serverSocket.send(JSON.stringify({ event: "pong" }));
-				}
-			});
-
-			const requestedProtocol = request.headers.get("Sec-WebSocket-Protocol");
-			const headers = new Headers();
-			if (requestedProtocol) {
-				headers.set("Sec-WebSocket-Protocol", requestedProtocol);
-			}
-
-			return new Response(null, {
-				status: 101,
-				webSocket: clientSocket,
-				headers,
-			} as ResponseInit & { webSocket: WebSocket });
-		}
-
-		return new Response("Not found", { status: 404 });
-	}
-}
-`;
+export const realtimeDurableObjectModule = `
+export class AppflareRealtimeDurableObject {
+	private readonly subscriptions = new Map<string, RealtimeSubscription>();
+	private readonly sockets = new Map<string, WebSocket>();
+
+	public constructor(_state: unknown) {}
+
+	public async fetch(request: Request): Promise<Response> {
+		const url = new URL(request.url);
+
+		if (request.method === "POST" && url.pathname === "/subscribe") {
+			const payload = (await request.json().catch(() => null)) as RealtimeSubscription | null;
+			if (!payload?.token || !payload.queryName ) {
+				return new Response(JSON.stringify({ message: "Invalid subscription payload" }), {
+					status: 400,
+					headers: { "content-type": "application/json" },
+				});
+			}
+
+			this.subscriptions.set(payload.token, payload);
+			return new Response(JSON.stringify({ ok: true }), {
+				status: 200,
+				headers: { "content-type": "application/json" },
+			});
+		}
+
+		if (request.method === "POST" && url.pathname === "/subscriptions") {
+			return new Response(
+				JSON.stringify({ subscriptions: Array.from(this.subscriptions.values()) }),
+				{
+					status: 200,
+					headers: { "content-type": "application/json" },
+				},
+			);
+		}
+
+		if (request.method === "POST" && url.pathname === "/unsubscribe") {
+			const payload = (await request.json().catch(() => null)) as {
+				token?: unknown;
+				authToken?: unknown;
+			} | null;
+			const token = typeof payload?.token === "string" ? payload.token : "";
+			const authToken =
+				typeof payload?.authToken === "string" ? payload.authToken : "";
+
+			if (!token ) {
+				return new Response(
+					JSON.stringify({ message: "token is required" }),
+					{
+						status: 400,
+						headers: { "content-type": "application/json" },
+					},
+				);
+			}
+
+			const existing = this.subscriptions.get(token);
+			if (!existing || existing.authToken !== authToken) {
+				return new Response(JSON.stringify({ message: "Subscription not found" }), {
+					status: 404,
+					headers: { "content-type": "application/json" },
+				});
+			}
+
+			const socket = this.sockets.get(token);
+			if (socket && socket.readyState === 1) {
+				socket.close();
+			}
+
+			this.sockets.delete(token);
+			this.subscriptions.delete(token);
+
+			return new Response(JSON.stringify({ ok: true }), {
+				status: 200,
+				headers: { "content-type": "application/json" },
+			});
+		}
+
+		if (request.method === "POST" && url.pathname === "/emit") {
+			const payload = (await request.json().catch(() => null)) as RealtimeEmitPayload | null;
+			if (!payload?.token || !payload.event) {
+				return new Response(JSON.stringify({ message: "Invalid emit payload" }), {
+					status: 400,
+					headers: { "content-type": "application/json" },
+				});
+			}
+
+			const socket = this.sockets.get(payload.token);
+			if (socket && socket.readyState === 1) {
+				socket.send(
+					JSON.stringify({
+						event: payload.event,
+						payload: payload.payload,
+					}),
+				);
+			}
+
+			return new Response(JSON.stringify({ ok: true }), {
+				status: 200,
+				headers: { "content-type": "application/json" },
+			});
+		}
+
+		if (request.method === "GET" && (url.pathname === "/ws" || url.pathname.endsWith("/ws"))) {
+			const token = url.searchParams.get("token") ?? "";
+			const authToken = url.searchParams.get("authToken") ?? "";
+			const subscription = this.subscriptions.get(token);
+			if (!subscription) {
+				return new Response("Unauthorized", { status: 401 });
+			}
+
+			const pair = new WebSocketPair();
+			const [clientSocket, serverSocket] = Object.values(pair);
+			serverSocket.accept();
+			this.sockets.set(token, serverSocket);
+
+			const release = () => {
+				this.sockets.delete(token);
+			};
+
+			serverSocket.addEventListener("close", release);
+			serverSocket.addEventListener("error", release);
+			serverSocket.addEventListener("message", (event) => {
+				if (String(event.data ?? "").trim() === "ping") {
+					serverSocket.send(JSON.stringify({ event: "pong" }));
+				}
+			});
+
+			const requestedProtocol = request.headers.get("Sec-WebSocket-Protocol");
+			const headers = new Headers();
+			if (requestedProtocol) {
+				headers.set("Sec-WebSocket-Protocol", requestedProtocol);
+			}
+
+			return new Response(null, {
+				status: 101,
+				webSocket: clientSocket,
+				headers,
+			} as ResponseInit & { webSocket: WebSocket });
+		}
+
+		return new Response("Not found", { status: 404 });
+	}
+}
+`;

package/cli/templates/handlers/generators/registration/modules/realtime/index.ts

@@ -1,15 +1,15 @@
-import { realtimeAuthModule } from "./auth";
-import { realtimeDurableObjectModule } from "./durable-object";
-import { realtimePublisherModule } from "./publisher";
-import { realtimeRoutesModule } from "./routes";
-import { realtimeTypesModule } from "./types";
-import { realtimeUtilsModule } from "./utils";
-
-export const realtimeModule = [
-	realtimeTypesModule,
-	realtimeUtilsModule,
-	realtimeAuthModule,
-	realtimePublisherModule,
-	realtimeRoutesModule,
-	realtimeDurableObjectModule,
+import { realtimeAuthModule } from "./auth";
+import { realtimeDurableObjectModule } from "./durable-object";
+import { realtimePublisherModule } from "./publisher";
+import { realtimeRoutesModule } from "./routes";
+import { realtimeTypesModule } from "./types";
+import { realtimeUtilsModule } from "./utils";
+
+export const realtimeModule = [
+	realtimeTypesModule,
+	realtimeUtilsModule,
+	realtimeAuthModule,
+	realtimePublisherModule,
+	realtimeRoutesModule,
+	realtimeDurableObjectModule,
 ].join("\n\n");

package/cli/templates/handlers/generators/registration/modules/realtime/publisher.ts

@@ -1,102 +1,102 @@
-export const realtimePublisherModule = `
-async function publishMutationEvents(
-	c: { req: { raw: Request }; env: Record<string, unknown> },
-	options: RegisterHandlersOptions,
-	mutationEvents: DbMutationEvent[],
-): Promise<void> {
-	if (mutationEvents.length === 0) {
-		return;
-	}
-
-	const stub = getRealtimeStub(c.env, options);
-	if (!stub) {
-		return;
-	}
-
-	const subscriptionsResponse = await stub.fetch(
-		new Request("https://realtime.internal/subscriptions", {
-			method: "POST",
-			headers: {
-				"content-type": "application/json",
-			},
-		}),
-	);
-	if (!subscriptionsResponse.ok) {
-		return;
-	}
-
-	const payload = (await subscriptionsResponse.json()) as {
-		subscriptions?: RealtimeSubscription[];
-	};
-	const subscriptions = Array.isArray(payload.subscriptions)
-		? payload.subscriptions
-		: [];
-
-	for (const subscription of subscriptions) {
-		const operation = (realtimeQueryHandlers as Record<
-			string,
-			{
-				definition: {
-					handler: (ctx: AppflareContext, args: unknown) => Promise<unknown> | unknown;
-				};
-				schema: z.ZodTypeAny;
-			}
-		>)[subscription.queryName];
-		if (!operation) {
-			continue;
-		}
-
-		const authSession = await validateAuthToken(
-			c.req.raw,
-			c.env,
-			options,
-			subscription.authToken,
-		);
-
-		const subscriberCtx = await createExecutionContext(c as never, options);
-		subscriberCtx.user = authSession?.user as never;
-		subscriberCtx.session = authSession?.session as never;
-
-		try {
-			const parsedArgs = operation.schema.parse(subscription.args);
-			const matchPlan = await buildRealtimeQueryMatchPlan(
-				operation.definition.handler,
-				parsedArgs,
-				{
-					user: subscriberCtx.user,
-					session: subscriberCtx.session,
-				},
-			);
-			const shouldPublish = mutationEvents.some((event) => {
-				return doesSubscriptionMatchMutation(matchPlan, event);
-			});
-			if (!shouldPublish) {
-				continue;
-			}
-
-			const result = await operation.definition.handler(subscriberCtx, parsedArgs);
-			const emitPayload: RealtimeEmitPayload = {
-				token: subscription.token,
-				event: "query:update",
-				payload: {
-					queryName: subscription.queryName,
-					signature: subscription.signature,
-					data: result,
-				},
-			};
-
-			await stub.fetch(
-				new Request("https://realtime.internal/emit", {
-					method: "POST",
-					headers: {
-						"content-type": "application/json",
-					},
-					body: JSON.stringify(emitPayload),
-				}),
-			);
-		} catch (error) {
-			console.warn("Failed to publish realtime update", subscription.queryName, error);
-		}
-	}
-}
-`;
+export const realtimePublisherModule = `
+async function publishMutationEvents(
+	c: { req: { raw: Request }; env: Record<string, unknown> },
+	options: RegisterHandlersOptions,
+	mutationEvents: DbMutationEvent[],
+): Promise<void> {
+	if (mutationEvents.length === 0) {
+		return;
+	}
+
+	const stub = getRealtimeStub(c.env, options);
+	if (!stub) {
+		return;
+	}
+
+	const subscriptionsResponse = await stub.fetch(
+		new Request("https://realtime.internal/subscriptions", {
+			method: "POST",
+			headers: {
+				"content-type": "application/json",
+			},
+		}),
+	);
+	if (!subscriptionsResponse.ok) {
+		return;
+	}
+
+	const payload = (await subscriptionsResponse.json()) as {
+		subscriptions?: RealtimeSubscription[];
+	};
+	const subscriptions = Array.isArray(payload.subscriptions)
+		? payload.subscriptions
+		: [];
+
+	for (const subscription of subscriptions) {
+		const operation = (realtimeQueryHandlers as Record<
+			string,
+			{
+				definition: {
+					handler: (ctx: AppflareContext, args: unknown) => Promise<unknown> | unknown;
+				};
+				schema: z.ZodTypeAny;
+			}
+		>)[subscription.queryName];
+		if (!operation) {
+			continue;
+		}
+
+		const authSession = await validateAuthToken(
+			c.req.raw,
+			c.env,
+			options,
+			subscription.authToken,
+		);
+
+		const subscriberCtx = await createExecutionContext(c as never, options);
+		subscriberCtx.user = authSession?.user as never;
+		subscriberCtx.session = authSession?.session as never;
+
+		try {
+			const parsedArgs = operation.schema.parse(subscription.args);
+			const matchPlan = await buildRealtimeQueryMatchPlan(
+				operation.definition.handler,
+				parsedArgs,
+				{
+					user: subscriberCtx.user,
+					session: subscriberCtx.session,
+				},
+			);
+			const shouldPublish = mutationEvents.some((event) => {
+				return doesSubscriptionMatchMutation(matchPlan, event);
+			});
+			if (!shouldPublish) {
+				continue;
+			}
+
+			const result = await operation.definition.handler(subscriberCtx, parsedArgs);
+			const emitPayload: RealtimeEmitPayload = {
+				token: subscription.token,
+				event: "query:update",
+				payload: {
+					queryName: subscription.queryName,
+					signature: subscription.signature,
+					data: result,
+				},
+			};
+
+			await stub.fetch(
+				new Request("https://realtime.internal/emit", {
+					method: "POST",
+					headers: {
+						"content-type": "application/json",
+					},
+					body: JSON.stringify(emitPayload),
+				}),
+			);
+		} catch (error) {
+			console.warn("Failed to publish realtime update", subscription.queryName, error);
+		}
+	}
+}
+`;