[Web] better error handling

nokotan · Apr 24, 2024 · d9c4e4b · d9c4e4b
1 parent d91d152
commit d9c4e4b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 35 deletions.
diff --git a/Siv3D/lib/Web/jslib/Siv3D.System.js b/Siv3D/lib/Web/jslib/Siv3D.System.js
@@ -172,13 +172,7 @@ mergeInto(LibraryManager.library, {
             let awake = siv3dAwakeFunction;
             siv3dAwakeFunction = null;
 
-            try {
-                awake();
-            } catch (e) {
-                handleException(e);
-            } finally {
-                maybeExit();
-            }
+            callUserCallback(awake);
         }
     },
     siv3dMaybeAwake__sig: "v",
@@ -187,13 +181,7 @@ mergeInto(LibraryManager.library, {
     siv3dRequestAnimationFrame: function() {
         Asyncify.handleSleep(function(wakeUp) {
             requestAnimationFrame(function() {
-                try {
-                    wakeUp();
-                } catch (e) {
-                    handleException(e);
-                } finally {
-                    maybeExit();
-                }
+                callUserCallback(wakeUp);
             });
         });
     },

diff --git a/Siv3D/lib/Web/jslib/Siv3D.pre.js b/Siv3D/lib/Web/jslib/Siv3D.pre.js
@@ -1,10 +1,8 @@
 (function() 
 {
-    Module["onAlert"] = Module["onAlert"] || function(text) {
-        window.alert(text);
-    };
-
-    const originalOnAbort = Module["onAbort"];
+    const onAbort = Module["onAbort"] || ((e) => {
+        window.alert(e);
+    });
 
     Module["onAbort"] = function(e) 
     {
@@ -17,27 +15,28 @@ Please refer https://webassembly.org/roadmap/ to check which webassembly feature
 \
 Original Error: " + e;
 
-            Module["onAlert"](additionalMessage);
+            onAbort(additionalMessage);
         }
         else if (e instanceof ProgressEvent)
         {
-            Module["onAlert"]("Browser seems to blocked fetch required assets. \
+            onAbort("Browser seems to blocked fetch required assets. \
 The application has been launched from explorer, which is not supported. \
 Please launch emrun or your favorite HTTP server and access this application through it.");
         }
         else if (e instanceof ReferenceError && e.message.includes("WebAssembly"))
         {
-            Module["onAlert"]("The application cannot be launched with this browser. \
+            onAbort("The application cannot be launched with this browser. \
 The application requires that this browser supports WebAssembly, which seems to be not available in this browser.\
 Please use another browser that supports WebAssembly.")
         }
-        else if (typeof e === "string" && e !== "" && e !== "native code called abort()")
+        else
         {
-            Module["siv3dSetThrowJSException"](e);
-        }
-
-        if (originalOnAbort) {
-            originalOnAbort(e);
+            onAbort(e);
         }
+        // Test stub: throw JSException instead of abort.
+        // else if (typeof e === "string" && e !== "" && e !== "native code called abort()")
+        // {
+        //     Module["siv3dSetThrowJSException"](e);
+        // }
     };
 })();
diff --git a/Web/App/Templates/Embeddable/web-player.html b/Web/App/Templates/Embeddable/web-player.html
@@ -366,7 +366,9 @@
 
       let hasRaiseRuntimeError = false;
 
-      function onRuntimeError() {
+      function handleRuntimeError(e) {
+        document.querySelector(".error-text").textContent = e.toString()
+
         progressElement.classList.add('progress-error');
         progressElement.style.width = '100%';
         progressElement.hidden = false;
@@ -378,10 +380,8 @@
         preRun: [],
         postRun: [ doResize, onAudioInit ],
         onAbort: function (e) {
-          onRuntimeError();
-        },
-        onAlert: function (text) {
-          document.querySelector(".error-text").textContent = text;
+          handleRuntimeError(e);
+          Options.onRuntimeExit();
         },
         canvas: (function () {
           var canvas = document.getElementById("canvas");
@@ -392,8 +392,7 @@
           canvas.addEventListener(
             "webglcontextlost",
             function (e) {
-                alert("WebGL context lost. You will need to reload the page.");
-                onRuntimeError();
+                handleRuntimeError("WebGL context lost. You will need to reload the page.");
                 e.preventDefault();
             },
             false