appflare 0.0.17 → 0.0.18

package/cli/core/discover-handlers.ts

@@ -39,7 +39,7 @@ export async function discoverHandlers(params: {
 		const content = await fs.readFile(fileAbs, "utf8");
 		const cronTriggersByHandler = extractCronTriggers(content);
 		const regex =
-			/export\s+const\s+([A-Za-z_$][\w$]*)\s*=\s*(query|mutation|internalQuery|internalMutation|scheduler|cron)\s*\(/g;
+			/export\s+const\s+([A-Za-z_$][\w$]*)\s*=\s*(query|mutation|internalQuery|internalMutation|scheduler|cron|http)\s*\(/g;
 		let match: RegExpExecArray | null;
 		while ((match = regex.exec(content)) !== null) {
 			const kind = match[2] as HandlerKind;

package/cli/generators/generate-hono-server/index.ts

@@ -1,7 +1,7 @@
 import type { AppflareConfig, DiscoveredHandler } from "../../utils/utils";
 import { buildImportSection } from "./imports";
 import { buildAuthSection } from "./auth";
-import { buildRouteLines } from "./routes";
+import { buildRouteLines, buildHttpRouteLines } from "./routes";
 import { renderServerTemplate } from "./template";
 
 export type GenerateHonoServerParams = {
@@ -17,6 +17,9 @@ export function generateHonoServer(params: GenerateHonoServerParams): string {
 	const mutations = params.handlers.filter(
 		(handler) => handler.kind === "mutation"
 	);
+	const https = params.handlers.filter(
+		(handler) => handler.kind === "http"
+	);
 
 	const imports = buildImportSection({
 		handlers: params.handlers,
@@ -30,6 +33,10 @@ export function generateHonoServer(params: GenerateHonoServerParams): string {
 		mutations,
 		localNameFor: imports.localNameFor,
 	});
+	const httpLines = buildHttpRouteLines({
+		https,
+		localNameFor: imports.localNameFor,
+	});
 
 	return renderServerTemplate({
 		schemaImportPath: imports.schemaImportPath,
@@ -40,5 +47,6 @@ export function generateHonoServer(params: GenerateHonoServerParams): string {
 		authMountBlock: auth.mountBlock,
 		authResolverBlock: auth.resolverBlock,
 		routeLines,
+		httpLines,
 	});
 }

package/cli/generators/generate-hono-server/routes.ts

@@ -78,3 +78,38 @@ export function buildRouteLines(params: {
 	}
 	return routeLines;
 }
+
+export function buildHttpRouteLines(params: {
+	https: DiscoveredHandler[];
+	localNameFor: (handler: DiscoveredHandler) => string;
+}): string[] {
+	const routeLines: string[] = [];
+	for (const hook of params.https) {
+		const local = params.localNameFor(hook);
+		routeLines.push(
+			`app.all(\n` +
+				`	${JSON.stringify(`/http/${hook.routePath}/${hook.name}`)},\n` +
+				`	async (c) => {\n` +
+				`\t\ttry {\n` +
+				`\t\t\tconst ctx = await resolveContext(c);\n` +
+				`\t\t\tconst result = await runHandlerWithMiddleware(\n` +
+				`\t\t\t\t${local} as any,\n` +
+				`\t\t\t\tctx as any,\n` +
+				`\t\t\t\tc.req.raw\n` +
+				`\t\t\t);\n` +
+				`\t\t\tif (isHandlerError(result)) {\n` +
+				`\t\t\t\tconst { status, body } = formatHandlerError(result);\n` +
+				`\t\t\t\treturn c.json(body as any, status);\n` +
+				`\t\t\t}\n` +
+				`\t\t\treturn result;\n` +
+				`\t\t} catch (err) {\n` +
+				`\t\t\tconst { status, body } = formatHandlerError(err);\n` +
+				`\t\t\tconsole.error("Appflare http handler error", err);\n` +
+				`\t\t\treturn c.json(body as any, status);\n` +
+				`\t\t}\n` +
+				`\t}\n` +
+				`);`
+		);
+	}
+	return routeLines;
+}

package/cli/generators/generate-hono-server/template.ts

@@ -7,6 +7,7 @@ export type ServerTemplateParams = {
 	authMountBlock: string;
 	authResolverBlock: string;
 	routeLines: string[];
+	httpLines: string[];
 };
 
 export function renderServerTemplate(params: ServerTemplateParams): string {
@@ -338,13 +339,15 @@ ${params.authSetupBlock}${params.authMountBlock}${params.authResolverBlock}\tcon
 		return merged as AppflareServerContext;
 	};
 
-\t${params.routeLines.join("\n\n\t")}
+		${params.routeLines.join("\n\n\t")}
 
-\treturn app;
+	${params.httpLines.join("\n\n\t")}
+
+	return app;
 }
 
 function createMutationNotifier(
-\toptions?: RealtimeOptions
+	options?: RealtimeOptions
 ): MutationNotifier | undefined {
 \tif (!options) return undefined;
 \tif (options.notify) return options.notify;

package/cli/schema/schema-static-types.ts

@@ -676,4 +676,18 @@ export interface InternalMutationDefinition<
 export const internalMutation = <TArgs extends QueryArgsShape, TResult>(
 	definition: InternalMutationDefinition<TArgs, TResult>
 ): InternalMutationDefinition<TArgs, TResult> => definition;
+
+export interface HttpContext extends AppflareAuthContext {
+	db: DatabaseWriter;
+	scheduler?: Scheduler;
+	error: AppflareErrorFactory;
+}
+
+export interface HttpDefinition {
+	handler: (ctx: HttpContext, request: Request) => Promise<Response>;
+}
+
+export const http = (
+	definition: HttpDefinition
+): HttpDefinition => definition;
 `;

package/cli/utils/utils.ts

@@ -50,7 +50,8 @@ export type HandlerKind =
 	| "internalQuery"
 	| "internalMutation"
 	| "scheduler"
-	| "cron";
+	| "cron"
+	| "http";
 
 export type DiscoveredHandler = {
 	fileName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "appflare",
-	"version": "0.0.17",
+	"version": "0.0.18",
 	"bin": {
 		"appflare": "./cli/index.ts"
 	},