From 83791b58171af93199680d840de663c59efab25f Mon Sep 17 00:00:00 2001
From: aidenlx <31102694+aidenlx@users.noreply.github.com>
Date: Tue, 6 Feb 2024 11:57:46 +0800
Subject: [PATCH] fix(webpage): improve logic to detect play timeout

---
 apps/app/src/lib/remote-player/provider.ts | 52 ++++++++++++++++++----
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/apps/app/src/lib/remote-player/provider.ts b/apps/app/src/lib/remote-player/provider.ts
index 939b82ca..73fb2164 100644
--- a/apps/app/src/lib/remote-player/provider.ts
+++ b/apps/app/src/lib/remote-player/provider.ts
@@ -162,20 +162,48 @@ export class WebiviewMediaProvider implements MediaProviderAdapter {
   }
 
   handlePlayReady() {
+    const finishLoad = new Promise<void>((_resolve, _reject) => {
+      const resolve = () => {
+        _resolve();
+        this.webview.removeEventListener("did-fail-load", reject);
+      };
+      const reject = (evt: Electron.DidFailLoadEvent) => {
+        _reject(new WebviewLoadError(evt));
+        this.webview.removeEventListener("did-finish-load", resolve);
+      };
+      this.webview.addEventListener("did-finish-load", resolve, {
+        once: true,
+      } as any);
+      this.webview.addEventListener("did-fail-load", reject, {
+        once: true,
+      } as any);
+    });
+    let timeoutId: number;
+    const timeout = (ms: number) =>
+      new Promise<void>((_, reject) => {
+        timeoutId = window.setTimeout(() => reject(new TimeoutError(ms)), ms);
+      });
     const playReady = new Promise<void>((resolve) => {
-      const cancel = this._port.once("mx-play-ready", () => {
+      this._port.once("mx-play-ready", () => {
         resolve();
         window.clearTimeout(timeoutId);
       });
-      const timeoutId = window.setTimeout(() => {
-        cancel();
-        resolve();
-        new Notice("Play ready timeout");
-      }, 10e3);
-    });
-    playReady.then(() => {
-      this.togglePlayReady(true);
     });
+
+    finishLoad
+      .then(() => Promise.race([playReady, timeout(10e3)]))
+      .then(() => {
+        this.togglePlayReady(true);
+      })
+      .catch((err) => {
+        if (err instanceof TimeoutError) {
+          new Notice("Webview failed to load plugin in time");
+        } else if (err instanceof WebviewLoadError) {
+          new Notice("Webview failed to load website: " + err.message);
+        } else {
+          throw err;
+        }
+      });
   }
 
   onDomReady = async (evt: Event) => {
@@ -265,3 +293,9 @@ export class WebiviewMediaProvider implements MediaProviderAdapter {
     // console.log("vidstack player loaded");
   }
 }
+
+class WebviewLoadError extends Error {
+  constructor(evt: Electron.DidFailLoadEvent) {
+    super(`${evt.errorCode}: ${evt.errorDescription}`);
+  }
+}