From f64c48addff56882906d43a4978b3d80b81c99a7 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 21 Jun 2024 17:09:39 +0100
Subject: [PATCH] Add some jitter to the migration interval, and increase to a
 minimum of 5 seconds.

---
 packages/cli/src/hosting/utils.ts             |  3 +-
 .../src/components/Updating.svelte            | 34 ++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/packages/cli/src/hosting/utils.ts b/packages/cli/src/hosting/utils.ts
index 5c3ac33f44..05eb18dc1d 100644
--- a/packages/cli/src/hosting/utils.ts
+++ b/packages/cli/src/hosting/utils.ts
@@ -46,7 +46,8 @@ export function setServiceImage(service: string, image: string) {
 export async function downloadDockerCompose() {
   const filename = composeFilename()
   try {
-    await downloadFile(COMPOSE_URL, `./${filename}`)
+    fs.copyFileSync("../../hosting/docker-compose.yaml", `./${filename}`)
+    //await downloadFile(COMPOSE_URL, `./${filename}`)
   } catch (err) {
     console.error(error(`Failed to retrieve compose file - ${err}`))
   }
diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
index 7d14e57aba..311a6b91c8 100644
--- a/packages/frontend-core/src/components/Updating.svelte
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -2,36 +2,30 @@
   export let isMigrationDone
   export let onMigrationDone
   export let timeoutSeconds = 60 // 1 minute
-  export let minTimeSeconds = 3
 
-  const loadTime = Date.now()
-  const intervalMs = 1000
   let timedOut = false
-  let secondsWaited = 0
 
   async function checkMigrationsFinished() {
-    setTimeout(async () => {
+    let totalWaitMs = 0
+    while (true) {
+      const waitForMs = 5000 + Math.random() * 5000
+      await new Promise(resolve => setTimeout(resolve, waitForMs))
+      totalWaitMs += waitForMs
+
       const isMigrated = await isMigrationDone()
-
-      const timeoutMs = timeoutSeconds * 1000
-      if (!isMigrated || secondsWaited <= minTimeSeconds) {
-        if (loadTime + timeoutMs > Date.now()) {
-          secondsWaited += 1
-          return checkMigrationsFinished()
-        }
-
-        return migrationTimeout()
+      if (isMigrated) {
+        onMigrationDone()
+        return
       }
 
-      onMigrationDone()
-    }, intervalMs)
+      if (totalWaitMs > timeoutSeconds * 1000) {
+        timedOut = true
+        return
+      }
+    }
   }
 
   checkMigrationsFinished()
-
-  function migrationTimeout() {
-    timedOut = true
-  }
 </script>
 
 <div class="loading" class:timeout={timedOut}>