Cleanup

Author: hoodmane

src/pyodide/helpers.bzl

@@ -323,8 +323,6 @@ def _python_bundle(version, *, pyodide_asm_wasm = None, pyodide_asm_js = None, p
         internal_data_modules = [
             _out_path("python_stdlib.zip", version),
             _out_path("pyodide.asm.wasm", version),
-        ],
-        internal_modules = [
             _out_path("emscriptenSetup.js", version),
         ],
         deps = [
@@ -341,7 +339,7 @@ def _python_bundle(version, *, pyodide_asm_wasm = None, pyodide_asm_js = None, p
         srcs = [
             ":pyodide@%s.capnp" % version,
             "//src/workerd/jsg:modules.capnp",
-            _ts_bundle_out(import_name + "-internal_", "emscriptenSetup", version),
+            _ts_bundle_out(import_name + "-internal_", "emscriptenSetup.js", version),
             _ts_bundle_out(import_name + "-internal_", "pyodide.asm.wasm", version),
             _ts_bundle_out(import_name + "-internal_", "python_stdlib.zip", version),
         ],

src/pyodide/internal/pool/builtin_wrappers.ts

@@ -206,7 +206,7 @@ function prepareStackTrace(
   try {
     const funcName = stack[2].getFunctionName();
     const fileName = stack[2].getFileName();
-    if (fileName !== 'pyodideRuntime-internal:emscriptenSetup') {
+    if (fileName !== 'pyodide-internal:generated/emscriptenSetup') {
       return [false, funcName];
     }
     return [

src/pyodide/internal/pool/emscriptenSetup.ts

@@ -110,7 +110,7 @@ function getPrepareFileSystem(pythonStdlib: ArrayBuffer): PreRunHook {
 function getInstantiateWasm(
   pyodideWasmModule: WebAssembly.Module
 ): EmscriptenSettings['instantiateWasm'] {
-  const sentinelImportPromise = getSentinelImport(UnsafeEval);
+  const sentinelImportPromise = getSentinelImport();
   return function instantiateWasm(
     wasmImports: WebAssembly.Imports,
     successCallback: (
@@ -229,9 +229,7 @@ export async function instantiateEmscriptenModule(
   isWorkerd: boolean,
   pythonStdlib: ArrayBuffer,
   wasmModule: WebAssembly.Module,
-  unsafeEval: any
 ): Promise<Module> {
-  UnsafeEval = unsafeEval;
   setUnsafeEval(UnsafeEval);
   const emscriptenSettings = getEmscriptenSettings(
     isWorkerd,
@@ -248,6 +246,7 @@ export async function instantiateEmscriptenModule(
 
   // Wait until we've executed all the preRun hooks before proceeding
   const emscriptenModule = await emscriptenSettings.readyPromise;
+  emscriptenModule.setUnsafeEval = setUnsafeEval;
   emscriptenModule.setGetRandomValues = setGetRandomValues;
   emscriptenModule.setSetTimeout = setSetTimeout;
   finishSetup();

src/pyodide/internal/python.ts

@@ -22,9 +22,7 @@ import {
  * emscripten seperately from this code in another context.
  * The underlying code for it can be found in pool/emscriptenSetup.ts.
  */
-import { instantiateEmscriptenModule } from 'pyodideRuntime-internal:emscriptenSetup';
-import pythonStdlib from 'pyodideRuntime-internal:python_stdlib.zip';
-import wasmSource from 'pyodideRuntime-internal:pyodide.asm.wasm';
+import { default as SetupEmscripten } from 'internal:setup-emscripten';
 
 import { default as UnsafeEval } from 'internal:unsafe-eval';
 import { reportError } from 'pyodide-internal:util';
@@ -116,24 +114,21 @@ function validatePyodideVersion(pyodide: Pyodide): void {
   }
 }
 
-export async function loadPyodide(
+export function loadPyodide(
   isWorkerd: boolean,
   lockfile: PackageLock,
   indexURL: string
-): Promise<Pyodide> {
+): Pyodide {
   try {
-    const wasmModule = UnsafeEval.newWasmModule(wasmSource);
-    const Module = await instantiateEmscriptenModule(
-      true,
-      pythonStdlib,
-      wasmModule,
-      UnsafeEval
+    const Module = enterJaegerSpan('instantiate_emscripten', () =>
+      SetupEmscripten.getModule()
     );
     Module.API.config.jsglobals = globalThis;
     if (isWorkerd) {
       Module.API.config.indexURL = indexURL;
       Module.API.config.resolveLockFilePromise!(lockfile);
     }
+    Module.setUnsafeEval(UnsafeEval);
     Module.setGetRandomValues(getRandomValues);
     Module.setSetTimeout(setTimeout, clearTimeout, setInterval, clearInterval);
 

src/pyodide/types/emscripten.d.ts

@@ -99,6 +99,7 @@ interface Module {
   addRunDependency(x: string): void;
   removeRunDependency(x: string): void;
   noInitialRun: boolean;
+  setUnsafeEval(mod: typeof import('internal:unsafe-eval').default): void;
   setGetRandomValues(
     func: typeof import('pyodide-internal:topLevelEntropy/lib').getRandomValues
   ): void;

src/workerd/api/pyodide/setup-emscripten.c++

@@ -81,6 +81,8 @@ EmscriptenRuntime EmscriptenRuntime::initialize(
       pyodideAsmWasmReader = module.getData();
     }
   }
+  js.setAllowEval(true);
+  KJ_DEFER(js.setAllowEval(false));
   auto module = loadEmscriptenSetupModule(js, KJ_ASSERT_NONNULL(emsciptenSetupJsReader));
   instantiateEmscriptenSetupModule(js, module);
   auto instantiateEmscriptenModule = getInstantiateEmscriptenModule(js, module);

src/workerd/server/workerd-api.c++

@@ -712,13 +712,13 @@ void WorkerdApi::compileModules(jsg::Lock& lockParam,
       auto version = getPythonBundleName(pythonRelease);
       auto bundle = retrievePyodideBundle(impl->pythonConfig, version);
       // Inject SetupEmscripten module
-      // {
-      //   auto emscriptenRuntime =
-      //       api::pyodide::EmscriptenRuntime::initialize(lockParam, true, bundle);
-      //   modules->addBuiltinModule("internal:setup-emscripten",
-      //       jsg::alloc<SetupEmscripten>(kj::mv(emscriptenRuntime)),
-      //       workerd::jsg::ModuleRegistry::Type::INTERNAL);
-      // }
+      {
+        auto emscriptenRuntime =
+            api::pyodide::EmscriptenRuntime::initialize(lockParam, true, bundle);
+        modules->addBuiltinModule("internal:setup-emscripten",
+            jsg::alloc<SetupEmscripten>(kj::mv(emscriptenRuntime)),
+            workerd::jsg::ModuleRegistry::Type::INTERNAL);
+      }
 
       // Inject Pyodide bundle
       modules->addBuiltinBundle(bundle, kj::none);