appflare 0.2.30 → 0.2.31

package/cli/templates/handlers/generators/context/storage-helpers.ts

@@ -1,59 +1,59 @@
-export function generateStorageHelpers(): string {
-	return `
-function normalizeStoragePath(path: string): string {
-	const trimmed = path.trim();
-	if (trimmed.length === 0) {
-		throw new Error("Storage path is required");
-	}
-
-	const withoutLeadingSlash = trimmed.replace(/^\\/+/, "");
-	if (withoutLeadingSlash.length === 0) {
-		throw new Error("Storage path is required");
-	}
-
-	return withoutLeadingSlash;
-}
-
-function normalizeStorageMethod(method: StorageMethod | undefined): StorageMethod {
-	return method ?? "get";
-}
-
-function sanitizeSignedFileName(fileName: string | undefined): string | null {
-	if (!fileName) {
-		return null;
-	}
-
-	const normalized = fileName.replace(/[\\r\\n\\"]/g, "").trim();
-	return normalized.length > 0 ? normalized : null;
-}
-
-function buildSignedRequest(
-	args: StorageSignedUrlArgs,
-	path: string,
-): Request {
-	const method = args.method ?? "GET";
-	const endpoint = new URL("https://r2.appflare.local/" + encodeURI(path));
-	const headers = new Headers();
-
-	if (args.contentType) {
-		headers.set("content-type", args.contentType);
-	}
-
-	if (method === "GET") {
-		const disposition = args.downloadAsAttachment === false ? "inline" : "attachment";
-		const fileName = sanitizeSignedFileName(args.fileName);
-		headers.set(
-			"response-content-disposition",
-			fileName
-				? disposition + '; filename="' + fileName + '"'
-				: disposition,
-		);
-	}
-
-	return new Request(endpoint.toString(), {
-		method,
-		headers,
-	});
-}
-`;
-}
+export function generateStorageHelpers(): string {
+	return `
+function normalizeStoragePath(path: string): string {
+	const trimmed = path.trim();
+	if (trimmed.length === 0) {
+		throw new Error("Storage path is required");
+	}
+
+	const withoutLeadingSlash = trimmed.replace(/^\\/+/, "");
+	if (withoutLeadingSlash.length === 0) {
+		throw new Error("Storage path is required");
+	}
+
+	return withoutLeadingSlash;
+}
+
+function normalizeStorageMethod(method: StorageMethod | undefined): StorageMethod {
+	return method ?? "get";
+}
+
+function sanitizeSignedFileName(fileName: string | undefined): string | null {
+	if (!fileName) {
+		return null;
+	}
+
+	const normalized = fileName.replace(/[\\r\\n\\"]/g, "").trim();
+	return normalized.length > 0 ? normalized : null;
+}
+
+function buildSignedRequest(
+	args: StorageSignedUrlArgs,
+	path: string,
+): Request {
+	const method = args.method ?? "GET";
+	const endpoint = new URL("https://r2.appflare.local/" + encodeURI(path));
+	const headers = new Headers();
+
+	if (args.contentType) {
+		headers.set("content-type", args.contentType);
+	}
+
+	if (method === "GET") {
+		const disposition = args.downloadAsAttachment === false ? "inline" : "attachment";
+		const fileName = sanitizeSignedFileName(args.fileName);
+		headers.set(
+			"response-content-disposition",
+			fileName
+				? disposition + '; filename="' + fileName + '"'
+				: disposition,
+		);
+	}
+
+	return new Request(endpoint.toString(), {
+		method,
+		headers,
+	});
+}
+`;
+}

package/cli/templates/handlers/generators/context/types.ts

