From 25253c56fc9a3bc10978bcd6a5b6ca83a3472131 Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Sat, 24 Feb 2024 20:54:01 -0800
Subject: [PATCH] fix: correctly detect failed iframe loads

---
 .../lib/Apps/GBAEmulator/GBAEmulator.svelte   | 32 +++++++++++--------
 client/src/lib/Apps/JSDoom/JSDoom.svelte      | 32 +++++++++++--------
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/client/src/lib/Apps/GBAEmulator/GBAEmulator.svelte b/client/src/lib/Apps/GBAEmulator/GBAEmulator.svelte
index c6362de..3d3ee32 100644
--- a/client/src/lib/Apps/GBAEmulator/GBAEmulator.svelte
+++ b/client/src/lib/Apps/GBAEmulator/GBAEmulator.svelte
@@ -1,18 +1,25 @@
 <script lang="ts">
-  import AppContainer from "../AppContainer.svelte";
-  import { Notifications } from "../../Notifications/notifications";
-  import { onMount } from "svelte";
-  import { gbaEmulatorBootupSequence } from "../../Sequences/sequences";
-
-  const handleError = () => {
-    Notifications.error(
-      "Failed to load the GBA Emulator app. Did you add it to the app/static/external-apps directory?"
-    );
-  };
+  import AppContainer from '../AppContainer.svelte'
+  import { Notifications } from '../../Notifications/notifications'
+  import { onMount } from 'svelte'
+  import { gbaEmulatorBootupSequence } from '../../Sequences/sequences'
 
   onMount(() => {
-    gbaEmulatorBootupSequence();
-  });
+    fetch('/static/external-apps/gba-emulator/index.html')
+      .then((res: Response) => {
+        if (!res.ok) {
+          throw new Error('GBA failed to load', { cause: res })
+        } else {
+          gbaEmulatorBootupSequence()
+        }
+      })
+      .catch(() => {
+        Notifications.error(
+          'Failed to load the GBA Emulator app. Did you add it to the app/static/external-apps directory?',
+          { duration: 10000 }
+        )
+      })
+  })
 </script>
 
 <AppContainer useContainer={false} class="h-screen w-full">
@@ -21,6 +28,5 @@
     src="/static/external-apps/gba-emulator/index.html"
     class="w-full h-screen rounded-xl"
     frameborder="0"
-    on:error={handleError}
   />
 </AppContainer>
diff --git a/client/src/lib/Apps/JSDoom/JSDoom.svelte b/client/src/lib/Apps/JSDoom/JSDoom.svelte
index 05a53f6..49622c0 100644
--- a/client/src/lib/Apps/JSDoom/JSDoom.svelte
+++ b/client/src/lib/Apps/JSDoom/JSDoom.svelte
@@ -1,18 +1,25 @@
 <script lang="ts">
-  import { onMount } from "svelte";
-  import AppContainer from "../AppContainer.svelte";
-  import { doomBootupSequence } from "../../Sequences/sequences";
-  import { Notifications } from "../../Notifications/notifications";
+  import { onMount } from 'svelte'
+  import AppContainer from '../AppContainer.svelte'
+  import { doomBootupSequence } from '../../Sequences/sequences'
+  import { Notifications } from '../../Notifications/notifications'
 
   onMount(() => {
-    doomBootupSequence();
-  });
-
-  const handleError = () => {
-    Notifications.error(
-      "Failed to load the Doom app. Did you add it to the app/static/external-apps directory?"
-    );
-  };
+    fetch('/static/external-apps/jsdoom/index.html')
+      .then((res: Response) => {
+        if (!res.ok) {
+          throw new Error('Doom failed to load', { cause: res })
+        } else {
+          doomBootupSequence()
+        }
+      })
+      .catch(() => {
+        Notifications.error(
+          'Failed to load the Doom app. Did you add it to the app/static/external-apps directory?',
+          { duration: 10000 }
+        )
+      })
+  })
 </script>
 
 <AppContainer>
@@ -21,6 +28,5 @@
     src="/static/external-apps/jsdoom/index.html"
     class="w-full h-screen rounded-xl"
     frameborder="0"
-    on:error={handleError}
   />
 </AppContainer>