From 3292945887190a39a60ea58f9ab69601e6ecd1b4 Mon Sep 17 00:00:00 2001
From: Lorenzo Blasa <lblasa@meta.com>
Date: Wed, 13 Sep 2023 04:06:58 -0700
Subject: [PATCH] Launch should be blocking and at a later stage

Summary: This should be a blocking call and done later as it depends on the FlipperServerConfig to be set.

Reviewed By: antonk52

Differential Revision: D49193650

fbshipit-source-id: 4f74ca5de30b7f992880bbb9032792fd713203b7
---
 desktop/flipper-server-core/src/tracker.tsx |  1 +
 desktop/flipper-server/src/index.tsx        | 27 ++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/desktop/flipper-server-core/src/tracker.tsx b/desktop/flipper-server-core/src/tracker.tsx
index f694cec53..3549a7d97 100644
--- a/desktop/flipper-server-core/src/tracker.tsx
+++ b/desktop/flipper-server-core/src/tracker.tsx
@@ -32,6 +32,7 @@ type ServerBootstrapPerformancePayload = {
   appServerStartedMS: number;
   developmentServerAttachedMS: number;
   serverStartedMS: number;
+  launchedMS: number;
 };
 
 type TrackerEvents = {
diff --git a/desktop/flipper-server/src/index.tsx b/desktop/flipper-server/src/index.tsx
index e2d093d02..e5efd2d33 100644
--- a/desktop/flipper-server/src/index.tsx
+++ b/desktop/flipper-server/src/index.tsx
@@ -219,9 +219,6 @@ async function start() {
     `[flipper-server][bootstrap] HTTP server started (${httpServerStartedMS} ms)`,
   );
 
-  // At this point, the HTTP server is ready and listening.
-  launch();
-
   const flipperServer = await startFlipperServer(
     rootPath,
     staticPath,
@@ -238,14 +235,20 @@ async function start() {
     `[flipper-server][bootstrap] FlipperServer created (${serverCreatedMS} ms)`,
   );
 
+  // At this point, the HTTP server is ready and configuration is set.
+  await launch();
+
+  const t6 = performance.now();
+  const launchedMS = t6 - t5;
+
   exitHook(async () => {
     await flipperServer.close();
   });
 
   const companionEnv = await initCompanionEnv(flipperServer);
 
-  const t6 = performance.now();
-  const companionEnvironmentInitializedMS = t6 - t5;
+  const t7 = performance.now();
+  const companionEnvironmentInitializedMS = t7 - t6;
 
   console.info(
     `[flipper-server][bootstrap] Companion environment initialised (${companionEnvironmentInitializedMS} ms)`,
@@ -263,8 +266,8 @@ async function start() {
   }
   await flipperServer.connect();
 
-  const t7 = performance.now();
-  const appServerStartedMS = t7 - t6;
+  const t8 = performance.now();
+  const appServerStartedMS = t8 - t7;
   console.info(
     `[flipper-server][bootstrap] Ready for app connections (${appServerStartedMS} ms)`,
   );
@@ -273,15 +276,15 @@ async function start() {
     await attachDevServer(app, server, socket, rootPath);
   }
 
-  const t8 = performance.now();
-  const developmentServerAttachedMS = t8 - t7;
+  const t9 = performance.now();
+  const developmentServerAttachedMS = t9 - t8;
   console.info(
     `[flipper-server][bootstrap] Development server attached (${developmentServerAttachedMS} ms)`,
   );
   readyForIncomingConnections(flipperServer, companionEnv);
 
-  const t9 = performance.now();
-  const serverStartedMS = t9 - t8;
+  const t10 = performance.now();
+  const serverStartedMS = t10 - t9;
   console.info(
     `[flipper-server][bootstrap] Listening at port ${chalk.green(
       argv.port,
@@ -298,10 +301,12 @@ async function start() {
     appServerStartedMS,
     developmentServerAttachedMS,
     serverStartedMS,
+    launchedMS,
   });
 }
 
 async function launch() {
+  console.info('[flipper-server] Launch UI');
   const token = await getAuthToken();
 
   const searchParams = new URLSearchParams({token: token ?? ''});