Skip to content

Commit b9fbc84

Browse files
authored
Fix accidential change in #803 (#804)
1 parent 5c3a9ee commit b9fbc84

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

packages/runtime/src/plugins/useUpstreamTimeout.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,15 @@ export function useUpstreamTimeout<TContext extends Record<string, any>>(
6666
timeoutSignal.addEventListener('abort', rejectDeferred, {
6767
once: true,
6868
});
69+
const combinedSignal = AbortSignal.any(signals);
6970
const res$ = executor({
7071
...executionRequest,
71-
signal: AbortSignal.any(signals),
72+
signal: combinedSignal,
7273
});
7374
if (!isPromise(res$)) {
7475
return res$;
7576
}
76-
return Promise.race([
77-
timeoutDeferred.promise,
78-
executor({
79-
...executionRequest,
80-
signal: AbortSignal.any(signals),
81-
}),
82-
])
77+
return Promise.race([timeoutDeferred.promise, res$])
8378
.then((result) => {
8479
if (isAsyncIterable(result)) {
8580
return {

0 commit comments

Comments
 (0)