@jupyterlite/xeus 2.0.0 → 2.1.0

package/lib/index.d.ts

@@ -1,3 +1,4 @@
 import { JupyterLiteServerPlugin } from '@jupyterlite/server';
-declare const plugins: JupyterLiteServerPlugin<void>[];
+import { IEmpackEnvMetaFile } from './tokens';
+declare const plugins: JupyterLiteServerPlugin<void | IEmpackEnvMetaFile>[];
 export default plugins;

package/lib/index.js

@@ -6,6 +6,7 @@ import { IServiceWorkerManager } from '@jupyterlite/server';
 import { IBroadcastChannelWrapper } from '@jupyterlite/contents';
 import { IKernelSpecs } from '@jupyterlite/kernel';
 import { WebWorkerKernel } from './web_worker_kernel';
+import { IEmpackEnvMetaFile } from './tokens';
 function getJson(url) {
     const json_url = URLExt.join(PageConfig.getBaseUrl(), url);
     const xhr = new XMLHttpRequest();
@@ -26,8 +27,12 @@ const plugins = kernel_list.map((kernel) => {
         id: `@jupyterlite/xeus-${kernel}:register`,
         autoStart: true,
         requires: [IKernelSpecs],
-        optional: [IServiceWorkerManager, IBroadcastChannelWrapper],
-        activate: (app, kernelspecs, serviceWorker, broadcastChannel) => {
+        optional: [
+            IServiceWorkerManager,
+            IBroadcastChannelWrapper,
+            IEmpackEnvMetaFile
+        ],
+        activate: (app, kernelspecs, serviceWorker, broadcastChannel, empackEnvMetaFile) => {
             // Fetch kernel spec
             const kernelspec = getJson('xeus/kernels/' + kernel + '/kernel.json');
             kernelspec.name = kernel;
@@ -47,15 +52,34 @@ const plugins = kernel_list.map((kernel) => {
                     else {
                         console.warn(`${kernelspec.name} contents will NOT be synced with Jupyter Contents`);
                     }
+                    const link = empackEnvMetaFile
+                        ? await empackEnvMetaFile.getLink(kernelspec)
+                        : '';
                     return new WebWorkerKernel({
                         ...options,
                         contentsManager,
                         mountDrive,
-                        kernelSpec: kernelspec
+                        kernelSpec: kernelspec,
+                        empackEnvMetaLink: link
                     });
                 }
             });
         }
     };
 });
+const empackEnvMetaPlugin = {
+    id: '@jupyterlite/xeus:empack-env-meta',
+    autoStart: true,
+    provides: IEmpackEnvMetaFile,
+    activate: () => {
+        return {
+            getLink: async (kernelspec) => {
+                const kernelName = kernelspec.name;
+                const kernel_root_url = URLExt.join(PageConfig.getBaseUrl(), `xeus/kernels/${kernelName}`);
+                return `${kernel_root_url}`;
+            }
+        };
+    }
+};
+plugins.push(empackEnvMetaPlugin);
 export default plugins;

package/lib/tokens.d.ts

@@ -3,6 +3,7 @@
  */
 import { TDriveMethod, TDriveRequest, TDriveResponse } from '@jupyterlite/contents';
 import { IWorkerKernel } from '@jupyterlite/kernel';
+import { Token } from '@lumino/coreutils';
 /**
  * An interface for Xeus workers.
  */
@@ -64,5 +65,13 @@ export declare namespace IXeusWorkerKernel {
         baseUrl: string;
         kernelSpec: any;
         mountDrive: boolean;
+        empackEnvMetaLink?: string;
     }
 }
+export interface IEmpackEnvMetaFile {
+    /**
+     * Get empack_env_meta link.
+     */
+    getLink: (kernelspec: Record<string, any>) => Promise<string>;
+}
+export declare const IEmpackEnvMetaFile: Token<IEmpackEnvMetaFile>;

package/lib/tokens.js

@@ -1,3 +1,4 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
-export {};
+import { Token } from '@lumino/coreutils';
+export const IEmpackEnvMetaFile = new Token('@jupyterlite/xeus:IEmpackEnvMetaFile');

package/lib/web_worker_kernel.d.ts

@@ -88,6 +88,7 @@ export declare class WebWorkerKernel implements IKernel {
     private _parentHeader;
     private _parent;
     private _ready;
+    private _empackEnvMetaLink;
 }
 /**
  * A namespace for WebWorkerKernel statics.
@@ -100,5 +101,6 @@ export declare namespace WebWorkerKernel {
         contentsManager: Contents.IManager;
         mountDrive: boolean;
         kernelSpec: any;
+        empackEnvMetaLink?: string | undefined;
     }
 }

package/lib/web_worker_kernel.js

@@ -21,13 +21,14 @@ export class WebWorkerKernel {
         this._parentHeader = undefined;
         this._parent = undefined;
         this._ready = new PromiseDelegate();
-        const { id, name, sendMessage, location, kernelSpec, contentsManager } = options;
+        const { id, name, sendMessage, location, kernelSpec, contentsManager, empackEnvMetaLink } = options;
         this._id = id;
         this._name = name;
         this._location = location;
         this._kernelSpec = kernelSpec;
         this._contentsManager = contentsManager;
         this._sendMessage = sendMessage;
+        this._empackEnvMetaLink = empackEnvMetaLink;
         this._worker = this.initWorker(options);
         this._remoteKernel = this.initRemote(options);
         this.initFileSystem(options);
@@ -84,7 +85,8 @@ export class WebWorkerKernel {
             .initialize({
             kernelSpec: this._kernelSpec,
             baseUrl: PageConfig.getBaseUrl(),
-            mountDrive: options.mountDrive
+            mountDrive: options.mountDrive,
+            empackEnvMetaLink: this._empackEnvMetaLink
         })
             .then(this._ready.resolve.bind(this._ready));
         return remote;

package/lib/worker.js

@@ -84,7 +84,7 @@ export class XeusRemoteKernel {
         }
     }
     async initialize(options) {
-        const { baseUrl, kernelSpec } = options;
+        const { baseUrl, kernelSpec, empackEnvMetaLink } = options;
         // location of the kernel binary on the server
         const binary_js = URLExt.join(baseUrl, kernelSpec.argv[0]);
         const binary_wasm = binary_js.replace('.js', '.wasm');
@@ -104,7 +104,9 @@ export class XeusRemoteKernel {
             // This function is usually implemented in the pre/post.js
             // in the emscripten build of that kernel
             if (globalThis.Module['async_init'] !== undefined) {
-                const kernel_root_url = URLExt.join(baseUrl, `xeus/kernels/${kernelSpec.dir}`);
+                const kernel_root_url = empackEnvMetaLink
+                    ? empackEnvMetaLink
+                    : URLExt.join(baseUrl, `xeus/kernels/${kernelSpec.dir}`);
                 const pkg_root_url = URLExt.join(baseUrl, 'xeus/kernel_packages');
                 const verbose = true;
                 await globalThis.Module['async_init'](kernel_root_url, pkg_root_url, verbose);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jupyterlite/xeus",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "description": "JupyterLite loader for Xeus kernels",
     "keywords": [
         "jupyter",