Skip to content
Merged
Show file tree
Hide file tree
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
29 changes: 29 additions & 0 deletions packages/peer/src/client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,35 @@ describe('clientPeer', () => {
).rejects.toThrow('pre-aborted')
})

it('cancels an octet-stream request body if signal already aborted', async () => {
const controller = new AbortController()
const error = new Error('pre-aborted')
controller.abort(error)
const cancel = vi.fn()

await expect(
peer.request(makeRequest({ body: new ReadableStream({ cancel }), signal: controller.signal })),
).rejects.toBe(error)
await vi.waitFor(() => expect(cancel).toHaveBeenCalledOnce())
expect(cancel).toHaveBeenCalledWith(error)
expect(send).not.toHaveBeenCalled()
expect(getPeerSize(peer)).toEqual(0)
})

it('returns an event-stream request body if signal already aborted', async () => {
const controller = new AbortController()
controller.abort(new Error('pre-aborted'))
const cleanup = vi.fn()

await expect(
peer.request(makeRequest({ body: new AsyncIteratorClass<unknown>(() => new Promise(() => {}), cleanup), signal: controller.signal })),
).rejects.toThrow('pre-aborted')
await vi.waitFor(() => expect(cleanup).toHaveBeenCalledOnce())
expect(cleanup).toHaveBeenCalledWith({ kind: 'cancelled' })
expect(send).not.toHaveBeenCalled()
expect(getPeerSize(peer)).toEqual(0)
})

it('sends abort message when signal aborts after request sent', async () => {
const controller = new AbortController()
const promise = peer.request(makeRequest({ signal: controller.signal }))
Expand Down
4 changes: 2 additions & 2 deletions packages/peer/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ export class ClientPeer {
request(request: StandardRequest): Promise<StandardLazyResponse> {
return new Promise<StandardLazyResponse>((resolve, reject) => {
const signal = request.signal
throwIfAborted(signal)

const id = this.idGenerator.generate()
const state: ClientPeerRequestStateInternal = { resolve, reject }
this.requests.set(id, state)
Expand Down Expand Up @@ -71,6 +69,8 @@ export class ClientPeer {
let failure: unknown

try {
throwIfAborted(request.signal)

const encodedAtomicBody = await encodeAtomicStandardBody(request.body, request.headers)

// signal can be aborted during encode
Expand Down
Loading