Support in-memory I/O APIs

Cargo.toml

@@ -8,6 +8,7 @@ members = [
   "tests/fixtures/messagepack-valid",
   "tests/fixtures/messagepack-invalid",
   "tests/fixtures/wasm_api_v1",
+  "tests/fixtures/wasm_api_v2",
 ]
 
 [package]

src/engine.rs

@@ -1,13 +1,13 @@
 use anyhow::{anyhow, Result};
-use rust_embed::RustEmbed;
+use std::path::PathBuf;
 use std::string::String;
-use std::{collections::HashSet, path::PathBuf};
 use wasmtime::{AsContextMut, Config, Engine, Linker, Module, ResourceLimiter, Store};
-use wasmtime_wasi::pipe::{MemoryInputPipe, MemoryOutputPipe};
 use wasmtime_wasi::preview1::WasiP1Ctx;
-use wasmtime_wasi::{I32Exit, WasiCtxBuilder};
+use wasmtime_wasi::I32Exit;
 
 use crate::function_run_result::FunctionRunResult;
+use crate::io::{IOHandler, OutputAndLogs};
+use crate::validated_module::ValidatedModule;
 use crate::{BytesContainer, BytesContainerType};
 
 #[derive(Clone)]
@@ -16,44 +16,15 @@ pub struct ProfileOpts {
     pub out: PathBuf,
 }
 
-#[derive(RustEmbed)]
-#[folder = "providers/"]
-struct StandardProviders;
-
 pub fn uses_msgpack_provider(module: &Module) -> bool {
     module.imports().map(|i| i.module()).any(|module| {
-        module.starts_with("shopify_function_v") || module == "shopify_functions_javy_v2"
+        module.starts_with("shopify_function_v")
+            || module
+                .strip_prefix("shopify_functions_javy_v")
+                .is_some_and(|v| v.parse::<usize>().is_ok_and(|v| v >= 2))
     })
 }
 
-fn import_modules<T>(
-    module: &Module,
-    engine: &Engine,
-    linker: &mut Linker<T>,
-    mut store: &mut Store<T>,
-) {
-    let imported_modules: HashSet<String> =
-        module.imports().map(|i| i.module().to_string()).collect();
-
-    imported_modules.iter().for_each(|module_name| {
-        let provider_path = format!("{module_name}.wasm");
-        let imported_module_bytes = StandardProviders::get(&provider_path);
-
-        if let Some(bytes) = imported_module_bytes {
-            let imported_module = Module::from_binary(engine, &bytes.data)
-                .unwrap_or_else(|_| panic!("Failed to load module {module_name}"));
-
-            let imported_module_instance = linker
-                .instantiate(&mut store, &imported_module)
-                .expect("Failed to instantiate imported instance");
-
-            linker
-                .instance(&mut store, module_name, imported_module_instance)
-                .expect("Failed to import module");
-        }
-    });
-}
-
 pub struct FunctionRunParams<'a> {
     pub function_path: PathBuf,
     pub input: BytesContainer,
@@ -68,12 +39,12 @@ const STARTING_FUEL: u64 = u64::MAX;
 const MAXIMUM_MEMORIES: usize = 2; // 1 for the module, 1 for Javy's provider
 
 struct FunctionContext {
-    wasi: WasiP1Ctx,
+    wasi: Option<WasiP1Ctx>,
     limiter: MemoryLimiter,
 }
 
 impl FunctionContext {
-    fn new(wasi: WasiP1Ctx) -> Self {
+    fn new(wasi: Option<WasiP1Ctx>) -> Self {
         Self {
             wasi,
             limiter: Default::default(),
@@ -128,33 +99,29 @@ pub fn run(params: FunctionRunParams) -> Result<FunctionRunResult> {
         module,
     } = params;
 
-    let input_stream = MemoryInputPipe::new(input.raw.clone());
-    let output_stream = MemoryOutputPipe::new(usize::MAX);
-    let error_stream = MemoryOutputPipe::new(usize::MAX);
+    let mut io_handler = IOHandler::new(ValidatedModule::new(module)?, input.clone());
 
     let mut error_logs: String = String::new();
 
     let mut linker = Linker::new(&engine);
-    wasmtime_wasi::preview1::add_to_linker_sync(&mut linker, |ctx: &mut FunctionContext| {
-        &mut ctx.wasi
-    })?;
-    deterministic_wasi_ctx::replace_scheduling_functions(&mut linker)?;
-    let mut wasi_builder = WasiCtxBuilder::new();
-    wasi_builder.stdin(input_stream);
-    wasi_builder.stdout(output_stream.clone());
-    wasi_builder.stderr(error_stream.clone());
-    deterministic_wasi_ctx::add_determinism_to_wasi_ctx_builder(&mut wasi_builder);
-    let wasi = wasi_builder.build_p1();
+    let wasi = io_handler.wasi();
+    if wasi.is_some() {
+        wasmtime_wasi::preview1::add_to_linker_sync(&mut linker, |ctx: &mut FunctionContext| {
+            ctx.wasi.as_mut().expect("Should have WASI context")
+        })?;
+        deterministic_wasi_ctx::replace_scheduling_functions(&mut linker)?;
+    }
+
     let function_context = FunctionContext::new(wasi);
     let mut store = Store::new(&engine, function_context);
     store.limiter(|s| &mut s.limiter);
+
+    io_handler.initialize(&engine, &mut linker, &mut store)?;
+
     store.set_fuel(STARTING_FUEL)?;
     store.set_epoch_deadline(1);
 
-    import_modules(&module, &engine, &mut linker, &mut store);
-
-    linker.module(&mut store, "Function", &module)?;
-    let instance = linker.instantiate(&mut store, &module)?;
+    let instance = linker.instantiate(&mut store, io_handler.module())?;
 
     let func = instance.get_typed_func::<(), ()>(store.as_context_mut(), export)?;
 
@@ -163,7 +130,6 @@ pub fn run(params: FunctionRunParams) -> Result<FunctionRunResult> {
             .frequency(profile_opts.interval)
             .weight_unit(wasmprof::WeightUnit::Fuel)
             .profile(|store| func.call(store.as_context_mut(), ()));
-
         (
             result,
             Some(profile_data.into_collapsed_stacks().to_string()),
@@ -191,18 +157,14 @@ pub fn run(params: FunctionRunParams) -> Result<FunctionRunResult> {
         }
     }
 
-    drop(store);
-
-    let mut logs = error_stream
-        .try_into_inner()
-        .expect("Log stream reference still exists");
+    let OutputAndLogs {
+        output: raw_output,
+        mut logs,
+    } = io_handler.finalize(store)?;
 
     logs.extend_from_slice(error_logs.as_bytes());
 
     let output_codec = input.codec;
-    let raw_output = output_stream
-        .try_into_inner()
-        .expect("Output stream reference still exists");
     let output = BytesContainer::new(
         BytesContainerType::Output,
         output_codec,

src/function_run_result.rs

@@ -3,7 +3,7 @@ use colored::Colorize;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 
-const FUNCTION_LOG_LIMIT: usize = 1_000;
+pub(crate) const FUNCTION_LOG_LIMIT: usize = 1_000;
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct InvalidOutput {