From 4f5bf2835c43699d61d6313abde4ec9a2329d025 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 5 Feb 2023 16:11:23 +0100
Subject: [PATCH] backend-app-api: tweak backend initializer to wait for
 startup before shutdown

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/wiring/BackendInitializer.ts          | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/packages/backend-app-api/src/wiring/BackendInitializer.ts b/packages/backend-app-api/src/wiring/BackendInitializer.ts
index d1139615f1..4bdee8b085 100644
--- a/packages/backend-app-api/src/wiring/BackendInitializer.ts
+++ b/packages/backend-app-api/src/wiring/BackendInitializer.ts
@@ -28,7 +28,7 @@ import {
 } from './types';
 
 export class BackendInitializer {
-  #started = false;
+  #startPromise?: Promise<void>;
   #features = new Map<BackendFeature, unknown>();
   #registerInits = new Array<BackendRegisterInit>();
   #extensionPoints = new Map<ExtensionPoint<unknown>, unknown>();
@@ -75,30 +75,40 @@ export class BackendInitializer {
   }
 
   add<TOptions>(feature: BackendFeature, options?: TOptions) {
-    if (this.#started) {
+    if (this.#startPromise) {
       throw new Error('feature can not be added after the backend has started');
     }
     this.#features.set(feature, options);
   }
 
   async start(): Promise<void> {
-    if (this.#started) {
+    if (this.#startPromise) {
       throw new Error('Backend has already started');
     }
-    this.#started = true;
 
-    for (const event of ['SIGTERM', 'SIGINT', 'beforeExit']) {
-      process.on(event, async () => {
-        try {
-          await this.stop();
-          process.exit(0);
-        } catch (error) {
-          console.error(error);
-          process.exit(1);
-        }
-      });
-    }
+    const exitHandler = async () => {
+      process.removeListener('SIGTERM', exitHandler);
+      process.removeListener('SIGINT', exitHandler);
+      process.removeListener('beforeExit', exitHandler);
 
+      try {
+        await this.stop();
+        process.exit(0);
+      } catch (error) {
+        console.error(error);
+        process.exit(1);
+      }
+    };
+
+    process.addListener('SIGTERM', exitHandler);
+    process.addListener('SIGINT', exitHandler);
+    process.addListener('beforeExit', exitHandler);
+
+    this.#startPromise = this.#doStart();
+    await this.#startPromise;
+  }
+
+  async #doStart(): Promise<void> {
     // Initialize all root scoped services
     for (const ref of this.#serviceHolder.getServiceRefs()) {
       if (ref.scope === 'root') {
@@ -189,9 +199,10 @@ export class BackendInitializer {
   }
 
   async stop(): Promise<void> {
-    if (!this.#started) {
+    if (!this.#startPromise) {
       return;
     }
+    await this.#startPromise;
 
     const lifecycleService = await this.#serviceHolder.get(
       coreServices.rootLifecycle,