feat(js-runtime,serverless,cli): allow fetch() with a Request (#965)

.changeset/pretty-jeans-develop.md

@@ -0,0 +1,7 @@
+---
+'@lagon/js-runtime': patch
+'@lagon/cli': patch
+'@lagon/serverless': patch
+---
+
+Allow `fetch()` with a `Request`

crates/runtime/tests/fetch.rs

@@ -627,3 +627,85 @@ async fn fetch_set_content_length() {
     )
     .await;
 }
+
+#[tokio::test]
+async fn fetch_input_request() {
+    utils::setup();
+    let server = Server::run();
+    server.expect(
+        Expectation::matching(all_of![
+            request::method_path("POST", "/"),
+            request::headers(contains(("x-token", "hello"))),
+            request::body("Hello!"),
+        ])
+        .respond_with(status_code(200).body("Hello, World")),
+    );
+    let url = server.url("/");
+
+    let (send, receiver) = utils::create_isolate(IsolateOptions::new(format!(
+        "export async function handler() {{
+    const body = await fetch(new Request('{url}', {{
+        method: 'POST',
+        headers: {{
+            'x-token': 'hello'
+        }},
+        body: 'Hello!'
+    }})).then(res => res.text());
+    return new Response(body);
+}}"
+    )));
+    send(Request::default());
+
+    utils::assert_response(
+        &receiver,
+        Response::builder()
+            .header(CONTENT_TYPE, "text/plain;charset=UTF-8")
+            .body("Hello, World".into())
+            .unwrap(),
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn fetch_input_request_init() {
+    utils::setup();
+    let server = Server::run();
+    server.expect(
+        Expectation::matching(all_of![
+            request::method_path("POST", "/"),
+            request::headers(contains(("x-token", "hello"))),
+            request::body("Hello!"),
+        ])
+        .respond_with(status_code(200).body("Hello, World")),
+    );
+    let url = server.url("/");
+
+    let (send, receiver) = utils::create_isolate(IsolateOptions::new(format!(
+        "export async function handler() {{
+    const body = await fetch(new Request('{url}', {{
+        method: 'GET',
+        headers: {{
+            'hello': 'world'
+        }},
+        body: 'No'
+    }}), {{
+        method: 'POST',
+        headers: {{
+            'x-token': 'hello'
+        }},
+        body: 'Hello!'
+    }}).then(res => res.text());
+    return new Response(body);
+}}"
+    )));
+    send(Request::default());
+
+    utils::assert_response(
+        &receiver,
+        Response::builder()
+            .header(CONTENT_TYPE, "text/plain;charset=UTF-8")
+            .body("Hello, World".into())
+            .unwrap(),
+    )
+    .await;
+}

packages/js-runtime/src/runtime/http/fetch.ts

@@ -5,19 +5,42 @@
     const headers = new Headers(init?.headers);
     let body: string | undefined;
 
-    if (init?.body) {
-      if (globalThis.__lagon__.isIterable(init.body)) {
-        body = globalThis.__lagon__.TEXT_DECODER.decode(init.body);
+    const isInputRequest = input instanceof Request;
+
+    if (init?.body || (isInputRequest && (input as Request).body)) {
+      const paramBody = init?.body || (input as Request).body;
+
+      if (globalThis.__lagon__.isIterable(paramBody)) {
+        body = globalThis.__lagon__.TEXT_DECODER.decode(paramBody);
+      } else if (paramBody instanceof ReadableStream) {
+        body = '';
+
+        // @ts-expect-error iterate over the stream
+        for await (const chunk of paramBody) {
+          body += globalThis.__lagon__.TEXT_DECODER.decode(chunk);
+        }
       } else {
-        if (typeof init.body !== 'string') {
+        if (typeof paramBody !== 'string') {
           // TODO: Support other body types
           throw new Error('Body must be a string or an iterable');
         }
 
-        body = init.body;
+        body = paramBody;
       }
     }
 
+    let method = init?.method || 'GET';
+    let url = input.toString();
+
+    if (isInputRequest) {
+      for (const [key, value] of (input as Request).headers.entries()) {
+        headers.set(key, value);
+      }
+
+      method = init?.method || (input as Request).method;
+      url = (input as Request).url.toString();
+    }
+
     if (body === undefined && init?.method && FORCE_0_CONTENT_LENGTH_METHODS.includes(init.method)) {
       headers.set('content-length', '0');
     }
@@ -32,8 +55,8 @@
       checkAborted();
 
       const response = await LagonAsync.fetch({
-        m: init?.method || 'GET',
-        u: input.toString(),
+        m: method,
+        u: url,
         b: body,
         // @ts-expect-error private property
         h: headers.h,