Add response handling in pages handler

Author: ijjk

packages/next/errors.json

@@ -693,9 +693,10 @@
   "692": "Expected clientReferenceManifest to be defined.",
   "693": "%s must not be used within a client component. Next.js should be preventing %s from being included in client components statically, but did not in this case.",
   "694": "createPrerenderPathname was called inside a client component scope.",
-  "695": "Expected workUnitAsyncStorage to have a store.",
-  "696": "Next DevTools: Can't dispatch %s in this environment. This is a bug in Next.js",
+  "695": "Invariant: received non-pages cache entry in pages handler",
+  "696": "Expected workUnitAsyncStorage to have a store.",
   "697": "Next DevTools: Can't render in this environment. This is a bug in Next.js",
-  "698": "Next DevTools: App Dev Overlay is already mounted. This is a bug in Next.js",
-  "699": "Next DevTools: Pages Dev Overlay is already mounted. This is a bug in Next.js"
+  "698": "Next DevTools: Can't dispatch %s in this environment. This is a bug in Next.js",
+  "699": "Next DevTools: App Dev Overlay is already mounted. This is a bug in Next.js",
+  "700": "Next DevTools: Pages Dev Overlay is already mounted. This is a bug in Next.js"
 }

packages/next/src/build/templates/app-page.ts

@@ -1,5 +1,4 @@
 import type { LoaderTree } from '../../server/lib/app-dir-module'
