flightdeck 0.1.2 → 0.2.0

package/dist/flightdeck.bin.js

@@ -198,8 +198,7 @@ class FlightDeck {
                         }
                         this.getLatestRelease();
                         if (toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)) {
-                          this.logger.info(`All services are ready to update!`);
-                          this.stopAllServices();
+                          this.tryUpdate();
                           return;
                         }
                         for (const entry of toEntries(this.services)) {
@@ -236,13 +235,40 @@ class FlightDeck {
         this.logger.info(`Server started on port ${port}`);
       });
     }
-    this.startAllServices();
+    this.startAllServices().then(() => {
+      this.logger.info(`All services started.`);
+    }).catch((thrown) => {
+      if (thrown instanceof Error) {
+        this.logger.error(`Failed to start all services:`, thrown.message);
+      }
+    });
+  }
+  tryUpdate() {
+    if (toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)) {
+      this.logger.info(`All services are ready to update.`);
+      this.stopAllServices().then(() => {
+        this.logger.info(`All services stopped; starting up fresh...`);
+        this.startAllServices().then(() => {
+          this.logger.info(`All services started; we're back online.`);
+        }).catch((thrown) => {
+          if (thrown instanceof Error) {
+            this.logger.error(`Failed to start all services:`, thrown.message);
+          }
+        });
+      }).catch((thrown) => {
+        if (thrown instanceof Error) {
+          this.logger.error(`Failed to stop all services:`, thrown.message);
+        }
+      });
+    }
   }
   startAllServices() {
     this.logger.info(`Starting all services...`);
+    this.servicesShouldRestart = true;
     for (const [serviceName] of toEntries(this.services)) {
       this.startService(serviceName);
     }
+    return this.live;
   }
   startService(serviceName) {
     this.logger.info(`Starting service ${this.options.packageName}::${serviceName}, try ${this.safety}/2...`);
@@ -270,10 +296,7 @@ class FlightDeck {
     this.services[serviceName].on(`readyToUpdate`, () => {
       this.serviceLoggers[serviceName].info(`Ready to update.`);
       this.servicesReadyToUpdate[serviceName] = true;
-      if (toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)) {
-        this.logger.info(`All services are ready to update.`);
-        this.stopAllServices();
-      }
+      this.tryUpdate();
     });
     this.services[serviceName].on(`alive`, () => {
       this.servicesLive[this.serviceIdx[serviceName]].use(Promise.resolve());
@@ -285,7 +308,7 @@ class FlightDeck {
       }
       this.dead.use(Promise.all(this.servicesDead));
     });
-    this.services[serviceName].process.on(`close`, (exitCode) => {
+    this.services[serviceName].process.once(`close`, (exitCode) => {
       this.serviceLoggers[serviceName].info(`Exited with code ${exitCode}`);
       this.services[serviceName] = null;
       if (!this.servicesShouldRestart) {
@@ -346,16 +369,25 @@ class FlightDeck {
   }
   stopAllServices() {
     this.logger.info(`Stopping all services...`);
+    this.servicesShouldRestart = false;
     for (const [serviceName] of toEntries(this.services)) {
       this.stopService(serviceName);
     }
+    return this.dead;
   }
   stopService(serviceName) {
-    if (this.services[serviceName]) {
+    const service = this.services[serviceName];
+    if (service) {
       this.serviceLoggers[serviceName].info(`Stopping service...`);
-      this.services[serviceName].process.kill(`SIGINT`);
-      this.services[serviceName] = null;
-      this.servicesDead[this.serviceIdx[serviceName]].use(Promise.resolve());
+      this.servicesDead[this.serviceIdx[serviceName]].use(new Promise((pass) => {
+        service.emit(`timeToStop`);
+        service.process.once(`close`, (exitCode) => {
+          this.logger.info(`\uD83D\uDEEC service ${serviceName} exited with code ${exitCode}`);
+          this.services[serviceName] = null;
+          pass();
+        });
+      }));
+      this.dead.use(Promise.all(this.servicesDead));
       this.servicesLive[this.serviceIdx[serviceName]] = new Future(() => {
       });
       if (this.live.done) {
@@ -367,11 +399,6 @@ class FlightDeck {
       this.serviceLoggers[serviceName].error(`Tried to stop service, but it wasn't running.`);
     }
   }
-  shutdown() {
-    this.logger.info(`Shutting down...`);
-    this.servicesShouldRestart = false;
-    this.stopAllServices();
-  }
 }
 
 // src/flightdeck.bin.ts
@@ -463,8 +490,7 @@ switch (inputs.case) {
   default: {
     const flightDeck = new FlightDeck(inputs.opts);
     process.on(`close`, async () => {
-      flightDeck.stopAllServices();
-      await flightDeck.dead;
+      await flightDeck.stopAllServices();
     });
   }
 }

package/dist/lib.d.ts

@@ -23,6 +23,7 @@ declare class FlightDeck<S extends string = string> {
     protected webhookServer: Server;
     protected services: {
         [service in S]: ChildSocket<{
+            timeToStop: [];
             updatesReady: [];
         }, {
             readyToUpdate: [];
@@ -50,13 +51,13 @@ declare class FlightDeck<S extends string = string> {
     protected restartTimes: number[];
     protected persistentStateDir: string;
     constructor(options: FlightDeckOptions<S>);
-    protected startAllServices(): void;
+    protected tryUpdate(): void;
+    protected startAllServices(): Future<unknown>;
     protected startService(serviceName: S): void;
     protected applyUpdate(): void;
     protected getLatestRelease(): void;
-    stopAllServices(): void;
+    stopAllServices(): Future<unknown>;
     stopService(serviceName: S): void;
-    shutdown(): void;
 }
 
 type AlertOptions = {

package/dist/lib.js

@@ -202,8 +202,7 @@ class FlightDeck {
                         }
                         this.getLatestRelease();
                         if (toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)) {
-                          this.logger.info(`All services are ready to update!`);
-                          this.stopAllServices();
+                          this.tryUpdate();
                           return;
                         }
                         for (const entry of toEntries(this.services)) {
@@ -240,13 +239,40 @@ class FlightDeck {
         this.logger.info(`Server started on port ${port}`);
       });
     }
-    this.startAllServices();
+    this.startAllServices().then(() => {
+      this.logger.info(`All services started.`);
+    }).catch((thrown) => {
+      if (thrown instanceof Error) {
+        this.logger.error(`Failed to start all services:`, thrown.message);
+      }
+    });
+  }
+  tryUpdate() {
+    if (toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)) {
+      this.logger.info(`All services are ready to update.`);
+      this.stopAllServices().then(() => {
+        this.logger.info(`All services stopped; starting up fresh...`);
+        this.startAllServices().then(() => {
+          this.logger.info(`All services started; we're back online.`);
+        }).catch((thrown) => {
+          if (thrown instanceof Error) {
+            this.logger.error(`Failed to start all services:`, thrown.message);
+          }
+        });
+      }).catch((thrown) => {
+        if (thrown instanceof Error) {
+          this.logger.error(`Failed to stop all services:`, thrown.message);
+        }
+      });
+    }
   }
   startAllServices() {
     this.logger.info(`Starting all services...`);
+    this.servicesShouldRestart = true;
     for (const [serviceName] of toEntries(this.services)) {
       this.startService(serviceName);
     }
+    return this.live;
   }
   startService(serviceName) {
     this.logger.info(`Starting service ${this.options.packageName}::${serviceName}, try ${this.safety}/2...`);
@@ -274,10 +300,7 @@ class FlightDeck {
     this.services[serviceName].on(`readyToUpdate`, () => {
       this.serviceLoggers[serviceName].info(`Ready to update.`);
       this.servicesReadyToUpdate[serviceName] = true;
-      if (toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)) {
-        this.logger.info(`All services are ready to update.`);
-        this.stopAllServices();
-      }
+      this.tryUpdate();
     });
     this.services[serviceName].on(`alive`, () => {
       this.servicesLive[this.serviceIdx[serviceName]].use(Promise.resolve());
@@ -289,7 +312,7 @@ class FlightDeck {
       }
       this.dead.use(Promise.all(this.servicesDead));
     });
-    this.services[serviceName].process.on(`close`, (exitCode) => {
+    this.services[serviceName].process.once(`close`, (exitCode) => {
       this.serviceLoggers[serviceName].info(`Exited with code ${exitCode}`);
       this.services[serviceName] = null;
       if (!this.servicesShouldRestart) {
@@ -350,16 +373,25 @@ class FlightDeck {
   }
   stopAllServices() {
     this.logger.info(`Stopping all services...`);
+    this.servicesShouldRestart = false;
     for (const [serviceName] of toEntries(this.services)) {
       this.stopService(serviceName);
     }
+    return this.dead;
   }
   stopService(serviceName) {
-    if (this.services[serviceName]) {
+    const service = this.services[serviceName];
+    if (service) {
       this.serviceLoggers[serviceName].info(`Stopping service...`);
-      this.services[serviceName].process.kill(`SIGINT`);
-      this.services[serviceName] = null;
-      this.servicesDead[this.serviceIdx[serviceName]].use(Promise.resolve());
+      this.servicesDead[this.serviceIdx[serviceName]].use(new Promise((pass) => {
+        service.emit(`timeToStop`);
+        service.process.once(`close`, (exitCode) => {
+          this.logger.info(`\uD83D\uDEEC service ${serviceName} exited with code ${exitCode}`);
+          this.services[serviceName] = null;
+          pass();
+        });
+      }));
+      this.dead.use(Promise.all(this.servicesDead));
       this.servicesLive[this.serviceIdx[serviceName]] = new Future(() => {
       });
       if (this.live.done) {
@@ -371,11 +403,6 @@ class FlightDeck {
       this.serviceLoggers[serviceName].error(`Tried to stop service, but it wasn't running.`);
     }
   }
-  shutdown() {
-    this.logger.info(`Shutting down...`);
-    this.servicesShouldRestart = false;
-    this.stopAllServices();
-  }
 }
 // src/klaxon.lib.ts
 var exports_klaxon_lib = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flightdeck",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "license": "MIT",
   "author": {
     "name": "Jeremy Banka",
@@ -23,18 +23,18 @@
   "dependencies": {
     "@t3-oss/env-core": "0.11.1",
     "zod": "3.23.8",
-    "atom.io": "0.30.1",
+    "atom.io": "0.30.2",
     "comline": "0.1.6"
   },
   "devDependencies": {
-    "@types/node": "22.7.9",
+    "@types/node": "22.9.0",
     "@types/tmp": "0.2.6",
-    "bun-types": "1.1.33",
-    "concurrently": "9.0.1",
+    "bun-types": "1.1.34",
+    "concurrently": "9.1.0",
     "rimraf": "6.0.1",
     "tmp": "0.2.3",
-    "tsup": "8.3.0",
-    "vitest": "2.1.3"
+    "tsup": "8.3.5",
+    "vitest": "2.1.4"
   },
   "scripts": {
     "build": "rimraf dist && concurrently \"bun:build:*\" && concurrently \"bun:schema:*\"",

package/src/flightdeck.bin.ts

@@ -105,8 +105,7 @@ switch (inputs.case) {
 	default: {
 		const flightDeck = new FlightDeck(inputs.opts)
 		process.on(`close`, async () => {
-			flightDeck.stopAllServices()
-			await flightDeck.dead
+			await flightDeck.stopAllServices()
 		})
 	}
 }

package/src/flightdeck.lib.ts

@@ -28,7 +28,7 @@ export class FlightDeck<S extends string = string> {
 	protected webhookServer: Server
 	protected services: {
 		[service in S]: ChildSocket<
-			{ updatesReady: [] },
+			{ timeToStop: []; updatesReady: [] },
 			{ readyToUpdate: []; alive: [] }
 		> | null
 	}
@@ -174,8 +174,7 @@ export class FlightDeck<S extends string = string> {
 															([, isReady]) => isReady,
 														)
 													) {
-														this.logger.info(`All services are ready to update!`)
-														this.stopAllServices()
+														this.tryUpdate()
 														return
 													}
 													for (const entry of toEntries(this.services)) {
@@ -216,13 +215,50 @@ export class FlightDeck<S extends string = string> {
 		}
 
 		this.startAllServices()
+			.then(() => {
+				this.logger.info(`All services started.`)
+			})
+			.catch((thrown) => {
+				if (thrown instanceof Error) {
+					this.logger.error(`Failed to start all services:`, thrown.message)
+				}
+			})
+	}
+
+	protected tryUpdate(): void {
+		if (toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)) {
+			this.logger.info(`All services are ready to update.`)
+			this.stopAllServices()
+				.then(() => {
+					this.logger.info(`All services stopped; starting up fresh...`)
+					this.startAllServices()
+						.then(() => {
+							this.logger.info(`All services started; we're back online.`)
+						})
+						.catch((thrown) => {
+							if (thrown instanceof Error) {
+								this.logger.error(
+									`Failed to start all services:`,
+									thrown.message,
+								)
+							}
+						})
+				})
+				.catch((thrown) => {
+					if (thrown instanceof Error) {
+						this.logger.error(`Failed to stop all services:`, thrown.message)
+					}
+				})
+		}
 	}
 
-	protected startAllServices(): void {
+	protected startAllServices(): Future<unknown> {
 		this.logger.info(`Starting all services...`)
+		this.servicesShouldRestart = true
 		for (const [serviceName] of toEntries(this.services)) {
 			this.startService(serviceName)
 		}
+		return this.live
 	}
 
 	protected startService(serviceName: S): void {
@@ -261,12 +297,7 @@ export class FlightDeck<S extends string = string> {
 		this.services[serviceName].on(`readyToUpdate`, () => {
 			this.serviceLoggers[serviceName].info(`Ready to update.`)
 			this.servicesReadyToUpdate[serviceName] = true
-			if (
-				toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)
-			) {
-				this.logger.info(`All services are ready to update.`)
-				this.stopAllServices()
-			}
+			this.tryUpdate()
 		})
 		this.services[serviceName].on(`alive`, () => {
 			this.servicesLive[this.serviceIdx[serviceName]].use(Promise.resolve())
@@ -276,7 +307,7 @@ export class FlightDeck<S extends string = string> {
 			}
 			this.dead.use(Promise.all(this.servicesDead))
 		})
-		this.services[serviceName].process.on(`close`, (exitCode) => {
+		this.services[serviceName].process.once(`close`, (exitCode) => {
 			this.serviceLoggers[serviceName].info(`Exited with code ${exitCode}`)
 			this.services[serviceName] = null
 			if (!this.servicesShouldRestart) {
@@ -345,19 +376,32 @@ export class FlightDeck<S extends string = string> {
 		}
 	}
 
-	public stopAllServices(): void {
+	public stopAllServices(): Future<unknown> {
 		this.logger.info(`Stopping all services...`)
+		this.servicesShouldRestart = false
 		for (const [serviceName] of toEntries(this.services)) {
 			this.stopService(serviceName)
 		}
+		return this.dead
 	}
 
 	public stopService(serviceName: S): void {
-		if (this.services[serviceName]) {
+		const service = this.services[serviceName]
+		if (service) {
 			this.serviceLoggers[serviceName].info(`Stopping service...`)
-			this.services[serviceName].process.kill(`SIGINT`)
-			this.services[serviceName] = null
-			this.servicesDead[this.serviceIdx[serviceName]].use(Promise.resolve())
+			this.servicesDead[this.serviceIdx[serviceName]].use(
+				new Promise((pass) => {
+					service.emit(`timeToStop`)
+					service.process.once(`close`, (exitCode) => {
+						this.logger.info(
+							`🛬 service ${serviceName} exited with code ${exitCode}`,
+						)
+						this.services[serviceName] = null
+						pass()
+					})
+				}),
+			)
+			this.dead.use(Promise.all(this.servicesDead))
 			this.servicesLive[this.serviceIdx[serviceName]] = new Future(() => {})
 			if (this.live.done) {
 				this.live = new Future(() => {})
@@ -369,10 +413,4 @@ export class FlightDeck<S extends string = string> {
 			)
 		}
 	}
-
-	public shutdown(): void {
-		this.logger.info(`Shutting down...`)
-		this.servicesShouldRestart = false
-		this.stopAllServices()
-	}
 }