From 8dbcf443723dc67d8d9aed89e7a1af57e5586d02 Mon Sep 17 00:00:00 2001
From: George Stagg <george.stagg@posit.co>
Date: Fri, 8 Mar 2024 09:47:57 +0000
Subject: [PATCH] Handle startup errors

---
 www/index.html |  9 +++++++
 www/index.js   | 66 +++++++++++++++++++++++++++++---------------------
 2 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/www/index.html b/www/index.html
index 645dfa1..f3e4693 100644
--- a/www/index.html
+++ b/www/index.html
@@ -19,6 +19,15 @@
   </div>
   <script src="https://cdn.jsdelivr.net/npm/d3@7"></script>
   <script src="https://cdn.jsdelivr.net/npm/@observablehq/plot@0.6"></script>
+  <script>
+    var Module = {};
+    Module.onRuntimeInitialized = () => {
+      doLoadData();
+    };
+    Module.onAbort = () => {
+      doAbort();
+    };
+  </script>
   <script src="mnist.js"></script>
   <script src="index.js"></script>
 </body>
diff --git a/www/index.js b/www/index.js
index cd0f464..835a9b4 100644
--- a/www/index.js
+++ b/www/index.js
@@ -26,7 +26,7 @@ function handleMouseMove(evt) {
   if (isDown) {
     drawCtx.lineTo(x, y);
     drawCtx.stroke();
-    do_classify();
+    doClassify();
   }
 }
 
@@ -38,7 +38,7 @@ function handleTouchMove(evt) {
   if (isDown) {
     drawCtx.lineTo(x, y);
     drawCtx.stroke();
-    do_classify();
+    doClassify();
   }
 }
 
@@ -122,33 +122,35 @@ function drawHist(classify) {
 
 // Download and initialise MNIST trained MLP weights
 let weights_ptr = -1;
-(async () => {
-  const response = await fetch("./mnist.data");
-  if (!response.ok) {
-    throw new Error(`Problem downloading model weights (${response.status})`);
-  }
-  const bytes = await response.arrayBuffer();
-  const floats = new Float64Array(bytes);
-  weights_ptr = Module._malloc(floats.byteLength);
-  Module.HEAPF64.set(floats, weights_ptr / 8);
-
-  // Ready to start
-  reset();
-  canvas.addEventListener("mousedown", handleDown);
-  canvas.addEventListener('touchstart', handleDown);
-  canvas.addEventListener("mousemove", handleMouseMove);
-  canvas.addEventListener('touchmove', handleTouchMove);
-  document.addEventListener('touchend', handleUp);
-  document.addEventListener("mouseup", handleUp);
-  document.getElementById("clear").addEventListener('click', reset);
-})().catch(err => {
-  drawCtx.fillStyle = "red";
-  drawCtx.font = "14px sans-serif bold";
-  drawCtx.fillText("An error occurred:", 5, 100);
-  drawCtx.fillText(err.message, 5, 120);
-});
+function doLoadData() {
+  (async () => {
+    const response = await fetch("./mnist.data");
+    if (!response.ok) {
+      throw new Error(`Problem downloading model weights (${response.status})`);
+    }
+    const bytes = await response.arrayBuffer();
+    const floats = new Float64Array(bytes);
+    weights_ptr = Module._malloc(floats.byteLength);
+    Module.HEAPF64.set(floats, weights_ptr / 8);
+
+    // Ready to start
+    reset();
+    canvas.addEventListener("mousedown", handleDown);
+    canvas.addEventListener('touchstart', handleDown);
+    canvas.addEventListener("mousemove", handleMouseMove);
+    canvas.addEventListener('touchmove', handleTouchMove);
+    document.addEventListener('touchend', handleUp);
+    document.addEventListener("mouseup", handleUp);
+    document.getElementById("clear").addEventListener('click', reset);
+  })().catch(err => {
+    drawCtx.fillStyle = "red";
+    drawCtx.font = "14px sans-serif bold";
+    drawCtx.fillText("An error occurred:", 5, 100);
+    drawCtx.fillText(err.message, 5, 120);
+  });
+}
 
-function do_classify() {
+function doClassify() {
   if (weights_ptr < 0) {
     throw new Error("Can't classify image. Weights not downloaded yet.");
   }
@@ -176,6 +178,14 @@ function do_classify() {
   Module._free(out_ptr);
 }
 
+// Handle Wasm startup problems
+function doAbort() {
+  drawCtx.fillStyle = "red";
+  drawCtx.font = "14px sans-serif bold";
+  drawCtx.fillText("An error occurred while starting Wasm:", 5, 100);
+  drawCtx.fillText("See the JavaScript console for details.", 5, 120);
+}
+
 // Canvas inital display
 reset();
 drawCtx.fillStyle = "#EEE";