@@ -1,40 +1,40 @@
-export function generateContextTypes(): string {
-	return `
-type SchedulerQueueBinding = {
-	send: (body: unknown, options?: SchedulerEnqueueOptions) => Promise<void>;
-};
-
-type R2ObjectBody = {
-	body: ReadableStream;
-	bodyUsed: boolean;
-	writeHttpResponse: (response: Response) => void;
-	httpMetadata?: Record<string, string | undefined>;
-	customMetadata?: Record<string, string>;
-	range?: { offset: number; length: number };
-	size: number;
-	etag: string;
-	httpEtag: string;
-	checksums: {
-		md5?: ArrayBuffer;
-		sha1?: ArrayBuffer;
-		sha256?: ArrayBuffer;
-		sha384?: ArrayBuffer;
-		sha512?: ArrayBuffer;
-	};
-	uploaded: Date;
-	key: string;
-	contentType?: string;
-};
-
-type R2BucketBinding = {
-	put: (key: string, value: unknown, options?: Record<string, unknown>) => Promise<unknown>;
-	get: (key: string, options?: Record<string, unknown>) => Promise<R2ObjectBody | null>;
-	delete: (key: string | string[]) => Promise<void>;
-	list: (options?: Record<string, unknown>) => Promise<unknown>;
-	createPresignedUrl?: (
-		request: Request,
-		options?: { expiresIn?: number },
-	) => Promise<URL>;
-};
-`;
-}
+export function generateContextTypes(): string {
+	return `
+type SchedulerQueueBinding = {
+	send: (body: unknown, options?: SchedulerEnqueueOptions) => Promise<void>;
+};
+
+type R2ObjectBody = {
+	body: ReadableStream;
+	bodyUsed: boolean;
+	writeHttpResponse: (response: Response) => void;
+	httpMetadata?: Record<string, string | undefined>;
+	customMetadata?: Record<string, string>;
+	range?: { offset: number; length: number };
+	size: number;
+	etag: string;
+	httpEtag: string;
+	checksums: {
+		md5?: ArrayBuffer;
+		sha1?: ArrayBuffer;
+		sha256?: ArrayBuffer;
+		sha384?: ArrayBuffer;
+		sha512?: ArrayBuffer;
+	};
+	uploaded: Date;
+	key: string;
+	contentType?: string;
+};
+
+type R2BucketBinding = {
+	put: (key: string, value: unknown, options?: Record<string, unknown>) => Promise<unknown>;
+	get: (key: string, options?: Record<string, unknown>) => Promise<R2ObjectBody | null>;
+	delete: (key: string | string[]) => Promise<void>;
+	list: (options?: Record<string, unknown>) => Promise<unknown>;
+	createPresignedUrl?: (
+		request: Request,
+		options?: { expiresIn?: number },
+	) => Promise<URL>;
+};
+`;
+}

package/cli/templates/handlers/generators/context.ts

@@ -1,43 +1,43 @@
-import { generateAuth } from "../auth";
-import { generateContextTypes } from "./context/types";
-import { generateSchedulerFunctions } from "./context/scheduler";
-import { generateErrorHelpers } from "./context/error-helpers";
-import { generateStorageHelpers } from "./context/storage-helpers";
-import { generateStorageApi } from "./context/storage-api";
-import { generateContextCreation } from "./context/context-creation";
-
-export function generateContextSource(defaultR2Binding?: string): string {
-	return `import type { Context } from "hono";
-import type { D1Database, IncomingRequestCfProperties, KVNamespace } from "@cloudflare/workers-types";
-import { createAuth } from "./auth.config";
-import {
-	type AppflareContext,
-	type AppflareStorage,
-	AppflareHandledError,
-	type Scheduler,
-	type SchedulerEnqueueOptions,
-	type RegisterHandlersOptions,
-	type StorageAuthorizationArgs,
-	type StorageMethod,
-	type StorageSignedUrlArgs,
-	type WorkerEnv,
-	isStorageAllowed,
-	createDb,
-	createQueryDb,
-} from "./handlers";
-
-${generateContextTypes()}
-
-${generateAuth()}
-
-${generateSchedulerFunctions()}
-
-${generateErrorHelpers()}
-
-${generateStorageHelpers()}
-
-${generateStorageApi()}
-
-${generateContextCreation(defaultR2Binding)}
-`;
-}
+import { generateAuth } from "../auth";
+import { generateContextTypes } from "./context/types";
+import { generateSchedulerFunctions } from "./context/scheduler";
+import { generateErrorHelpers } from "./context/error-helpers";
+import { generateStorageHelpers } from "./context/storage-helpers";
+import { generateStorageApi } from "./context/storage-api";
+import { generateContextCreation } from "./context/context-creation";
+
+export function generateContextSource(defaultR2Binding?: string): string {
+	return `import type { Context } from "hono";
+import type { D1Database, IncomingRequestCfProperties, KVNamespace } from "@cloudflare/workers-types";
+import { createAuth } from "./auth.config";
+import {
+	type AppflareContext,
+	type AppflareStorage,
+	AppflareHandledError,
+	type Scheduler,
+	type SchedulerEnqueueOptions,
+	type RegisterHandlersOptions,
+	type StorageAuthorizationArgs,
+	type StorageMethod,
+	type StorageSignedUrlArgs,
+	type WorkerEnv,
+	isStorageAllowed,
+	createDb,
+	createQueryDb,
+} from "./handlers";
+
+${generateContextTypes()}
+
+${generateAuth()}
+
+${generateSchedulerFunctions()}
+
+${generateErrorHelpers()}
+
+${generateStorageHelpers()}
+
+${generateStorageApi()}
+
+${generateContextCreation(defaultR2Binding)}
+`;
+}

