From e4afa15c2c054591464825e5eb4a92226799dcc1 Mon Sep 17 00:00:00 2001
From: Ingvar Stepanyan <rreverser@google.com>
Date: Tue, 20 Jul 2021 16:14:14 +0000
Subject: [PATCH] Remove Wasm preload; instead, actually load it sooner

---
 ui.html |  1 -
 ui.js   | 16 +++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ui.html b/ui.html
index af43824..2fe561c 100644
--- a/ui.html
+++ b/ui.html
@@ -6,7 +6,6 @@
       href="https://unpkg.com/purecss@2.0.6/build/pure-min.css"
       crossorigin="anonymous"
     />
-    <link rel="preload" href="libapi.wasm" as="fetch" />
     <style>
       .center-parent {
         display: flex;
diff --git a/ui.js b/ui.js
index 768d2c2..50c3826 100644
--- a/ui.js
+++ b/ui.js
@@ -12,15 +12,17 @@ if (isDebug) {
 }
 
 /** This function should be called once user has selected the camera and other operations can begin. */
-let prepareContext;
+let start;
+
+let started = new Promise(resolve => {
+  start = resolve;
+});
 
 /** Schedules an exclusive async operation on the global context. */
 const scheduleOp = (() => {
   let queue = (async () => {
-    await new Promise(resolve => {
-      prepareContext = resolve;
-    });
     let { Context } = await initModule();
+    await started;
     let ctx = await new Context();
     addEventListener('beforeunload', e => {
       ctx.delete();
@@ -281,12 +283,12 @@ class App extends Component {
       }
       this.setState({ type: 'CameraPicker' });
     });
-    window.onerror = message => {
+    addEventListener('error', ({ message }) => {
       this.setState({
         type: 'Status',
         message: `⚠ ${message}`
       });
-    };
+    });
   }
 
   selectDevice = async () => {
@@ -303,7 +305,7 @@ class App extends Component {
   };
 
   connectToCamera() {
-    prepareContext();
+    start();
     this.setState({ type: 'Status', message: 'Connecting...' });
     (async () => {
       while (true) {