@wasm-oj/server 0.2.0 → 0.2.1

package/crates/runtime-core/src/deterministic.rs

@@ -903,6 +903,7 @@ pub fn attach_deterministic_imports(
     clock: VirtualClock,
     startup_entropy_bytes: u64,
 ) {
+    crate::stdio::attach_redirected_stdio(store, imports, &memory);
     let poll_memory = memory.clone();
     let env = FunctionEnv::new(
         store,

package/crates/runtime-core/src/lib.rs

@@ -16,6 +16,7 @@ mod module_imports;
 mod module_policy;
 mod output;
 mod run;
+mod stdio;
 mod types;
 
 pub use compiler::CompilerToolchain;

package/crates/runtime-core/src/stdio.rs

@@ -0,0 +1,56 @@
+use std::sync::{Arc, Mutex};
+use wasmer::{AsStoreMut, Extern, Function, FunctionEnv, Imports, Memory, RuntimeError, Value};
+use wasmer_wasix::wasmer_wasix_types::wasi::Filetype;
+
+struct StdioEnv {
+    original: Function,
+    memory: Arc<Mutex<Option<Memory>>>,
+}
+
+pub(crate) fn attach_redirected_stdio(
+    store: &mut impl AsStoreMut,
+    imports: &mut Imports,
+    memory: &Arc<Mutex<Option<Memory>>>,
+) {
+    for namespace in ["wasi_snapshot_preview1", "wasix_32v1", "wasix_64v1"] {
+        let Some(Extern::Function(original)) = imports.get_export(namespace, "fd_fdstat_get")
+        else {
+            continue;
+        };
+        let signature = original.ty(store);
+        let env = FunctionEnv::new(
+            store,
+            StdioEnv {
+                original,
+                memory: memory.clone(),
+            },
+        );
+        imports.define(
+            namespace,
+            "fd_fdstat_get",
+            Function::new_with_env(store, &env, signature, |mut env, arguments| {
+                let result = env.data().original.clone().call(&mut env, arguments)?;
+                if matches!(arguments.first(), Some(Value::I32(0..=2)))
+                    && matches!(result.as_ref(), [Value::I32(0)])
+                {
+                    let offset = match arguments[1] {
+                        Value::I32(offset) => u64::from(offset as u32),
+                        Value::I64(offset) => offset as u64,
+                        _ => return Err(RuntimeError::new("Invalid fdstat pointer type")),
+                    };
+                    let memory = env.data().memory.lock().unwrap();
+                    let memory = memory
+                        .as_ref()
+                        .ok_or_else(|| RuntimeError::new("Missing WASI memory"))?;
+                    // Wasmer hardcodes stdio as CharacterDevice even when backed by pipes.
+                    // WASI has no FIFO filetype; only replace the first fdstat field.
+                    memory
+                        .view(&env)
+                        .write(offset, &[Filetype::Unknown as u8])
+                        .map_err(|error| RuntimeError::new(error.to_string()))?;
+                }
+                Ok(result.into_vec())
+            }),
+        );
+    }
+}

package/dist/index.js

@@ -779,8 +779,8 @@ Object.freeze({
 });
 new TextEncoder();
 Object.freeze({
-	runtimeCoreWasmSha256: "92500f3a2e65fe6979e893179d8000e12d66822c160eeb779b0d4fe0a6b55603",
-	runtimeSourceRootSha256: "3ef42cb2c70e7013e4a6f9d4d7457a7071101795fbd3753efcd20c1ac338ebd5",
+	runtimeCoreWasmSha256: "e4c7fca566ff5ba66931e0cf11cacbf37610d35c36d5f3ee97d719468a2f6466",
+	runtimeSourceRootSha256: "0140ecc6ed5060eae465e73db6822bcde32295734517de84929a537e3c45e663",
 	wasmerNativeVersion: "7.2.1",
 	wasmerSdkVersion: "0.10.0",
 	wasmerSdkWasmSha256: "49a6646209f5ab5e7c737eac33407d87d9a9959ac83e5ecaaab9261b2323589e",
@@ -791,7 +791,7 @@ Object.freeze({
 * Release verification independently checks the component bytes before this
 * identity is admitted into a calibrated release.
 */
-var WASM_OJ_RUNTIME_IDENTITY_SHA256 = "24c0bcff9820fbfd1fd4db1c57e2a866b83041409dd22b5b725688739bd3e223";
+var WASM_OJ_RUNTIME_IDENTITY_SHA256 = "59414bf4fa5191d0942c0e190c69d32f3a2251461b8eb41aaba32598baab1d5f";
 //#endregion
 //#region src/core/cost-profile.ts
 function coordinates(language, target, optimization) {

package/dist/server-build-stage.mjs

@@ -562,8 +562,8 @@ Object.freeze({
 });
 new TextEncoder();
 Object.freeze({
-	runtimeCoreWasmSha256: "92500f3a2e65fe6979e893179d8000e12d66822c160eeb779b0d4fe0a6b55603",
-	runtimeSourceRootSha256: "3ef42cb2c70e7013e4a6f9d4d7457a7071101795fbd3753efcd20c1ac338ebd5",
+	runtimeCoreWasmSha256: "e4c7fca566ff5ba66931e0cf11cacbf37610d35c36d5f3ee97d719468a2f6466",
+	runtimeSourceRootSha256: "0140ecc6ed5060eae465e73db6822bcde32295734517de84929a537e3c45e663",
 	wasmerNativeVersion: "7.2.1",
 	wasmerSdkVersion: "0.10.0",
 	wasmerSdkWasmSha256: "49a6646209f5ab5e7c737eac33407d87d9a9959ac83e5ecaaab9261b2323589e",
@@ -574,7 +574,7 @@ Object.freeze({
 * Release verification independently checks the component bytes before this
 * identity is admitted into a calibrated release.
 */
-var WASM_OJ_RUNTIME_IDENTITY_SHA256 = "24c0bcff9820fbfd1fd4db1c57e2a866b83041409dd22b5b725688739bd3e223";
+var WASM_OJ_RUNTIME_IDENTITY_SHA256 = "59414bf4fa5191d0942c0e190c69d32f3a2251461b8eb41aaba32598baab1d5f";
 //#endregion
 //#region src/core/cost-profile.ts
 function coordinates(language, target, optimization) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wasm-oj/server",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Node.js compiler and runner host for the WASM-OJ SDK.",
   "license": "MIT",
   "author": "JacobLinCool",
@@ -58,8 +58,8 @@
     "node": ">=24.18.0 <25"
   },
   "dependencies": {
-    "@wasm-oj/contracts": "0.2.0",
-    "@wasm-oj/core": "0.2.0",
+    "@wasm-oj/contracts": "0.2.1",
+    "@wasm-oj/core": "0.2.1",
     "@wasmer/sdk": "0.10.0",
     "fflate": "0.8.3"
   },