@qwik.dev/router 2.0.0-beta.37 → 2.0.0-beta.39

package/lib/middleware/node/index.mjs

@@ -5,7 +5,9 @@ import { createReadStream } from 'node:fs';
 import { join, basename, extname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { n as normalizeRequestUrl, M as MIME_TYPES } from '../../chunks/url.mjs';
+import { d as devPreloadedRouteLoaders } from '../../chunks/dev-preloaded-route-loader.mjs';
 import { Http2ServerRequest } from 'node:http2';
+import { D as DEFAULT_REQUEST_BODY_LIMIT, v as validateRequestBodyLimit, R as RequestBodyLimitError } from '../../chunks/request-body-limit.mjs';
 
 function fallbackOrigin(req) {
   const { PROTOCOL_HEADER, HOST_HEADER } = process.env;
@@ -184,7 +186,8 @@ function createNodeResponseSink(res) {
     close
   };
 }
-async function fromNodeHttp(url, req, res, mode, getClientConn) {
+async function fromNodeHttp(url, req, res, mode, getClientConn, requestBodyLimit = DEFAULT_REQUEST_BODY_LIMIT) {
+  validateRequestBodyLimit(requestBodyLimit);
   const requestHeaders = new Headers();
   const nodeRequestHeaders = req.headers;
   try {
@@ -204,7 +207,14 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
     console.error(err);
   }
   const getRequestBody = async function* () {
+    let received = 0;
     for await (const chunk of req) {
+      const byteLength = typeof chunk === "string" ? Buffer.byteLength(chunk) : chunk.byteLength;
+      if (byteLength > requestBodyLimit - received) {
+        req.resume();
+        throw new RequestBodyLimitError(requestBodyLimit);
+      }
+      received += byteLength;
       yield chunk;
     }
   };
@@ -280,13 +290,28 @@ function createQwikRouter(opts) {
     setServerPlatform(opts.manifest);
   }
   const staticFolder = opts.static?.root ?? join(fileURLToPath(import.meta.url), "..", "..", "dist");
-  const router = async (req, res, next) => {
+  const router = async (req, res, next, limits = {}) => {
     try {
       const origin = computeOrigin(req, opts);
-      const serverRequestEv = await fromNodeHttp(getUrl(req, origin), req, res, "server", opts.getClientConn);
+      let requestBodyLimit = opts.requestBodyLimit;
+      if (limits?.bodyLimit !== void 0) {
+        if (requestBodyLimit === void 0) {
+          requestBodyLimit = limits.bodyLimit;
+        } else {
+          requestBodyLimit = Math.min(requestBodyLimit, limits.bodyLimit);
+        }
+      }
+      const serverRequestEv = await fromNodeHttp(getUrl(req, origin), req, res, "server", opts.getClientConn, requestBodyLimit);
       if (isDev && opts.platform) {
         Object.assign(serverRequestEv.platform, opts.platform);
       }
+      if (isDev) {
+        const loader = devPreloadedRouteLoaders.get(req);
+        if (loader) {
+          devPreloadedRouteLoaders.set(serverRequestEv.request, loader);
+          devPreloadedRouteLoaders.delete(req);
+        }
+      }
       const handled = await requestHandler(serverRequestEv, opts);
       if (handled) {
         const err = await handled.completion;

package/lib/middleware/request-handler/index.d.ts

@@ -14,6 +14,8 @@ import type { ValueOrPromise } from '@qwik.dev/core';
 
 /** @public */
 export declare class AbortMessage {
+    /** Type-only brand so `Exclude<>` can drop control-flow signals from resolved loader/action data. */
+    readonly __controlFlow: true;
 }
 
 /** @internal */
@@ -339,6 +341,8 @@ declare type DocumentStyle = Readonly<((Omit<QwikIntrinsicElements['style'], 'da
     style?: never;
 })>;
 
+declare type EndpointModuleLoader = () => ValueOrPromise<RouteModule>;
+
 /** @public */
 export declare interface EnvGetter {
     get(key: string): string | undefined;
@@ -349,13 +353,6 @@ declare type ErrorCodes = ClientErrorCode | ServerErrorCode;
 /** @public */
 export declare function getErrorHtml(status: number, e: any): string;
 
-/**
- * Return the HTML for a 404 page.
- *
- * @internal
- */
-export declare function getNotFound(prefix: string): string;
-
 /**
  * HTTP Informational Status Codes Status codes in the 1xx range indicate that the server has
  * received and is processing the request, but no response is available yet.
@@ -396,8 +393,8 @@ declare interface LoadedRoute {
     $routeBundleNames$?: string[] | undefined;
     /** Whether this route is a not-found (404) route */
     $notFound$?: boolean;
-    /** The error module loader (nearest _E ancestor), for rendering ServerErrors */
-    $errorLoader$?: ContentModuleLoader;
+    /** The nearest _E (error.tsx) boundary's chain to render on a thrown ServerError (in its layouts). */
+    $errorLoader$?: ModuleLoader[];
     /** Merged array of routeLoader$ hashes from all matched nodes (layouts + page) */
     $loaders$?: string[];
     /** Runtime-only mapping of routeLoader$ hashes to the matched pathname used for q-loader fetches */
@@ -407,6 +404,8 @@ declare interface LoadedRoute {
 /** @public */
 export declare const mergeHeadersCookies: (headers: Headers, cookies: Cookie) => Headers;
 
+declare type ModuleLoader = ContentModuleLoader | EndpointModuleLoader;
+
 /** @public */
 declare type PageModule = RouteModule & {
     readonly default: (props: Record<string, never>) => JSXOutput;
@@ -660,7 +659,7 @@ declare const RequestEvMode: unique symbol;
 declare const RequestEvRoute: unique symbol;
 
 /** @public */
-export declare type RequestHandler<PLATFORM = QwikRouterPlatform> = (ev: RequestEvent<PLATFORM>) => Promise<void> | void;
+export declare type RequestHandler<PLATFORM = QwikRouterPlatform> = (ev: RequestEvent<PLATFORM>) => Promise<void | AbortMessage | ServerError> | void | AbortMessage | ServerError;
 
 /**
  * The request handler for QwikRouter. Called by every adapter.