From 9e219b07d883c9b5166730fd615f738d57096ab3 Mon Sep 17 00:00:00 2001
From: Lorenzo Blasa <lblasa@meta.com>
Date: Fri, 15 Sep 2023 05:29:40 -0700
Subject: [PATCH] Fix Loading page

Summary:
The existing loading page was not behaving the way it was intended. The previous implementation triggered a page reload which made the whole retry mechanism useless.

Instead, a new endpoint was defined to expose whether the server is ready or not. Use this instead as a way of knowing whether we are good to reload the page.

Reviewed By: passy

Differential Revision: D49314749

fbshipit-source-id: eb67765d7deab8610fa5d31e710070da43a18c1c
---
 .../flipper-server-core/src/server/startServer.tsx   |  5 +++++
 desktop/flipper-ui-browser/src/index.tsx             |  5 ++++-
 desktop/static/loading.html                          | 12 ++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/desktop/flipper-server-core/src/server/startServer.tsx b/desktop/flipper-server-core/src/server/startServer.tsx
index 53e4be19b..b6213b3ed 100644
--- a/desktop/flipper-server-core/src/server/startServer.tsx
+++ b/desktop/flipper-server-core/src/server/startServer.tsx
@@ -128,6 +128,11 @@ async function startHTTPServer(config: Config): Promise<{
     });
   });
 
+  app.get('/ready', (_req, res) => {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify({isReady}));
+  });
+
   app.get('/health', (_req, res) => {
     res.end('flipper-ok');
   });
diff --git a/desktop/flipper-ui-browser/src/index.tsx b/desktop/flipper-ui-browser/src/index.tsx
index 617a5073a..6fe3fc5cb 100644
--- a/desktop/flipper-ui-browser/src/index.tsx
+++ b/desktop/flipper-ui-browser/src/index.tsx
@@ -41,7 +41,10 @@ async function start() {
     token = manifest.token;
   }
 
-  console.info('Token is available: ' + token !== undefined && token?.length);
+  console.info(
+    '[flipper-client][ui-browser] Token is available: ',
+    token?.length,
+  );
 
   const openPlugin = params.get('open-plugin');
   if (openPlugin) {
diff --git a/desktop/static/loading.html b/desktop/static/loading.html
index 387580ee2..b7713e28b 100644
--- a/desktop/static/loading.html
+++ b/desktop/static/loading.html
@@ -52,10 +52,14 @@
     // the actual entry point instead of this page.
     async function checkAndReload() {
       try {
-        const response = await fetch('.');
-        if (response.status >= 200 && response.status < 500) {
-          window.location.reload();
-          return;
+        const response = await fetch('/ready');
+        if (response.status >= 200 && response.status < 300) {
+          const data = await response.text();
+          const {isReady} = JSON.parse(data);
+          if (isReady) {
+            window.location.reload();
+            return;
+          }
         }
       } catch {
       }