Wrap errors to work around webworkers not handling onerror correctly?

mit-plv · Nov 21, 2023 · 2d0a173 · 2d0a173
1 parent b5447a2
commit 2d0a173
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/fiat-html/fiat_crypto_worker.js b/fiat-html/fiat_crypto_worker.js
@@ -1,5 +1,9 @@
 self.importScripts("fiat_crypto.js");
 self.onmessage = function(e) {
-    const result = synthesize(e.data);
-    postMessage(result);
+    try {
+        const result = synthesize(e.data);
+        postMessage({result: result});
+    } catch (err) {
+        postMessage({error: err});
+    }
 };
diff --git a/fiat-html/main.js b/fiat-html/main.js
@@ -231,9 +231,9 @@ document.addEventListener('DOMContentLoaded', function() {
                 const timeTaken = (endTime - startTime) / 1000;
                 const now = new Date();
                 const resultData = {
-                    result: e.data,
+                    result: success ? (e.data.error !== undefined ? e.data.error : e.data.result) : e.data,
                     time: timeTaken,
-                    success: success,
+                    success: success && e.data !== undefined && e.data.error === undefined,
                     timestamp: now.toISOString(),
                     version: SYNTHESIS_CACHE_VERSION,
                     fiat_crypto_version: fiat_crypto_version,