package/cli/templates/handlers/generators/execution.ts

@@ -1,15 +1,15 @@
-import { generateExecution } from "../execution";
-
-export function generateExecutionSource(): string {
-	return `import type { Context } from "hono";
-import { ZodError, type ZodRawShape } from "zod";
-import {
-	type AppflareContext,
-	AppflareHandledError,
-	type RegisteredOperation,
-	type WorkerEnv,
-} from "./handlers";
-
-${generateExecution()}
-`;
-}
+import { generateExecution } from "../execution";
+
+export function generateExecutionSource(): string {
+	return `import type { Context } from "hono";
+import { ZodError, type ZodRawShape } from "zod";
+import {
+	type AppflareContext,
+	AppflareHandledError,
+	type RegisteredOperation,
+	type WorkerEnv,
+} from "./handlers";
+
+${generateExecution()}
+`;
+}

package/cli/templates/handlers/generators/handlers.ts

@@ -1,13 +1,13 @@
-import { generateTypes } from "../types";
-
-export function generateHandlersSource(schemaImportPath: string): string {
-	return `import type { Context } from "hono";
-import type { D1Database } from "@cloudflare/workers-types";
-import { drizzle } from "drizzle-orm/d1";
-import { z, type ZodRawShape } from "zod";
-import * as authSchema from "./auth.schema";
-import * as schema from "${schemaImportPath}";
-
-${generateTypes()}
-`;
-}
+import { generateTypes } from "../types";
+
+export function generateHandlersSource(schemaImportPath: string): string {
+	return `import type { Context } from "hono";
+import type { D1Database } from "@cloudflare/workers-types";
+import { drizzle } from "drizzle-orm/d1";
+import { z, type ZodRawShape } from "zod";
+import * as authSchema from "./auth.schema";
+import * as schema from "${schemaImportPath}";
+
+${generateTypes()}
+`;
+}

package/cli/templates/handlers/generators/registration/modules/cron.ts

@@ -1,26 +1,26 @@
-export const cronModule = `
-export async function executeCronTriggers(
-	controller: { cron: string },
-	env: Record<string, unknown>,
-	options: RegisterHandlersOptions,
-): Promise<void> {
-	const cronValue = controller?.cron;
-	if (!cronValue) {
-		return;
-	}
-
-	const ctx = await createSchedulerExecutionContext(env, options);
-
-	for (const cronEntry of cronHandlers) {
-		if (!cronEntry.cronTriggers.includes(cronValue)) {
-			continue;
-		}
-
-		try {
-			await cronEntry.definition.handler(ctx);
-		} catch (error) {
-			console.error("Cron task failed", cronEntry.taskName, error);
-		}
-	}
-}
-`;
+export const cronModule = `
+export async function executeCronTriggers(
+	controller: { cron: string },
+	env: Record<string, unknown>,
+	options: RegisterHandlersOptions,
+): Promise<void> {
+	const cronValue = controller?.cron;
+	if (!cronValue) {
+		return;
+	}
+
+	const ctx = await createSchedulerExecutionContext(env, options);
+
+	for (const cronEntry of cronHandlers) {
+		if (!cronEntry.cronTriggers.includes(cronValue)) {
+			continue;
+		}
+
+		try {
+			await cronEntry.definition.handler(ctx);
+		} catch (error) {
+			console.error("Cron task failed", cronEntry.taskName, error);
+		}
+	}
+}
+`;

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

