From 7e3f9edacf6a96e821a7e1850b598b6e303fae1c Mon Sep 17 00:00:00 2001
From: AAGaming <aagaming@riseup.net>
Date: Mon, 19 Feb 2024 23:42:24 -0500
Subject: clean up updater logic

---
 frontend/src/components/settings/pages/general/Updater.tsx | 3 +--
 frontend/src/index.ts                                      | 2 +-
 frontend/src/updater.ts                                    | 4 ++++
 frontend/src/wsrouter.ts                                   | 6 ++----
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'frontend')

diff --git a/frontend/src/components/settings/pages/general/Updater.tsx b/frontend/src/components/settings/pages/general/Updater.tsx
index 29d26435..01aeb4c3 100644
--- a/frontend/src/components/settings/pages/general/Updater.tsx
+++ b/frontend/src/components/settings/pages/general/Updater.tsx
@@ -80,10 +80,9 @@ export default function UpdaterSettings() {
       setIsLoaderUpdating(true);
     });
 
-    const b = DeckyBackend.addEventListener('frontend/finish_download', async () => {
+    const b = DeckyBackend.addEventListener('frontend/finish_download', () => {
       setUpdateProgress(0);
       setReloading(true);
-      await doRestart();
     });
 
     return () => {
diff --git a/frontend/src/index.ts b/frontend/src/index.ts
index 1ca06b0e..91324b4f 100644
--- a/frontend/src/index.ts
+++ b/frontend/src/index.ts
@@ -2,7 +2,7 @@
 (async () => {
   console.debug('Setting up decky-frontend-lib...');
   window.DFL = await import('decky-frontend-lib');
-  console.debug('Authenticating to Decky backend...');
+  console.debug('Authenticating with Decky backend...');
   window.deckyAuthToken = await fetch('http://127.0.0.1:1337/auth/token').then((r) => r.text());
   console.debug('Connecting to Decky backend...');
   window.DeckyBackend = new (await import('./wsrouter')).WSRouter();
diff --git a/frontend/src/updater.ts b/frontend/src/updater.ts
index 2df1f2a5..edc9eeb3 100644
--- a/frontend/src/updater.ts
+++ b/frontend/src/updater.ts
@@ -27,3 +27,7 @@ export const doUpdate = DeckyBackend.callable('updater/do_update');
 export const doRestart = DeckyBackend.callable('updater/do_restart');
 export const getVersionInfo = DeckyBackend.callable<[], VerInfo>('updater/get_version_info');
 export const checkForUpdates = DeckyBackend.callable<[], VerInfo>('updater/check_for_updates');
+
+DeckyBackend.addEventListener('frontend/finish_download', async () => {
+  await doRestart();
+});
diff --git a/frontend/src/wsrouter.ts b/frontend/src/wsrouter.ts
index b3961125..778c03bf 100644
--- a/frontend/src/wsrouter.ts
+++ b/frontend/src/wsrouter.ts
@@ -84,9 +84,7 @@ export class WSRouter extends Logger {
       resolver.reject = reject;
     });
     resolver.promise = promise;
-    // The promise will always run first
-    // @ts-expect-error 2454
-    return resolver;
+    return resolver as PromiseResolver<T>;
   }
 
   async write(data: Message) {
@@ -167,7 +165,7 @@ export class WSRouter extends Logger {
               })();
             }
           } else {
-            this.debug(`event ${data.event} has no listeners`);
+            this.warn(`event ${data.event} has no listeners`);
           }
           break;
 
-- 
cgit v1.2.3