Rev to wasi-http 0.2.0 (#10)

* Update for wasi-http 0.2.0

* Rename files to match version

Author: brendandburns

.devcontainer/devcontainer.json

@@ -5,10 +5,10 @@
 	"PATH": "${containerEnv:PATH}:/usr/local/lib/wasi-sdk-20.0/bin:/usr/local/lib"
     },
     "features": {
-        "devwasm.azurecr.io/dev-wasm/dev-wasm-feature/wasmtime-wasi:0.0.14": {
+        "devwasm.azurecr.io/dev-wasm/dev-wasm-feature/wasmtime-wasi:0.0.15": {
             "version": "20",
-            "wasmtime_version": "v15.0.1",
-            "wit_version": "0.16.0"
+            "wasmtime_version": "v18.0.2",
+            "wit_version": "0.19.2"
 
         },
         "ghcr.io/devcontainers/features/common-utils": {}

Makefile

@@ -1,17 +1,19 @@
-cc := /usr/local/lib/wasi-sdk-20.0/bin/clang
+sdk := /usr/local/lib/wasi-sdk-20.0
+cc := ${sdk}/bin/clang
+cpp := ${sdk}/bin/clang++
 
 .phony: all clean
 
 default: all
 
 main.wasm: main.c
-	clang -o main.wasm main.c
+	${cc} -o main.wasm main.c
 
 run_c: main.wasm
 	wasmtime --dir . main.wasm
 
 main-cc.wasm: main.cc
-	clang++ -o main-cc.wasm main.cc
+	${cpp} -o main-cc.wasm main.cc
 
 run_cc: main-cc.wasm
 	wasmtime --dir . main-cc.wasm

http/Makefile

@@ -19,26 +19,26 @@ client.o : client.c
 libwasihttp.a: ${lib_objs}
 	${ar} cr libwasihttp.a ${lib_objs}
 
-wasi-http: ; git clone https://github.com/WebAssembly/wasi-http; cd wasi-http; git checkout v0.2.0-rc-2023-11-10 ; cp ../client.wit wit/client.wit; cd ../
+wasi-http: ; git clone https://github.com/WebAssembly/wasi-http; cd wasi-http; git checkout v0.2.0; cp ../client.wit wit/client.wit; cd ../
 
 gen: wasi-http ; wit-bindgen c ./wasi-http/wit -w client
 
 main.wasm: gen main.o libwasihttp.a; ${cc} main.o -L. -lwasihttp -o main.wasm
 
-main_2023_11_10.embed.wasm: main.wasm ; wasm-tools component embed ./wasi-http/wit main.wasm -o main_2023_11_10.embed.wasm -w client
+main_0_2_0.embed.wasm: main.wasm ; wasm-tools component embed ./wasi-http/wit main.wasm -o main_0_2_0.embed.wasm -w client
 
-wasi_snapshot_preview1.reactor.wasm: ; wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasi_snapshot_preview1.reactor.wasm
+wasi_snapshot_preview1.reactor.wasm: ; wget https://github.com/bytecodealliance/wasmtime/releases/download/v18.0.2/wasi_snapshot_preview1.reactor.wasm
 
-main_2023_11_10.component.wasm: main_2023_11_10.embed.wasm wasi_snapshot_preview1.reactor.wasm; wasm-tools component new main_2023_11_10.embed.wasm -o main_2023_11_10.component.wasm --adapt wasi_snapshot_preview1.reactor.wasm
+main_0_2_0.component.wasm: main_0_2_0.embed.wasm wasi_snapshot_preview1.reactor.wasm; wasm-tools component new main_0_2_0.embed.wasm -o main_0_2_0.component.wasm --adapt wasi_snapshot_preview1.reactor.wasm
 
 clean: ; rm -f client.c client_component_type.o client.h proxy.h proxy.c *.wasm *.a; rm -rf wasi-http
 
-run: main_2023_11_10.component.wasm ; wasmtime -S http --wasm component-model main_2023_11_10.component.wasm
+run: main_0_2_0.component.wasm ; wasmtime -S http --wasm component-model main_0_2_0.component.wasm
 
 server.wasm: gen server.o libwasihttp.a; ${cc} server.o -L. -lwasihttp -o server.wasm
 
-server_2023_11_10.embed.wasm: server.wasm ; wasm-tools component embed ./wasi-http/wit server.wasm -o server_2023_11_10.embed.wasm -w proxy
+server_0_2_0.embed.wasm: server.wasm ; wasm-tools component embed ./wasi-http/wit server.wasm -o server_0_2_0.embed.wasm -w proxy
 
-server_2023_11_10.component.wasm: server_2023_11_10.embed.wasm wasi_snapshot_preview1.reactor.wasm; wasm-tools component new server_2023_11_10.embed.wasm -o server_2023_11_10.component.wasm --adapt wasi_snapshot_preview1.reactor.wasm
+server_0_2_0.component.wasm: server_0_2_0.embed.wasm wasi_snapshot_preview1.reactor.wasm; wasm-tools component new server_0_2_0.embed.wasm -o server_0_2_0.component.wasm --adapt wasi_snapshot_preview1.reactor.wasm
 
-run-server: server_2023_11_10.component.wasm ; wasmtime serve server_2023_11_10.component.wasm
+run-server: server_0_2_0.component.wasm ; wasmtime serve -Scommon server_0_2_0.component.wasm

http/client.wit

@@ -1,20 +1,20 @@
 // This is a slightly modified version of the wasi-http world to include the
 // wasi::cli/run package as an export, since otherwise the code isn't runnable
-package wasi:http@0.2.0-rc-2023-11-10;
+package wasi:http@0.2.0;
 
 /// The `wasi:http/client` world captures what is needed to perform 
 /// HTTP client calls.
 world client {
   /// Clients have standard output and error streams which are expected to
   /// terminate in a developer-facing console provided by the host.
-  import wasi:cli/stdout@0.2.0-rc-2023-11-10;
-  import wasi:cli/stderr@0.2.0-rc-2023-11-10;
+  import wasi:cli/stdout@0.2.0;
+  import wasi:cli/stderr@0.2.0;
 
   /// TODO: this is a temporary workaround until component tooling is able to
   /// gracefully handle the absence of stdin. Hosts must return an eof stream
   /// for this import, which is what wasi-libc + tooling will do automatically
   /// when this import is properly removed.
-  import wasi:cli/stdin@0.2.0-rc-2023-11-10;
+  import wasi:cli/stdin@0.2.0;
 
   /// This is the default handler to use when user code simply wants to make an
   /// HTTP request (e.g., via `fetch()`).
@@ -27,5 +27,5 @@ world client {
   export incoming-handler;
 
   // The 'main' hook for the CLI
-  export wasi:cli/run@0.2.0-rc-2023-11-10;
+  export wasi:cli/run@0.2.0;
 }

http/main.c

@@ -32,6 +32,6 @@ int main() {
 }
 
 // The wasm component hook for the 'main'
-bool exports_wasi_cli_0_2_0_rc_2023_11_10_run_run() {
+bool exports_wasi_cli_run_run() {
     return !main();
 }

http/server.c

@@ -12,6 +12,6 @@ int main() {
 }
 
 // This is hack and doesn't actually do anything for this server 
-bool exports_wasi_cli_0_2_0_rc_2023_11_10_run_run() {
+bool exports_wasi_cli_run_run() {
     return !main();
 }