Handle messageerror, remove es6, check raf only for dedicated worker

webgpu · Jan 31, 2024 · 1aa49d9 · 1aa49d9
1 parent 9f6d451
commit 1aa49d9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 30 deletions.
diff --git a/index.js b/index.js
@@ -339,6 +339,14 @@ class WorkerHelper {
     });
     this._worker.onmessage = (e) => {
       const {id, data} = e.data;
+      if (data == "messageerror") {
+        this._bad = true;
+        // resolve all existing promises
+        this._promisesByIdMap.forEach(({resolve}) => {
+          resolve({});
+        });
+        return;
+      }
       this._messagesByIdMap.set(id, data);
       this._process(id);
     };
@@ -440,21 +448,13 @@ async function checkWorkers(workerType) {
     }
   }
 
-  addSupportsRow('requestAnimationFrame', rAF);
+  if (workerType === "dedicated") {
+    addSupportsRow('requestAnimationFrame', rAF);
+  }
   addSupportsRow('transferControlToOffscreen', offscreen);
   addSupportsRow('OffscreenCanvas', offscreenSupported);
   addSupportsRow('CanvasRenderingContext2D', twoD);
 
-  let moduleSupport = false;
-  try {
-    const workerModule = new WorkerHelper('worker-module.js');
-    const data = await workerModule.getMessage('ping');
-    moduleSupport = true;
-  } catch (e) {
-    //
-  }
-  addSupportsRow('es6 modules', moduleSupport);
-
   addElemToDocument(el('table', { className: 'worker' }, [
     el('tbody', {}, mapLikeToTableRows(obj, false)),
   ]));

diff --git a/worker-import.js b/worker-import.js
diff --git a/worker-module.js b/worker-module.js
diff --git a/worker.js b/worker.js
@@ -62,4 +62,7 @@ self.onconnect = function(e) {
   port.onmessage = function(event) {
     handleMessage.call(port, event);
   };
+  port.onmessageerror = function() {
+    port.postMessage({data: 'messageerror'});
+  };
 };