@qwik.dev/router 2.0.0-beta.4 → 2.0.0-beta.41

package/lib/middleware/deno/index.mjs

@@ -1,195 +1,108 @@
-// packages/qwik-router/src/middleware/deno/index.ts
-import { getNotFound } from "@qwik-router-not-found-paths";
-import { isStaticPath } from "@qwik-router-static-paths";
-import { _deserialize, _serialize, _verifySerializable } from "@qwik.dev/core/internal";
+import { n as MIME_TYPES, t as normalizeRequestUrl } from "../../chunks/url.mjs";
+import { r as limitRequestBody } from "../../chunks/request-body-limit.mjs";
+import { isDev } from "@qwik.dev/core/build";
 import { setServerPlatform } from "@qwik.dev/core/server";
-import { mergeHeadersCookies, requestHandler } from "../request-handler/index.mjs";
-
-// packages/qwik-router/src/middleware/request-handler/mime-types.ts
-var MIME_TYPES = {
-  "3gp": "video/3gpp",
-  "3gpp": "video/3gpp",
-  asf: "video/x-ms-asf",
-  asx: "video/x-ms-asf",
-  avi: "video/x-msvideo",
-  avif: "image/avif",
-  bmp: "image/x-ms-bmp",
-  css: "text/css",
-  flv: "video/x-flv",
-  gif: "image/gif",
-  htm: "text/html",
-  html: "text/html",
-  ico: "image/x-icon",
-  jng: "image/x-jng",
-  jpeg: "image/jpeg",
-  jpg: "image/jpeg",
-  js: "application/javascript",
-  json: "application/json",
-  kar: "audio/midi",
-  m4a: "audio/x-m4a",
-  m4v: "video/x-m4v",
-  mid: "audio/midi",
-  midi: "audio/midi",
-  mng: "video/x-mng",
-  mov: "video/quicktime",
-  mp3: "audio/mpeg",
-  mp4: "video/mp4",
-  mpeg: "video/mpeg",
-  mpg: "video/mpeg",
-  ogg: "audio/ogg",
-  pdf: "application/pdf",
-  png: "image/png",
-  rar: "application/x-rar-compressed",
-  shtml: "text/html",
-  svg: "image/svg+xml",
-  svgz: "image/svg+xml",
-  tif: "image/tiff",
-  tiff: "image/tiff",
-  ts: "video/mp2t",
-  txt: "text/plain",
-  wbmp: "image/vnd.wap.wbmp",
-  webm: "video/webm",
-  webp: "image/webp",
-  wmv: "video/x-ms-wmv",
-  woff: "font/woff",
-  woff2: "font/woff2",
-  xml: "text/xml",
-  zip: "application/zip"
-};
-
-// packages/qwik-router/src/middleware/deno/index.ts
+import { isStaticPath, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
 import { extname, fromFileUrl, join } from "https://deno.land/std/path/mod.ts";
-function createQwikRouter(opts) {
-  var _a;
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
-  }
-  const qwikSerializer = {
-    _deserialize,
-    _serialize,
-    _verifySerializable
-  };
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  const staticFolder = ((_a = opts.static) == null ? void 0 : _a.root) ?? join(fromFileUrl(import.meta.url), "..", "..", "dist");
-  async function router(request, info) {
-    try {
-      const url = new URL(request.url);
-      const serverRequestEv = {
-        mode: "server",
-        locale: void 0,
-        url,
-        // @ts-ignore
-        env: Deno.env,
-        request,
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const { readable, writable } = new TransformStream();
-          const response = new Response(readable, {
-            status,
-            headers: mergeHeadersCookies(headers, cookies)
-          });
-          resolve(response);
-          return writable;
-        },
-        platform: {
-          ssr: true
-        },
-        getClientConn: () => {
-          return opts.getClientConn ? opts.getClientConn(request, info) : {
-            ip: info.remoteAddr.hostname
-          };
-        }
-      };
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
-      if (handledResponse) {
-        handledResponse.completion.then((v) => {
-          if (v) {
-            console.error(v);
-          }
-        });
-        const response = await handledResponse.response;
-        if (response) {
-          return response;
-        }
-      }
-      return null;
-    } catch (e) {
-      console.error(e);
-      return new Response(String(e || "Error"), {
-        status: 500,
-        headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
-      });
-    }
-  }
-  const notFound = async (request) => {
-    try {
-      const url = new URL(request.url);
-      const notFoundHtml = isStaticPath(request.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
-      return new Response(notFoundHtml, {
-        status: 404,
-        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname }
-      });
-    } catch (e) {
-      console.error(e);
-      return new Response(String(e || "Error"), {
-        status: 500,
-        headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
-      });
-    }
-  };
-  const openStaticFile = async (url) => {
-    const pathname = url.pathname;
-    const fileName = pathname.slice(url.pathname.lastIndexOf("/"));
-    let filePath;
-    if (fileName.includes(".")) {
-      filePath = join(staticFolder, pathname);
-    } else if (opts.qwikRouterConfig.trailingSlash) {
-      filePath = join(staticFolder, pathname + "index.html");
-    } else {
-      filePath = join(staticFolder, pathname, "index.html");
-    }
-    return {
-      filePath,
-      // @ts-ignore
-      content: await Deno.open(filePath, { read: true })
-    };
-  };
-  const staticFile = async (request) => {
-    var _a2;
-    try {
-      const url = new URL(request.url);
-      if (isStaticPath(request.method || "GET", url)) {
-        const { filePath, content } = await openStaticFile(url);
-        const ext = extname(filePath).replace(/^\./, "");
-        return new Response(content.readable, {
-          status: 200,
-          headers: {
-            "content-type": MIME_TYPES[ext] || "text/plain; charset=utf-8",
-            "Cache-Control": ((_a2 = opts.static) == null ? void 0 : _a2.cacheControl) || "max-age=3600"
-          }
-        });
-      }
-      return null;
-    } catch (e) {
-      console.error(e);
-      return new Response(String(e || "Error"), {
-        status: 500,
-        headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
-      });
-    }
-  };
-  return {
-    router,
-    notFound,
-    staticFile
-  };
+function getRequestUrl(request, opts, info) {
+	const url = new URL(request.url);
+	const origin = opts.getOrigin?.(request, info) ?? Deno.env?.get?.("ORIGIN");
+	if (!origin) return url;
+	return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+/** @public */ function createQwikRouter(opts) {
+	if (opts.manifest) setServerPlatform(opts.manifest);
+	const staticFolder = opts.static?.root ?? join(fromFileUrl(import.meta.url), "..", "..", "dist");
+	async function router(request, info) {
+		try {
+			const serverRequestEv = {
+				mode: "server",
+				locale: void 0,
+				url: getRequestUrl(request, opts, info),
+				env: Deno.env,
+				request: limitRequestBody(request, opts.requestBodyLimit),
+				getWritableStream: (status, headers, cookies, resolve) => {
+					const { readable, writable } = new TransformStream();
+					resolve(new Response(readable, {
+						status,
+						headers: mergeHeadersCookies(headers, cookies)
+					}));
+					return writable;
+				},
+				platform: { ssr: true },
+				getClientConn: () => {
+					return opts.getClientConn ? opts.getClientConn(request, info) : { ip: info.remoteAddr.hostname };
+				}
+			};
+			const handledResponse = await requestHandler(serverRequestEv, opts);
+			if (handledResponse) {
+				handledResponse.completion.then((completion) => {
+					if (completion) console.error(completion);
+				});
+				const response = await handledResponse.response;
+				if (response) return response;
+			}
+			return null;
+		} catch (e) {
+			console.error(e);
+			return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
+				status: 500,
+				headers: {
+					"Content-Type": "text/plain; charset=utf-8",
+					"X-Error": "deno-server"
+				}
+			});
+		}
+	}
+	/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_request) => {
+		return null;
+	};
+	const openStaticFile = async (url) => {
+		const pathname = url.pathname;
+		const fileName = pathname.slice(url.pathname.lastIndexOf("/"));
+		let filePath;
+		if (fileName.includes(".")) filePath = join(staticFolder, pathname);
+		else if (!globalThis.__NO_TRAILING_SLASH__) filePath = join(staticFolder, pathname + "index.html");
+		else filePath = join(staticFolder, pathname, "index.html");
+		return {
+			filePath,
+			content: await Deno.open(filePath, { read: true })
+		};
+	};
+	const staticFile = async (request) => {
+		try {
+			const url = getRequestUrl(request, opts);
+			if (isStaticPath(request.method || "GET", url)) {
+				const { filePath, content } = await openStaticFile(url);
+				const ext = extname(filePath).replace(/^\./, "");
+				return new Response(content.readable, {
+					status: 200,
+					headers: {
+						"content-type": MIME_TYPES[ext] || "text/plain; charset=utf-8",
+						"Cache-Control": opts.static?.cacheControl || "max-age=3600"
+					}
+				});
+			}
+			return null;
+		} catch (e) {
+			console.error(e);
+			return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
+				status: 500,
+				headers: {
+					"Content-Type": "text/plain; charset=utf-8",
+					"X-Error": "deno-server"
+				}
+			});
+		}
+	};
+	return {
+		router,
+		notFound,
+		staticFile
+	};
+}
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
+export { createQwikCity, createQwikRouter };

