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

package/lib/middleware/bun/index.mjs

@@ -1,208 +1,122 @@
-// packages/qwik-router/src/middleware/bun/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 { isDev } from "@qwik.dev/core/build";
 import { setServerPlatform } from "@qwik.dev/core/server";
-import {
-  _TextEncoderStream_polyfill,
-  mergeHeadersCookies,
-  requestHandler
-} from "../request-handler/index.mjs";
 import { extname, join } from "node:path";
-
-// 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/bun/index.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.");
-  }
-  globalThis.TextEncoderStream ||= _TextEncoderStream_polyfill;
-  const qwikSerializer = { _deserialize, _serialize, _verifySerializable };
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  const staticFolder = ((_a = opts.static) == null ? void 0 : _a.root) ?? join(Bun.fileURLToPath(import.meta.url), "..", "..", "dist");
-  async function router(request) {
-    try {
-      const url = new URL(request.url);
-      const serverRequestEv = {
-        mode: "server",
-        locale: void 0,
-        url,
-        env: {
-          get(key) {
-            return Bun.env[key];
-          }
-        },
-        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) : {};
-        }
-      };
-      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) {
-          const status = response.status;
-          const location = response.headers.get("Location");
-          const isRedirect = status >= 301 && status <= 308 && location;
-          if (isRedirect) {
-            return new Response(null, 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": "bun-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": "bun-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,
-      content: Bun.file(filePath)
-    };
-  };
-  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);
-        if (!await content.exists()) {
-          return new Response("Not Found", {
-            status: 404,
-            headers: { "Content-Type": "text/plain; charset=utf-8", "X-Not-Found": url.pathname }
-          });
-        }
-        const ext = extname(filePath).replace(/^\./, "");
-        return new Response(await content.stream(), {
-          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": "bun-server" }
-      });
-    }
-  };
-  return {
-    router,
-    notFound,
-    staticFile
-  };
+import { _TextEncoderStream_polyfill, isStaticPath, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
+function getRequestUrl(request, opts) {
+	const url = new URL(request.url);
+	const origin = opts.getOrigin?.(request) ?? Bun.env.ORIGIN;
+	if (!origin) return url;
+	return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+/** @public */ function createQwikRouter(opts) {
+	globalThis.TextEncoderStream ||= _TextEncoderStream_polyfill;
+	if (opts.manifest) setServerPlatform(opts.manifest);
+	const staticFolder = opts.static?.root ?? join(Bun.fileURLToPath(import.meta.url), "..", "..", "dist");
+	async function router(request) {
+		try {
+			const serverRequestEv = {
+				mode: "server",
+				locale: void 0,
+				url: getRequestUrl(request, opts),
+				env: { get(key) {
+					return Bun.env[key];
+				} },
+				request,
+				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) : {};
+				}
+			};
+			const handledResponse = await requestHandler(serverRequestEv, opts);
+			if (handledResponse) {
+				handledResponse.completion.then((completion) => {
+					if (completion) console.error(completion);
+				});
+				const response = await handledResponse.response;
+				if (response) {
+					const status = response.status;
+					const location = response.headers.get("Location");
+					if (status >= 301 && status <= 308 && location) return new Response(null, 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": "bun-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: Bun.file(filePath)
+		};
+	};
+	const staticFile = async (request) => {
+		try {
+			const url = getRequestUrl(request, opts);
+			if (isStaticPath(request.method || "GET", url)) {
+				const { filePath, content } = await openStaticFile(url);
+				if (!await content.exists()) return new Response("Not Found", {
+					status: 404,
+					headers: {
+						"Content-Type": "text/plain; charset=utf-8",
+						"X-Not-Found": url.pathname
+					}
+				});
+				const ext = extname(filePath).replace(/^\./, "");
+				return new Response(await content.stream(), {
+					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": "bun-server"
+				}
+			});
+		}
+	};
+	return {
+		router,
+		notFound,
+		staticFile
+	};
+}
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
+export { createQwikCity, createQwikRouter };

package/lib/middleware/cloudflare-pages/index.mjs

@@ -1,107 +1,90 @@
-// packages/qwik-router/src/middleware/cloudflare-pages/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 {
-  _TextEncoderStream_polyfill,
-  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.");
-  }
-  try {
-    new globalThis.TextEncoderStream();
-  } catch (e) {
-    globalThis.TextEncoderStream = _TextEncoderStream_polyfill;
-  }
-  const qwikSerializer = { _deserialize, _serialize, _verifySerializable };
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  async function onCloudflarePagesFetch(request, env, ctx) {
-    try {
-      const url = new URL(request.url);
-      if (isStaticPath(request.method, url)) {
-        return env.ASSETS.fetch(request);
-      }
-      const useCache = url.hostname !== "127.0.0.1" && url.hostname !== "localhost" && url.port === "" && request.method === "GET";
-      const cacheKey = new Request(url.href, request);
-      const cache = useCache ? await caches.open("custom:qwikrouter") : null;
-      if (cache) {
-        const cachedResponse = await cache.match(cacheKey);
-        if (cachedResponse) {
-          return cachedResponse;
-        }
-      }
-      const serverRequestEv = {
-        mode: "server",
-        locale: void 0,
-        url,
-        request,
-        env: {
-          get(key) {
-            return env[key];
-          }
-        },
-        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: () => {
-          return {
-            ip: request.headers.get("CF-connecting-ip") || "",
-            country: request.headers.get("CF-IPCountry") || ""
-          };
-        },
-        platform: {
-          request,
-          env,
-          ctx
-        }
-      };
-      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) {
-          if (response.ok && cache && response.headers.has("Cache-Control")) {
-            ctx.waitUntil(cache.put(cacheKey, response.clone()));
-          }
-          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": "cloudflare-pages" }
-      });
-    }
-  }
-  return onCloudflarePagesFetch;
+import { _TextEncoderStream_polyfill, getErrorHtml, isStaticPath, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
+/** @public */ function createQwikRouter(opts) {
+	try {
+		new globalThis.TextEncoderStream();
+	} catch {
+		globalThis.TextEncoderStream = _TextEncoderStream_polyfill;
+	}
+	if (opts.manifest) setServerPlatform(opts.manifest);
+	async function onCloudflarePagesFetch(request, env, ctx) {
+		try {
+			const url = new URL(request.url);
+			if (isStaticPath(request.method, url)) return env.ASSETS.fetch(request);
+			const useCache = url.hostname !== "127.0.0.1" && url.hostname !== "localhost" && url.port === "" && request.method === "GET";
+			const cacheKey = new Request(url.href, request);
+			const cache = useCache ? await caches.open("custom:qwikrouter") : null;
+			if (cache) {
+				const cachedResponse = await cache.match(cacheKey);
+				if (cachedResponse) return cachedResponse;
+			}
+			const handledResponse = await requestHandler({
+				mode: "server",
+				locale: void 0,
+				url,
+				request,
+				env: { get(key) {
+					return env[key];
+				} },
+				getWritableStream: (status, headers, cookies, resolve) => {
+					const responseInit = {
+						status,
+						headers: mergeHeadersCookies(headers, cookies)
+					};
+					if (status === 204 || status === 205 || status === 304) {
+						resolve(new Response(null, responseInit));
+						return new WritableStream();
+					}
+					const { readable, writable } = new TransformStream();
+					resolve(new Response(readable, responseInit));
+					return writable;
+				},
+				getClientConn: () => {
+					return {
+						ip: request.headers.get("CF-connecting-ip") || "",
+						country: request.headers.get("CF-IPCountry") || ""
+					};
+				},
+				platform: {
+					request,
+					env,
+					ctx
+				}
+			}, opts);
+			if (handledResponse) {
+				handledResponse.completion.then((completion) => {
+					if (completion) console.error(completion);
+				});
+				const response = await handledResponse.response;
+				if (response) {
+					if (response.ok && cache && response.headers.has("Cache-Control")) ctx.waitUntil(cache.put(cacheKey, response.clone()));
+					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": "cloudflare-pages"
+				}
+			});
+		}
+	}
+	return onCloudflarePagesFetch;
 }
