Fix mounting logic

jupyterlite · Sep 6, 2024 · 641a3a0 · 641a3a0
1 parent 9bef843
commit 641a3a0
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 69 deletions.
diff --git a/src/coincident.worker.ts b/src/coincident.worker.ts
@@ -44,27 +44,29 @@ export class XeusCoincidentKernel extends XeusRemoteKernel {
   /**
    * Setup custom Emscripten FileSystem
    */
-  protected async initFilesystem(
-    options: IXeusWorkerKernel.IOptions
+  async mount(
+    driveName: string,
+    mountpoint: string,
+    baseUrl: string
   ): Promise<void> {
-    if (options.mountDrive) {
-      const mountpoint = '/drive';
-      const { FS, PATH, ERRNO_CODES } = globalThis.Module;
-      const { baseUrl } = options;
+    const { FS, PATH, ERRNO_CODES } = globalThis.Module;
 
-      const driveFS = new XeusDriveFS({
-        FS,
-        PATH,
-        ERRNO_CODES,
-        baseUrl,
-        driveName: this._driveName,
-        mountpoint
-      });
-      FS.mkdir(mountpoint);
-      FS.mount(driveFS, {}, mountpoint);
-      FS.chdir(mountpoint);
-      this._driveFS = driveFS;
+    if (!FS) {
+      return;
     }
+
+    const drive = new XeusDriveFS({
+      FS,
+      PATH,
+      ERRNO_CODES,
+      baseUrl,
+      driveName,
+      mountpoint
+    });
+
+    FS.mkdir(mountpoint);
+    FS.mount(drive, {}, mountpoint);
+    FS.chdir(mountpoint);
   }
 }
 

diff --git a/src/comlink.worker.ts b/src/comlink.worker.ts
@@ -13,8 +13,6 @@ import {
   ServiceWorkerContentsAPI
 } from '@jupyterlite/contents';
 
-import { IXeusWorkerKernel } from './tokens';
-
 import { XeusRemoteKernel } from './worker';
 
 /**
@@ -36,27 +34,29 @@ export class XeusComlinkKernel extends XeusRemoteKernel {
   /**
    * Setup custom Emscripten FileSystem
    */
-  protected async initFilesystem(
-    options: IXeusWorkerKernel.IOptions
+  async mount(
+    driveName: string,
+    mountpoint: string,
+    baseUrl: string
   ): Promise<void> {
-    if (options.mountDrive) {
-      const mountpoint = '/drive';
-      const { FS, PATH, ERRNO_CODES } = globalThis.Module;
-      const { baseUrl } = options;
+    const { FS, PATH, ERRNO_CODES } = globalThis.Module;
 
-      const driveFS = new XeusDriveFS({
-        FS,
-        PATH,
-        ERRNO_CODES,
-        baseUrl,
-        driveName: this._driveName,
-        mountpoint
-      });
-      FS.mkdir(mountpoint);
-      FS.mount(driveFS, {}, mountpoint);
-      FS.chdir(mountpoint);
-      this._driveFS = driveFS;
+    if (!FS) {
+      return;
     }
+
+    const drive = new XeusDriveFS({
+      FS,
+      PATH,
+      ERRNO_CODES,
+      baseUrl,
+      driveName,
+      mountpoint
+    });
+
+    FS.mkdir(mountpoint);
+    FS.mount(drive, {}, mountpoint);
+    FS.chdir(mountpoint);
   }
 }
 

diff --git a/src/web_worker_kernel.ts b/src/web_worker_kernel.ts
@@ -4,7 +4,8 @@
 
 import coincident from 'coincident';
 
-import { Remote, proxy, wrap } from 'comlink';
+import { wrap } from 'comlink';
+import type { Remote } from 'comlink';
 
 import { ISignal, Signal } from '@lumino/signaling';
 import { PromiseDelegate } from '@lumino/coreutils';
@@ -90,8 +91,10 @@ export class WebWorkerKernel implements IKernel {
         return await this._contentsProcessor.processDriveRequest(data);
       };
     } else {
+      this._worker.onmessage = e => {
+        this._processWorkerMessage(e.data);
+      };
       remote = wrap(this._worker) as Remote<IXeusWorkerKernel>;
-      remote.registerCallback(proxy(this._processWorkerMessage.bind(this)));
     }
     remote
       .initialize({

diff --git a/src/worker.ts b/src/worker.ts
@@ -157,38 +157,9 @@ export class XeusRemoteKernel {
       }
     }
 
-    await this.initFilesystem(options);
-
     kernelReady(1);
   }
 
-  /**
-   * Setup custom Emscripten FileSystem
-   */
-  protected async initFilesystem(
-    options: IXeusWorkerKernel.IOptions
-  ): Promise<void> {
-    if (options.mountDrive) {
-      const mountpoint = '/drive';
-      const { FS, PATH, ERRNO_CODES } = globalThis.Module;
-      const { baseUrl } = options;
-      const { DriveFS } = await import('@jupyterlite/contents');
-
-      const driveFS = new DriveFS({
-        FS,
-        PATH,
-        ERRNO_CODES,
-        baseUrl,
-        driveName: this._driveName,
-        mountpoint
-      });
-      FS.mkdir(mountpoint);
-      FS.mount(driveFS, {}, mountpoint);
-      FS.chdir(mountpoint);
-      this._driveFS = driveFS;
-    }
-  }
-
   /**
    * Register the callback function to send messages from the worker back to the main thread.
    * @param callback the callback to register