Skip to content

Commit 9f7b568

Browse files
committed
fix: rpcStream.cancel retains this context
1 parent 3435a11 commit 9f7b568

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/RPCClient.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ class RPCClient<M extends ClientManifest> {
348348
utils.clientInputTransformStream<I>(method);
349349
const middleware = this.middlewareFactory(
350350
{ signal, timer },
351-
rpcStream.cancel,
351+
(...args) => rpcStream.cancel(...args),
352352
metadata,
353353
);
354354
// This `Promise.allSettled` is used to asynchronously track the state
@@ -372,7 +372,7 @@ class RPCClient<M extends ClientManifest> {
372372
return {
373373
readable: outputMessageTransformStream.readable,
374374
writable: inputMessageTransformStream.writable,
375-
cancel: rpcStream.cancel,
375+
cancel: (...args) => rpcStream.cancel(...args),
376376
meta: metadata,
377377
};
378378
}
@@ -512,7 +512,7 @@ class RPCClient<M extends ClientManifest> {
512512
const newRpcStream: RPCStream<Uint8Array, Uint8Array> = {
513513
writable: rpcStream.writable,
514514
readable: headTransformStream.readable as ReadableStream<Uint8Array>,
515-
cancel: rpcStream.cancel,
515+
cancel: (...args) => rpcStream.cancel(...args),
516516
meta: rpcStream.meta,
517517
};
518518
return [leadingMessage.result, newRpcStream];
@@ -532,7 +532,7 @@ class RPCClient<M extends ClientManifest> {
532532
return {
533533
writable: rpcStream.writable,
534534
readable: rpcStream.readable,
535-
cancel: rpcStream.cancel,
535+
cancel: (...args) => rpcStream.cancel(...args),
536536
meta: metadata,
537537
};
538538
}

src/RPCServer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ class RPCServer {
622622
headerMessage.value,
623623
transformStream.readable as ReadableStream<Uint8Array>,
624624
],
625-
rpcStream.cancel,
625+
(...args) => rpcStream.cancel(...args),
626626
rpcStream.meta,
627627
{ signal: abortController.signal, timer },
628628
);

0 commit comments

Comments
 (0)