@jupyterlite/xeus 3.0.0-a0 → 3.0.0-a2

package/lib/worker.js

@@ -2,6 +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';
 globalThis.Module = {};
 // when a toplevel cell uses an await, the cell is implicitly
 // wrapped in a async function. Since the webloop - eventloop
@@ -97,17 +98,24 @@ export class XeusRemoteKernel {
         });
         try {
             await waitRunDependency();
-            // each kernel can have a `async_init` function
-            // which can do kernel specific **async** initialization
-            // This function is usually implemented in the pre/post.js
-            // in the emscripten build of that kernel
-            if (globalThis.Module['async_init'] !== undefined) {
+            if (globalThis.Module.FS !== undefined &&
+                globalThis.Module.loadDynamicLibrary !== undefined) {
                 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);
+                const packagesJsonUrl = `${kernel_root_url}/empack_env_meta.json`;
+                const pkgRootUrl = URLExt.join(baseUrl, 'xeus/kernel_packages');
+                let packageData = {};
+                packageData = await bootstrapFromEmpackPackedEnvironment(packagesJsonUrl, verbose, false, globalThis.Module, pkgRootUrl);
+                if (kernelSpec.name === 'xpython') {
+                    if (Object.keys(packageData).length) {
+                        const { pythonVersion, prefix } = packageData;
+                        if (pythonVersion) {
+                            globalThis.Module.init_phase_2(prefix, pythonVersion, verbose);
+                        }
+                    }
+                }
             }
             await waitRunDependency();
             rawXKernel = new globalThis.Module.xkernel();
@@ -120,11 +128,9 @@ export class XeusRemoteKernel {
         catch (e) {
             if (typeof e === 'number') {
                 const msg = globalThis.Module.get_exception_message(e);
-                console.error(msg);
                 throw new Error(msg);
             }
             else {
-                console.error(e);
                 throw e;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jupyterlite/xeus",
-    "version": "3.0.0-a0",
+    "version": "3.0.0-a2",
     "description": "JupyterLite Xeus kernels",
     "keywords": [
         "jupyter",
@@ -36,11 +36,12 @@
         "watch:src": "tsc -w --sourceMap"
     },
     "dependencies": {
+        "@emscripten-forge/mambajs": "^0.1.0",
         "@jupyterlab/coreutils": "^6",
-        "@jupyterlab/services": "^7",
-        "@jupyterlite/contents": "^0.2.0 || ^0.3.0 || ^0.4.0",
-        "@jupyterlite/kernel": "^0.2.0 || ^0.3.0 || ^0.4.0",
-        "@jupyterlite/server": "^0.2.0 || ^0.3.0 || ^0.4.0",
+        "@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",
         "@lumino/coreutils": "^2",
         "@lumino/signaling": "^2",
         "coincident": "^1.2.3",