package/lib/middleware/firebase/index.mjs

@@ -1,36 +1,23 @@
-// packages/qwik-router/src/middleware/firebase/index.ts
-import { createQwikRouter as createQwikRouterNode } from "@qwik.dev/router/middleware/node";
-function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
-  }
-  const { staticFile, notFound, router } = createQwikRouterNode({
-    render: opts.render,
-    manifest: opts.manifest,
-    qwikRouterConfig: opts.qwikRouterConfig,
-    static: {
-      cacheControl: "public, max-age=31557600"
-    },
-    getOrigin(req) {
-      if (process.env.IS_OFFLINE) {
-        return `http://${req.headers.host}`;
-      }
-      return null;
-    }
-  });
-  const qwikApp = (req, res) => {
-    return staticFile(req, res, () => {
-      router(req, res, () => notFound(req, res, () => {
-      }));
-    });
-  };
-  return qwikApp;
+import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middleware/node";
+/** @public */ function createQwikRouter(opts) {
+	const { staticFile, router } = createQwikRouter$1({
+		render: opts.render,
+		manifest: opts.manifest,
+		static: { cacheControl: "public, max-age=31557600" },
+		getOrigin(req) {
+			if (process.env.IS_OFFLINE) return `http://${req.headers.host}`;
+			return null;
+		}
+	});
+	const qwikApp = (req, res) => {
+		return staticFile(req, res, () => {
+			router(req, res, () => {});
+		});
+	};
+	return qwikApp;
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
+export { createQwikCity, createQwikRouter };

package/lib/middleware/netlify-edge/index.mjs

@@ -1,83 +1,65 @@
-// packages/qwik-router/src/middleware/netlify-edge/index.ts
-import { getNotFound } from "@qwik-router-not-found-paths";
-import { isStaticPath } from "@qwik-router-static-paths";
-import { _deserialize, _serialize, _verifySerializable } from "@qwik.dev/core/internal";
+import { isDev } from "@qwik.dev/core/build";
 import { setServerPlatform } from "@qwik.dev/core/server";
-import { mergeHeadersCookies, requestHandler } from "../request-handler/index.mjs";
-function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
-  }
-  const qwikSerializer = {
-    _deserialize,
-    _serialize,
-    _verifySerializable
-  };
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  async function onNetlifyEdgeRequest(request, context) {
-    try {
-      const url = new URL(request.url);
-      if (isStaticPath(request.method, url) || url.pathname.startsWith("/.netlify")) {
-        return context.next();
-      }
-      const serverRequestEv = {
-        mode: "server",
-        locale: void 0,
-        url,
-        env: Deno.env,
-        request,
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const { readable, writable } = new TransformStream();
-          const response = new Response(readable, {
-            status,
-            headers: mergeHeadersCookies(headers, cookies)
-          });
-          resolve(response);
-          return writable;
-        },
-        getClientConn: () => {
-          var _a;
-          return {
-            ip: context.ip,
-            country: (_a = context.geo.country) == null ? void 0 : _a.code
-          };
-        },
-        platform: context
-      };
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
-      if (handledResponse) {
-        handledResponse.completion.then((v) => {
-          if (v) {
-            console.error(v);
-          }
-        });
-        const response = await handledResponse.response;
-        if (response) {
-          return response;
-        }
-      }
-      const notFoundHtml = isStaticPath(request.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
-      return new Response(notFoundHtml, {
-        status: 404,
-        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname }
-      });
-    } catch (e) {
-      console.error(e);
-      return new Response(String(e || "Error"), {
-        status: 500,
-        headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "netlify-edge" }
-      });
-    }
-  }
-  return onNetlifyEdgeRequest;
+import { getErrorHtml, isStaticPath, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
+/** @public */ function createQwikRouter(opts) {
+	if (opts.manifest) setServerPlatform(opts.manifest);
+	async function onNetlifyEdgeRequest(request, context) {
+		try {
+			const url = new URL(request.url);
+			if (isStaticPath(request.method, url) || url.pathname.startsWith("/.netlify")) return context.next();
+			const serverRequestEv = {
+				mode: "server",
+				locale: void 0,
+				url,
+				env: Deno.env,
+				request,
+				getWritableStream: (status, headers, cookies, resolve) => {
+					const { readable, writable } = new TransformStream();
+					resolve(new Response(readable, {
+						status,
+						headers: mergeHeadersCookies(headers, cookies)
+					}));
+					return writable;
+				},
+				getClientConn: () => {
+					return {
+						ip: context.ip,
+						country: context.geo.country?.code
+					};
+				},
+				platform: context
+			};
+			const handledResponse = await requestHandler(serverRequestEv, opts);
+			if (handledResponse) {
+				handledResponse.completion.then((completion) => {
+					if (completion) console.error(completion);
+				});
+				const response = await handledResponse.response;
+				if (response) return response;
+			}
+			const notFoundHtml = !request.headers.get("accept")?.includes("text/html") || isStaticPath(request.method || "GET", url) ? "Not Found" : getErrorHtml(404, "Not Found");
+			return new Response(notFoundHtml, {
+				status: 404,
+				headers: {
+					"Content-Type": "text/html; charset=utf-8",
+					"X-Not-Found": url.pathname
+				}
+			});
+		} catch (e) {
+			console.error(e);
+			return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
+				status: 500,
+				headers: {
+					"Content-Type": "text/plain; charset=utf-8",
+					"X-Error": "netlify-edge"
+				}
+			});
+		}
+	}
+	return onNetlifyEdgeRequest;
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
+export { createQwikCity, createQwikRouter };

