@sifxprime/krouter 0.5.166 → 0.5.168

package/app/node_modules/next/dist/server/app-render/action-handler.js

@@ -61,6 +61,12 @@ const INLINE_ACTION_PREFIX = '$$RSC_SERVER_ACTION_';
     const serverActionsManifest = (0, _manifestssingleton.getServerActionsManifest)();
     return Object.keys(serverActionsManifest.node).length > 0 || Object.keys(serverActionsManifest.edge).length > 0;
 }
+function getUnrecognizedActionStatusCode(actionId) {
+    return actionId !== null && !(0, _serverreferenceinfo.mightBeServerReferenceId)(actionId) ? 400 : 409;
+}
+function getUnrecognizedActionResponseBody(statusCode) {
+    return statusCode === 400 ? 'Invalid Server Action request.' : 'Server Action unavailable.';
+}
 function nodeHeadersToRecord(headers) {
     const record = {};
     for (const [key, value] of Object.entries(headers)){
@@ -125,13 +131,9 @@ function addRevalidationHeader(res, { workStore, requestStore }) {
 }
 /**
  * Forwards a server action request to a separate worker. Used when the requested action is not available in the current worker.
- */ async function createForwardedActionResponse(req, res, host, workerPathname, basePath) {
+ */ async function createForwardedActionResponse(req, res, host, workerPathname, basePath, actionId) {
     if (!host) {
-        throw Object.defineProperty(new Error('Invariant: Missing `host` header from a forwarded Server Actions request.'), "__NEXT_ERROR_CODE", {
-            value: "E226",
-            enumerable: false,
-            configurable: true
-        });
+        throw new Error('Invariant: Missing `host` header from a forwarded Server Actions request.');
     }
     const forwardedHeaders = getForwardedHeaders(req, res);
     // indicate that this action request was forwarded from another worker
@@ -147,20 +149,12 @@ function addRevalidationHeader(res, { workStore, requestStore }) {
                 const parsedUrl = new URL(initUrl);
                 origin = parsedUrl.origin;
             } catch (error) {
-                throw Object.defineProperty(new Error('Could not determine origin for forwarded Server Actions request. This can happen if port or hostname are not configured for this server.', {
+                throw new Error('Could not determine origin for forwarded Server Actions request. This can happen if port or hostname are not configured for this server.', {
                     cause: error
-                }), "__NEXT_ERROR_CODE", {
-                    value: "E1447",
-                    enumerable: false,
-                    configurable: true
                 });
             }
         } else {
-            throw Object.defineProperty(new _invarianterror.InvariantError('Missing initURL'), "__NEXT_ERROR_CODE", {
-                value: "E1446",
-                enumerable: false,
-                configurable: true
-            });
+            throw new _invarianterror.InvariantError('Missing initURL');
         }
     }
     const fetchUrl = new URL(`${origin}${basePath}${workerPathname}`);
@@ -172,23 +166,32 @@ function addRevalidationHeader(res, { workStore, requestStore }) {
         // environment variable check provides dead code elimination.
         process.env.NEXT_RUNTIME === 'edge' && (0, _helpers.isWebNextRequest)(req)) {
             if (!req.body) {
-                throw Object.defineProperty(new Error('Invariant: missing request body.'), "__NEXT_ERROR_CODE", {
-                    value: "E333",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error('Invariant: missing request body.');
             }
             body = req.body;
         } else if (// The type check here ensures that `req` is correctly typed, and the
         // environment variable check provides dead code elimination.
         process.env.NEXT_RUNTIME !== 'edge' && (0, _helpers.isNodeNextRequest)(req)) {
-            body = req.stream();
+            // If the action body was already stashed (and consumed from the
+            // request stream) so it could be replayed for the local action
+            // handler (e.g. when resume state was read from the body first),
+            // forward that stashed body instead of re-reading the now-exhausted
+            // stream, which would otherwise hang forever. Since the forwarded
+            // body no longer starts with the postponed state, the resume headers
+            // no longer apply and must be dropped so the receiving worker doesn't
+            // try to read postponed state from it.
+            // The platform can attach the target page's postponed state, including
+            // its RDC, to the forwarded request independently of these headers.
+            const actionBody = (0, _requestmeta.getRequestMeta)(req, 'actionBody');
+            if (actionBody) {
+                body = new Uint8Array(actionBody);
+                forwardedHeaders.delete(_constants.NEXT_RESUME_HEADER);
+                forwardedHeaders.delete(_constants.NEXT_RESUME_STATE_LENGTH_HEADER);
+            } else {
+                body = req.stream();
+            }
         } else {
-            throw Object.defineProperty(new Error('Invariant: Unknown request type.'), "__NEXT_ERROR_CODE", {
-                value: "E114",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error('Invariant: Unknown request type.');
         }
         // Forward the request to the new worker
         const response = await fetch(fetchUrl, {
@@ -217,8 +220,11 @@ function addRevalidationHeader(res, { workStore, requestStore }) {
         if (response.headers.get(_approuterheaders.NEXT_ACTION_NOT_FOUND_HEADER) === '1') {
             res.setHeader(_approuterheaders.NEXT_ACTION_NOT_FOUND_HEADER, '1');
             res.setHeader('content-type', 'text/plain');
-            res.statusCode = 404;
-            return _renderresult.default.fromStatic('Server action not found.', 'text/plain');
+            // The marker denotes an unavailable action. Derive the status from the
+            // requested ID so mixed-version workers cannot change its semantics.
+            const statusCode = getUnrecognizedActionStatusCode(actionId);
+            res.statusCode = statusCode;
+            return _renderresult.default.fromStatic(getUnrecognizedActionResponseBody(statusCode), 'text/plain');
         }
     } catch (err) {
         // we couldn't stream the forwarded response, so we'll just return an empty response
@@ -267,11 +273,7 @@ async function createRedirectRenderResult(req, res, originalHost, redirectUrl, r
     const appRelativeRedirectUrl = getAppRelativeRedirectUrl(basePath, originalHost, redirectUrl, currentPathname);
     if (appRelativeRedirectUrl) {
         if (!originalHost) {
-            throw Object.defineProperty(new Error('Invariant: Missing `host` header from a forwarded Server Actions request.'), "__NEXT_ERROR_CODE", {
-                value: "E226",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error('Invariant: Missing `host` header from a forwarded Server Actions request.');
         }
         const forwardedHeaders = getForwardedHeaders(req, res);
         forwardedHeaders.set(_approuterheaders.RSC_HEADER, '1');
@@ -284,27 +286,19 @@ async function createRedirectRenderResult(req, res, originalHost, redirectUrl, r
                     const parsedUrl = new URL(initUrl);
                     origin = parsedUrl.origin;
                 } catch (error) {
-                    throw Object.defineProperty(new Error('Could not determine origin for forwarded Server Actions request. This can happen if port or hostname are not configured for this server.', {
+                    throw new Error('Could not determine origin for forwarded Server Actions request. This can happen if port or hostname are not configured for this server.', {
                         cause: error
-                    }), "__NEXT_ERROR_CODE", {
-                        value: "E1447",
-                        enumerable: false,
-                        configurable: true
                     });
                 }
             } else {
-                throw Object.defineProperty(new _invarianterror.InvariantError('Missing initURL'), "__NEXT_ERROR_CODE", {
-                    value: "E1446",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new _invarianterror.InvariantError('Missing initURL');
             }
         }
         const fetchUrl = new URL(`${origin}${appRelativeRedirectUrl.pathname}${appRelativeRedirectUrl.search}`);
         if (workStore.pendingRevalidatedTags) {
-            var _workStore_incrementalCache_prerenderManifest_preview, _workStore_incrementalCache_prerenderManifest, _workStore_incrementalCache;
+            var _workStore_incrementalCache;
             forwardedHeaders.set(_constants.NEXT_CACHE_REVALIDATED_TAGS_HEADER, workStore.pendingRevalidatedTags.map((item)=>item.tag).join(','));
-            forwardedHeaders.set(_constants.NEXT_CACHE_REVALIDATE_TAG_TOKEN_HEADER, ((_workStore_incrementalCache = workStore.incrementalCache) == null ? void 0 : (_workStore_incrementalCache_prerenderManifest = _workStore_incrementalCache.prerenderManifest) == null ? void 0 : (_workStore_incrementalCache_prerenderManifest_preview = _workStore_incrementalCache_prerenderManifest.preview) == null ? void 0 : _workStore_incrementalCache_prerenderManifest_preview.previewModeId) || '');
+            forwardedHeaders.set(_constants.NEXT_CACHE_REVALIDATE_TAG_TOKEN_HEADER, ((_workStore_incrementalCache = workStore.incrementalCache) == null ? void 0 : _workStore_incrementalCache.previewProps.previewModeId) || '');
         }
         // Ensures that when the path was revalidated we don't return a partial response on redirects
         forwardedHeaders.delete(_approuterheaders.NEXT_ROUTER_STATE_TREE_HEADER);
@@ -370,12 +364,21 @@ function parseHostHeader(headers, originDomain) {
         value: hostHeader
     } : undefined;
 }
+function getRevalidationWaitUntil(workStore, skipPageRendering) {
+    if (!skipPageRendering) {
+        // Page rendering executes pending revalidations before rendering. We only
+        // need to attach them to waitUntil when no page render will take place.
+        return undefined;
+    }
+    const revalidatesPromise = (0, _revalidationutils.executeRevalidates)(workStore);
+    return revalidatesPromise === false ? undefined : revalidatesPromise;
+}
 async function handleAction({ req, res, ComponentMod, generateFlight, workStore, requestStore, serverActions, ctx, metadata }) {
     const contentType = req.headers['content-type'];
     const { page } = ctx.renderOpts;
     const serverModuleMap = (0, _manifestssingleton.getServerModuleMap)();
     const { actionId, isMultipartAction, isFetchAction, isURLEncodedAction, isPossibleServerAction } = (0, _serveractionrequestmeta.getServerActionRequestMetadata)(req);
-    const handleUnrecognizedFetchAction = (err)=>{
+    const handleUnrecognizedAction = (err, statusCode)=>{
         // If the deployment doesn't have skew protection, this is expected to occasionally happen,
         // so we use a warning instead of an error.
         console.warn(err);
@@ -385,10 +388,10 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
         // (i.e. without needing to invoke a lambda)
         res.setHeader(_approuterheaders.NEXT_ACTION_NOT_FOUND_HEADER, '1');
         res.setHeader('content-type', 'text/plain');
-        res.statusCode = 404;
+        res.statusCode = statusCode;
         return {
             type: 'done',
-            result: _renderresult.default.fromStatic('Server action not found.', 'text/plain')
+            result: _renderresult.default.fromStatic(getUnrecognizedActionResponseBody(statusCode), 'text/plain')
         };
     };
     // If it can't be a Server Action, skip handling.
@@ -409,17 +412,10 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
             return null;
         }
     }
-    // If the app has no server actions at all, we can 404 early.
+    // If the app has no server actions at all, we can reject the request early.
     if (!hasServerActions()) {
         const error = actionId !== null && !(0, _serverreferenceinfo.mightBeServerReferenceId)(actionId) ? (0, _manifestssingleton.getInvalidServerReferenceIdError)(actionId) : (0, _manifestssingleton.getActionNotFoundError)(actionId);
-        return handleUnrecognizedFetchAction(error);
-    }
-    if (workStore.isStaticGeneration) {
-        throw Object.defineProperty(new Error("Invariant: server actions can't be handled during static rendering"), "__NEXT_ERROR_CODE", {
-            value: "E359",
-            enumerable: false,
-            configurable: true
-        });
+        return handleUnrecognizedAction(error, getUnrecognizedActionStatusCode(actionId));
     }
     let temporaryReferences;
     // When running actions the default is no-store, you can still `cache: 'force-cache'`
@@ -457,11 +453,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                 // This is an attack. We should not proceed the action.
                 console.error(`\`x-forwarded-host\` or \`host\` headers are not provided. One of these is needed to compare the \`origin\` header from a forwarded Server Actions request. Aborting the action.`);
             }
-            const error = Object.defineProperty(new Error('Invalid Server Actions request.'), "__NEXT_ERROR_CODE", {
-                value: "E80",
-                enumerable: false,
-                configurable: true
-            });
+            const error = new Error('Invalid Server Actions request.');
             if (isFetchAction) {
                 res.statusCode = 500;
                 metadata.statusCode = 500;
@@ -477,7 +469,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                 }
                 return {
                     type: 'done',
-                    result: await generateFlight(req, ctx, requestStore, {
+                    result: await generateFlight(ctx, requestStore, {
                         actionResult: promise,
                         // We didn't execute an action, so no revalidations could have
                         // occurred. We can skip rendering the page.
@@ -492,6 +484,10 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
     // ensure we avoid caching server actions unexpectedly
     res.setHeader('Cache-Control', 'no-cache, no-store, max-age=0, must-revalidate');
     const actionWasForwarded = Boolean(req.headers['x-action-forwarded']);
+    // A fetch action targeting a fallback route has no concrete params with
+    // which to resume the destination page.
+    const isActionOnlyFallbackRequest = isFetchAction && ctx.fallbackRouteParams != null && typeof ctx.renderOpts.postponed === 'string';
+    const shouldSkipPageRendering = actionWasForwarded || isActionOnlyFallbackRequest;
     // Only attempt to forward if this request has not already been forwarded.
     // Otherwise middleware that rewrites the action POST can cause the receiving
     // worker to forward again, looping indefinitely.
@@ -503,7 +499,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
         if (forwardedWorker) {
             return {
                 type: 'done',
-                result: await createForwardedActionResponse(req, res, host, forwardedWorker, ctx.renderOpts.basePath)
+                result: await createForwardedActionResponse(req, res, host, forwardedWorker, ctx.renderOpts.basePath, actionId)
             };
         }
     }
@@ -522,11 +518,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
             // environment variable check provides dead code elimination.
             process.env.NEXT_RUNTIME === 'edge' && (0, _helpers.isWebNextRequest)(req)) {
                 if (!req.body) {
-                    throw Object.defineProperty(new Error('invariant: Missing request body.'), "__NEXT_ERROR_CODE", {
-                        value: "E364",
-                        enumerable: false,
-                        configurable: true
-                    });
+                    throw new Error('invariant: Missing request body.');
                 }
                 // Use react-server-dom-webpack/server
                 const { createTemporaryReferenceSet, decodeReply, decodeAction, decodeFormState } = ComponentMod;
@@ -545,11 +537,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                         edgeBodySize += value.byteLength;
                         if (edgeBodySize > bodySizeLimitBytes) {
                             const { ApiError } = require('../api-utils');
-                            throw Object.defineProperty(new ApiError(413, `Body exceeded ${bodySizeLimit} limit.\n` + `To configure the body size limit for Server Actions, see: https://nextjs.org/docs/app/api-reference/next-config-js/serverActions#bodysizelimit`), "__NEXT_ERROR_CODE", {
-                                value: "E394",
-                                enumerable: false,
-                                configurable: true
-                            });
+                            throw new ApiError(413, `Body exceeded ${bodySizeLimit} limit.\n` + `To configure the body size limit for Server Actions, see: https://nextjs.org/docs/app/api-reference/next-config-js/serverActions#bodysizelimit`);
                         }
                         edgeChunks.push(value);
                     }
@@ -575,7 +563,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                         try {
                             actionModId = getActionModIdOrError(actionId, serverModuleMap);
                         } catch (err) {
-                            return handleUnrecognizedFetchAction(err);
+                            return handleUnrecognizedAction(err, getUnrecognizedActionStatusCode(actionId));
                         }
                         boundActionArguments = await decodeReply(formData, serverModuleMap, {
                             temporaryReferences
@@ -583,14 +571,12 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                     } else {
                         // Multipart POST, but not a fetch action.
                         // Potentially an MPA action, we have to try decoding it to check.
-                        if (areAllActionIdsValid(formData, serverModuleMap) === false) {
-                            // TODO: This can be from skew or manipulated input. We should handle this case
-                            // more gracefully but this preserves the prior behavior where decodeAction would throw instead.
-                            throw Object.defineProperty(new Error(`Failed to find Server Action. This request might be from an older or newer deployment.\nRead more: https://nextjs.org/docs/messages/failed-to-find-server-action`), "__NEXT_ERROR_CODE", {
-                                value: "E975",
-                                enumerable: false,
-                                configurable: true
-                            });
+                        try {
+                            if (!areAllActionIdsValid(formData, serverModuleMap)) {
+                                return handleUnrecognizedAction(new Error('Invalid Server Actions request.'), 400);
+                            }
+                        } catch (err) {
+                            return handleUnrecognizedAction(err, 409);
                         }
                         const action = await decodeAction(formData, serverModuleMap);
                         if (typeof action === 'function') {
@@ -621,7 +607,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                     try {
                         actionModId = getActionModIdOrError(actionId, serverModuleMap);
                     } catch (err) {
-                        return handleUnrecognizedFetchAction(err);
+                        return handleUnrecognizedAction(err, getUnrecognizedActionStatusCode(actionId));
                     }
                     // A fetch action with a non-multipart body.
                     // In practice, this happens if `encodeReply` returned a string instead of FormData,
@@ -637,11 +623,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                         nonMultipartBodySize += value.byteLength;
                         if (nonMultipartBodySize > bodySizeLimitBytes) {
                             const { ApiError } = require('../api-utils');
-                            throw Object.defineProperty(new ApiError(413, `Body exceeded ${bodySizeLimit} limit.\n` + `To configure the body size limit for Server Actions, see: https://nextjs.org/docs/app/api-reference/next-config-js/serverActions#bodysizelimit`), "__NEXT_ERROR_CODE", {
-                                value: "E394",
-                                enumerable: false,
-                                configurable: true
-                            });
+                            throw new ApiError(413, `Body exceeded ${bodySizeLimit} limit.\n` + `To configure the body size limit for Server Actions, see: https://nextjs.org/docs/app/api-reference/next-config-js/serverActions#bodysizelimit`);
                         }
                         chunks.push(value);
                     }
@@ -668,11 +650,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                         size += Buffer.byteLength(chunk, encoding);
                         if (size > bodySizeLimitBytes) {
                             const { ApiError } = require('../api-utils');
-                            callback(Object.defineProperty(new ApiError(413, `Body exceeded ${bodySizeLimit} limit.\n` + `To configure the body size limit for Server Actions, see: https://nextjs.org/docs/app/api-reference/next-config-js/serverActions#bodysizelimit`), "__NEXT_ERROR_CODE", {
-                                value: "E394",
-                                enumerable: false,
-                                configurable: true
-                            }));
+                            callback(new ApiError(413, `Body exceeded ${bodySizeLimit} limit.\n` + `To configure the body size limit for Server Actions, see: https://nextjs.org/docs/app/api-reference/next-config-js/serverActions#bodysizelimit`));
                             return;
                         }
                         callback(null, chunk);
@@ -684,7 +662,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                         try {
                             actionModId = getActionModIdOrError(actionId, serverModuleMap);
                         } catch (err) {
-                            return handleUnrecognizedFetchAction(err);
+                            return handleUnrecognizedAction(err, getUnrecognizedActionStatusCode(actionId));
                         }
                         const busboy = require('next/dist/compiled/busboy')({
                             defParamCharset: 'utf8',
@@ -737,14 +715,12 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                             abortController.abort();
                             throw err;
                         }
-                        if (areAllActionIdsValid(formData, serverModuleMap) === false) {
-                            // TODO: This can be from skew or manipulated input. We should handle this case
-                            // more gracefully but this preserves the prior behavior where decodeAction would throw instead.
-                            throw Object.defineProperty(new Error(`Failed to find Server Action. This request might be from an older or newer deployment.\nRead more: https://nextjs.org/docs/messages/failed-to-find-server-action`), "__NEXT_ERROR_CODE", {
-                                value: "E975",
-                                enumerable: false,
-                                configurable: true
-                            });
+                        try {
+                            if (!areAllActionIdsValid(formData, serverModuleMap)) {
+                                return handleUnrecognizedAction(new Error('Invalid Server Actions request.'), 400);
+                            }
+                        } catch (err) {
+                            return handleUnrecognizedAction(err, 409);
                         }
                         // TODO: Refactor so it is harder to accidentally decode an action before you have validated that the
                         // action referred to is available.
@@ -777,7 +753,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                     try {
                         actionModId = getActionModIdOrError(actionId, serverModuleMap);
                     } catch (err) {
-                        return handleUnrecognizedFetchAction(err);
+                        return handleUnrecognizedAction(err, getUnrecognizedActionStatusCode(actionId));
                     }
                     // A fetch action with a non-multipart body.
                     // In practice, this happens if `encodeReply` returned a string instead of FormData,
@@ -798,11 +774,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                     });
                 }
             } else {
-                throw Object.defineProperty(new Error('Invariant: Unknown request type.'), "__NEXT_ERROR_CODE", {
-                    value: "E114",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error('Invariant: Unknown request type.');
             }
             // actions.js
             // app/page.js
@@ -848,7 +820,7 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                 }
             }
             const startTime = performance.now();
-            const { actionResult, skipPageRendering } = await executeActionAndPrepareForRender(actionHandler, boundActionArguments, workStore, requestStore, actionWasForwarded).finally(()=>{
+            const { actionResult, skipPageRendering } = await executeActionAndPrepareForRender(actionHandler, boundActionArguments, workStore, requestStore, shouldSkipPageRendering).finally(()=>{
                 addRevalidationHeader(res, {
                     workStore,
                     requestStore
@@ -866,17 +838,13 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
             });
             // For form actions, we need to continue rendering the page.
             if (isFetchAction) {
-                // If we skip page rendering, we need to ensure pending revalidates
-                // are awaited before closing the response. Otherwise, this will be
-                // done after rendering the page.
-                const maybeRevalidatesPromise = skipPageRendering ? (0, _revalidationutils.executeRevalidates)(workStore) : false;
                 return {
                     type: 'done',
-                    result: await _actionasyncstorageexternal.actionAsyncStorage.exit(()=>generateFlight(req, ctx, requestStore, {
+                    result: await _actionasyncstorageexternal.actionAsyncStorage.exit(()=>generateFlight(ctx, requestStore, {
                             actionResult: Promise.resolve(actionResult),
                             skipPageRendering,
                             temporaryReferences,
-                            waitUntil: maybeRevalidatesPromise === false ? undefined : maybeRevalidatesPromise
+                            waitUntil: getRevalidationWaitUntil(workStore, skipPageRendering)
                         }))
                 };
             } else {
@@ -924,10 +892,11 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
                 }
                 return {
                     type: 'done',
-                    result: await generateFlight(req, ctx, requestStore, {
-                        skipPageRendering: false,
+                    result: await generateFlight(ctx, requestStore, {
+                        skipPageRendering: shouldSkipPageRendering,
                         actionResult: promise,
-                        temporaryReferences
+                        temporaryReferences,
+                        waitUntil: getRevalidationWaitUntil(workStore, shouldSkipPageRendering)
                     })
                 };
             }
@@ -954,14 +923,16 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
             } catch  {
             // swallow error, it's gonna be handled on the client
             }
+            const skipPageRendering = workStore.pathWasRevalidated === undefined || workStore.pathWasRevalidated === _actionrevalidationkind.ActionDidNotRevalidate || shouldSkipPageRendering;
             return {
                 type: 'done',
-                result: await generateFlight(req, ctx, requestStore, {
+                result: await generateFlight(ctx, requestStore, {
                     actionResult: promise,
-                    // If the page was not revalidated, or if the action was forwarded
-                    // from another worker, we can skip rendering the page.
-                    skipPageRendering: workStore.pathWasRevalidated === undefined || workStore.pathWasRevalidated === _actionrevalidationkind.ActionDidNotRevalidate || actionWasForwarded,
-                    temporaryReferences
+                    // If the page was not revalidated, or if this is an action-only
+                    // request, we can skip rendering the page.
+                    skipPageRendering,
+                    temporaryReferences,
+                    waitUntil: getRevalidationWaitUntil(workStore, skipPageRendering)
                 })
             };
         }
@@ -973,20 +944,16 @@ async function handleAction({ req, res, ComponentMod, generateFlight, workStore,
  * Limit on the number of arguments passed to a server action. This prevents
  * stack overflow during `action.apply()` from malicious requests.
  */ const SERVER_ACTION_ARGS_LIMIT = 1000;
-async function executeActionAndPrepareForRender(action, args, workStore, requestStore, actionWasForwarded) {
+async function executeActionAndPrepareForRender(action, args, workStore, requestStore, shouldSkipPageRendering) {
     requestStore.phase = 'action';
-    let skipPageRendering = actionWasForwarded;
+    let skipPageRendering = shouldSkipPageRendering;
     if (args.length > SERVER_ACTION_ARGS_LIMIT) {
-        throw Object.defineProperty(new Error(`Server Action arguments list is too long (${args.length}). Maximum allowed is ${SERVER_ACTION_ARGS_LIMIT}.`), "__NEXT_ERROR_CODE", {
-            value: "E986",
-            enumerable: false,
-            configurable: true
-        });
+        throw new Error(`Server Action arguments list is too long (${args.length}). Maximum allowed is ${SERVER_ACTION_ARGS_LIMIT}.`);
     }
     try {
         const actionResult = await _workunitasyncstorageexternal.workUnitAsyncStorage.run(requestStore, ()=>action.apply(null, args));
-        // If the page was not revalidated, or if the action was forwarded from
-        // another worker, we can skip rendering the page.
+        // If the page was not revalidated, or if this is an action-only request,
+        // we can skip rendering the page.
         skipPageRendering ||= workStore.pathWasRevalidated === undefined || workStore.pathWasRevalidated === _actionrevalidationkind.ActionDidNotRevalidate;
         return {
             actionResult,
@@ -1018,11 +985,7 @@ async function executeActionAndPrepareForRender(action, args, workStore, request
  */ function getActionModIdOrError(actionId, serverModuleMap) {
     // if we're missing the action ID header, we can't do any further processing
     if (!actionId) {
-        throw Object.defineProperty(new _invarianterror.InvariantError("Missing 'next-action' header."), "__NEXT_ERROR_CODE", {
-            value: "E664",
-            enumerable: false,
-            configurable: true
-        });
+        throw new _invarianterror.InvariantError("Missing 'next-action' header.");
     }
     const entry = serverModuleMap[actionId];
     if (entry == null) {
@@ -1047,8 +1010,8 @@ const $ACTION_ID_ = '$ACTION_ID_';
  */ function areAllActionIdsValid(mpaFormData, serverModuleMap) {
     let seenActionRefs = 0;
     let hasAtLeastOneAction = false;
-    // Before we attempt to decode the payload for a possible MPA action, assert that all
-    // action IDs are valid IDs. If not we should disregard the payload
+    // Before we attempt to decode the payload for a possible MPA action, assert
+    // that all action IDs are valid IDs.
     for (let key of mpaFormData.keys()){
         if (!key.startsWith($ACTION_)) {
             continue;

package/app/node_modules/next/dist/server/app-render/after-task-async-storage-instance.js

@@ -9,6 +9,6 @@ Object.defineProperty(exports, "afterTaskAsyncStorageInstance", {
     }
 });
 const _asynclocalstorage = require("./async-local-storage");
-const afterTaskAsyncStorageInstance = (0, _asynclocalstorage.createAsyncLocalStorage)();
+const afterTaskAsyncStorageInstance = (0, _asynclocalstorage.getOrCreateGlobalAsyncLocalStorage)('after-task-async-storage');
 
 //# sourceMappingURL=after-task-async-storage-instance.js.map

package/app/node_modules/next/dist/server/app-render/app-render-prerender-utils.js

@@ -55,11 +55,7 @@ class ReactServerResult {
             return this._replayable.createReplayStream();
         }
         if (this._stream === null) {
-            throw Object.defineProperty(new Error('Cannot tee a ReactServerResult that has already been consumed'), "__NEXT_ERROR_CODE", {
-                value: "E106",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error('Cannot tee a ReactServerResult that has already been consumed');
         }
         if (isWebStream(this._stream)) {
             const tee = this._stream.tee();
@@ -67,11 +63,7 @@ class ReactServerResult {
             return tee[1];
         }
         if (process.env.NEXT_RUNTIME === 'edge') {
-            throw Object.defineProperty(new _invarianterror.InvariantError('Node.js Readable cannot be teed in the edge runtime'), "__NEXT_ERROR_CODE", {
-                value: "E1149",
-                enumerable: false,
-                configurable: true
-            });
+            throw new _invarianterror.InvariantError('Node.js Readable cannot be teed in the edge runtime');
         } else {
             let Readable;
             if (process.env.TURBOPACK) {
@@ -93,11 +85,7 @@ class ReactServerResult {
             return stream;
         }
         if (this._stream === null) {
-            throw Object.defineProperty(new Error('Cannot consume a ReactServerResult that has already been consumed'), "__NEXT_ERROR_CODE", {
-                value: "E470",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error('Cannot consume a ReactServerResult that has already been consumed');
         }
         const stream = this._stream;
         this._stream = null;
@@ -147,19 +135,11 @@ class ReplayableNodeStream {
    * scope (e.g. during Fizz's performWork).
    */ createReplayStream() {
         if (this._chunks === null) {
-            throw Object.defineProperty(new _invarianterror.InvariantError('Cannot create a replay stream after the ReplayableNodeStream has been disposed.'), "__NEXT_ERROR_CODE", {
-                value: "E1156",
-                enumerable: false,
-                configurable: true
-            });
+            throw new _invarianterror.InvariantError('Cannot create a replay stream after the ReplayableNodeStream has been disposed.');
         }
         let ReadableCtor;
         if (process.env.NEXT_RUNTIME === 'edge') {
-            throw Object.defineProperty(new _invarianterror.InvariantError('Node.js Readable cannot be teed in the edge runtime'), "__NEXT_ERROR_CODE", {
-                value: "E1149",
-                enumerable: false,
-                configurable: true
-            });
+            throw new _invarianterror.InvariantError('Node.js Readable cannot be teed in the edge runtime');
         } else {
             if (process.env.__NEXT_BUNDLER === 'Webpack' || process.env.__NEXT_BUNDLER === 'Rspack') {
                 ReadableCtor = __non_webpack_require__('node:stream').Readable;
@@ -252,11 +232,7 @@ async function createReactServerPrerenderResultFromRender(underlying) {
 class ReactServerPrerenderResult {
     assertChunks(expression) {
         if (this._chunks === null) {
-            throw Object.defineProperty(new _invarianterror.InvariantError(`Cannot \`${expression}\` on a ReactServerPrerenderResult that has already been consumed.`), "__NEXT_ERROR_CODE", {
-                value: "E593",
-                enumerable: false,
-                configurable: true
-            });
+            throw new _invarianterror.InvariantError(`Cannot \`${expression}\` on a ReactServerPrerenderResult that has already been consumed.`);
         }
         return this._chunks;
     }

package/app/node_modules/next/dist/server/app-render/app-render-render-utils.js

@@ -15,11 +15,7 @@ const _isthenable = require("../../shared/lib/is-thenable");
 function noop() {}
 function runInSequentialTasks(first, ...rest) {
     if (process.env.NEXT_RUNTIME === 'edge') {
-        throw Object.defineProperty(new _invarianterror.InvariantError('`runInSequentialTasks` should not be called in edge runtime.'), "__NEXT_ERROR_CODE", {
-            value: "E1054",
-            enumerable: false,
-            configurable: true
-        });
+        throw new _invarianterror.InvariantError('`runInSequentialTasks` should not be called in edge runtime.');
     } else {
         return new Promise((resolve, reject)=>{
             const scheduleTimeout = (0, _apprenderscheduling.createAtomicTimerGroup)();

package/app/node_modules/next/dist/server/app-render/app-render-scheduling.js

@@ -100,11 +100,7 @@ function warnAboutTimers() {
 }
 function createAtomicTimerGroup(delayMs = 0) {
     if (process.env.NEXT_RUNTIME === 'edge') {
-        throw Object.defineProperty(new _invarianterror.InvariantError('createAtomicTimerGroup cannot be called in the edge runtime'), "__NEXT_ERROR_CODE", {
-            value: "E934",
-            enumerable: false,
-            configurable: true
-        });
+        throw new _invarianterror.InvariantError('createAtomicTimerGroup cannot be called in the edge runtime');
     } else {
         let isFirstCallback = true;
         let firstTimerIdleStart = null;
@@ -137,11 +133,7 @@ function createAtomicTimerGroup(delayMs = 0) {
         }
         return function scheduleTimeout(callback) {
             if (didFirstTimerRun) {
-                throw Object.defineProperty(new _invarianterror.InvariantError('Cannot schedule more timers into a group that already executed'), "__NEXT_ERROR_CODE", {
-                    value: "E935",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new _invarianterror.InvariantError('Cannot schedule more timers into a group that already executed');
             }
             const timer = setTimeout(isFirstCallback ? runFirstCallback : runSubsequentCallback, delayMs, callback);
             isFirstCallback = false;
@@ -170,12 +162,8 @@ function createAtomicTimerGroup(delayMs = 0) {
             } catch (err) {
                 // This should never fail in current Node, but it might start failing in the future.
                 // We might be okay even without tweaking the timers, so warn and try to continue.
-                console.error(Object.defineProperty(new _invarianterror.InvariantError('An unexpected error occurred while adjusting `_idleStart` on an atomic timer', {
+                console.error(new _invarianterror.InvariantError('An unexpected error occurred while adjusting `_idleStart` on an atomic timer', {
                     cause: err
-                }), "__NEXT_ERROR_CODE", {
-                    value: "E933",
-                    enumerable: false,
-                    configurable: true
                 }));
                 shouldAttemptPatching = false;
                 warnAboutTimers();