Revert "Fix cross-worker revalidate API"

packages/next/src/server/api-utils/node.ts

@@ -27,6 +27,7 @@ import {
   SYMBOL_PREVIEW_DATA,
   RESPONSE_LIMIT_DEFAULT,
 } from './index'
+import { createRequestResponseMocks } from '../lib/mock-request'
 import { getTracer } from '../lib/trace/tracer'
 import { NodeSpan } from '../lib/trace/constants'
 import { RequestCookies } from '../web/spec-extension/cookies'
@@ -35,7 +36,6 @@ import {
   PRERENDER_REVALIDATE_HEADER,
   PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER,
 } from '../../lib/constants'
-import { invokeRequest } from '../lib/server-ipc'
 
 export function tryGetPreviewData(
   req: IncomingMessage | BaseNextRequest | Request,
@@ -194,14 +194,7 @@ export async function parseBody(
 type ApiContext = __ApiPreviewProps & {
   trustHostHeader?: boolean
   allowedRevalidateHeaderKeys?: string[]
-  hostname?: string
-  revalidate?: (config: {
-    urlPath: string
-    revalidateHeaders: { [key: string]: string | string[] }
-    opts: { unstable_onlyGenerated?: boolean }
-  }) => Promise<any>
-
-  // (_req: IncomingMessage, _res: ServerResponse) => Promise<any>
+  revalidate?: (_req: IncomingMessage, _res: ServerResponse) => Promise<any>
 }
 
 function getMaxContentLength(responseLimit?: ResponseLimit) {
@@ -460,44 +453,20 @@ async function revalidate(
         throw new Error(`Invalid response ${res.status}`)
       }
     } else if (context.revalidate) {
-      // We prefer to use the IPC call if running under the workers mode.
-      const ipcPort = process.env.__NEXT_PRIVATE_ROUTER_IPC_PORT
-      if (ipcPort) {
-        const ipcKey = process.env.__NEXT_PRIVATE_ROUTER_IPC_KEY
-        const res = await invokeRequest(
-          `http://${
-            context.hostname
-          }:${ipcPort}?key=${ipcKey}&method=revalidate&args=${encodeURIComponent(
-            JSON.stringify([{ urlPath, revalidateHeaders }])
-          )}`,
-          {
-            method: 'GET',
-            headers: {},
-          }
-        )
-
-        const chunks = []
+      const mocked = createRequestResponseMocks({
+        url: urlPath,
+        headers: revalidateHeaders,
+      })
 
-        for await (const chunk of res) {
-          if (chunk) {
-            chunks.push(chunk)
-          }
-        }
-        const body = Buffer.concat(chunks).toString()
-        const result = JSON.parse(body)
+      await context.revalidate(mocked.req, mocked.res)
+      await mocked.res.hasStreamed
 
-        if (result.err) {
-          throw new Error(result.err.message)
-        }
-
-        return
+      if (
+        mocked.res.getHeader('x-nextjs-cache') !== 'REVALIDATED' &&
+        !(mocked.res.statusCode === 404 && opts.unstable_onlyGenerated)
+      ) {
+        throw new Error(`Invalid response ${mocked.res.statusCode}`)
       }
-
-      await context.revalidate({
-        urlPath,
-        revalidateHeaders,
-        opts,
-      })
     } else {
       throw new Error(
         `Invariant: required internal revalidate method not passed to api-utils`

packages/next/src/server/next-server.ts

@@ -107,7 +107,6 @@ import { removePathPrefix } from '../shared/lib/router/utils/remove-path-prefix'
 import { addPathPrefix } from '../shared/lib/router/utils/add-path-prefix'
 import { pathHasPrefix } from '../shared/lib/router/utils/path-has-prefix'
 import { filterReqHeaders, invokeRequest } from './lib/server-ipc'
-import { createRequestResponseMocks } from './lib/mock-request'
 
 export * from './base-server'
 
@@ -907,13 +906,16 @@ export default class NextNodeServer extends BaseServer {
       pageModule,
       {
         ...this.renderOpts.previewProps,
-        revalidate: this.revalidate.bind(this),
+        revalidate: (newReq: IncomingMessage, newRes: ServerResponse) =>
+          this.getRequestHandler()(
+            new NodeNextRequest(newReq),
+            new NodeNextResponse(newRes)
+          ),
         // internal config so is not typed
         trustHostHeader: (this.nextConfig.experimental as Record<string, any>)
           .trustHostHeader,
         allowedRevalidateHeaderKeys:
           this.nextConfig.experimental.allowedRevalidateHeaderKeys,
-        hostname: this.hostname,
       },
       this.minimalMode,
       this.renderOpts.dev,
@@ -1670,36 +1672,6 @@ export default class NextNodeServer extends BaseServer {
     }
   }
 
-  public async revalidate({
-    urlPath,
-    revalidateHeaders,
-    opts,
-  }: {
-    urlPath: string
-    revalidateHeaders: { [key: string]: string | string[] }
-    opts: { unstable_onlyGenerated?: boolean }
-  }) {
-    const mocked = createRequestResponseMocks({
-      url: urlPath,
-      headers: revalidateHeaders,
-    })
-
-    const handler = this.getRequestHandler()
-    await handler(
-      new NodeNextRequest(mocked.req),
-      new NodeNextResponse(mocked.res)
-    )
-    await mocked.res.hasStreamed
-
-    if (
-      mocked.res.getHeader('x-nextjs-cache') !== 'REVALIDATED' &&
-      !(mocked.res.statusCode === 404 && opts.unstable_onlyGenerated)
-    ) {
-      throw new Error(`Invalid response ${mocked.res.statusCode}`)
-    }
-    return {}
-  }
-
   public async render(
     req: BaseNextRequest | IncomingMessage,
     res: BaseNextResponse | ServerResponse,