@sigil-dev/grimoire 0.7.5 → 0.7.6

package/src/server/index.ts

@@ -1,4 +1,5 @@
-import type { ServerWebSocket } from "bun";
+import { isAbsolute, join } from "node:path";
+import { plugin as bunPlugin, type ServerWebSocket } from "bun";
 import { renderRoute } from "../rendering";
 import { registerSSRPlugin } from "../rendering/ssrPlugin";
 import { findClosestError, matchRoute } from "../routing/router";
@@ -10,6 +11,8 @@ import { buildProject } from "./build";
 import { createCookies } from "./cookie-utils";
 import type {
 	Handle,
+	HandleError,
+	HandleFetch,
 	InitFunction,
 	RequestEvent,
 	ResolveFunction,
@@ -17,15 +20,23 @@ import type {
 import { runDeserializeLocals, runHook, runRequestHooks } from "./plugins";
 
 /**
- * Try to load hooks.index.ts from the project root.
+ * Try to load hooks.server.ts from the project root.
  */
-async function loadHooks(
-	projectRoot: string,
-): Promise<{ handle?: Handle; init?: InitFunction }> {
+async function loadHooks(projectRoot: string): Promise<{
+	handle?: Handle;
+	init?: InitFunction;
+	handleError?: HandleError;
+	handleFetch?: HandleFetch;
+}> {
 	const hooksPath = `${projectRoot}/hooks.server.ts`;
 	try {
 		const mod = await import(hooksPath);
-		return { handle: mod.handle, init: mod.init };
+		return {
+			handle: mod.handle,
+			init: mod.init,
+			handleError: mod.handleError,
+			handleFetch: mod.handleFetch,
+		};
 	} catch {
 		// no hooks file — that's fine
 		return {};
@@ -48,12 +59,12 @@ export async function createServer(config: GrimoireConfig = {}) {
 		finalConfig = plugin.config?.(finalConfig) ?? finalConfig;
 	}
 
-	//w timings????
 	const {
 		port = 3000,
 		host = "localhost",
 		plugins = [],
 		routes = "src/routes",
+		cspNonce,
 		_skipBuild = false,
 	} = finalConfig;
 
@@ -64,9 +75,8 @@ export async function createServer(config: GrimoireConfig = {}) {
 		tree = _tree;
 	} else {
 		// worker — build already done by loom, just scan routes
-		const { isAbsolute, join } = await import("node:path");
-		const { scanRoutes } = await import("../routing/scanner");
 		const routesDir = isAbsolute(routes) ? routes : join(process.cwd(), routes);
+		const { scanRoutes } = await import("../routing/scanner");
 		tree = await scanRoutes(routesDir, process.cwd());
 	}
 
@@ -74,21 +84,42 @@ export async function createServer(config: GrimoireConfig = {}) {
 	// WHAT ARE WE DOINGGGGGGGGG
 	registerSSRPlugin(plugins);
 
-	// Load hooks.index.ts
-	const { handle: hooksHandle, init: hooksInit } = await loadHooks(
-		process.cwd(),
-	);
+	// Load hooks.server.ts
+	const {
+		handle: hooksHandle,
+		init: hooksInit,
+		handleError: hooksHandleError,
+		handleFetch: hooksHandleFetch,
+	} = await loadHooks(process.cwd());
 
 	// Run init hook if present
 	await hooksInit?.();
 
+	// Register alias plugin so dynamically-imported +server.ts routes can resolve custom aliases
+	const aliases = finalConfig.alias ?? {};
+	if (Object.keys(aliases).length > 0) {
+		bunPlugin({
+			name: "grimoire-alias",
+			setup(build) {
+				for (const [prefix, target] of Object.entries(aliases)) {
+					const escaped = prefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+					build.onResolve(
+						{ filter: new RegExp(`^${escaped}(/|$)`) },
+						(args) => ({
+							path: args.path.replace(prefix, join(process.cwd(), target)),
+						}),
+					);
+				}
+			},
+		});
+	}
+
 	const server = Bun.serve({
 		port,
 		hostname: host,
 		fetch: async (req) => {
-			// Shared locals object for this request — same reference across all route handlers.
-			// hooks.index.ts handle() runs via resolve() for page routes only.
-			// For server/WebSocket routes, auth must use cookies/headers in upgrade().
+			// Shared locals object for this request.
+			// hooks.server.ts handle() runs for ALL routes (page, server, WebSocket).
 			// If this request came from a coordinator, deserialize its locals
 			const rawLocals = req.headers.get("X-Grimoire-Locals");
 			const locals: App.Locals = rawLocals
@@ -118,49 +149,6 @@ export async function createServer(config: GrimoireConfig = {}) {
 					return new Response("Not Found", { status: 404 });
 				}
 
-				// API routes (+server.ts)
-				if (matched.route.type === "server") {
-					const mod = await import(matched.route.filePath);
-
-					// WebSocket upgrade path
-					const isWsUpgrade =
-						req.headers.get("upgrade")?.toLowerCase() === "websocket";
-					if (isWsUpgrade && mod.websocket) {
-						let extraData: Record<string, unknown> = {};
-						if (mod.upgrade) {
-							try {
-								const result = await mod.upgrade({
-									request: req,
-									params: matched.params,
-									url,
-									locals,
-								});
-								if (result && typeof result === "object") extraData = result;
-							} catch {
-								return new Response("Upgrade Required", { status: 426 });
-							}
-						}
-						const wsData: _WsInternalData = {
-							params: matched.params,
-							__handler: mod.websocket,
-							...extraData,
-						};
-						//@ts-expect-error i dont know what you are talking about please
-						if (server.upgrade(req, { data: wsData })) {
-							// Bun sends the 101 response — return undefined to signal no HTTP response
-							return undefined as unknown as Response;
-						}
-						return new Response("Upgrade Required", { status: 426 });
-					}
-
-					// HTTP method dispatch
-					const handler = mod[req.method];
-					if (!handler) {
-						return new Response("Method Not Allowed", { status: 405 });
-					}
-					return handler({ request: req, params: matched.params, url, locals });
-				}
-
 				const HTTP_METHODS = [
 					"GET",
 					"POST",
@@ -182,12 +170,72 @@ export async function createServer(config: GrimoireConfig = {}) {
 					params: matched.params,
 					locals,
 					cookies,
+					route: { id: matched.route.path },
+					fetch: globalThis.fetch,
 					setHeaders: (headers) => Object.assign(setHeadersMap, headers),
 				};
 
-				// Resolve function: runs the actual page/form action logic
+				// Patch event.fetch if handleFetch hook is defined
+				if (hooksHandleFetch) {
+					event.fetch = (reqInfo: RequestInfo | URL, init?: RequestInit) => {
+						const r = new Request(reqInfo, init);
+						return Promise.resolve(
+							hooksHandleFetch({ request: r, fetch: globalThis.fetch, event }),
+						);
+					};
+				}
+
+				// Resolve function: runs the actual route logic (server, form action, or page)
 				const resolve: ResolveFunction = async (evt) => {
-					// form actions
+					// API routes (+server.ts) — pass through hooks chain like all other routes
+					if (matched.route.type === "server") {
+						const mod = await import(matched.route.filePath);
+
+						// WebSocket upgrade path
+						const isWsUpgrade =
+							evt.request.headers.get("upgrade")?.toLowerCase() === "websocket";
+						if (isWsUpgrade && mod.websocket) {
+							let extraData: Record<string, unknown> = {};
+							if (mod.upgrade) {
+								try {
+									const result = await mod.upgrade({
+										request: evt.request,
+										params: matched.params,
+										url: evt.url,
+										locals: evt.locals,
+									});
+									if (result && typeof result === "object") extraData = result;
+								} catch {
+									return new Response("Upgrade Required", { status: 426 });
+								}
+							}
+							const wsData: _WsInternalData = {
+								params: matched.params,
+								__handler: mod.websocket,
+								...extraData,
+							};
+							//@ts-expect-error i dont know what you are talking about please
+							if (server.upgrade(req, { data: wsData })) {
+								// Bun sends the 101 response — return undefined to signal no HTTP response
+								return undefined as unknown as Response;
+							}
+							return new Response("Upgrade Required", { status: 426 });
+						}
+
+						// HTTP method dispatch
+						const handler = mod[evt.request.method];
+						if (!handler) {
+							return new Response("Method Not Allowed", { status: 405 });
+						}
+						return handler({
+							request: evt.request,
+							params: matched.params,
+							url: evt.url,
+							locals: evt.locals,
+						});
+					}
+
+					// form actions (+page.server.ts)
 					if (
 						matched.pageServer &&
 						HTTP_METHODS.includes(evt.request.method as any)
@@ -267,6 +315,7 @@ export async function createServer(config: GrimoireConfig = {}) {
 						undefined,
 						evt.locals,
 						plugins,
+						cspNonce,
 					);
 
 					if (evt.request.headers.get("x-grimoire-navigate") === "1") {
@@ -294,17 +343,42 @@ export async function createServer(config: GrimoireConfig = {}) {
 					return response;
 				};
 
-				// If no hooks handle, resolve directly
-				if (!hooksHandle) {
-					return resolve(event);
+				// Run through hooks chain, or resolve directly if no hooks defined
+				let response: Response;
+				try {
+					if (!hooksHandle) {
+						response = await resolve(event);
+					} else {
+						response = await hooksHandle({ event, resolve });
+					}
+				} catch (err) {
+					console.error(
+						`[grimoire] ${event.request.method} ${event.url.pathname} failed:`,
+						err,
+					);
+					await hooksHandleError?.({
+						error: err,
+						event,
+						status: 500,
+						message: "Internal Server Error",
+					});
+					const errorHtmlPath = `${process.cwd()}/error.html`;
+					try {
+						const errorFile = Bun.file(errorHtmlPath);
+						if (await errorFile.exists()) {
+							return new Response(errorFile, {
+								status: 500,
+								headers: { "Content-Type": "text/html" },
+							});
+						}
+					} catch {}
+					const message =
+						process.env.NODE_ENV === "production"
+							? "Internal Server Error"
+							: `${err instanceof Error ? `${err.message}\n${err.stack}` : String(err)}`;
+					return new Response(message, { status: 500 });
 				}
 
-				// Run through hooks chain
-				let response = await hooksHandle({
-					event,
-					resolve,
-				});
-
 				// Apply setHeaders
 				const setCookieHeaders = cookies.toHeaders();
 				if (

package/src/server/worker.ts

@@ -1,59 +1,59 @@
-import { join } from "node:path";
-import type { GrimoireConfig, GrimoirePlugin, WorkerMode } from "../types";
-import { createServer } from "./index";
-import { runDeserializeLocals } from "./plugins";
-
-export interface WorkerOptions {
-	config: GrimoireConfig;
-	plugins: GrimoirePlugin[];
-	secret: string;
-	mode: WorkerMode;
-}
-
-export async function startWorker(options: WorkerOptions) {
-	const { secret, plugins } = options;
-
-	const workerAuthPlugin: GrimoirePlugin = {
-		name: "__grimoire-worker-auth",
-		async onRequest(req, next) {
-			if (req.headers.get("X-Grimoire-Internal") !== secret) {
-				return new Response("Forbidden", { status: 403 });
-			}
-			return next();
-		},
-	};
-
-	return createServer({
-		...options.config,
-		plugins: [workerAuthPlugin, ...plugins],
-		_skipBuild: true,
-	});
-}
-
-// bootstrap when spawned by coordinator
-if (process.env.GRIMOIRE_INTERNAL_SECRET) {
-	const secret = process.env.GRIMOIRE_INTERNAL_SECRET;
-	const port = Number(process.env.GRIMOIRE_WORKER_PORT ?? 3001);
-	const cwd = process.cwd();
-
-	let config: GrimoireConfig = {};
-	try {
-		const mod = await import(join(cwd, "sigil.config.ts"));
-		config = mod.default ?? {};
-	} catch {}
-
-	let finalConfig: GrimoireConfig = { ...config, port, host: "127.0.0.1" };
-	const plugins = finalConfig.plugins ?? [];
-	for (const plugin of plugins) {
-		finalConfig = plugin.config?.(finalConfig) ?? finalConfig;
-	}
-
-	await startWorker({
-		config: finalConfig,
-		plugins,
-		secret,
-		mode: (process.env.GRIMOIRE_MODE ?? "full") as WorkerMode,
-	});
-
-	process.send?.({ ready: true });
-}
+import { join } from "node:path";
+import type { GrimoireConfig, GrimoirePlugin, WorkerMode } from "../types";
+import { createServer } from "./index";
+import { runDeserializeLocals } from "./plugins";
+
+export interface WorkerOptions {
+	config: GrimoireConfig;
+	plugins: GrimoirePlugin[];
+	secret: string;
+	mode: WorkerMode;
+}
+
+export async function startWorker(options: WorkerOptions) {
+	const { secret, plugins } = options;
+
+	const workerAuthPlugin: GrimoirePlugin = {
+		name: "__grimoire-worker-auth",
+		async onRequest(req, next) {
+			if (req.headers.get("X-Grimoire-Internal") !== secret) {
+				return new Response("Forbidden", { status: 403 });
+			}
+			return next();
+		},
+	};
+
+	return createServer({
+		...options.config,
+		plugins: [workerAuthPlugin, ...plugins],
+		_skipBuild: true,
+	});
+}
+
+// bootstrap when spawned by coordinator
+if (process.env.GRIMOIRE_INTERNAL_SECRET) {
+	const secret = process.env.GRIMOIRE_INTERNAL_SECRET;
+	const port = Number(process.env.GRIMOIRE_WORKER_PORT ?? 3001);
+	const cwd = process.cwd();
+
+	let config: GrimoireConfig = {};
+	try {
+		const mod = await import(join(cwd, "sigil.config.ts"));
+		config = mod.default ?? {};
+	} catch {}
+
+	let finalConfig: GrimoireConfig = { ...config, port, host: "127.0.0.1" };
+	const plugins = finalConfig.plugins ?? [];
+	for (const plugin of plugins) {
+		finalConfig = plugin.config?.(finalConfig) ?? finalConfig;
+	}
+
+	await startWorker({
+		config: finalConfig,
+		plugins,
+		secret,
+		mode: (process.env.GRIMOIRE_MODE ?? "full") as WorkerMode,
+	});
+
+	process.send?.({ ready: true });
+}