@nimbus-sh/worker 0.1.4 → 0.1.6

package/dist/runtime/python-repl.js

@@ -28,6 +28,7 @@
  */
 import { ReplSession } from './repl-session.js';
 import { buildPyodidePreamble } from './python-runner.js';
+import { readPyodideRuntimeFiles } from './pyodide-runtime-assets.js';
 /**
  * Adapter that owns a NimbusLoaderPool for the lifetime of the REPL
  * session. Each push(line) is a fresh pool.submit() into the cached
@@ -124,24 +125,15 @@ class PythonReplAdapter {
         if (!vfs.exists(stdlibPath)) {
             throw new Error(`python_stdlib.zip missing at ${stdlibPath}`);
         }
-        const wasmBytes = vfs.readFile(wasmPath);
-        const jsBytes = vfs.readFile(jsPath);
-        const stdlibBytes = vfs.readFile(stdlibPath);
-        // Apply the same asm.js source-patches python-runner.ts:317-331 does.
-        let asmJsSrc = new TextDecoder('utf-8').decode(jsBytes);
-        const PATCH_NEEDLE = 'else throw new Error("Cannot determine runtime environment")';
-        const PATCH_REPLACE = '/* nimbus-patch: was: ' + PATCH_NEEDLE + ' */';
-        if (asmJsSrc.includes(PATCH_NEEDLE)) {
-            asmJsSrc = asmJsSrc.replace(PATCH_NEEDLE, PATCH_REPLACE);
-        }
-        const HEAD_NEEDLE = 'if(d.IN_BROWSER_MAIN_THREAD)';
-        const HEAD_REPLACE = 'if(true||d.IN_BROWSER_MAIN_THREAD)';
-        if (asmJsSrc.includes(HEAD_NEEDLE)) {
-            asmJsSrc = asmJsSrc.replace(HEAD_NEEDLE, HEAD_REPLACE);
-        }
-        // Encode stdlib bytes to base64 for splice into preamble.
-        const stdlibB64 = uint8ToBase64(stdlibBytes);
-        const preamble = buildPyodidePreamble(asmJsSrc, stdlibB64);
+        const files = readPyodideRuntimeFiles({
+            asmWasmVfs: wasmPath,
+            asmJsVfs: jsPath,
+            stdlibVfs: stdlibPath,
+            lockfileVfs: `${installRoot}/share/pyodide/pyodide-lock.json`,
+            manifest: this.deps.manifest,
+            vfs,
+        });
+        const preamble = buildPyodidePreamble(files.asmJsSrc, files.stdlibB64, files.lockfileText);
         // Create the pool. Tag MUST differ from 'python-runner' so REPL
         // sessions don't collide with one-shot dispatches in the loader
         // slot cache (different fnHash + different tag = separate slot).
@@ -153,14 +145,13 @@ class PythonReplAdapter {
             concurrency: 1,
             omitSupervisor: true,
             preamble,
+            wasmModules: {
+                'pyodide.asm.wasm': toAB(files.asmWasmBytes),
+            },
         });
-        // Stash the wasm bytes for first submit's wasmModules.
-        this.__wasmBytesAB = toAB(wasmBytes);
     }
     async submitFacetFn(args) {
-        const wasmModules = { 'pyodide.asm.wasm': this.__wasmBytesAB };
         return await this.pool.submit(replStepFacetFn, args, {
-            wasmModules,
             timeoutMs: 60_000,
         });
     }
