@mayflowergmbh/wasmsh-pyodide 0.5.2 → 0.5.3

package/lib/node-module.mjs

@@ -1,10 +1,18 @@
 import { execFileSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
+import { createRequire } from "node:module";
 import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 
 import { createRuntimeBridge } from "./runtime-bridge.mjs";
 
+// Deno's Node compat layer exposes `process` (so Emscripten detects
+// ENVIRONMENT_IS_NODE) but does not provide CJS globals in ESM context.
+// pyodide.asm.js uses `require("fs")` in its Node path.
+if (typeof globalThis.require === "undefined") {
+  globalThis.require = createRequire(import.meta.url);
+}
+
 const fetchHelperPath = resolve(
   new URL(".", import.meta.url).pathname,
   "fetch-helper.mjs",
@@ -15,6 +23,8 @@ const fetchHelperPath = resolve(
  * fetch-helper.mjs. Request data is passed via stdin (no argv size limits).
  * Returns a JSON object with {status, headers, body_base64}.
  */
+const IS_DENO = typeof globalThis.Deno !== "undefined";
+
 export function syncHttpFetchNode(url, method, headersJson, bodyBase64, followRedirects) {
   const input = JSON.stringify({
     url,
@@ -24,9 +34,15 @@ export function syncHttpFetchNode(url, method, headersJson, bodyBase64, followRe
     follow_redirects: Boolean(followRedirects),
   });
   try {
+    // Under Deno, the fetch-helper subprocess needs --allow-net to make
+    // outbound requests. Extract the hostname and grant only that host.
+    const host = new URL(url).hostname;
+    const args = IS_DENO
+      ? ["run", `--allow-net=${host}`, fetchHelperPath]
+      : [fetchHelperPath];
     const out = execFileSync(
       process.execPath,
-      [fetchHelperPath],
+      args,
       { timeout: 30000, encoding: "utf-8", input, stdio: ["pipe", "pipe", "ignore"] },
     );
     return JSON.parse(out);
@@ -66,6 +82,22 @@ let _nodeModuleRef = null;
  * stubs and sentinel imports, then restore it after boot.
  */
 export async function createFullModule(distDir) {
+  // Polyfill __dirname/__filename for Deno — pyodide.asm.js needs them to
+  // resolve its own location. Must point to the assets dir, not this module.
+  const savedDirname = globalThis.__dirname;
+  const savedFilename = globalThis.__filename;
+  globalThis.__dirname = distDir;
+  globalThis.__filename = resolve(distDir, "pyodide.asm.js");
+
+  // Under Deno, pyodide.mjs's nodeLoadScript uses import() which loads
+  // pyodide.asm.js as ESM — but the glue is CJS and calls require("fs").
+  // Pre-load it via createRequire so _createPyodideModule is already
+  // defined as a global, skipping nodeLoadScript entirely.
+  if (IS_DENO && typeof globalThis._createPyodideModule === "undefined") {
+    const denoRequire = createRequire(resolve(distDir, "package.json"));
+    denoRequire("./pyodide.asm.js");
+  }
+
   // Import loadPyodide from the packaged pyodide.mjs
   const pyodideMjs = resolve(distDir, "pyodide.mjs");
   const { loadPyodide } = await import(pathToFileURL(pyodideMjs).href);
@@ -107,8 +139,10 @@ export async function createFullModule(distDir) {
       stderr: () => {},
     });
   } finally {
-    // Restore original WebAssembly.instantiate
+    // Restore original WebAssembly.instantiate and CJS globals
     WebAssembly.instantiate = origInstantiate;
+    globalThis.__dirname = savedDirname;
+    globalThis.__filename = savedFilename;
   }
 
   // The underlying Emscripten module is accessible via pyodide._module

package/node-host.mjs

@@ -1,7 +1,13 @@
+import { createRequire } from "node:module";
 import { dirname, resolve } from "node:path";
 import readline from "node:readline";
 import { fileURLToPath } from "node:url";
 
+// Polyfill CJS globals for Deno — Emscripten's pyodide.asm.js expects them.
+if (typeof globalThis.require === "undefined") {
+  globalThis.require = createRequire(import.meta.url);
+}
+
 import { isHostAllowed } from "./lib/allowlist.mjs";
 import { createFullModule } from "./lib/node-module.mjs";
 import {
@@ -42,6 +48,12 @@ class WasmshNodeHost {
     if (this.module && this.runtimeBridge) {
       return;
     }
+    // Polyfill __dirname/__filename for Deno — pyodide.asm.js needs them
+    // to resolve its own location within the asset directory.
+    if (typeof globalThis.__dirname === "undefined") {
+      globalThis.__dirname = this.assetDir;
+      globalThis.__filename = resolve(this.assetDir, "pyodide.asm.js");
+    }
     this.module = await createFullModule(this.assetDir);
     this.runtimeBridge = createRuntimeBridge(this.module);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mayflowergmbh/wasmsh-pyodide",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Pyodide-backed wasmsh runtime package for Node.js and browser workers",
   "type": "module",
   "main": "./index.js",