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.

Sign up for GitHub

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

Jump to bottom

Use decodeReplyFromBusboy in node runtime #48686

Merged
merged 3 commits into from
Apr 21, 2023
Merged

Use decodeReplyFromBusboy in node runtime #48686

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13c36f3
use decodeReplyFromBusboy when possible
shuding Apr 21, 2023
837c6fd
Merge branch 'canary' into shu/5tgf
kodiakhq[bot] Apr 21, 2023
e3aa0bc
Merge branch 'canary' into shu/5tgf
kodiakhq[bot] Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
58 changes: 25 additions & 33 deletions packages/next/src/server/app-render/action-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,24 @@ export async function handleAction({
let bound = []

const workerName = 'app' + pathname
const { decodeReply } = ComponentMod
const serverModuleMap = new Proxy(
{},
{
get: (_, id: string) => {
return {
id: serverActionsManifest.node[id].workers[workerName],
name: id,
chunks: [],
}
},
}
)

try {
if (process.env.NEXT_RUNTIME === 'edge') {
// Use react-server-dom-webpack/server.edge
const { decodeReply } = ComponentMod

const webRequest = req as unknown as Request
if (!webRequest.body) {
throw new Error('invariant: Missing request body.')
Expand Down Expand Up @@ -72,44 +86,22 @@ export async function handleAction({
formData.delete('$$id')
bound = [formData]
} else {
bound = await decodeReply(actionData)
bound = await decodeReply(actionData, serverModuleMap)
}
}
} else {
if (isMultipartAction) {
const formFields = new FormData()
// Use react-server-dom-webpack/server.node which supports streaming
const {
decodeReply,
decodeReplyFromBusboy,
} = require('next/dist/compiled/react-server-dom-webpack/server.node')

if (isMultipartAction) {
const busboy = require('busboy')
const bb = busboy({ headers: req.headers })
let innerResolvor: () => void, innerRejector: (e: any) => void
const promise = new Promise<void>((resolve, reject) => {
innerResolvor = resolve
innerRejector = reject
})
bb.on('file', () =>
innerRejector(new Error('File upload is not supported.'))
)
bb.on('error', (err: any) => innerRejector(err))
bb.on('field', (id: any, val: any) => formFields.append(id, val))
bb.on('finish', () => innerResolvor())
req.pipe(bb)
await promise

bound = await decodeReply(
formFields,
new Proxy(
{},
{
get: (_, id: string) => {
return {
id: serverActionsManifest.node[id].workers[workerName],
name: id,
chunks: [],
}
},
}
)
)

bound = await decodeReplyFromBusboy(bb, serverModuleMap)
} else {
const { parseBody } =
require('../api-utils/node') as typeof import('../api-utils/node')
Expand All @@ -124,7 +116,7 @@ export async function handleAction({
formData.delete('$$id')
bound = [formData]
} else {
bound = await decodeReply(actionData)
bound = await decodeReply(actionData, serverModuleMap)
}
}
}
Expand Down