cleanup

src/pyodide/BUILD.bazel

@@ -82,7 +82,7 @@ copy_file(
 # TODO: all of these should be fixed by linking our own Pyodide or by upstreaming.
 
 PRELUDE = """
-import { newWasmModule, monotonicDateNow, wasmInstantiate } from "pyodide-internal:builtin_wrappers";
+import { newWasmModule, monotonicDateNow, wasmInstantiate, getRandomValues } from "pyodide-internal:builtin_wrappers";
 
 // Pyodide uses `new URL(some_url, location)` to resolve the path in `loadPackage`. Setting
 // `location = undefined` makes this throw an error if some_url is not an absolute url. Which is what
@@ -124,11 +124,7 @@ REPLACEMENTS = [
     ],
     [
         "crypto.getRandomValues(",
-        "Module.getRandomValues(Module, ",
-    ],
-    [
-        "(shouldRunNow)",
-        "(Module.noInitialRun)",
+        "getRandomValues(Module, ",
     ],
 ]
 

src/pyodide/internal/builtin_wrappers.ts

@@ -1,4 +1,5 @@
 import { default as UnsafeEval } from 'internal:unsafe-eval';
+export { getRandomValues } from 'pyodide-internal:topLevelEntropy/lib';
 
 let lastTime: number;
 let lastDelta = 0;

src/pyodide/internal/python.ts

@@ -1,17 +1,19 @@
 Error.stackTraceLimit = Infinity;
 import { enterJaegerSpan } from 'pyodide-internal:jaeger';
 import {
+  TRANSITIVE_REQUIREMENTS,
   SITE_PACKAGES,
   adjustSysPath,
   mountSitePackages,
   mountWorkerFiles,
 } from 'pyodide-internal:setupPackages';
+import { reportError } from 'pyodide-internal:util';
 import {
   SHOULD_RESTORE_SNAPSHOT,
   finishSnapshotSetup,
+  getSnapshotSettings,
   maybeSetupSnapshotUpload,
   restoreSnapshot,
-  preloadDynamicLibs,
 } from 'pyodide-internal:snapshot';
 import {
   entropyMountFiles,
@@ -202,10 +204,6 @@ async function prepareWasmLinearMemory(Module: Module): Promise<void> {
   // Note: if we are restoring from a snapshot, runtime is not initialized yet.
   mountSitePackages(Module, SITE_PACKAGES.rootInfo);
   entropyMountFiles(Module);
-  Module.noInitialRun = !SHOULD_RESTORE_SNAPSHOT;
-  preloadDynamicLibs(Module);
-  Module.getRandomValues = getRandomValues;
-  Module.removeRunDependency('dynlibs');
   if (SHOULD_RESTORE_SNAPSHOT) {
     restoreSnapshot(Module);
   }
@@ -224,8 +222,10 @@ export async function loadPyodide(
   lockfile: PackageLock,
   indexURL: string
 ): Promise<Pyodide> {
-  const Module = await setupEmscriptenModule(lockfile, indexURL);
-  // Finish setting up Pyodide's ffi so we can use the nice Python interface
+  const emscriptenSettings = getEmscriptenSettings(lockfile, indexURL);
+  const Module = await enterJaegerSpan('instantiate_emscripten', () =>
+    instantiateEmscriptenModule(emscriptenSettings)
+  );
   await enterJaegerSpan('prepare_wasm_linear_memory', () =>
     prepareWasmLinearMemory(Module)
   );

src/pyodide/internal/snapshot.ts

@@ -161,6 +161,17 @@ export function preloadDynamicLibs(Module: Module): void {
   }
 }
 
+export function getSnapshotSettings() {
+  return {
+    preRun: [preloadDynamicLibs],
+    // if SNAPSHOT_SIZE is defined, start with the linear memory big enough to
+    // fit the snapshot. If it's not defined, this falls back to the default.
+    INITIAL_MEMORY: SNAPSHOT_SIZE,
+    // skip running main() if we have a snapshot
+    noInitialRun: SHOULD_RESTORE_SNAPSHOT,
+  };
+}
+
 type DylinkInfo = {
   [name: string]: { handles: string[] };
 } & {
@@ -405,17 +416,12 @@ function decodeSnapshot(): void {
 }
 
 export function restoreSnapshot(Module: Module): void {
-  if (!READ_MEMORY || !SNAPSHOT_SIZE) {
+  if (!READ_MEMORY) {
     throw Error('READ_MEMORY not defined when restoring snapshot');
   }
-  Module.growMemory(SNAPSHOT_SIZE);
   READ_MEMORY(Module);
 }
 
-export function hasSnapshot() {
-  return !!READ_MEMORY;
-}
-
 let TEST_SNAPSHOT: Uint8Array | undefined = undefined;
 (function () {
   try {

src/pyodide/types/Module.d.ts

@@ -39,16 +39,4 @@ interface Module {
     opt: object,
     path: string
   ) => WebAssembly.Exports;
-  growMemory(newSize: number): void;
-  resolveGlobalSymbol(symName: string): { sym?: (...args: number[]) => number };
-  getExecutableName(): string;
-  HEAPU32: Uint32Array;
-  stringToUTF8OnStack(str: string): number;
-  stackAlloc(size: number): number;
-  exitJS(ret: number, implicit: boolean): never;
-  handleException(e: any): number;
-  addRunDependency(x: string): void;
-  removeRunDependency(x: string): void;
-  noInitialRun: boolean;
-  getRandomValues(Module: Module, x: Uint8Array): Uint8Array | undefined;
 }

src/pyodide/types/emscripten.d.ts

@@ -8,8 +8,8 @@ interface EmscriptenSettings {
     ) => void
   ) => WebAssembly.Exports;
   reportUndefinedSymbolsNoOp: () => void;
+  noInitialRun: boolean;
   API: {
     config: API['config'];
   };
-  readyPromise: Promise<Module>;
 }

src/workerd/jsg/setup.h

@@ -17,6 +17,7 @@
 
 #include <kj/map.h>
 #include <kj/mutex.h>
+
 namespace workerd::jsg {
 
 // Construct a default V8 platform, with the given background thread pool size.