Add Restarting status to be set from settings

Radiokot · Dec 1, 2023 · 5e89a9a · 5e89a9a
1 parent 5b0ca7d
commit 5e89a9a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 3 deletions.
diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
@@ -6,7 +6,9 @@
         ? "Unreacahable"
         : $tunnelStatus?.isOk()
           ? "Running"
-          : $tunnelStatus?.status;
+          : $tunnelStatus?.isRestarting()
+            ? "Restarting"
+            : $tunnelStatus?.status;
     $: isTunnelHealthy = $tunnelStatus?.isOk() == true;
     $: connecorVersion = $tunnelStatus?.version;
 </script>

diff --git a/src/model/TunnelStatus.js b/src/model/TunnelStatus.js
@@ -29,6 +29,13 @@ export default class TunnelStatus {
         return this.status == 'UNREACHABLE'
     }
 
+    /**
+     * @returns {boolean} if the tunnel is restarting
+     */
+    isRestarting() {
+        return this.status == 'RESTARTING'
+    }
+
     /**
      * 
      * @returns {boolean} if the tunnel is fine
@@ -44,4 +51,12 @@ export default class TunnelStatus {
     static from(json) {
         return new TunnelStatus(json.status, json.version, json.routes);
     }
+
+    /**
+     * Creates status of a restartung tunnel
+     * @returns {TunnelStatus}
+     */
+    static restarting() {
+        return new TunnelStatus('RESTARTING')
+    }
 }
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
@@ -1,6 +1,7 @@
 <script>
     import { PUBLIC_GUIDE_URL } from "$env/static/public";
     import TunnelSettings from "../../model/TunnelSettings";
+    import { setTunnelStatusRestarting } from "../../stores/tunnel-status";
 
     const tokenRegex = /[A-Za-z0-9+/]+={0,2}$/g;
 
@@ -18,11 +19,17 @@
         saveResult = null;
         try {
             await saveTunnelSettings();
+            try {
+                if (setTunnelStatusRestarting) {
+                    setTunnelStatusRestarting()
+                }
+            } catch {}
             saveResult = "The connector will restart in a moment.";
         } catch (err) {
-            console.error("onSaveClicked(): save_failed:", err)
+            console.error("onSaveClicked(): save_failed:", err);
 
-            saveResult = "Failed to save the settings. Check the dev console for errors.";
+            saveResult =
+                "Failed to save the settings. Check the dev console for errors.";
         } finally {
             isSavingSettings = false;
         }

diff --git a/src/stores/tunnel-status.js b/src/stores/tunnel-status.js
@@ -3,12 +3,21 @@ import { browser } from '$app/environment';
 
 import TunnelStatus from "../model/TunnelStatus";
 
+/**
+ * @type{(() => void)?}
+ */
+export let setTunnelStatusRestarting = null
+
 /**
  * Auto-updating tunnel status store.
  * 
  * @type {import("svelte/store").Readable<TunnelStatus?>}
  */
 export default readable(null, (set) => {
+    setTunnelStatusRestarting = () => {
+        set(TunnelStatus.restarting())
+    }
+
     const updateValue = async () => {
         let response = await fetch("/api/status");
         if (!response.ok) {