Skip to content

fix: create hasBytes promise before await #3304

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

Merged
merged 1 commit into from
Sep 24, 2025
Merged

fix: create hasBytes promise before await #3304

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
13 changes: 7 additions & 6 deletions packages/utils/src/stream-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export function byteStream <T extends MessageStream> (stream: T, opts?: ByteStre
const maxBufferSize = opts?.maxBufferSize ?? DEFAULT_MAX_BUFFER_SIZE
const readBuffer = new Uint8ArrayList()

let hasBytes = Promise.withResolvers<void>()
let hasBytes: PromiseWithResolvers<void> | undefined
let unwrapped = false

if (!isValid(stream)) {
Expand All @@ -129,24 +129,24 @@ export function byteStream <T extends MessageStream> (stream: T, opts?: ByteStre
if (readBuffer.byteLength > maxBufferSize) {
const readBufferSize = readBuffer.byteLength
readBuffer.consume(readBuffer.byteLength)
hasBytes.reject(new Error(`Read buffer overflow - ${readBufferSize} > ${maxBufferSize}`))
hasBytes?.reject(new Error(`Read buffer overflow - ${readBufferSize} > ${maxBufferSize}`))
}

hasBytes.resolve()
hasBytes?.resolve()
}
stream.addEventListener('message', byteStreamOnMessageListener)

const byteStreamOnCloseListener = (evt: StreamCloseEvent): void => {
if (evt.error != null) {
hasBytes.reject(evt.error)
hasBytes?.reject(evt.error)
} else {
hasBytes.resolve()
hasBytes?.resolve()
}
}
stream.addEventListener('close', byteStreamOnCloseListener)

const byteStreamOnRemoteCloseWrite = (): void => {
hasBytes.resolve()
hasBytes?.resolve()
}
stream.addEventListener('remoteCloseWrite', byteStreamOnRemoteCloseWrite)

Expand All @@ -171,6 +171,7 @@ export function byteStream <T extends MessageStream> (stream: T, opts?: ByteStre
}

const bytesToRead = options?.bytes ?? 1
hasBytes = Promise.withResolvers<void>()

while (true) {
if (readBuffer.byteLength >= bytesToRead) {
Expand Down
Loading