crelte 0.5.8 → 0.5.10

package/src/vite/index.ts

@@ -8,11 +8,13 @@ import {
 	UserConfig,
 	build as viteBuild,
 	ViteDevServer,
+	Connect,
 } from 'vite';
 import fs from 'node:fs/promises';
 import {
 	EnvData,
 	initEnvData,
+	initSites,
 	modRender,
 	modRenderError,
 } from '../server/shared.js';
@@ -24,6 +26,9 @@ import {
 	requestToWebRequest,
 	webResponseToResponse,
 } from '../node/utils.js';
+import { SiteFromGraphQl } from '../routing/Site.js';
+import { ServerResponse } from 'node:http';
+import QueryError from '../queries/QueryError.js';
 
 const VIRT_MOD_ID = 'virtual:crelte/svelteComponents';
 const RESOLVED_VIRT_MOD_ID = '\0' + VIRT_MOD_ID;
@@ -327,33 +332,29 @@ export default function crelte(opts?: CrelteOptions): Plugin {
 }
 
 async function serveVite(env: EnvData, vite: ViteDevServer) {
-	vite.middlewares.use(async (nReq, res, next) => {
+	let sites: SiteFromGraphQl[] | null = null;
+
+	const handle = async (
+		nReq: Connect.IncomingMessage,
+		res: ServerResponse,
+	) => {
 		const protocol = vite.config.server.https ? 'https' : 'http';
 		const baseUrl = protocol + '://' + nReq.headers['host'];
 
 		const req = requestToWebRequest(baseUrl, nReq);
 
-		let thrownError: any = null;
+		const serverMod = await vite.ssrLoadModule('./src/server.js');
 
-		let serverMod;
-		try {
-			serverMod = await vite.ssrLoadModule('./src/server.js', {
-				fixStacktrace: true,
-			});
-		} catch (e: any) {
-			next(e);
-			return;
+		if (!sites) {
+			sites = await initSites(env);
 		}
 
-		// check if a route matches (todo can i move this out of the middleware?)
 		const router = new ServerRouter(
 			env.endpointUrl,
 			env.frontendUrl,
 			env.env,
-			env.sites,
-			{
-				endpointToken: env.endpointToken,
-			},
+			sites,
+			{ endpointToken: env.endpointToken },
 		);
 
 		await initQueryRoutes(PLATFORM, serverMod, router);
@@ -362,15 +363,9 @@ async function serveVite(env: EnvData, vite: ViteDevServer) {
 			await serverMod.routes(router);
 		}
 
-		try {
-			const response = await router.z_handle(req);
-			if (response) {
-				await webResponseToResponse(response, res);
-				return;
-			}
-		} catch (e: any) {
-			vite.ssrFixStacktrace(e);
-			next(e);
+		const routeResp = await router.z_handle(req);
+		if (routeResp) {
+			await webResponseToResponse(routeResp, res);
 			return;
 		}
 
@@ -380,29 +375,38 @@ async function serveVite(env: EnvData, vite: ViteDevServer) {
 			template,
 		);
 
-		try {
-			const response = await modRender(env, serverMod, template, req);
-			await webResponseToResponse(response, res);
-			return;
-		} catch (e: any) {
-			vite.ssrFixStacktrace(e);
-
-			if (typeof serverMod.renderError !== 'function') return next(e);
+		if (serverMod.debugError) {
+			let error: any;
 
-			thrownError = e;
-		}
+			if (typeof serverMod.debugError === 'number') {
+				error = new QueryError({ status: serverMod.debugError });
+			} else if (typeof serverMod.debugError === 'function') {
+				error = serverMod.debugError(req);
+			} else {
+				error = new Error('Simulated Error');
+			}
 
-		try {
-			const response = await modRenderError(
+			const errorResp = await modRenderError(
 				env,
 				serverMod,
-				thrownError,
+				error,
 				template,
 				req,
+				{ debugError: true },
 			);
-			await webResponseToResponse(response, res);
+			await webResponseToResponse(errorResp, res);
 			return;
-		} catch (e) {
+		}
+
+		const response = await modRender(env, sites, serverMod, template, req);
+		await webResponseToResponse(response, res);
+	};
+
+	vite.middlewares.use(async (nReq, res, next) => {
+		try {
+			await handle(nReq, res);
+		} catch (e: any) {
+			vite.ssrFixStacktrace(e);
 			next(e);
 		}
 	});