Use postMessage instead of a comlink produced MessageChannel

jupyterlite · Dec 15, 2024 · 19bd184 · 19bd184
1 parent 9a9c722
commit 19bd184
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/packages/pyodide-kernel/src/comlink.worker.ts b/packages/pyodide-kernel/src/comlink.worker.ts
@@ -29,6 +29,14 @@ class PyodideDriveFS extends DriveFS {
 }
 
 export class PyodideComlinkKernel extends PyodideRemoteKernel {
+  constructor() {
+    super();
+    this._sendWorkerMessage = (msg: any) => {
+      // use postMessage, but in a format, that comlink would not process.
+      postMessage({ jMsg: msg });
+    };
+  }
+
   /**
    * Setup custom Emscripten FileSystem
    */

diff --git a/packages/pyodide-kernel/src/kernel.ts b/packages/pyodide-kernel/src/kernel.ts
@@ -1,6 +1,6 @@
 import coincident from 'coincident';
 
-import { Remote, proxy, wrap } from 'comlink';
+import { Remote, wrap } from 'comlink';
 
 import { PromiseDelegate } from '@lumino/coreutils';
 
@@ -86,7 +86,13 @@ export class PyodideKernel extends BaseKernel implements IKernel {
       };
     } else {
       remote = wrap(this._worker) as IPyodideWorkerKernel;
-      remote.registerCallback(proxy(this._processWorkerMessage.bind(this)));
+      // we use the normal postMessage mechanism
+      this._worker.addEventListener('message', (ev) => {
+        if (typeof ev?.data?.jMsg !== 'undefined') {
+          // only process non comlink messages
+          this._processWorkerMessage(ev.data.jMsg);
+        }
+      });
     }
     const remoteOptions = this.initRemoteOptions(options);
     remote.initialize(remoteOptions).then(this._ready.resolve.bind(this._ready));