@qwik.dev/router 2.0.0-alpha.9 → 2.0.0-beta.10

package/lib/middleware/node/index.cjs

@@ -1,314 +1 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// packages/qwik-router/src/middleware/node/index.ts
-var node_exports = {};
-__export(node_exports, {
-  createQwikCity: () => createQwikCity,
-  createQwikRouter: () => createQwikRouter
-});
-module.exports = __toCommonJS(node_exports);
-var import_qwik_router_not_found_paths = require("@qwik-router-not-found-paths");
-var import_qwik_router_static_paths = require("@qwik-router-static-paths");
-var import_internal = require("@qwik.dev/core/internal");
-var import_server = require("@qwik.dev/core/server");
-var import_request_handler = require("../request-handler/index.cjs");
-var import_node_fs = require("node:fs");
-var import_node_path = require("node:path");
-var import_node_url = require("node:url");
-
-// 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/node/http.ts
-var import_node_http2 = require("node:http2");
-function computeOrigin(req, opts) {
-  var _a;
-  return ((_a = opts == null ? void 0 : opts.getOrigin) == null ? void 0 : _a.call(opts, req)) ?? (opts == null ? void 0 : opts.origin) ?? process.env.ORIGIN ?? fallbackOrigin(req);
-}
-function fallbackOrigin(req) {
-  const { PROTOCOL_HEADER, HOST_HEADER } = process.env;
-  const headers = req.headers;
-  const protocol = PROTOCOL_HEADER && headers[PROTOCOL_HEADER] || (req.socket.encrypted || req.connection.encrypted ? "https" : "http");
-  const hostHeader = HOST_HEADER ?? (req instanceof import_node_http2.Http2ServerRequest ? ":authority" : "host");
-  const host = headers[hostHeader];
-  return `${protocol}://${host}`;
-}
-function getUrl(req, origin) {
-  return normalizeUrl(req.originalUrl || req.url || "/", origin);
-}
-function isIgnoredError(message = "") {
-  const ignoredErrors = ["The stream has been destroyed", "write after end"];
-  return ignoredErrors.some((ignored) => message.includes(ignored));
-}
-var invalidHeadersPattern = /^:(method|scheme|authority|path)$/i;
-function normalizeUrl(url, base) {
-  const DOUBLE_SLASH_REG = /\/\/|\\\\/g;
-  return new URL(url.replace(DOUBLE_SLASH_REG, "/"), base);
-}
-async function fromNodeHttp(url, req, res, mode, getClientConn) {
-  const requestHeaders = new Headers();
-  const nodeRequestHeaders = req.headers;
-  try {
-    for (const [key, value] of Object.entries(nodeRequestHeaders)) {
-      if (invalidHeadersPattern.test(key)) {
-        continue;
-      }
-      if (typeof value === "string") {
-        requestHeaders.set(key, value);
-      } else if (Array.isArray(value)) {
-        for (const v of value) {
-          requestHeaders.append(key, v);
-        }
-      }
-    }
-  } catch (err) {
-    console.error(err);
-  }
-  const getRequestBody = async function* () {
-    for await (const chunk of req) {
-      yield chunk;
-    }
-  };
-  const body = req.method === "HEAD" || req.method === "GET" ? void 0 : getRequestBody();
-  const controller = new AbortController();
-  const options = {
-    method: req.method,
-    headers: requestHeaders,
-    body,
-    signal: controller.signal,
-    duplex: "half"
-  };
-  res.on("close", () => {
-    controller.abort();
-  });
-  const serverRequestEv = {
-    mode,
-    url,
-    request: new Request(url.href, options),
-    env: {
-      get(key) {
-        return process.env[key];
-      }
-    },
-    getWritableStream: (status, headers, cookies) => {
-      res.statusCode = status;
-      try {
-        for (const [key, value] of headers) {
-          if (invalidHeadersPattern.test(key)) {
-            continue;
-          }
-          res.setHeader(key, value);
-        }
-        const cookieHeaders = cookies.headers();
-        if (cookieHeaders.length > 0) {
-          res.setHeader("Set-Cookie", cookieHeaders);
-        }
-      } catch (err) {
-        console.error(err);
-      }
-      return new WritableStream({
-        write(chunk) {
-          if (res.closed || res.destroyed) {
-            return;
-          }
-          res.write(chunk, (error) => {
-            if (error && !isIgnoredError(error.message)) {
-              console.error(error);
-            }
-          });
-        },
-        close() {
-          res.end();
-        }
-      });
-    },
-    getClientConn: () => {
-      return getClientConn ? getClientConn(req) : {
-        ip: req.socket.remoteAddress
-      };
-    },
-    platform: {
-      ssr: true,
-      incomingMessage: req,
-      node: process.versions.node
-      // Weirdly needed to make typecheck of insights happy
-    },
-    locale: void 0
-  };
-  return serverRequestEv;
-}
-
-// packages/qwik-router/src/middleware/node/index.ts
-var import_meta = {};
-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: import_internal._deserialize,
-    _serialize: import_internal._serialize,
-    _verifySerializable: import_internal._verifySerializable
-  };
-  if (opts.manifest) {
-    (0, import_server.setServerPlatform)(opts.manifest);
-  }
-  const staticFolder = ((_a = opts.static) == null ? void 0 : _a.root) ?? (0, import_node_path.join)((0, import_node_url.fileURLToPath)(import_meta.url), "..", "..", "dist");
-  const router = async (req, res, next) => {
-    try {
-      const origin = computeOrigin(req, opts);
-      const serverRequestEv = await fromNodeHttp(
-        getUrl(req, origin),
-        req,
-        res,
-        "server",
-        opts.getClientConn
-      );
-      const handled = await (0, import_request_handler.requestHandler)(serverRequestEv, opts, qwikSerializer);
-      if (handled) {
-        const err = await handled.completion;
-        if (err) {
-          throw err;
-        }
-        if (handled.requestEv.headersSent) {
-          return;
-        }
-      }
-      next();
-    } catch (e) {
-      console.error(e);
-      next(e);
-    }
-  };
-  const notFound = async (req, res, next) => {
-    try {
-      if (!res.headersSent) {
-        const origin = computeOrigin(req, opts);
-        const url = getUrl(req, origin);
-        const notFoundHtml = (0, import_qwik_router_static_paths.isStaticPath)(req.method || "GET", url) ? "Not Found" : (0, import_qwik_router_not_found_paths.getNotFound)(url.pathname);
-        res.writeHead(404, {
-          "Content-Type": "text/html; charset=utf-8",
-          "X-Not-Found": url.pathname
-        });
-        res.end(notFoundHtml);
-      }
-    } catch (e) {
-      console.error(e);
-      next(e);
-    }
-  };
-  const staticFile = async (req, res, next) => {
-    var _a2;
-    try {
-      const origin = computeOrigin(req, opts);
-      const url = getUrl(req, origin);
-      if ((0, import_qwik_router_static_paths.isStaticPath)(req.method || "GET", url)) {
-        const pathname = url.pathname;
-        let filePath;
-        if ((0, import_node_path.basename)(pathname).includes(".")) {
-          filePath = (0, import_node_path.join)(staticFolder, pathname);
-        } else if (opts.qwikRouterConfig.trailingSlash) {
-          filePath = (0, import_node_path.join)(staticFolder, pathname + "index.html");
-        } else {
-          filePath = (0, import_node_path.join)(staticFolder, pathname, "index.html");
-        }
-        const ext = (0, import_node_path.extname)(filePath).replace(/^\./, "");
-        const stream = (0, import_node_fs.createReadStream)(filePath);
-        stream.on("error", next);
-        const contentType = MIME_TYPES[ext];
-        if (contentType) {
-          res.setHeader("Content-Type", contentType);
-        }
-        if ((_a2 = opts.static) == null ? void 0 : _a2.cacheControl) {
-          res.setHeader("Cache-Control", opts.static.cacheControl);
-        }
-        stream.pipe(res);
-        return;
-      }
-      return next();
-    } catch (e) {
-      console.error(e);
-      next(e);
-    }
-  };
-  return {
-    router,
-    notFound,
-    staticFile
-  };
-}
-var createQwikCity = createQwikRouter;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createQwikCity,
-  createQwikRouter
-});
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("@qwik.dev/core/server"),w=require("@qwik.dev/router/middleware/request-handler"),k=require("node:fs"),g=require("node:path"),E=require("node:url"),_=require("node:http2");var y=typeof document<"u"?document.currentScript:null;const j={"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"};function x(e,t){return t?.getOrigin?.(e)??t?.origin??process.env.ORIGIN??T(e)}function T(e){const{PROTOCOL_HEADER:t,HOST_HEADER:i}=process.env,h=e.headers,v=t&&h[t]||(e.socket.encrypted||e.connection.encrypted?"https":"http"),o=i??(e instanceof _.Http2ServerRequest?":authority":"host"),r=h[o];return`${v}://${r}`}function R(e,t){return O(e.originalUrl||e.url||"/",t)}function P(e=""){return["The stream has been destroyed","write after end"].some(i=>e.includes(i))}const C=/^:(method|scheme|authority|path)$/i;function O(e,t){const i=/\/\/|\\\\/g;return new URL(e.replace(i,"/"),t)}async function A(e,t,i,h,v){const o=new Headers,r=t.headers;try{for(const[a,l]of Object.entries(r))if(!C.test(a)){if(typeof l=="string")o.set(a,l);else if(Array.isArray(l))for(const u of l)o.append(a,u)}}catch(a){console.error(a)}const d=async function*(){for await(const a of t)yield a},n=t.method==="HEAD"||t.method==="GET"?void 0:d(),c=new AbortController,s={method:t.method,headers:o,body:n,signal:c.signal,duplex:"half"};return i.on("close",()=>{c.abort()}),{mode:h,url:e,request:new Request(e.href,s),env:{get(a){return process.env[a]}},getWritableStream:(a,l,u)=>{i.statusCode=a;try{for(const[p,S]of l)C.test(p)||i.setHeader(p,S);const f=u.headers();f.length>0&&i.setHeader("Set-Cookie",f)}catch(f){console.error(f)}return new WritableStream({write(f){i.closed||i.destroyed||i.write(f,p=>{p&&!P(p.message)&&console.error(p)})},close(){i.end()}})},getClientConn:()=>v?v(t):{ip:t.socket.remoteAddress},platform:{ssr:!0,incomingMessage:t,node:process.versions.node},locale:void 0}}function H(e){e.qwikCityPlan&&!e.qwikRouterConfig&&(console.warn("qwikCityPlan is deprecated. Simply remove it."),e.qwikRouterConfig=e.qwikCityPlan),e.manifest&&b.setServerPlatform(e.manifest);const t=e.static?.root??g.join(E.fileURLToPath(typeof document>"u"?require("url").pathToFileURL(__filename).href:y&&y.tagName.toUpperCase()==="SCRIPT"&&y.src||new URL("index.cjs",document.baseURI).href),"..","..","dist");return{router:async(o,r,d)=>{try{const n=x(o,e),c=await A(R(o,n),o,r,"server",e.getClientConn),s=await w.requestHandler(c,e);if(s){const m=await s.completion;if(m)throw m;if(s.requestEv.headersSent)return}d()}catch(n){console.error(n),d(n)}},notFound:async(o,r,d)=>{try{if(!r.headersSent){const n=x(o,e),c=R(o,n),s=!o.headers.accept?.includes("text/html")||w.isStaticPath(o.method||"GET",c)?"Not Found":w.getNotFound(c.pathname);r.writeHead(404,{"Content-Type":"text/html; charset=utf-8","X-Not-Found":c.pathname}),r.end(s)}}catch(n){console.error(n),d(n)}},staticFile:async(o,r,d)=>{try{const n=x(o,e),c=R(o,n);if(w.isStaticPath(o.method||"GET",c)){const s=c.pathname;let m;g.basename(s).includes(".")?m=g.join(t,s):globalThis.__NO_TRAILING_SLASH__?m=g.join(t,s,"index.html"):m=g.join(t,s+"index.html");const a=g.extname(m).replace(/^\./,""),l=k.createReadStream(m);l.on("error",d);const u=j[a];u&&r.setHeader("Content-Type",u),e.static?.cacheControl&&r.setHeader("Cache-Control",e.static.cacheControl),l.pipe(r);return}return d()}catch(n){console.error(n),d(n)}}}}const F=H;exports.createQwikCity=F;exports.createQwikRouter=H;

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

