Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: batch original stack frame requests in turbopack overlay #75556

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import {
jsonString,
noContent,
type OriginalStackFrameResponse,
type OriginalStackFramesRequest,
type OriginalStackFramesResponse,
} from './shared'

import fs, { constants as FS } from 'fs/promises'
Expand Down Expand Up @@ -118,18 +120,47 @@ export async function batchedTraceSource(
source,
}
}

function createStackFrame(searchParams: URLSearchParams) {
const fileParam = searchParams.get('file')

function parseFile(fileParam: string | null): string | undefined {
if (!fileParam) {
return undefined
}

// rsc://React/Server/file://<filename>?42 => file://<filename>
const file = fileParam
.replace(/^rsc:\/\/React\/[^/]+\//, '')
.replace(/\?\d+$/, '')
return fileParam.replace(/^rsc:\/\/React\/[^/]+\//, '').replace(/\?\d+$/, '')
}

function createStackFrames(
body: OriginalStackFramesRequest
): TurbopackStackFrame[] {
const { frames, isServer } = body

return frames
.map((frame): TurbopackStackFrame | undefined => {
const file = parseFile(frame.file)

if (!file) {
return undefined
}

return {
file,
methodName: frame.methodName ?? '<unknown>',
line: frame.lineNumber ?? 0,
column: frame.column ?? 0,
isServer,
} satisfies TurbopackStackFrame
})
.filter((f): f is TurbopackStackFrame => f !== undefined)
}

function createStackFrame(
searchParams: URLSearchParams
): TurbopackStackFrame | undefined {
const file = parseFile(searchParams.get('file'))

if (!file) {
return undefined
}

return {
file,
Expand Down Expand Up @@ -314,25 +345,37 @@ export function getOverlayMiddleware(project: Project) {
): Promise<void> {
const { pathname, searchParams } = new URL(req.url!, 'http://n')

if (pathname === '/__nextjs_original-stack-frame') {
const frame = createStackFrame(searchParams)

if (!frame) return badRequest(res)

let originalStackFrame: OriginalStackFrameResponse | null
try {
originalStackFrame = await createOriginalStackFrame(project, frame)
} catch (e: any) {
return internalServerError(res, e.stack)
if (pathname === '/__nextjs_original-stack-frames') {
if (req.method !== 'POST') {
return badRequest(res)
}

if (!originalStackFrame) {
res.statusCode = 404
res.end('Unable to resolve sourcemap')
return
}
const body = await new Promise<string>((resolve, reject) => {
let data = ''
req.on('data', (chunk) => {
data += chunk
})
req.on('end', () => resolve(data))
req.on('error', reject)
})

const request = JSON.parse(body) as OriginalStackFramesRequest
const stackFrames = createStackFrames(request)
const result = (await Promise.allSettled(
stackFrames.map(async (frame) => {
try {
const stackFrame = await createOriginalStackFrame(project, frame)
if (stackFrame === null) {
return Promise.reject('Failed to create original stack frame')
}
return stackFrame
} catch (e: any) {
return Promise.reject(e.stack)
}
})
)) satisfies OriginalStackFramesResponse

return json(res, originalStackFrame)
return json(res, result)
} else if (pathname === '/__nextjs_launch-editor') {
const frame = createStackFrame(searchParams)

Expand Down
Loading