Skip to content

Commit 377dbc7

Browse files
committed
fix the new configurable waitUntil timeout
1 parent 2417983 commit 377dbc7

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

packages/cli-v3/src/entryPoints/dev-run-worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ function resetExecutionEnvironment() {
336336
// Wait for all streams to finish before completing the run
337337
waitUntil.register({
338338
requiresResolving: () => standardRealtimeStreamsManager.hasActiveStreams(),
339-
promise: () => standardRealtimeStreamsManager.waitForAllStreams(),
339+
promise: (timeoutInMs) => standardRealtimeStreamsManager.waitForAllStreams(timeoutInMs),
340340
});
341341

342342
log(`[${new Date().toISOString()}] Reset execution environment`);

packages/cli-v3/src/entryPoints/managed-run-worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ function resetExecutionEnvironment() {
310310
// Wait for all streams to finish before completing the run
311311
waitUntil.register({
312312
requiresResolving: () => standardRealtimeStreamsManager.hasActiveStreams(),
313-
promise: () => standardRealtimeStreamsManager.waitForAllStreams(),
313+
promise: (timeoutInMs) => standardRealtimeStreamsManager.waitForAllStreams(timeoutInMs),
314314
});
315315

316316
console.log(`[${new Date().toISOString()}] Reset execution environment`);

packages/core/src/v3/waitUntil/manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class StandardWaitUntilManager implements WaitUntilManager {
1919
}
2020

2121
const promises = this.promisesRequringResolving.map((p) =>
22-
typeof p.promise === "function" ? p.promise() : p.promise
22+
typeof p.promise === "function" ? p.promise(this.timeoutInMs) : p.promise
2323
);
2424

2525
await Promise.race([

packages/core/src/v3/waitUntil/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export type MaybeDeferredPromise = {
22
requiresResolving(): boolean;
3-
promise: Promise<any> | (() => Promise<any>);
3+
promise: Promise<any> | ((timeoutInMs: number) => Promise<any>);
44
};
55

66
export interface WaitUntilManager {

0 commit comments

Comments
 (0)