@netlify/plugin-nextjs 5.0.0-beta.6 → 5.0.0-beta.8

package/dist/run/handlers/server.js

@@ -5,8 +5,8 @@
       })();
     
 import {
-  import_internal
-} from "../../esm-chunks/chunk-X7XIMV6B.js";
+  require_src
+} from "../../esm-chunks/chunk-VDDK7MXY.js";
 import {
   getTagsManifest
 } from "../../esm-chunks/chunk-XIP2W57K.js";
@@ -17,15 +17,18 @@ import {
   setCacheControlHeaders,
   setCacheTagsHeaders,
   setVaryHeaders
-} from "../../esm-chunks/chunk-W5TLWQMF.js";
+} from "../../esm-chunks/chunk-N23TUUXK.js";
 import "../../esm-chunks/chunk-TYCYFZ22.js";
 import {
   nextResponseProxy
-} from "../../esm-chunks/chunk-NE4HYI2D.js";
+} from "../../esm-chunks/chunk-WT2HN3M6.js";
+import {
+  import_internal
+} from "../../esm-chunks/chunk-HYBEXB2Z.js";
 import {
   __commonJS,
   __toESM
-} from "../../esm-chunks/chunk-WELZ7LFO.js";
+} from "../../esm-chunks/chunk-5JVNISGM.js";
 
 // node_modules/node-inspect-extracted/dist/inspect.js
 var require_inspect = __commonJS({
@@ -3257,46 +3260,65 @@ function toComputeResponse(res) {
 }
 
 // src/run/handlers/server.ts
+var import_api = __toESM(require_src(), 1);
 var nextHandler;
 var nextConfig;
 var tagsManifest;
 var server_default = async (request) => {
+  const tracer = import_api.trace.getTracer("Next.js Runtime");
   if (!nextHandler) {
-    const { getRunConfig, setRunConfig } = await import("../config.js");
-    nextConfig = await getRunConfig();
-    setRunConfig(nextConfig);
-    tagsManifest = await getTagsManifest();
-    const { getMockedRequestHandlers } = await import("../next.cjs");
-    const url = new URL(request.url);
-    [nextHandler] = await getMockedRequestHandlers({
-      port: Number(url.port) || 443,
-      hostname: url.hostname,
-      dir: process.cwd(),
-      isDev: false
+    await tracer.startActiveSpan("initialize next server", async (span) => {
+      const { getRunConfig, setRunConfig } = await import("../config.js");
+      nextConfig = await getRunConfig();
+      setRunConfig(nextConfig);
+      tagsManifest = await getTagsManifest();
+      span.setAttributes(
+        Object.entries(tagsManifest).reduce(
+          (acc, [key, value]) => ({ ...acc, [`tagsManifest.${key}`]: value }),
+          {}
+        )
+      );
+      const { getMockedRequestHandlers } = await import("../next.cjs");
+      const url = new URL(request.url);
+      [nextHandler] = await getMockedRequestHandlers({
+        port: Number(url.port) || 443,
+        hostname: url.hostname,
+        dir: process.cwd(),
+        isDev: false
+      });
+      span.end();
     });
   }
-  const { req, res } = toReqRes(request);
-  const resProxy = nextResponseProxy(res);
-  delete req.headers["accept-encoding"];
-  try {
-    await nextHandler(req, resProxy);
-  } catch (error) {
-    import_internal.systemLogger.withError(error).error("next handler error");
-    console.error(error);
-    resProxy.statusCode = 500;
-    resProxy.end("Internal Server Error");
-  }
-  const response = await toComputeResponse(resProxy);
-  await adjustDateHeader(response.headers, request);
-  setCacheControlHeaders(response.headers, request);
-  setCacheTagsHeaders(response.headers, request, tagsManifest);
-  setVaryHeaders(response.headers, request, nextConfig);
-  handleNextCacheHeader(response.headers);
-  if (response.status > 300 && response.status < 400 || response.status >= 500) {
-    const body = await response.text();
-    return new Response(body || null, response);
-  }
-  return response;
+  return await tracer.startActiveSpan("generate response", async (span) => {
+    const { req, res } = toReqRes(request);
+    const resProxy = nextResponseProxy(res);
+    delete req.headers["accept-encoding"];
+    const nextHandlerPromise = nextHandler(req, resProxy).catch((error) => {
+      import_internal.systemLogger.withError(error).error("next handler error");
+      console.error(error);
+      resProxy.statusCode = 500;
+      resProxy.end("Internal Server Error");
+    });
+    const response = await toComputeResponse(resProxy);
+    await adjustDateHeader(response.headers, request, span, tracer);
+    setCacheControlHeaders(response.headers, request);
+    setCacheTagsHeaders(response.headers, request, tagsManifest);
+    setVaryHeaders(response.headers, request, nextConfig);
+    handleNextCacheHeader(response.headers);
+    if (response.status > 300 && response.status < 400 || response.status >= 500) {
+      const body = await response.text();
+      span.end();
+      return new Response(body || null, response);
+    }
+    const keepOpenUntilNextFullyRendered = new TransformStream({
+      flush() {
+        return nextHandlerPromise.then(() => {
+          span.end();
+        });
+      }
+    });
+    return new Response(response.body?.pipeThrough(keepOpenUntilNextFullyRendered), response);
+  });
 };
 export {
   server_default as default