Unverified Commit b5e8d653 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix free port handling (#50248)

Follow-up to https://github.com/vercel/next.js/pull/48019 ensures we
don't use arbitrary ports by incrementing favoring always getting a
fresh free port instead. Also favors exact address for internal IPC
requests instead of `localhost`.
parent 6ebc725f
...@@ -136,6 +136,6 @@ export async function initialize(opts: { ...@@ -136,6 +136,6 @@ export async function initialize(opts: {
return reject(err) return reject(err)
} }
}) })
server.listen((await getFreePort()) + 1, opts.hostname) server.listen(await getFreePort(), opts.hostname)
}) })
} }
...@@ -4,7 +4,7 @@ import { getNodeOptionsWithoutInspect } from '../utils' ...@@ -4,7 +4,7 @@ import { getNodeOptionsWithoutInspect } from '../utils'
import { deserializeErr, errorToJSON } from '../../render' import { deserializeErr, errorToJSON } from '../../render'
import crypto from 'crypto' import crypto from 'crypto'
import isError from '../../../lib/is-error' import isError from '../../../lib/is-error'
import { genRenderExecArgv } from '../worker-utils' import { genRenderExecArgv, getFreePort } from '../worker-utils'
// we can't use process.send as jest-worker relies on // we can't use process.send as jest-worker relies on
// it already and can cause unexpected message errors // it already and can cause unexpected message errors
...@@ -116,7 +116,9 @@ export const createWorker = async ( ...@@ -116,7 +116,9 @@ export const createWorker = async (
} }
: {}), : {}),
}, },
execArgv: isNodeDebugging ? genRenderExecArgv(type) : undefined, execArgv: isNodeDebugging
? genRenderExecArgv(await getFreePort(), type)
: undefined,
}, },
exposedMethods: [ exposedMethods: [
'initialize', 'initialize',
......
...@@ -26,7 +26,7 @@ export const invokeRequest = async ( ...@@ -26,7 +26,7 @@ export const invokeRequest = async (
try { try {
const invokeReq = http.request( const invokeReq = http.request(
targetUrl, parsedUrl.toString(),
{ {
headers: invokeHeaders, headers: invokeHeaders,
method: requestInit.method, method: requestInit.method,
......
...@@ -17,7 +17,7 @@ export const getFreePort = async (): Promise<number> => { ...@@ -17,7 +17,7 @@ export const getFreePort = async (): Promise<number> => {
}) })
} }
export const genRenderExecArgv = (type: 'pages' | 'app') => { export const genRenderExecArgv = (debugPort: number, type: 'pages' | 'app') => {
const isDebugging = const isDebugging =
process.execArgv.some((localArg) => localArg.startsWith('--inspect')) || process.execArgv.some((localArg) => localArg.startsWith('--inspect')) ||
process.env.NODE_OPTIONS?.match?.(/--inspect(=\S+)?( |$)/) process.env.NODE_OPTIONS?.match?.(/--inspect(=\S+)?( |$)/)
...@@ -26,21 +26,6 @@ export const genRenderExecArgv = (type: 'pages' | 'app') => { ...@@ -26,21 +26,6 @@ export const genRenderExecArgv = (type: 'pages' | 'app') => {
process.execArgv.some((localArg) => localArg.startsWith('--inspect-brk')) || process.execArgv.some((localArg) => localArg.startsWith('--inspect-brk')) ||
process.env.NODE_OPTIONS?.match?.(/--inspect-brk(=\S+)?( |$)/) process.env.NODE_OPTIONS?.match?.(/--inspect-brk(=\S+)?( |$)/)
let debugPort = (() => {
const debugPortStr =
process.execArgv
.find(
(localArg) =>
localArg.startsWith('--inspect') ||
localArg.startsWith('--inspect-brk')
)
?.split('=')[1] ??
process.env.NODE_OPTIONS?.match?.(/--inspect(-brk)?(=(\S+))?( |$)/)?.[3]
return debugPortStr ? parseInt(debugPortStr, 10) : 9229
})()
debugPort += type === 'pages' ? 2 : 3
if (isDebugging || isDebuggingWithBrk) { if (isDebugging || isDebuggingWithBrk) {
Log.info( Log.info(
`the --inspect${ `the --inspect${
......
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