@cfasim-ui/pyodide 0.6.4 → 0.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfasim-ui/pyodide",
-  "version": "0.6.4",
+  "version": "0.7.1",
   "type": "module",
   "description": "Pyodide (Python-in-browser) integration for cfasim-ui",
   "license": "Apache-2.0",
@@ -20,8 +20,7 @@
     "./vite": "./src/vitePlugin.js"
   },
   "dependencies": {
-    "pyodide": "^0.29.3",
-    "@cfasim-ui/shared": "0.6.4"
+    "@cfasim-ui/shared": "0.7.1"
   },
   "peerDependencies": {
     "vue": "^3.5.0"

package/src/messages.ts

@@ -0,0 +1,23 @@
+export interface RunMessage {
+  id: number;
+  type?: "run";
+  python: string;
+  context?: Record<string, unknown>;
+}
+export interface CallMessage {
+  id: number;
+  type: "call";
+  module: string;
+  fn: string;
+  kwargs?: Record<string, unknown>;
+}
+export interface LoadModuleMessage {
+  id: number;
+  type: "loadModule";
+  module: string;
+}
+export type WorkerMessage = RunMessage | CallMessage | LoadModuleMessage;
+export type OutgoingMessage =
+  | Omit<RunMessage, "id">
+  | Omit<CallMessage, "id">
+  | Omit<LoadModuleMessage, "id">;

package/src/pyodide.worker.ts

@@ -4,26 +4,7 @@ import {
   postErrorWithTransfer,
 } from "@cfasim-ui/shared/transfer";
 import type { ColumnDescriptor, ModelOutputsWire } from "@cfasim-ui/shared";
-
-interface RunMessage {
-  id: number;
-  type?: "run";
-  python: string;
-  context?: Record<string, unknown>;
-}
-interface CallMessage {
-  id: number;
-  type: "call";
-  module: string;
-  fn: string;
-  kwargs?: Record<string, unknown>;
-}
-interface LoadModuleMessage {
-  id: number;
-  type: "loadModule";
-  module: string;
-}
-type WorkerMessage = RunMessage | CallMessage | LoadModuleMessage;
+import type { WorkerMessage } from "./messages.js";
 
 let wheelMap: Record<string, string> = {};
 
@@ -63,8 +44,8 @@ async function fetchPyodidePackages(): Promise<string[]> {
 
 const pyodideReadyPromise = (async () => {
   const [pyodideModule, packages] = await Promise.all([
-    // @ts-expect-error - Pyodide types from CDN
     import(
+      // @ts-expect-error - Pyodide types from CDN
       /* @vite-ignore */ "https://cdn.jsdelivr.net/pyodide/v0.29.3/full/pyodide.mjs"
     ),
     fetchPyodidePackages(),

package/src/pyodideWorkerApi.ts

@@ -1,53 +1,18 @@
 import type { TransferableResponse } from "@cfasim-ui/shared";
-import { unwrapResponse } from "@cfasim-ui/shared";
+import {
+  unwrapResponse,
+  describeWorkerError,
+  MESSAGEERROR_TEXT,
+} from "@cfasim-ui/shared";
+import type { WorkerMessage, OutgoingMessage } from "./messages.js";
 
 let lastId = 0;
 function getId(): number {
   return ++lastId;
 }
 
-interface RunMessage {
-  id: number;
-  type?: "run";
-  python: string;
-  context?: Record<string, unknown>;
-}
-interface CallMessage {
-  id: number;
-  type: "call";
-  module: string;
-  fn: string;
-  kwargs?: Record<string, unknown>;
-}
-interface LoadModuleMessage {
-  id: number;
-  type: "loadModule";
-  module: string;
-}
-type WorkerMessage = RunMessage | CallMessage | LoadModuleMessage;
-type OutgoingMessage =
-  | Omit<RunMessage, "id">
-  | Omit<CallMessage, "id">
-  | Omit<LoadModuleMessage, "id">;
-
 export type PyodideResponse = { result?: unknown; error?: string };
 
-/**
- * Convert a worker `ErrorEvent` into a human-readable message. Cross-origin
- * worker failures sanitize the event so every field is null/empty (e.g. a
- * dynamic `import("https://cdn…")` that fails at module evaluation): in
- * that case we fall back to a hint about likely causes instead of an
- * empty string, which would otherwise surface as a blank error.
- */
-function describeWorkerError(e: ErrorEvent): string {
-  const msg = e.message || e.error?.message || "";
-  if (msg) {
-    if (e.filename) return `${msg} (${e.filename}:${e.lineno})`;
-    return msg;
-  }
-  return "Worker failed to load (no error details available — most often a cross-origin script load failure or a syntax error in the worker module)";
-}
-
 /**
  * Worker names are arbitrary string keys. Workers are spawned lazily on first
  * use; each one is an independent Pyodide interpreter. Use distinct names when
@@ -96,9 +61,7 @@ function getWorker(name: string): WorkerEntry {
       failAll(describeWorkerError(e));
     });
     worker.addEventListener("messageerror", () => {
-      failAll(
-        "Worker received a message it could not deserialize (messageerror)",
-      );
+      failAll(MESSAGEERROR_TEXT);
     });
     entry = newEntry;
     workers.set(name, entry);