-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/deno/index.d.ts

@@ -8,11 +8,7 @@ import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-ha
 export declare const createQwikCity: typeof createQwikRouter;
 
 /** @public */
-export declare function createQwikRouter(opts: QwikRouterDenoOptions): {
-    router: (request: Request, info: ServeHandlerInfo) => Promise<Response | null>;
-    notFound: (request: Request) => Promise<Response>;
-    staticFile: (request: Request) => Promise<Response | null>;
-};
+export declare function createQwikRouter(opts: QwikRouterDenoOptions): QwikRouterDenoMiddleware;
 
 /** @public */
 export declare interface NetAddr {
@@ -27,8 +23,18 @@ export declare interface NetAddr {
  */
 export declare type QwikCityDenoOptions = QwikRouterDenoOptions;
 
+/** @public */
+export declare interface QwikRouterDenoMiddleware {
+    router: (request: Request, info: ServeHandlerInfo) => Promise<Response | null>;
+    /** @deprecated `router` handles 404 responses. Will be removed in V3. */
+    notFound: (request: Request) => Promise<Response>;
+    staticFile: (request: Request) => Promise<Response | null>;
+}
+
 /** @public */
 export declare interface QwikRouterDenoOptions 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 */
@@ -36,6 +42,17 @@ export declare interface QwikRouterDenoOptions extends ServerRenderOptions {
         /** Set the Cache-Control header for all static files */
         cacheControl?: string;
     };
+    /**
+     * Provide a function that computes the origin of the server, used to resolve relative URLs and
+     * validate the request origin against CSRF attacks.
+     *
+     * When not specified, it defaults to the `ORIGIN` environment variable (if set).
+     *
+     * If `ORIGIN` is not set, it's derived from the incoming request, which is not recommended for
+     * production use.
+     */
+    getOrigin?: (request: Request, info?: ServeHandlerInfo) => string | null;
+    /** Provide a function that returns a `ClientConn` for the given request. */
     getClientConn?: (request: Request, info: ServeHandlerInfo) => ClientConn;
 }