Skip to content

Commit d92420b

Browse files
remote teardown logic and print ready-on message as soon as a runtime controller reloads
1 parent e034cf3 commit d92420b

File tree

4 files changed

+3
-15
lines changed

4 files changed

+3
-15
lines changed

packages/wrangler/src/api/startDevWorker/BaseController.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ export abstract class Controller<
7575
type RuntimeControllerEventMap = ControllerEventMap & {
7676
reloadStart: [ReloadStartEvent];
7777
reloadComplete: [ReloadCompleteEvent];
78-
teardown: [];
7978
};
8079
export abstract class RuntimeController extends Controller<RuntimeControllerEventMap> {
8180
// ******************

packages/wrangler/src/api/startDevWorker/DevEnv.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,18 @@ export class DevEnv extends EventEmitter {
9696
}
9797

9898
/**
99-
* Awaits for all the local runtime controllers to be ready, and when they are
99+
* Awaits for a runtime controllers to be ready, and when it is
100100
* it resolves a promise on the proxy controller to let it know that the
101101
* local server is now ready to handle requests
102102
*/
103103
private async resolveAllRuntimeControllersReady(): Promise<void> {
104-
await Promise.all(
104+
await Promise.race(
105105
this.runtimes.map((runtime) => {
106106
return new Promise<void>((resolve) => {
107107
// A runtime controller is ready when it either emits the
108108
// reloadComplete event (meaning that the runtime is in use and
109-
// ready) or when it emits the teardown event (meaning that the
110-
// runtime is not currently in use)
109+
// ready)
111110
runtime.once("reloadComplete", () => resolve());
112-
runtime.once("teardown", () => resolve());
113111
});
114112
})
115113
);

packages/wrangler/src/api/startDevWorker/LocalRuntimeController.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ export class LocalRuntimeController extends RuntimeController {
380380
};
381381

382382
#teardown = async (): Promise<void> => {
383-
this.emitTeardownEvent();
384383
logger.debug("LocalRuntimeController teardown beginning...");
385384

386385
if (this.#mf) {
@@ -422,9 +421,6 @@ export class LocalRuntimeController extends RuntimeController {
422421
emitReloadCompleteEvent(data: ReloadCompleteEvent) {
423422
this.emit("reloadComplete", data);
424423
}
425-
emitTeardownEvent() {
426-
this.emit("teardown");
427-
}
428424
}
429425

430426
/**

packages/wrangler/src/api/startDevWorker/RemoteRuntimeController.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,6 @@ export class RemoteRuntimeController extends RuntimeController {
333333
}
334334

335335
async teardown() {
336-
this.emitTeardownEvent();
337-
338336
if (this.#session) {
339337
logger.log(chalk.dim("⎔ Shutting down remote preview..."));
340338
}
@@ -354,7 +352,4 @@ export class RemoteRuntimeController extends RuntimeController {
354352
emitReloadCompleteEvent(data: ReloadCompleteEvent) {
355353
this.emit("reloadComplete", data);
356354
}
357-
emitTeardownEvent() {
358-
this.emit("teardown");
359-
}
360355
}

0 commit comments

Comments
 (0)