@@ -535,16 +526,6 @@ function replStepFacetFn(args) {
 function toAB(u8) {
     return u8.buffer.slice(u8.byteOffset, u8.byteOffset + u8.byteLength);
 }
-/** Encode Uint8Array → base64 in chunks to avoid stack overflow on
- *  ~2 MiB stdlib payload. Mirrors python-runner.ts's helper. */
-function uint8ToBase64(u8) {
-    const CHUNK = 0x8000;
-    let s = '';
-    for (let i = 0; i < u8.length; i += CHUNK) {
-        s += String.fromCharCode.apply(null, Array.from(u8.subarray(i, Math.min(i + CHUNK, u8.length))));
-    }
-    return btoa(s);
-}
 /**
  * Top-level wrapper: builds a Python REPL adapter, drives a
  * ReplSession to completion, returns the exit code.
@@ -560,3 +541,8 @@ export async function runPythonRepl(deps) {
     const session = new ReplSession(adapter, deps.terminal, deps.shell);
     return await session.run();
 }
+export async function warmPythonRepl(deps) {
+    const adapter = new PythonReplAdapter(deps);
+    await adapter.push('');
+    await adapter.close();
+}

package/dist/runtime/python-runner.d.ts

@@ -8,18 +8,17 @@
  *   - exit code via sys.exit(N) or unhandled exception → 1
  *   - argv passed through to sys.argv
  *
- * Out of v1 (queued for v2/v3):
+ * Current limits:
  *   - REPL mode (`python` with no args)
- *   - File I/O beyond reading the entry script
- *   - `pip install` / `loadPackage` / native-extension packages
+ *   - Native Linux wheels, runtime-loaded extension modules, and extension builds
  *   - Sync HTTP (urllib3 / requests blocked without JSPI)
  *
  * Architecture: SAME LOADER-modules transport as clang-runner/wasm-
  * runner. The Pyodide wasm bytes ship via the LOADER `modules` map
  * (CSP allows wasm code-gen at module-load time, not at request
- * time). The Pyodide.asm.js + stdlib zip ride via the loader-pool
- * `context` field (JSON-stringified into the inner worker.js at
- * module-load).
+ * time). The workerd-adapted Pyodide.asm.js artifact and stdlib zip ride via
+ * the loader-pool `context` field (JSON-stringified into the inner worker.js
+ * at module-load).
  *
  * Per wasm-csp/findings.md §4b: Pyodide.asm.wasm (10.1 MB on disk)
  * compiles in 314 ms via LOADER on PROD. With our v1 deployment of
@@ -39,11 +38,11 @@ export declare function makePythonRunnerFactory(deps: {
     vfs: SqliteVFS;
 }): (manifest: RuntimeManifest, installRoot: string, binName: string, binKind: string | undefined) => (ctx: any) => Promise<number>;
 /**
- * Compose the per-call preamble by splicing the pyodide.asm.js source
- * verbatim ahead of the __pyodideRun helper. Workerd compiles this
+ * Compose the per-call preamble by splicing the workerd-adapted
+ * pyodide.asm.js source ahead of the __pyodideRun helper. Workerd compiles this
  * blob as JS at module-load time (where `var` declarations + globals
  * assignment are allowed), then the asm.js's `var _createPyodideModule`
  * is hoisted onto globalThis.
  */
-export declare function buildPyodidePreamble(asmJsSrc: string, stdlibB64: string): string;
+export declare function buildPyodidePreamble(asmJsSrc: string, stdlibB64: string, lockfileContents?: string): string;
 //# sourceMappingURL=python-runner.d.ts.map

package/dist/runtime/python-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"python-runner.d.ts","sourceRoot":"","sources":["../../src/runtime/python-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,QAAQ,EAAE,YAAY,CAAC;IACvB,GAAG,EAAE,SAAS,CAAC;CAChB,GAAG,CAAC,QAAQ,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,KAC7F,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,CA2HhC;AAkPD;;;;;;GAMG;AAKH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAyFhF"}
+{"version":3,"file":"python-runner.d.ts","sourceRoot":"","sources":["../../src/runtime/python-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAsCzD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,QAAQ,EAAE,YAAY,CAAC;IACvB,GAAG,EAAE,SAAS,CAAC;CAChB,GAAG,CAAC,QAAQ,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,KAC7F,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,CAgNhC;AAqzBD;;;;;;GAMG;AAKH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,SAAoB,GAAG,MAAM,CAyFtH"}