Skip to content

fix(node): drain rejected upload bodies #1952

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

Closed
spa5k wants to merge 1 commit into from
Closed

fix(node): drain rejected upload bodies #1952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 17 additions & 11 deletions packages/node/src/tmp-file-upload-handler-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ export class TmpFileUploadHandlerPlugin<T extends Context> implements StandardHa
const fileName = contentDisposition !== undefined ? getFilenameFromContentDisposition(contentDisposition) : undefined
const contentType = flattenStandardHeader(request.headers['content-type'])

const limited = fileLimit === Number.POSITIVE_INFINITY ? stream : limitStream(stream, fileLimit)
const limited = limitStream(stream, fileLimit)

const tmpPath = await tmpFiles.allocate()

Expand Down Expand Up @@ -328,7 +328,7 @@ export class TmpFileUploadHandlerPlugin<T extends Context> implements StandardHa
return stream
}

const limited = totalLimit === Number.POSITIVE_INFINITY ? stream : limitStream(stream, totalLimit)
const limited = limitStream(stream, totalLimit)

const form = new FormData()
let memoryUsed = 0
Expand Down Expand Up @@ -399,18 +399,24 @@ function assertContentLengthWithin(headers: StandardHeaders, limit: number): voi
function limitStream(stream: ReadableStream<Uint8Array>, limit: number): ReadableStream<Uint8Array> {
let total = 0

return stream.pipeThrough(new TransformStream<Uint8Array, Uint8Array>({
transform(chunk, controller) {
total += chunk.byteLength
async function* generate(): AsyncGenerator<Uint8Array> {
try {
for await (const chunk of stream.values({ preventCancel: true })) {
total += chunk.byteLength

if (total > limit) {
throw new ORPCError('PAYLOAD_TOO_LARGE')
}

if (total > limit) {
controller.error(new ORPCError('PAYLOAD_TOO_LARGE'))
return
yield chunk
}
}
finally {
void stream.pipeTo(new WritableStream()).catch(() => {})
}
}

controller.enqueue(chunk)
},
}))
return ReadableStream.from(generate())
}

const EMPTY_CHUNK = new Uint8Array(0)
Expand Down