vinext 0.0.26 → 0.0.28

package/dist/server/prod-server.js

@@ -23,10 +23,12 @@ import { pathToFileURL } from "node:url";
 import fs from "node:fs";
 import path from "node:path";
 import zlib from "node:zlib";
-import { matchRedirect, matchRewrite, matchHeaders, requestContextFromRequest, applyMiddlewareRequestHeaders, isExternalUrl, proxyExternalRequest, sanitizeDestination } from "../config/config-matchers.js";
-import { IMAGE_OPTIMIZATION_PATH, IMAGE_CONTENT_SECURITY_POLICY, parseImageParams, isSafeImageContentType, DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES } from "./image-optimization.js";
+import { matchRedirect, matchRewrite, matchHeaders, requestContextFromRequest, applyMiddlewareRequestHeaders, isExternalUrl, proxyExternalRequest, sanitizeDestination, } from "../config/config-matchers.js";
+import { IMAGE_OPTIMIZATION_PATH, IMAGE_CONTENT_SECURITY_POLICY, parseImageParams, isSafeImageContentType, DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, } from "./image-optimization.js";
 import { normalizePath } from "./normalize-path.js";
+import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { computeLazyChunks } from "../index.js";
+import { manifestFileWithBase } from "../utils/manifest-paths.js";
 /** Convert a Node.js IncomingMessage into a ReadableStream for Web Request body. */
 function readNodeStream(req) {
     return new ReadableStream({
@@ -108,9 +110,7 @@ function mergeResponseHeaders(middlewareHeaders, response) {
     const responseCookies = response.headers.getSetCookie?.() ?? [];
     if (responseCookies.length > 0) {
         const existing = merged["set-cookie"];
-        const mwCookies = existing
-            ? (Array.isArray(existing) ? existing : [existing])
-            : [];
+        const mwCookies = existing ? (Array.isArray(existing) ? existing : [existing]) : [];
         merged["set-cookie"] = [...mwCookies, ...responseCookies];
     }
     return merged;
@@ -133,7 +133,9 @@ function sendCompressed(req, res, body, contentType, statusCode, extraHeaders =
         let varyValue;
         if (existingVary) {
             const existing = existingVary.toLowerCase();
-            varyValue = existing.includes("accept-encoding") ? existingVary : existingVary + ", Accept-Encoding";
+            varyValue = existing.includes("accept-encoding")
+                ? existingVary
+                : existingVary + ", Accept-Encoding";
         }
         else {
             varyValue = "Accept-Encoding";
@@ -145,11 +147,16 @@ function sendCompressed(req, res, body, contentType, statusCode, extraHeaders =
             Vary: varyValue,
         });
         compressor.end(buf);
-        pipeline(compressor, res, () => { });
+        pipeline(compressor, res, () => {
+            /* ignore pipeline errors on closed connections */
+        });
     }
     else {
+        // Strip any pre-existing content-length (from the Web Response constructor)
+        // before setting our own — avoids duplicate Content-Length headers.
+        const { "content-length": _cl, "Content-Length": _CL, ...headersWithoutLength } = extraHeaders;
         res.writeHead(statusCode, {
-            ...extraHeaders,
+            ...headersWithoutLength,
             "Content-Type": contentType,
             "Content-Length": String(buf.length),
         });
@@ -202,17 +209,13 @@ function tryServeStatic(req, res, clientDir, pathname, compress, extraHeaders) {
     if (!staticFile.startsWith(resolvedClient + path.sep) && staticFile !== resolvedClient) {
         return false;
     }
-    if (pathname === "/" ||
-        !fs.existsSync(staticFile) ||
-        !fs.statSync(staticFile).isFile()) {
+    if (pathname === "/" || !fs.existsSync(staticFile) || !fs.statSync(staticFile).isFile()) {
         return false;
     }
     const ext = path.extname(staticFile);
     const ct = CONTENT_TYPES[ext] ?? "application/octet-stream";
     const isHashed = pathname.startsWith("/assets/");
-    const cacheControl = isHashed
-        ? "public, max-age=31536000, immutable"
-        : "public, max-age=3600";
+    const cacheControl = isHashed ? "public, max-age=31536000, immutable" : "public, max-age=3600";
     const baseHeaders = {
         "Content-Type": ct,
         "Cache-Control": cacheControl,
@@ -229,7 +232,9 @@ function tryServeStatic(req, res, clientDir, pathname, compress, extraHeaders) {
                 "Content-Encoding": encoding,
                 Vary: "Accept-Encoding",
             });
-            pipeline(fileStream, compressor, res, () => { });
+            pipeline(fileStream, compressor, res, () => {
+                /* ignore */
+            });
             return true;
         }
     }
@@ -321,9 +326,7 @@ async function sendWebResponse(webResponse, req, res, compress) {
     webResponse.headers.forEach((value, key) => {
         const existing = nodeHeaders[key];
         if (existing !== undefined) {
-            nodeHeaders[key] = Array.isArray(existing)
-                ? [...existing, value]
-                : [existing, value];
+            nodeHeaders[key] = Array.isArray(existing) ? [...existing, value] : [existing, value];
         }
         else {
             nodeHeaders[key] = value;
@@ -339,7 +342,7 @@ async function sendWebResponse(webResponse, req, res, compress) {
     const alreadyEncoded = webResponse.headers.has("content-encoding");
     const contentType = webResponse.headers.get("content-type") ?? "";
     const baseType = contentType.split(";")[0].trim();
-    const encoding = (compress && !alreadyEncoded) ? negotiateEncoding(req) : null;
+    const encoding = compress && !alreadyEncoded ? negotiateEncoding(req) : null;
     const shouldCompress = !!(encoding && COMPRESSIBLE_TYPES.has(baseType));
     if (shouldCompress) {
         delete nodeHeaders["content-length"];
@@ -370,10 +373,14 @@ async function sendWebResponse(webResponse, req, res, compress) {
     const nodeStream = Readable.fromWeb(webResponse.body);
     if (shouldCompress) {
         const compressor = createCompressor(encoding);
-        pipeline(nodeStream, compressor, res, () => { });
+        pipeline(nodeStream, compressor, res, () => {
+            /* ignore pipeline errors on closed connections */
+        });
     }
     else {
-        pipeline(nodeStream, res, () => { });
+        pipeline(nodeStream, res, () => {
+            /* ignore pipeline errors on closed connections */
+        });
     }
 }
 /**
@@ -402,11 +409,36 @@ export async function startProdServer(options = {}) {
     }
     return startPagesRouterServer({ port, host, clientDir, serverEntryPath, compress });
 }
+function createNodeExecutionContext() {
+    return {
+        waitUntil(promise) {
+            // Node doesn't provide a Workers lifecycle, but we still attach a
+            // rejection handler so background waitUntil work doesn't surface as an
+            // unhandled rejection when a Worker-style entry is used with vinext start.
+            void Promise.resolve(promise).catch(() => { });
+        },
+        passThroughOnException() { },
+    };
+}
+function resolveAppRouterHandler(entry) {
+    if (typeof entry === "function") {
+        return (request) => Promise.resolve(entry(request));
+    }
+    if (entry && typeof entry === "object" && "fetch" in entry) {
+        const workerEntry = entry;
+        if (typeof workerEntry.fetch === "function") {
+            return (request) => Promise.resolve(workerEntry.fetch(request, undefined, createNodeExecutionContext()));
+        }
+    }
+    console.error("[vinext] App Router entry must export either a default handler function or a Worker-style default export with fetch()");
+    process.exit(1);
+}
 /**
  * Start the App Router production server.
  *
- * The RSC entry (dist/server/index.js) exports a default handler function:
- *   handler(request: Request) → Promise<Response>
+ * The App Router entry (dist/server/index.js) can export either:
+ *   - a default handler function: handler(request: Request) → Promise<Response>
+ *   - a Worker-style object: { fetch(request, env, ctx) → Promise<Response> }
  *
  * This handler already does everything: route matching, RSC rendering,
  * SSR HTML generation (via import("./ssr/index.js")), route handlers,
@@ -428,15 +460,13 @@ async function startAppRouterServer(options) {
         try {
             imageConfig = JSON.parse(fs.readFileSync(imageConfigPath, "utf-8"));
         }
-        catch { /* ignore parse errors */ }
+        catch {
+            /* ignore parse errors */
+        }
     }
     // Import the RSC handler (use file:// URL for reliable dynamic import)
     const rscModule = await import(pathToFileURL(rscEntryPath).href);
-    const rscHandler = rscModule.default;
-    if (typeof rscHandler !== "function") {
-        console.error("[vinext] RSC entry does not export a default handler function");
-        process.exit(1);
-    }
+    const rscHandler = resolveAppRouterHandler(rscModule.default);
     const server = createServer(async (req, res) => {
         const url = req.url ?? "/";
         // Normalize backslashes (browsers treat /\ as //), then decode and normalize path.
@@ -531,6 +561,33 @@ async function startAppRouterServer(options) {
  */
 async function startPagesRouterServer(options) {
     const { port, host, clientDir, serverEntryPath, compress } = options;
+    // Import the server entry module (use file:// URL for reliable dynamic import)
+    const serverEntry = await import(pathToFileURL(serverEntryPath).href);
+    const { renderPage, handleApiRoute: handleApi, runMiddleware, vinextConfig } = serverEntry;
+    // Extract config values (embedded at build time in the server entry)
+    const basePath = vinextConfig?.basePath ?? "";
+    const assetBase = basePath ? `${basePath}/` : "/";
+    const trailingSlash = vinextConfig?.trailingSlash ?? false;
+    const configRedirects = vinextConfig?.redirects ?? [];
+    const configRewrites = vinextConfig?.rewrites ?? {
+        beforeFiles: [],
+        afterFiles: [],
+        fallback: [],
+    };
+    const configHeaders = vinextConfig?.headers ?? [];
+    // Compute allowed image widths from config (union of deviceSizes + imageSizes)
+    const allowedImageWidths = [
+        ...(vinextConfig?.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES),
+        ...(vinextConfig?.images?.imageSizes ?? DEFAULT_IMAGE_SIZES),
+    ];
+    // Extract image security config for SVG handling and security headers
+    const pagesImageConfig = vinextConfig?.images
+        ? {
+            dangerouslyAllowSVG: vinextConfig.images.dangerouslyAllowSVG,
+            contentDispositionType: vinextConfig.images.contentDispositionType,
+            contentSecurityPolicy: vinextConfig.images.contentSecurityPolicy,
+        }
+        : undefined;
     // Load the SSR manifest (maps module URLs to client asset URLs)
     let ssrManifest = {};
     const manifestPath = path.join(clientDir, ".vite", "ssr-manifest.json");
@@ -544,33 +601,15 @@ async function startPagesRouterServer(options) {
     if (fs.existsSync(buildManifestPath)) {
         try {
             const buildManifest = JSON.parse(fs.readFileSync(buildManifestPath, "utf-8"));
-            const lazyChunks = computeLazyChunks(buildManifest);
+            const lazyChunks = computeLazyChunks(buildManifest).map((file) => manifestFileWithBase(file, assetBase));
             if (lazyChunks.length > 0) {
                 globalThis.__VINEXT_LAZY_CHUNKS__ = lazyChunks;
             }
         }
-        catch { /* ignore parse errors */ }
+        catch {
+            /* ignore parse errors */
+        }
     }
-    // Import the server entry module (use file:// URL for reliable dynamic import)
-    const serverEntry = await import(pathToFileURL(serverEntryPath).href);
-    const { renderPage, handleApiRoute: handleApi, runMiddleware, vinextConfig } = serverEntry;
-    // Extract config values (embedded at build time in the server entry)
-    const basePath = vinextConfig?.basePath ?? "";
-    const trailingSlash = vinextConfig?.trailingSlash ?? false;
-    const configRedirects = vinextConfig?.redirects ?? [];
-    const configRewrites = vinextConfig?.rewrites ?? { beforeFiles: [], afterFiles: [], fallback: [] };
-    const configHeaders = vinextConfig?.headers ?? [];
-    // Compute allowed image widths from config (union of deviceSizes + imageSizes)
-    const allowedImageWidths = [
-        ...(vinextConfig?.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES),
-        ...(vinextConfig?.images?.imageSizes ?? DEFAULT_IMAGE_SIZES),
-    ];
-    // Extract image security config for SVG handling and security headers
-    const pagesImageConfig = vinextConfig?.images ? {
-        dangerouslyAllowSVG: vinextConfig.images.dangerouslyAllowSVG,
-        contentDispositionType: vinextConfig.images.contentDispositionType,
-        contentSecurityPolicy: vinextConfig.images.contentSecurityPolicy,
-    } : undefined;
     const server = createServer(async (req, res) => {
         const rawUrl = req.url ?? "/";
         // Normalize backslashes (browsers treat /\ as //), then decode and normalize path.
@@ -601,9 +640,7 @@ async function startPagesRouterServer(options) {
         // Serve static files from client build. When basePath is configured,
         // Vite's `base` config ensures assets are under basePath/assets/.
         // We check both with and without basePath.
-        const staticLookupPath = basePath && pathname.startsWith(basePath)
-            ? pathname.slice(basePath.length) || "/"
-            : pathname;
+        const staticLookupPath = stripBasePath(pathname, basePath);
         if (staticLookupPath !== "/" &&
             !staticLookupPath.startsWith("/api/") &&
             tryServeStatic(req, res, clientDir, staticLookupPath, compress)) {
@@ -641,11 +678,13 @@ async function startPagesRouterServer(options) {
         }
         try {
             // ── 2. Strip basePath ─────────────────────────────────────────
-            if (basePath && pathname.startsWith(basePath)) {
-                const stripped = pathname.slice(basePath.length) || "/";
-                const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-                url = stripped + qs;
-                pathname = stripped;
+            {
+                const stripped = stripBasePath(pathname, basePath);
+                if (stripped !== pathname) {
+                    const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
+                    url = stripped + qs;
+                    pathname = stripped;
+                }
             }
             // ── 3. Trailing slash normalization ───────────────────────────
             if (pathname !== "/" && pathname !== "/api" && !pathname.startsWith("/api/")) {
@@ -683,12 +722,31 @@ async function startPagesRouterServer(options) {
                 // @ts-expect-error — duplex needed for streaming request bodies
                 duplex: hasBody ? "half" : undefined,
             });
-            // Build request context for has/missing condition matching.
-            // headers and redirects run before middleware and use this pre-middleware
-            // snapshot. beforeFiles, afterFiles, and fallback all run after middleware
-            // per the Next.js execution order, so they use postMwReqCtx below.
+            // Build request context for pre-middleware config matching. Redirects
+            // run before middleware in Next.js. Header match conditions also use the
+            // original request snapshot even though header merging happens later so
+            // middleware response headers can still take precedence.
+            // beforeFiles, afterFiles, and fallback all run after middleware per the
+            // Next.js execution order, so they use postMwReqCtx below.
             const reqCtx = requestContextFromRequest(webRequest);
-            // ── 4. Run middleware ─────────────────────────────────────────
+            // ── 4. Apply redirects from next.config.js ────────────────────
+            if (configRedirects.length) {
+                const redirect = matchRedirect(pathname, configRedirects, reqCtx);
+                if (redirect) {
+                    // Guard against double-prefixing: only add basePath if destination
+                    // doesn't already start with it.
+                    // Sanitize the final destination to prevent protocol-relative URL open redirects.
+                    const dest = sanitizeDestination(basePath &&
+                        !isExternalUrl(redirect.destination) &&
+                        !hasBasePath(redirect.destination, basePath)
+                        ? basePath + redirect.destination
+                        : redirect.destination);
+                    res.writeHead(redirect.permanent ? 308 : 307, { Location: dest });
+                    res.end();
+                    return;
+                }
+            }
+            // ── 5. Run middleware ─────────────────────────────────────────
             let resolvedUrl = url;
             const middlewareHeaders = {};
             let middlewareRewriteStatus;
@@ -771,15 +829,17 @@ async function startPagesRouterServer(options) {
             // middleware per the Next.js execution order).
             const { postMwReqCtx, request: postMwReq } = applyMiddlewareRequestHeaders(middlewareHeaders, webRequest);
             webRequest = postMwReq;
+            // Config header matching must keep using the original normalized pathname
+            // even if middleware rewrites the downstream route/render target.
             let resolvedPathname = resolvedUrl.split("?")[0];
-            // ── 5. Apply custom headers from next.config.js ───────────────
+            // ── 6. Apply custom headers from next.config.js ───────────────
             // Config headers are additive for multi-value headers (Vary,
             // Set-Cookie) and override for everything else. Set-Cookie values
             // are stored as arrays (RFC 6265 forbids comma-joining cookies).
             // Middleware headers take precedence: skip config keys already set
             // by middleware so middleware always wins for the same key.
             if (configHeaders.length) {
-                const matched = matchHeaders(resolvedPathname, configHeaders, reqCtx);
+                const matched = matchHeaders(pathname, configHeaders, reqCtx);
                 for (const h of matched) {
                     const lk = h.key.toLowerCase();
                     if (lk === "set-cookie") {
@@ -804,21 +864,6 @@ async function startPagesRouterServer(options) {
                     }
                 }
             }
-            // ── 6. Apply redirects from next.config.js ────────────────────
-            if (configRedirects.length) {
-                const redirect = matchRedirect(resolvedPathname, configRedirects, reqCtx);
-                if (redirect) {
-                    // Guard against double-prefixing: only add basePath if destination
-                    // doesn't already start with it.
-                    // Sanitize the final destination to prevent protocol-relative URL open redirects.
-                    const dest = sanitizeDestination(basePath && !redirect.destination.startsWith(basePath)
-                        ? basePath + redirect.destination
-                        : redirect.destination);
-                    res.writeHead(redirect.permanent ? 308 : 307, { Location: dest });
-                    res.end();
-                    return;
-                }
-            }
             // ── 7. Apply beforeFiles rewrites from next.config.js ─────────
             if (configRewrites.beforeFiles?.length) {
                 const rewritten = matchRewrite(resolvedPathname, configRewrites.beforeFiles, postMwReqCtx);
@@ -909,5 +954,5 @@ async function startPagesRouterServer(options) {
     return server;
 }
 // Export helpers for testing
-export { sendCompressed, negotiateEncoding, COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, resolveHost, trustedHosts, trustProxy, nodeToWebRequest, mergeResponseHeaders };
+export { sendCompressed, negotiateEncoding, COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, resolveHost, trustedHosts, trustProxy, nodeToWebRequest, mergeResponseHeaders, };
 //# sourceMappingURL=prod-server.js.map