package/lib/middleware/node/index.d.ts

@@ -11,11 +11,7 @@ import type { ServerResponse } from 'node:http';
 export declare const createQwikCity: typeof createQwikRouter;
 
 /** @public */
-export declare function createQwikRouter(opts: QwikRouterNodeRequestOptions | QwikCityNodeRequestOptions): {
-    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
-    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e: any) => void) => Promise<void>;
-    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
-};
+export declare function createQwikRouter(opts: QwikRouterNodeRequestOptions | QwikCityNodeRequestOptions): QwikRouterNodeMiddleware;
 
 /** @public */
 export declare interface NodeRequestNextFunction {
@@ -35,8 +31,24 @@ export declare interface PlatformNode {
  */
 export declare type QwikCityNodeRequestOptions = QwikRouterNodeRequestOptions;
 
+/** @public */
+export declare interface QwikRouterNodeMiddleware {
+    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction, limits?: QwikRouterNodeRequestLimits) => Promise<void>;
+    /** @deprecated `router` handles 404 responses. Will be removed in V3. */
+    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e: any) => void) => Promise<void>;
+    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
+}
+
+/** @public */
+export declare interface QwikRouterNodeRequestLimits {
+    /** Maximum request body size in bytes imposed by the host. */
+    bodyLimit?: number;
+}
+
 /** @public */
 export declare interface QwikRouterNodeRequestOptions extends ServerRenderOptions {
+    /** Maximum request body size in bytes. Defaults to 10 MiB. */
+    requestBodyLimit?: number;
     /** Options for serving static files */
     static?: {
         /** The root folder for statics files. Defaults to /dist */