From 4d81bf53bee582fc9194fcdb2d98888855d1032f Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <me@sebastinez.dev>
Date: Tue, 1 Oct 2024 15:53:27 +0200
Subject: [PATCH] Await event listeners and unlisten on unmount

---
 src/App.svelte | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 53d011b33..8c88e2d4c 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
-  import { onMount } from "svelte";
+  import type { UnlistenFn } from "@tauri-apps/api/event";
+
+  import { onDestroy, onMount } from "svelte";
 
   import { invoke } from "@tauri-apps/api/core";
   import { listen } from "@tauri-apps/api/event";
@@ -18,21 +20,20 @@
 
   const activeRouteStore = router.activeRouteStore;
 
+  let unlistenEvents: UnlistenFn | undefined = undefined;
+  let unlistenNodeEvents: UnlistenFn | undefined = undefined;
+
   onMount(async () => {
+    unlistenEvents = await listen("event", event => {
+      console.log(event.payload);
+    });
+
+    unlistenNodeEvents = await listen<boolean>("node_running", event => {
+      nodeRunning.set(event.payload);
+    });
+
     try {
-      await listen("event", event => {
-        console.log(event.payload);
-      });
-
-      await listen<boolean>("node_running", event => {
-        nodeRunning.set(event.payload);
-      });
-      // For development purposes don't run tauri commands when viewing from
-      // a browser.
-      if (window.__TAURI_INTERNALS__) {
-        await invoke("authenticate");
-      }
-
+      await invoke("authenticate");
       void router.loadFromLocation();
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any) {
@@ -46,6 +47,15 @@
     }
   });
 
+  onDestroy(() => {
+    if (unlistenEvents) {
+      unlistenEvents();
+    }
+    if (unlistenNodeEvents) {
+      unlistenNodeEvents();
+    }
+  });
+
   $: document.documentElement.setAttribute("data-theme", $theme);
 </script>