@@ -1,75 +1,75 @@
-export const realtimeAuthModule = `
-function getRealtimeStub(
-	env: Record<string, unknown>,
-	options: RegisterHandlersOptions,
-): RealtimeStub | null {
-	const binding = options.realtimeBinding ?? "APPFLARE_REALTIME";
-	const namespace = env[binding] as RealtimeDurableObjectNamespace | undefined;
-	if (!namespace) {
-		return null;
-	}
-
-	const objectName = options.realtimeObjectName ?? "global";
-	const objectId = namespace.idFromName(objectName);
-	return namespace.get(objectId);
-}
-
-async function validateAuthToken(
-	request: Request,
-	env: Record<string, unknown>,
-	options: RegisterHandlersOptions,
-	authToken: string,
-): Promise<{ user: unknown; session: unknown } | null> {
-	const database = env[options.databaseBinding] as D1Database | undefined;
-	if (!database) {
-		return null;
-	}
-
-	const kvNamespace = options.kvBinding
-		? (env[options.kvBinding] as KVNamespace | undefined)
-		: undefined;
-	const headers = new Headers(request.headers);
-	headers.set("authorization", "Bearer " + authToken);
-	headers.delete("upgrade");
-	headers.delete("connection");
-	for (const key of [...headers.keys()]) {
-		if (key.toLowerCase().startsWith("sec-websocket")) {
-			headers.delete(key);
-		}
-	}
-	const tokenRequest = new Request(request.url, {
-		method: "GET",
-		headers,
-	});
-
-	const session = await resolveSession(
-		tokenRequest,
-		database,
-		kvNamespace,
-		request.cf as IncomingRequestCfProperties | undefined,
-	);
-
-	if (!session?.user) {
-		return null;
-	}
-
-	return session;
-}
-
-function extractUserId(user: unknown): string {
-	if (!isRecord(user)) {
-		return "unknown";
-	}
-
-	const id = user.id;
-	return typeof id === "string" && id.length > 0 ? id : "unknown";
-}
-
-function buildRealtimeWsUrl(requestUrl: string, websocketPath: string): string {
-	const url = new URL(requestUrl);
-	url.pathname = websocketPath;
-	url.search = "";
-	url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
-	return url.toString();
-}
-`;
+export const realtimeAuthModule = `
+function getRealtimeStub(
+	env: Record<string, unknown>,
+	options: RegisterHandlersOptions,
+): RealtimeStub | null {
+	const binding = options.realtimeBinding ?? "APPFLARE_REALTIME";
+	const namespace = env[binding] as RealtimeDurableObjectNamespace | undefined;
+	if (!namespace) {
+		return null;
+	}
+
+	const objectName = options.realtimeObjectName ?? "global";
+	const objectId = namespace.idFromName(objectName);
+	return namespace.get(objectId);
+}
+
+async function validateAuthToken(
+	request: Request,
+	env: Record<string, unknown>,
+	options: RegisterHandlersOptions,
+	authToken: string,
+): Promise<{ user: unknown; session: unknown } | null> {
+	const database = env[options.databaseBinding] as D1Database | undefined;
+	if (!database) {
+		return null;
+	}
+
+	const kvNamespace = options.kvBinding
+		? (env[options.kvBinding] as KVNamespace | undefined)
+		: undefined;
+	const headers = new Headers(request.headers);
+	headers.set("authorization", "Bearer " + authToken);
+	headers.delete("upgrade");
+	headers.delete("connection");
+	for (const key of [...headers.keys()]) {
+		if (key.toLowerCase().startsWith("sec-websocket")) {
+			headers.delete(key);
+		}
+	}
+	const tokenRequest = new Request(request.url, {
+		method: "GET",
+		headers,
+	});
+
+	const session = await resolveSession(
+		tokenRequest,
+		database,
+		kvNamespace,
+		request.cf as IncomingRequestCfProperties | undefined,
+	);
+
+	if (!session?.user) {
+		return null;
+	}
+
+	return session;
+}
+
+function extractUserId(user: unknown): string {
+	if (!isRecord(user)) {
+		return "unknown";
+	}
+
+	const id = user.id;
+	return typeof id === "string" && id.length > 0 ? id : "unknown";
+}
+
+function buildRealtimeWsUrl(requestUrl: string, websocketPath: string): string {
+	const url = new URL(requestUrl);
+	url.pathname = websocketPath;
+	url.search = "";
+	url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
+	return url.toString();
+}
+`;