@jupyterlite/xeus 3.0.2 → 3.0.3

package/lib/worker.js

@@ -2,7 +2,7 @@
 // Copyright (c) JupyterLite Contributors
 // Distributed under the terms of the Modified BSD License.
 import { URLExt } from '@jupyterlab/coreutils';
-import { bootstrapFromEmpackPackedEnvironment } from '@emscripten-forge/mambajs';
+import { bootstrapEmpackPackedEnvironment, bootstrapPython, getPythonVersion, loadShareLibs, waitRunDependencies } from '@emscripten-forge/mambajs';
 globalThis.Module = {};
 // when a toplevel cell uses an await, the cell is implicitly
 // wrapped in a async function. Since the webloop - eventloop
@@ -24,22 +24,15 @@ async function get_stdin() {
     });
     return replyPromise;
 }
-self.get_stdin = get_stdin;
-async function waitRunDependency() {
-    const promise = new Promise(resolve => {
-        globalThis.Module.monitorRunDependencies = (n) => {
-            if (n === 0) {
-                resolve();
-            }
-        };
-    });
-    // If there are no pending dependencies left, monitorRunDependencies will
-    // never be called. Since we can't check the number of dependencies,
-    // manually trigger a call.
-    globalThis.Module.addRunDependency('dummy');
-    globalThis.Module.removeRunDependency('dummy');
-    return promise;
+async function fetchJson(url) {
+    const response = await fetch(url);
+    if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
+    }
+    const json = await response.json();
+    return json;
 }
+self.get_stdin = get_stdin;
 globalThis.ready = new Promise(resolve => {
     kernelReady = resolve;
 });
@@ -109,17 +102,38 @@ export class XeusRemoteKernel {
             }
         });
         try {
-            await waitRunDependency();
+            await waitRunDependencies(globalThis.Module);
             if (globalThis.Module.FS !== undefined &&
                 globalThis.Module.loadDynamicLibrary !== undefined) {
                 const empackEnvMetaLocation = empackEnvMetaLink || kernel_root_url;
-                const verbose = true;
                 const packagesJsonUrl = `${empackEnvMetaLocation}/empack_env_meta.json`;
                 const pkgRootUrl = URLExt.join(baseUrl, 'xeus/kernel_packages');
-                const bootstrapPython = kernelSpec.name === 'xpython';
-                await bootstrapFromEmpackPackedEnvironment(packagesJsonUrl, verbose, false, globalThis.Module, pkgRootUrl, bootstrapPython);
+                const empackEnvMeta = (await fetchJson(packagesJsonUrl));
+                const sharedLibs = await bootstrapEmpackPackedEnvironment({
+                    empackEnvMeta,
+                    pkgRootUrl,
+                    Module: globalThis.Module,
+                    verbose: true
+                });
+                // Bootstrap Python, if it's xeus-python
+                if (kernelSpec.name === 'xpython') {
+                    const pythonVersion = getPythonVersion(empackEnvMeta.packages);
+                    if (!pythonVersion) {
+                        throw new Error('Failed to load Python!');
+                    }
+                    await bootstrapPython({
+                        prefix: empackEnvMeta.prefix,
+                        pythonVersion: pythonVersion,
+                        Module: globalThis.Module
+                    });
+                }
+                // Load shared libs
+                await loadShareLibs({
+                    sharedLibs,
+                    prefix: empackEnvMeta.prefix,
+                    Module: globalThis.Module
+                });
             }
-            await waitRunDependency();
             rawXKernel = new globalThis.Module.xkernel();
             rawXServer = rawXKernel.get_server();
             if (!rawXServer) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jupyterlite/xeus",
-    "version": "3.0.2",
+    "version": "3.0.3",
     "description": "JupyterLite Xeus kernels",
     "keywords": [
         "jupyter",
@@ -36,12 +36,12 @@
         "watch:src": "tsc -w --sourceMap"
     },
     "dependencies": {
-        "@emscripten-forge/mambajs": "^0.2.2",
+        "@emscripten-forge/mambajs": "^0.3.1",
         "@jupyterlab/coreutils": "^6",
-        "@jupyterlab/services": "~7.2.5",
-        "@jupyterlite/contents": "^0.2.0 || ^0.3.0 || ^0.4.5",
-        "@jupyterlite/kernel": "^0.2.0 || ^0.3.0 || ^0.4.5",
-        "@jupyterlite/server": "^0.2.0 || ^0.3.0 || ^0.4.5",
+        "@jupyterlab/services": "^7.3.4",
+        "@jupyterlite/contents": "^0.2.0 || ^0.3.0 || ^0.4.5 || ^0.5.0",
+        "@jupyterlite/kernel": "^0.2.0 || ^0.3.0 || ^0.4.5 || ^0.5.0",
+        "@jupyterlite/server": "^0.2.0 || ^0.3.0 || ^0.4.5 || ^0.5.0",
         "@lumino/coreutils": "^2",
         "@lumino/signaling": "^2",
         "coincident": "^1.2.3",