Commit 179d14e4 authored by JJ Kasper's avatar JJ Kasper Committed by Steven

Replace image optimizer IPC call with request handler (#61471)

This ensures we don't do un-necessary IPC calls during image optimizing
and leverage the internal request handler for fetching internal static
images/resources.

x-ref: https://github.com/vercel/next.js/issues/58248

Closes NEXT-2318
parent f8fe70dd
...@@ -139,48 +139,6 @@ export async function initialize(opts: { ...@@ -139,48 +139,6 @@ export async function initialize(opts: {
renderServer.instance = renderServer.instance =
require('./render-server') as typeof import('./render-server') require('./render-server') as typeof import('./render-server')
const renderServerOpts: Parameters<RenderServer['initialize']>[0] = {
port: opts.port,
dir: opts.dir,
hostname: opts.hostname,
minimalMode: opts.minimalMode,
dev: !!opts.dev,
server: opts.server,
isNodeDebugging: !!opts.isNodeDebugging,
serverFields: developmentBundler?.serverFields || {},
experimentalTestProxy: !!opts.experimentalTestProxy,
experimentalHttpsServer: !!opts.experimentalHttpsServer,
bundlerService: devBundlerService,
startServerSpan: opts.startServerSpan,
}
// pre-initialize workers
const handlers = await renderServer.instance.initialize(renderServerOpts)
const logError = async (
type: 'uncaughtException' | 'unhandledRejection',
err: Error | undefined
) => {
if (isPostpone(err)) {
// React postpones that are unhandled might end up logged here but they're
// not really errors. They're just part of rendering.
return
}
await developmentBundler?.logErrorWithOriginalStack(err, type)
}
process.on('uncaughtException', logError.bind(null, 'uncaughtException'))
process.on('unhandledRejection', logError.bind(null, 'unhandledRejection'))
const resolveRoutes = getResolveRoutes(
fsChecker,
config,
opts,
renderServer.instance,
renderServerOpts,
developmentBundler?.ensureMiddleware
)
const requestHandlerImpl: WorkerRequestHandler = async (req, res) => { const requestHandlerImpl: WorkerRequestHandler = async (req, res) => {
if (compress) { if (compress) {
// @ts-expect-error not express req/res // @ts-expect-error not express req/res
...@@ -574,6 +532,49 @@ export async function initialize(opts: { ...@@ -574,6 +532,49 @@ export async function initialize(opts: {
} }
requestHandlers[opts.dir] = requestHandler requestHandlers[opts.dir] = requestHandler
const renderServerOpts: Parameters<RenderServer['initialize']>[0] = {
port: opts.port,
dir: opts.dir,
hostname: opts.hostname,
minimalMode: opts.minimalMode,
dev: !!opts.dev,
server: opts.server,
isNodeDebugging: !!opts.isNodeDebugging,
serverFields: developmentBundler?.serverFields || {},
experimentalTestProxy: !!opts.experimentalTestProxy,
experimentalHttpsServer: !!opts.experimentalHttpsServer,
bundlerService: devBundlerService,
startServerSpan: opts.startServerSpan,
}
renderServerOpts.serverFields.routerServerHandler = requestHandlerImpl
// pre-initialize workers
const handlers = await renderServer.instance.initialize(renderServerOpts)
const logError = async (
type: 'uncaughtException' | 'unhandledRejection',
err: Error | undefined
) => {
if (isPostpone(err)) {
// React postpones that are unhandled might end up logged here but they're
// not really errors. They're just part of rendering.
return
}
await developmentBundler?.logErrorWithOriginalStack(err, type)
}
process.on('uncaughtException', logError.bind(null, 'uncaughtException'))
process.on('unhandledRejection', logError.bind(null, 'unhandledRejection'))
const resolveRoutes = getResolveRoutes(
fsChecker,
config,
opts,
renderServer.instance,
renderServerOpts,
developmentBundler?.ensureMiddleware
)
const upgradeHandler: WorkerUpgradeHandler = async (req, socket, head) => { const upgradeHandler: WorkerUpgradeHandler = async (req, socket, head) => {
try { try {
req.on('error', (_err) => { req.on('error', (_err) => {
......
...@@ -90,8 +90,6 @@ import { getTracer } from './lib/trace/tracer' ...@@ -90,8 +90,6 @@ import { getTracer } from './lib/trace/tracer'
import { NextNodeServerSpan } from './lib/trace/constants' import { NextNodeServerSpan } from './lib/trace/constants'
import { nodeFs } from './lib/node-fs-methods' import { nodeFs } from './lib/node-fs-methods'
import { getRouteRegex } from '../shared/lib/router/utils/route-regex' import { getRouteRegex } from '../shared/lib/router/utils/route-regex'
import { invokeRequest } from './lib/server-ipc/invoke-request'
import { filterReqHeaders, ipcForbiddenHeaders } from './lib/server-ipc/utils'
import { pipeToNodeResponse } from './pipe-readable' import { pipeToNodeResponse } from './pipe-readable'
import { createRequestResponseMocks } from './lib/mock-request' import { createRequestResponseMocks } from './lib/mock-request'
import { NEXT_RSC_UNION_QUERY } from '../client/components/app-router-headers' import { NEXT_RSC_UNION_QUERY } from '../client/components/app-router-headers'
...@@ -171,6 +169,10 @@ export default class NextNodeServer extends BaseServer { ...@@ -171,6 +169,10 @@ export default class NextNodeServer extends BaseServer {
page: string page: string
re: RegExp re: RegExp
}[] }[]
private routerServerHandler?: (
req: IncomingMessage,
res: ServerResponse
) => void
constructor(options: Options) { constructor(options: Options) {
// Initialize super class // Initialize super class
...@@ -555,35 +557,11 @@ export default class NextNodeServer extends BaseServer { ...@@ -555,35 +557,11 @@ export default class NextNodeServer extends BaseServer {
throw new Error(`Invariant attempted to optimize _next/image itself`) throw new Error(`Invariant attempted to optimize _next/image itself`)
} }
const protocol = this.serverOptions.experimentalHttpsServer if (!this.routerServerHandler) {
? 'https' throw new Error(`Invariant missing routerServerHandler`)
: 'http'
const invokeRes = await invokeRequest(
`${protocol}://${this.fetchHostname || 'localhost'}:${this.port}${
newReq.url || ''
}`,
{
method: newReq.method || 'GET',
headers: newReq.headers,
signal: signalFromNodeResponse(res.originalResponse),
}
)
const filteredResHeaders = filterReqHeaders(
toNodeOutgoingHttpHeaders(invokeRes.headers),
ipcForbiddenHeaders
)
for (const key of Object.keys(filteredResHeaders)) {
newRes.setHeader(key, filteredResHeaders[key] || '')
} }
newRes.statusCode = invokeRes.status || 200
if (invokeRes.body) { await this.routerServerHandler(newReq, newRes)
await pipeToNodeResponse(invokeRes.body, newRes)
} else {
res.send()
}
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment