@jupyterlite/xeus 3.1.5 → 4.0.0-a1

package/lib/interfaces.d.ts

@@ -62,6 +62,7 @@ export declare namespace IXeusWorkerKernel {
      */
     interface IOptions extends IWorkerKernel.IOptions {
         baseUrl: string;
+        kernelId: string;
         kernelSpec: any;
         mountDrive: boolean;
         empackEnvMetaLink?: string;

package/lib/web_worker_kernel.js

@@ -83,6 +83,7 @@ export class WebWorkerKernel {
         }
         remote
             .initialize({
+            kernelId: this._id,
             kernelSpec: this._kernelSpec,
             baseUrl: PageConfig.getBaseUrl(),
             mountDrive: options.mountDrive,

package/lib/worker.d.ts

@@ -1,4 +1,12 @@
 import { IXeusWorkerKernel } from './interfaces';
+import { ILogger } from '@emscripten-forge/mambajs';
+export declare class XeusWorkerLogger implements ILogger {
+    constructor(kernelId: string);
+    log(...msg: any[]): void;
+    warn(...msg: any[]): void;
+    error(...msg: any[]): void;
+    private _channel;
+}
 export declare class XeusRemoteKernel {
     constructor(options?: XeusRemoteKernel.IOptions);
     ready(): Promise<void>;
@@ -11,6 +19,7 @@ export declare class XeusRemoteKernel {
      * @param callback the callback to register
      */
     registerCallback(callback: (msg: any) => void): void;
+    private _logger;
     protected _sendWorkerMessage: (msg: any) => void;
 }
 export declare namespace XeusRemoteKernel {

package/lib/worker.js

@@ -36,6 +36,20 @@ self.get_stdin = get_stdin;
 globalThis.ready = new Promise(resolve => {
     kernelReady = resolve;
 });
+export class XeusWorkerLogger {
+    constructor(kernelId) {
+        this._channel = new BroadcastChannel(`/kernel-broadcast/${kernelId}`);
+    }
+    log(...msg) {
+        this._channel.postMessage({ type: 'log', msg: msg.join(' ') });
+    }
+    warn(...msg) {
+        this._channel.postMessage({ type: 'warn', msg: msg.join(' ') });
+    }
+    error(...msg) {
+        this._channel.postMessage({ type: 'error', msg: msg.join(' ') });
+    }
+}
 export class XeusRemoteKernel {
     constructor(options = {}) {
         this._sendWorkerMessage = () => { };
@@ -76,7 +90,8 @@ export class XeusRemoteKernel {
         }
     }
     async initialize(options) {
-        const { baseUrl, kernelSpec, empackEnvMetaLink } = options;
+        const { baseUrl, kernelSpec, empackEnvMetaLink, kernelId } = options;
+        this._logger = new XeusWorkerLogger(kernelId);
         // 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');
@@ -107,13 +122,13 @@ export class XeusRemoteKernel {
                 globalThis.Module.loadDynamicLibrary !== undefined) {
                 const empackEnvMetaLocation = empackEnvMetaLink || kernel_root_url;
                 const packagesJsonUrl = `${empackEnvMetaLocation}/empack_env_meta.json`;
-                const pkgRootUrl = URLExt.join(baseUrl, 'xeus/kernel_packages');
+                const pkgRootUrl = URLExt.join(baseUrl, `xeus/kernels/${kernelSpec.name}/kernel_packages`);
                 const empackEnvMeta = (await fetchJson(packagesJsonUrl));
                 const sharedLibs = await bootstrapEmpackPackedEnvironment({
                     empackEnvMeta,
                     pkgRootUrl,
                     Module: globalThis.Module,
-                    verbose: false
+                    logger: this._logger
                 });
                 // Bootstrap Python, if it's xeus-python
                 if (kernelSpec.name === 'xpython') {
@@ -121,6 +136,7 @@ export class XeusRemoteKernel {
                     if (!pythonVersion) {
                         throw new Error('Failed to load Python!');
                     }
+                    this._logger.log('Starting Python');
                     await bootstrapPython({
                         prefix: empackEnvMeta.prefix,
                         pythonVersion: pythonVersion,
@@ -131,25 +147,29 @@ export class XeusRemoteKernel {
                 await loadShareLibs({
                     sharedLibs,
                     prefix: empackEnvMeta.prefix,
-                    Module: globalThis.Module
+                    Module: globalThis.Module,
+                    logger: this._logger
                 });
             }
             rawXKernel = new globalThis.Module.xkernel();
             rawXServer = rawXKernel.get_server();
             if (!rawXServer) {
-                console.error('Failed to start kernel!');
+                this._logger.error('Failed to start kernel!');
             }
             rawXKernel.start();
         }
         catch (e) {
             if (typeof e === 'number') {
                 const msg = globalThis.Module.get_exception_message(e);
+                this._logger.error(msg);
                 throw new Error(msg);
             }
             else {
+                this._logger.error(e);
                 throw e;
             }
         }
+        this._logger.log('Kernel successfuly started!');
         kernelReady(1);
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jupyterlite/xeus",
-    "version": "3.1.5",
+    "version": "4.0.0-a1",
     "description": "JupyterLite Xeus kernels",
     "keywords": [
         "jupyter",
@@ -36,7 +36,7 @@
         "watch:src": "tsc -w --sourceMap"
     },
     "dependencies": {
-        "@emscripten-forge/mambajs": "^0.4.1",
+        "@emscripten-forge/mambajs": "^0.6.0",
         "@jupyterlab/coreutils": "^6",
         "@jupyterlab/services": "^7.3.4",
         "@jupyterlite/contents": "^0.2.0 || ^0.3.0 || ^0.4.5 || ^0.5.1",