-import type { ServerOnInstrumentationRequestError } from '../../server/app-render/types'
 import type { IncomingMessage, ServerResponse } from 'node:http'
 
 import {
@@ -26,12 +25,8 @@ import { createServerModuleMap } from '../../server/app-render/action-utils'
 import { normalizeAppPath } from '../../shared/lib/router/utils/app-paths'
 import { getIsPossibleServerAction } from '../../server/lib/server-action-request-meta'
 import {
-  RouterServerContextSymbol,
-  routerServerGlobal,
-} from '../../server/lib/router-utils/router-server-context'
-import {
-  NEXT_ROUTER_PREFETCH_HEADER,
   RSC_HEADER,
+  NEXT_ROUTER_PREFETCH_HEADER,
 } from '../../client/components/app-router-headers'
 
 // These are injected by the loader afterwards.
@@ -132,49 +127,17 @@ export async function handler(
     pageIsDynamic,
     buildManifest,
     nextFontManifest,
-    serverFilesManifest,
     reactLoadableManifest,
     serverActionsManifest,
     clientReferenceManifest,
     subresourceIntegrityManifest,
     prerenderManifest,
     isDraftMode,
     isOnDemandRevalidate,
+    routerServerContext,
+    nextConfig,
   } = prepareResult
 
-  const routerServerContext =
-    routerServerGlobal[RouterServerContextSymbol]?.[
-      process.env.__NEXT_RELATIVE_PROJECT_DIR || ''
-    ]
-
-  const onInstrumentationRequestError =
-    routeModule.instrumentationOnRequestError.bind(routeModule)
-
-  const onError: ServerOnInstrumentationRequestError = (
-    err,
-    _,
-    errorContext
-  ) => {
-    if (routerServerContext?.logErrorWithOriginalStack) {
-      routerServerContext.logErrorWithOriginalStack(err, 'app-dir')
-    } else {
-      console.error(err)
-    }
-    return onInstrumentationRequestError(
-      req,
-      err,
-      {
-        path: req.url || '/',
-        headers: req.headers,
-        method: req.method || 'GET',
-      },
-      errorContext
-    )
-  }
-
-  const nextConfig =
-    routerServerContext?.nextConfig || serverFilesManifest.config
-
   const pathname = parsedUrl.pathname || '/'
   const normalizedSrcPage = normalizeAppPath(srcPage)
   let isIsr = Boolean(
@@ -311,11 +274,7 @@ export async function handler(
     isRevalidate ||
     // Otherwise we're checking the user agent to decide if we should
     // serve streaming metadata.
-    shouldServeStreamingMetadata(
-      userAgent,
-      // @ts-expect-error update for readonly
-      nextConfig.htmlLimitedBots
-    )
+    shouldServeStreamingMetadata(userAgent, nextConfig.htmlLimitedBots)
 
   if (isHtmlBot && isRoutePPREnabled) {
     isIsr = false
@@ -360,22 +319,21 @@ export async function handler(
           subresourceIntegrityManifest,
           serverActionsManifest,
           clientReferenceManifest,
-          isPossibleServerAction,
-          isOnDemandRevalidate,
           setIsrStatus: routerServerContext?.setIsrStatus,
 
           dir: routeModule.projectDir,
           isDraftMode,
           isRevalidate,
           botType,
+          isOnDemandRevalidate,
+          isPossibleServerAction,
           assetPrefix: nextConfig.assetPrefix,
           nextConfigOutput: nextConfig.output,
           crossOrigin: nextConfig.crossOrigin,
           trailingSlash: nextConfig.trailingSlash,
           previewProps: prerenderManifest.preview,
           deploymentId: nextConfig.deploymentId,
           enableTainting: nextConfig.experimental.taint,
-          // @ts-expect-error fix issue with readonly regex object type
           htmlLimitedBots: nextConfig.htmlLimitedBots,
           devtoolSegmentExplorer:
             nextConfig.experimental.devtoolSegmentExplorer,
@@ -385,7 +343,6 @@ export async function handler(
           incrementalCache: getRequestMeta(req, 'incrementalCache'),
           cacheLifeProfiles: nextConfig.experimental.cacheLife,
           basePath: nextConfig.basePath,
-          // @ts-expect-error fix issue with readonly regex object type
           serverActions: nextConfig.experimental.serverActions,
 
           ...(isDebugStaticShell || isDebugDynamicAccesses
@@ -419,7 +376,13 @@ export async function handler(
           },
           onAfterTaskError: () => {},
 
-          onInstrumentationRequestError: onError,
+          onInstrumentationRequestError: (error, _request, errorContext) =>
+            routeModule.onRequestError(
+              req,
+              error,
+              errorContext,
+              routerServerContext
+            ),
           err: getRequestMeta(req, 'invokeError'),
           dev: routeModule.isDev,
         },
@@ -512,15 +475,20 @@ export async function handler(
   } catch (err) {
     // if we aren't wrapped by base-server handle here
     if (!activeSpan) {
-      await onError(err, req, {
-        routerKind: 'App Router',
-        routePath: srcPage,
-        routeType: 'render',
-        revalidateReason: getRevalidateReason({
-          isRevalidate,
-          isOnDemandRevalidate,
-        }),
-      })
+      await routeModule.onRequestError(
+        req,
+        err,
+        {
+          routerKind: 'App Router',
+          routePath: srcPage,
+          routeType: 'render',
+          revalidateReason: getRevalidateReason({
+            isRevalidate,
+            isOnDemandRevalidate,
+          }),
+        },
+        routerServerContext
+      )
     }
 
     // rethrow so that we can handle serving error page

packages/next/src/build/templates/app-route.ts

@@ -5,12 +5,6 @@ import {
 } from '../../server/route-modules/app-route/module.compiled'
 import { RouteKind } from '../../server/route-kind'
 import { patchFetch as _patchFetch } from '../../server/lib/patch-fetch'
-
-import * as userland from 'VAR_USERLAND'
-import {
-  RouterServerContextSymbol,
-  routerServerGlobal,
-} from '../../server/lib/router-utils/router-server-context'
 import type { IncomingMessage, ServerResponse } from 'node:http'
 import { getRequestMeta } from '../../server/request-meta'
 import { getTracer, type Span, SpanKind } from '../../server/lib/trace/tracer'
@@ -31,6 +25,8 @@ import {
   type ResponseCacheEntry,
 } from '../../server/response-cache'
 
+import * as userland from 'VAR_USERLAND'
+
 // These are injected by the loader afterwards. This is injected as a variable
 // instead of a replacement because this could also be `undefined` instead of
 // an empty string.
@@ -112,16 +108,12 @@ export async function handler(
     buildId,
     params,
     parsedUrl,
-    serverFilesManifest,
+    nextConfig,
     prerenderManifest,
+    routerServerContext,
     isOnDemandRevalidate,
   } = prepareResult
 
-  const routerServerContext =
-    routerServerGlobal[RouterServerContextSymbol]?.[
-      process.env.__NEXT_RELATIVE_PROJECT_DIR || ''
-    ]
-
   const onInstrumentationRequestError =
     routeModule.instrumentationOnRequestError.bind(routeModule)
 
@@ -147,9 +139,6 @@ export async function handler(
     )
   }
 
-  const nextConfig =
-    routerServerContext?.nextConfig || serverFilesManifest.config
-
   const pathname = parsedUrl.pathname || '/'
   const normalizedSrcPage = normalizeAppPath(srcPage)
   let isIsr = Boolean(