Adding a way to load the runtime synchronously

ghadeeras · Dec 2, 2024 · ae103ef · ae103ef
1 parent 62b197a
commit ae103ef
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
                 "--require", "source-map-support/register",
                 "--timeout", "120000000",
                 // "--fgrep", ">>>",
-                "\"${workspaceFolder}/lib/test/**/*.test.js\"",
+                "\"${workspaceFolder}/out/test/**/*.test.js\"",
             ],
             "console": "integratedTerminal"
         }

diff --git a/src/prod/js/rt-node.ts b/src/prod/js/rt-node.ts
@@ -1,4 +1,5 @@
 import * as rt from "./rt.js"
+import * as wa from "./wa.js"
 import * as waNode from "./wa-node.js"
 
 import binaryen from 'binaryen'
@@ -124,3 +125,9 @@ export function addDelayImportsToModule(module: binaryen.Module) {
     module.addFunctionImport("item_ref", "delay", "item_ref", binaryen.createType([binaryen.i32, binaryen.i32]), binaryen.i32)
     module.addFunctionImport("rotate", "delay", "rotate", binaryen.createType([binaryen.i32]), binaryen.i32)
 }
+
+export function runtime(modulesLoader: wa.SyncModulesLoader = waNode.syncFsModulesLoader, rawMem: ArrayBuffer | null = null): rt.Runtime {
+    const modules = modulesLoader(import.meta.dirname + "/../wa", rt.runtimeModulePaths());
+    return rt.createRuntime(rawMem, modules);
+}
+
diff --git a/src/prod/js/rt.ts b/src/prod/js/rt.ts
@@ -146,12 +146,16 @@ export function runtimeModulePaths(): Record<RuntimeModuleNames, string> {
     }
 } 
 
-export async function runtime(waPath: string, modulesLoader: wa.ModulesLoader = wa.webModulesLoader, rawMem: ArrayBuffer | null = null): Promise<Runtime> {
-    const modules = await loadRuntimeModules(waPath, modulesLoader);
+export async function runtime(waPath: string = import.meta.url + "/../wa", modulesLoader: wa.ModulesLoader = wa.webModulesLoader, rawMem: ArrayBuffer | null = null): Promise<Runtime> {
+    const modules = await loadRuntimeModules(waPath, modulesLoader)
+    return createRuntime(rawMem, modules)
+}
+
+export function createRuntime(rawMem: ArrayBuffer | null, modules: wa.WebAssemblyModules<keyof RuntimeExports>) {
     if (rawMem) {
         modules.rawMem = new WebAssembly.Module(rawMem)
     }
-    return linkRuntime(modules);
+    return linkRuntime(modules)
 }
 
 export async function loadRuntimeModules(waPath: string, modulesLoader: wa.ModulesLoader = wa.webModulesLoader): Promise<wa.WebAssemblyModules<RuntimeModuleNames>> {

diff --git a/src/prod/js/wa-node.ts b/src/prod/js/wa-node.ts
@@ -5,6 +5,7 @@ import fs from 'fs'
 export * from "./wa.js"
 
 export const fsModulesLoader: wa.ModulesLoader = async (waPath, modulePaths) => fsLoadModules(waPath, modulePaths)
+export const syncFsModulesLoader: wa.SyncModulesLoader = (waPath, modulePaths) => fsLoadModules(waPath, modulePaths)
 
 export function fsLoadModules<N extends string>(waPath: string, modulePaths: wa.WebAssemblyModulePaths<N>): wa.WebAssemblyModules<N> {
     const result: wa.WebAssemblyModules<string> = {}

diff --git a/src/prod/js/wa.ts b/src/prod/js/wa.ts
@@ -4,6 +4,7 @@ export type WebAssemblyInstance = Pick<WebAssembly.Instance, any>
 export type WebAssemblyInstances<N extends string> = Record<N, WebAssemblyInstance>
 
 export type ModulesLoader = <N extends string>(waPath: string, modulePaths: WebAssemblyModulePaths<N>) => Promise<WebAssemblyModules<N>>
+export type SyncModulesLoader = <N extends string>(waPath: string, modulePaths: WebAssemblyModulePaths<N>) => WebAssemblyModules<N>
 
 export const webModulesLoader: ModulesLoader = webLoadModules