@cfasim-ui/pyodide 0.1.8 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfasim-ui/pyodide",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "type": "module",
   "description": "Pyodide (Python-in-browser) integration for cfasim-ui",
   "license": "Apache-2.0",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "pyodide": "^0.29.3",
-    "@cfasim-ui/shared": "0.1.8"
+    "@cfasim-ui/shared": "0.1.9"
   },
   "peerDependencies": {
     "vue": "^3.5.0"

package/src/pyodide.worker.ts

@@ -14,7 +14,6 @@ interface WorkerMessage {
 }
 
 let wheelMap: Record<string, string> = {};
-const loadedModules = new Set<string>();
 
 const baseUrl = import.meta.env.BASE_URL ?? "/";
 
@@ -44,28 +43,43 @@ const pyodideReadyPromise = (async () => {
   return pyodide;
 })();
 
-let wheelsInstalled = false;
+let installPromise: Promise<void> | null = null;
 
-async function installAllWheels() {
-  if (wheelsInstalled) return;
-  wheelsInstalled = true;
-  const urls = Object.values(wheelMap).map(
-    (f) => `${self.location.origin}${baseUrl}${f}`,
-  );
-  if (urls.length > 0) {
-    await micropip.install(urls);
+function installAllWheels(): Promise<void> {
+  if (!installPromise) {
+    installPromise = (async () => {
+      const urls = Object.values(wheelMap).map(
+        (f) => `${self.location.origin}${baseUrl}${f}`,
+      );
+      if (urls.length > 0) {
+        await micropip.install(urls);
+      }
+    })();
+    installPromise.catch(() => {
+      installPromise = null;
+    });
   }
+  return installPromise;
 }
 
-async function ensureModule(
+const modulePromises = new Map<string, Promise<void>>();
+
+function ensureModule(
   pyodide: Awaited<typeof pyodideReadyPromise>,
   moduleName: string,
-) {
-  if (loadedModules.has(moduleName)) return;
-  if (!wheelMap[moduleName]) throw new Error(`Unknown module: ${moduleName}`);
-  await installAllWheels();
-  pyodide.pyimport(moduleName);
-  loadedModules.add(moduleName);
+): Promise<void> {
+  if (!modulePromises.has(moduleName)) {
+    if (!wheelMap[moduleName]) throw new Error(`Unknown module: ${moduleName}`);
+    const promise = (async () => {
+      await installAllWheels();
+      pyodide.pyimport(moduleName);
+    })();
+    promise.catch(() => {
+      modulePromises.delete(moduleName);
+    });
+    modulePromises.set(moduleName, promise);
+  }
+  return modulePromises.get(moduleName)!;
 }
 
 // Map Python struct format characters to TypedArray constructors