@@ -1,64 +1,64 @@
-import type { ClientConn } from '@qwik.dev/router/middleware/request-handler';
-import type { Http2ServerRequest } from 'node:http2';
-import type { IncomingMessage } from 'node:http';
-import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
-import type { ServerResponse } from 'node:http';
-
-/**
- * @deprecated Use `createQwikRouter` instead. Will be removed in V3
- * @public
- */
-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>;
-};
-
-/** @public */
-export declare interface NodeRequestNextFunction {
-    (err?: any): void;
-}
-
-/** @public */
-export declare interface PlatformNode {
-    ssr?: true;
-    incomingMessage?: IncomingMessage | Http2ServerRequest;
-    node?: string;
-}
-
-/**
- * @deprecated Use `QwikRouterNodeRequestOptions` instead. Will be removed in V3
- * @public
- */
-export declare type QwikCityNodeRequestOptions = QwikRouterNodeRequestOptions;
-
-/** @public */
-export declare interface QwikRouterNodeRequestOptions extends ServerRenderOptions {
-    /** Options for serving static files */
-    static?: {
-        /** The root folder for statics files. Defaults to /dist */
-        root?: string;
-        /** 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. You can specify the `PROTOCOL_HEADER`, `HOST_HEADER` to `X-Forwarded-Proto` and
-     * `X-Forwarded-Host` respectively to override the default behavior.
-     */
-    getOrigin?: (req: IncomingMessage | Http2ServerRequest) => string | null;
-    /** Provide a function that returns a `ClientConn` for the given request. */
-    getClientConn?: (req: IncomingMessage | Http2ServerRequest) => ClientConn;
-    /** @deprecated Use `getOrigin` instead. Will be removed in V3 */
-    origin?: string;
-}
-
-export { }
+import type { ClientConn } from '@qwik.dev/router/middleware/request-handler';
+import type { Http2ServerRequest } from 'node:http2';
+import type { IncomingMessage } from 'node:http';
+import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
+import type { ServerResponse } from 'node:http';
+
+/**
+ * @deprecated Use `createQwikRouter` instead. Will be removed in V3
+ * @public
+ */
+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>;
+};
+
+/** @public */
+export declare interface NodeRequestNextFunction {
+    (err?: any): void;
+}
+
+/** @public */
+export declare interface PlatformNode {
+    ssr?: true;
+    incomingMessage?: IncomingMessage | Http2ServerRequest;
+    node?: string;
+}
+
+/**
+ * @deprecated Use `QwikRouterNodeRequestOptions` instead. Will be removed in V3
+ * @public
+ */
+export declare type QwikCityNodeRequestOptions = QwikRouterNodeRequestOptions;
+
+/** @public */
+export declare interface QwikRouterNodeRequestOptions extends ServerRenderOptions {
+    /** Options for serving static files */
+    static?: {
+        /** The root folder for statics files. Defaults to /dist */
+        root?: string;
+        /** 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. You can specify the `PROTOCOL_HEADER`, `HOST_HEADER` to `X-Forwarded-Proto` and
+     * `X-Forwarded-Host` respectively to override the default behavior.
+     */
+    getOrigin?: (req: IncomingMessage | Http2ServerRequest) => string | null;
+    /** Provide a function that returns a `ClientConn` for the given request. */
+    getClientConn?: (req: IncomingMessage | Http2ServerRequest) => ClientConn;
+    /** @deprecated Use `getOrigin` instead. Will be removed in V3 */
+    origin?: string;
+}
+
+export { }