Merge pull request #25 from golemcloud/async-wasi-runtime

Switched from Tokio to wasi-async-runtime

Author: vigoo

crates/wasm-rquickjs/skeleton/Cargo.toml_

@@ -21,12 +21,16 @@ logging = ["dep:log", "dep:wasi-logger"]
 [dependencies]
 # Core dependencies
 rquickjs = { version = "0.9.0", default-features = false, features = ["futures", "bindgen", "loader", "macro"] }
-tokio = { version = "1.43.0", features = ["macros", "rt", "sync", "time"] }
-tokio-util = { version = "0.7.15", default-features = false }
+
+futures = { version = "0.3.31", features = [] }
+futures-concurrency = "7.6.3"
+pin-project = "1.1.10"
+wasi = "0.12.1+wasi-0.2.0"
+wasi-async-runtime = "0.1.2"
 wit-bindgen-rt = { version = "0.42.1", features = ["bitflags"] }
 
 # HTTP
-reqwest = { git = "https://github.com/golemcloud/reqwest", branch = "update-may-2025", optional = true }
+reqwest = { git = "https://github.com/golemcloud/reqwest", branch = "update-july-2025", features = ["async"], optional = true }
 
 # Logging
 log = { version = "0.4.22", default-features = false, optional = true }

crates/wasm-rquickjs/skeleton/src/builtin/http.js

@@ -39,36 +39,38 @@ export async function fetch(resource, options = {}) {
 
     let body = options.body || '';
 
-    if (body instanceof ArrayBuffer) {
-        request.arrayBufferBody(body);
-    } else if (body instanceof Uint8Array) {
-        request.uint8ArrayBody(body);
-    } else if (typeof body === 'string' || body instanceof String) {
-        request.stringBody(body);
-    } else if (body instanceof ReadableStream) {
-        // TODO: currently the native implementation does not support streaming request body, so we just buffer the stream here
-        const reader = body.getReader();
-        let chunks = [];
-        let done, value;
-        while ({done, value} = await reader.read(), !done) {
-            chunks.push(value);
-        }
-        // Concatenate all chunks into a single Uint8Array
-        const totalLength = chunks.reduce((acc, chunk) => acc + chunk.length, 0);
-        const concatenated = new Uint8Array(totalLength);
-        let offset = 0;
-        for (const chunk of chunks) {
-            concatenated.set(chunk, offset);
-            offset += chunk.length;
+    if (body instanceof ReadableStream) {
+        request.initSend();
+        const bodyWriter = request.initRequestBody();
+        request.sendRequest();
+
+        async function sendBody(bodyWriter, body) {
+            const reader = body.getReader();
+            while (true) {
+                const { done, value } = await reader.read();
+                if (done) break;
+                await bodyWriter.writeRequestBodyChunk(value);
+            }
+            bodyWriter.finishBody();
         }
-        request.uint8ArrayBody(concatenated);
-    } else {
-        console.warn('Unsupported body type');
-    }
 
-    let nativeResponse = await request.send();
+        const [nativeResponse, _] = await Promise.all([request.receiveResponse(), sendBody(bodyWriter, body)]);
+
+        return new Response(nativeResponse, resource);
+    } else {
+        if (body instanceof ArrayBuffer) {
+            request.arrayBufferBody(body);
+        } else if (body instanceof Uint8Array) {
+            request.uint8ArrayBody(body);
+        } else if (typeof body === 'string' || body instanceof String) {
+            request.stringBody(body);
+        } else {
+            console.warn('Unsupported body type');
+        }
 
-    return new Response(nativeResponse, resource);
+        const nativeResponse = await request.simpleSend();
+        return new Response(nativeResponse, resource);
+    }
 }
 
 export class Response {
@@ -87,9 +89,27 @@ export class Response {
     }
 
     get body() {
-        let streamSource = this.nativeResponse.stream();
+        let nativeStreamSource = this.nativeResponse.stream();
         this.bodyUsed = true;
-        return new ReadableStream(streamSource);
+        return new ReadableStream({
+            start() {
+            },
+            get type() {
+                return "bytes";
+            },
+            async pull(controller) {
+                // controller is https://developer.mozilla.org/en-US/docs/Web/API/ReadableByteStreamController
+                const [next, err] = await nativeStreamSource.pull();
+                if (err !== undefined) {
+                    console.error("Error reading response body stream:", err);
+                    controller.error(err);
+                } else if (next === undefined) {
+                    controller.close();
+                } else {
+                    controller.enqueue(next);
+                }
+            }
+        });
     }
 
     get headers() {