From bcdef43b3fbe0a0a67496708d872d5c7e7943d54 Mon Sep 17 00:00:00 2001 From: Hiram Chirino Date: Mon, 17 Mar 2025 12:13:05 -0400 Subject: [PATCH] Set wasi arguments to satisfy proxy-wasm spec requirements Signed-off-by: Hiram Chirino --- src/main/java/io/roastedroot/proxywasm/ABI.java | 12 ------------ .../java/io/roastedroot/proxywasm/ProxyWasm.java | 7 ++++++- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/main/java/io/roastedroot/proxywasm/ABI.java b/src/main/java/io/roastedroot/proxywasm/ABI.java index 5fff8a1..1f461fa 100644 --- a/src/main/java/io/roastedroot/proxywasm/ABI.java +++ b/src/main/java/io/roastedroot/proxywasm/ABI.java @@ -1891,16 +1891,4 @@ void proxyOnForeignFunction(int contextId, int functionId, int argumentsSize) { } proxyOnForeignFunctionFn.apply(contextId, functionId, argumentsSize); } - - // ////////////////////////////////////////////////////////////////////// - // Unimplemented WASI functions - // ////////////////////////////////////////////////////////////////////// - - // wasi_snapshot_preview1.args_sizes_get : - // https://github.com/proxy-wasm/spec/tree/main/abi-versions/vNEXT#wasi_snapshot_preview1args_sizes_get - // wasi_snapshot_preview1.args_get : - // https://github.com/proxy-wasm/spec/tree/main/abi-versions/vNEXT#wasi_snapshot_preview1args_get - // wasi_snapshot_preview1.proc_exit : - // https://github.com/proxy-wasm/spec/tree/main/abi-versions/vNEXT#wasi_snapshot_preview1proc_exit - } diff --git a/src/main/java/io/roastedroot/proxywasm/ProxyWasm.java b/src/main/java/io/roastedroot/proxywasm/ProxyWasm.java index 9d1b26d..dbee2d8 100644 --- a/src/main/java/io/roastedroot/proxywasm/ProxyWasm.java +++ b/src/main/java/io/roastedroot/proxywasm/ProxyWasm.java @@ -355,7 +355,12 @@ public ProxyWasm build(Instance.Builder instanceBuilder) throws StartException { WasiPreview1.builder() .withOptions( Objects.requireNonNullElseGet( - wasiOptions, this::defaultWasiOptions)) + wasiOptions, + () -> + WasiOptions.builder() + .inheritSystem() + .withArguments(List.of()) + .build())) .build(); imports.addFunction(wasi.toHostFunctions()); imports.addFunction(Helpers.withModuleName(wasi.toHostFunctions(), "wasi_unstable"));