feat(runtime,js-runtime): use ArrayBuffer for Request/Response body (#…

…807)
lagonapp · Apr 29, 2023 · b0b0cc5 · b0b0cc5
1 parent a2146e2
commit b0b0cc5
Show file tree

Hide file tree

Showing 14 changed files with 290 additions and 104 deletions.
diff --git a/.changeset/stupid-spies-jog.md b/.changeset/stupid-spies-jog.md
@@ -0,0 +1,6 @@
+---
+'@lagon/runtime': patch
+'@lagon/js-runtime': patch
+---
+
+Use ArrayBuffer for Request/response body
diff --git a/crates/runtime/tests/async_context.rs b/crates/runtime/tests/async_context.rs
@@ -49,7 +49,7 @@ export function handler() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap().as_response(),
-        Response::from("")
+        Response::default()
     );
 }
 
@@ -75,7 +75,7 @@ export function handler() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap().as_response(),
-        Response::from("")
+        Response::default()
     );
 }
 
@@ -115,7 +115,7 @@ export function handler() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap().as_response(),
-        Response::from("")
+        Response::default()
     );
 }
 
@@ -167,7 +167,7 @@ export function handler() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap().as_response(),
-        Response::from("")
+        Response::default()
     );
 }
 

diff --git a/crates/runtime/tests/crypto.rs b/crates/runtime/tests/crypto.rs
@@ -296,7 +296,7 @@ async fn crypto_decrypt() {
         ciphertext,
     );
 
-    return new Response(text);
+    return new Response(new TextDecoder().decode(text));
 }"
         .into(),
     ));

diff --git a/crates/runtime/tests/fetch.rs b/crates/runtime/tests/fetch.rs
@@ -288,7 +288,10 @@ async fn response_array_buffer() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap().as_response(),
-        Response::from("Hello, World")
+        Response {
+            body: "Hello, World".into(),
+            ..Default::default()
+        }
     );
 }
 

diff --git a/crates/runtime/tests/runtime.rs b/crates/runtime/tests/runtime.rs
@@ -1,5 +1,5 @@
 use httptest::bytes::Bytes;
-use lagon_runtime_http::{Method, Request, Response};
+use lagon_runtime_http::{Method, Request, Response, RunResult, StreamResult};
 use lagon_runtime_isolate::options::IsolateOptions;
 use std::collections::HashMap;
 
@@ -71,7 +71,7 @@ async fn environment_variables() {
 }
 
 #[tokio::test]
-async fn get_body() {
+async fn get_body_streaming() {
     utils::setup();
     let (send, receiver) = utils::create_isolate(IsolateOptions::new(
         "export function handler(request) {
@@ -81,7 +81,46 @@ async fn get_body() {
     ));
     send(Request {
         body: Bytes::from("Hello world"),
-        headers: None,
+        headers: Some(HashMap::from([(
+            "content-type".into(),
+            Vec::from(["text/plain;charset=UTF-8".into()]),
+        )])),
+        method: Method::GET,
+        url: "".into(),
+    });
+
+    assert_eq!(
+        receiver.recv_async().await.unwrap(),
+        RunResult::Stream(StreamResult::Data(vec![
+            72, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100
+        ]))
+    );
+    assert!(receiver.recv_async().await.unwrap().as_stream_done());
+    assert_eq!(
+        receiver.recv_async().await.unwrap(),
+        RunResult::Stream(StreamResult::Start(Response {
+            headers: None,
+            body: Bytes::from("[object ReadableStream]"),
+            status: 200,
+        }))
+    );
+}
+
+#[tokio::test]
+async fn get_body() {
+    utils::setup();
+    let (send, receiver) = utils::create_isolate(IsolateOptions::new(
+        "export async function handler(request) {
+    return new Response(await request.text());
+}"
+        .into(),
+    ));
+    send(Request {
+        body: Bytes::from("Hello world"),
+        headers: Some(HashMap::from([(
+            "content-type".into(),
+            Vec::from(["text/plain;charset=UTF-8".into()]),
+        )])),
         method: Method::GET,
         url: "".into(),
     });
@@ -103,7 +142,10 @@ async fn get_input() {
     ));
     send(Request {
         body: Bytes::new(),
-        headers: None,
+        headers: Some(HashMap::from([(
+            "content-type".into(),
+            Vec::from(["text/plain;charset=UTF-8".into()]),
+        )])),
         method: Method::GET,
         url: "https://hello.world".into(),
     });
@@ -125,7 +167,10 @@ async fn get_method() {
     ));
     send(Request {
         body: Bytes::new(),
-        headers: None,
+        headers: Some(HashMap::from([(
+            "content-type".into(),
+            Vec::from(["text/plain;charset=UTF-8".into()]),
+        )])),
         method: Method::POST,
         url: "".into(),
     });
@@ -241,7 +286,10 @@ async fn return_status() {
         receiver.recv_async().await.unwrap().as_response(),
         Response {
             body: "Moved permanently".into(),
-            headers: None,
+            headers: Some(HashMap::from([(
+                "content-type".into(),
+                Vec::from(["text/plain;charset=UTF-8".into()]),
+            )])),
             status: 302,
         }
     );
@@ -262,7 +310,10 @@ async fn return_uint8array() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap().as_response(),
-        Response::from("Hello world")
+        Response {
+            body: "Hello world".into(),
+            ..Default::default()
+        }
     );
 }
 
@@ -285,7 +336,7 @@ async fn console_log() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap().as_response(),
-        Response::default()
+        Response::from("")
     );
 }
 

diff --git a/crates/runtime/tests/streams.rs b/crates/runtime/tests/streams.rs
@@ -32,9 +32,11 @@ async fn sync_streaming() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap(),
-        RunResult::Stream(StreamResult::Start(Response::from(
-            "[object ReadableStream]"
-        )))
+        RunResult::Stream(StreamResult::Start(Response {
+            headers: None,
+            body: Bytes::from("[object ReadableStream]"),
+            status: 200,
+        }))
     );
 }
 
@@ -72,9 +74,11 @@ async fn queue_multiple() {
     assert!(receiver.recv_async().await.unwrap().as_stream_done());
     assert_eq!(
         receiver.recv_async().await.unwrap(),
-        RunResult::Stream(StreamResult::Start(Response::from(
-            "[object ReadableStream]"
-        )))
+        RunResult::Stream(StreamResult::Start(Response {
+            headers: None,
+            body: Bytes::from("[object ReadableStream]"),
+            status: 200,
+        }))
     );
 }
 
@@ -158,9 +162,11 @@ async fn start_and_pull() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap(),
-        RunResult::Stream(StreamResult::Start(Response::from(
-            "[object ReadableStream]"
-        )))
+        RunResult::Stream(StreamResult::Start(Response {
+            headers: None,
+            body: Bytes::from("[object ReadableStream]"),
+            status: 200,
+        }))
     );
 }
 
@@ -200,9 +206,11 @@ async fn response_before_write() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap(),
-        RunResult::Stream(StreamResult::Start(Response::from(
-            "[object ReadableStream]"
-        )))
+        RunResult::Stream(StreamResult::Start(Response {
+            headers: None,
+            body: Bytes::from("[object ReadableStream]"),
+            status: 200,
+        }))
     );
 
     assert_eq!(
@@ -228,9 +236,11 @@ async fn timeout_infinite_streaming() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap(),
-        RunResult::Stream(StreamResult::Start(Response::from(
-            "[object ReadableStream]"
-        )))
+        RunResult::Stream(StreamResult::Start(Response {
+            headers: None,
+            body: Bytes::from("[object ReadableStream]"),
+            status: 200,
+        }))
     );
 
     assert_eq!(receiver.recv_async().await.unwrap(), RunResult::Timeout);
@@ -289,9 +299,11 @@ async fn promise_reject_callback_after_response() {
 
     assert_eq!(
         receiver.recv_async().await.unwrap(),
-        RunResult::Stream(StreamResult::Start(Response::from(
-            "[object ReadableStream]"
-        )))
+        RunResult::Stream(StreamResult::Start(Response {
+            headers: None,
+            body: Bytes::from("[object ReadableStream]"),
+            status: 200,
+        }))
     );
 
     assert_eq!(receiver.recv_async().await.unwrap(), RunResult::Error("Uncaught ReferenceError: doesNotExists is not defined\n  at 12:17\n  at stream (11:19)".to_owned()));

diff --git a/crates/runtime_http/src/request.rs b/crates/runtime_http/src/request.rs
@@ -6,7 +6,8 @@ use hyper::{
     Body, Request as HyperRequest,
 };
 use lagon_runtime_v8_utils::{
-    extract_v8_headers_object, extract_v8_string, v8_headers_object, v8_string,
+    extract_v8_headers_object, extract_v8_string, extract_v8_uint8array, v8_headers_object,
+    v8_string, v8_uint8array,
 };
 use std::{collections::HashMap, str::FromStr};
 
@@ -55,7 +56,7 @@ impl IntoV8 for Request {
 
         if body_exists {
             names.push(v8_string(scope, "b").into());
-            values.push(v8_string(scope, &String::from_utf8(self.body.to_vec()).unwrap()).into());
+            values.push(v8_uint8array(scope, self.body.to_vec()).into());
         }
 
         if let Some(headers) = self.headers {
@@ -83,7 +84,7 @@ impl FromV8 for Request {
 
         if let Some(body_value) = request.get(scope, body_key.into()) {
             if !body_value.is_null_or_undefined() {
-                body = Bytes::from(extract_v8_string(body_value, scope)?);
+                body = Bytes::from(extract_v8_uint8array(body_value)?);
             }
         }
 

diff --git a/crates/runtime_http/src/response.rs b/crates/runtime_http/src/response.rs
@@ -6,7 +6,7 @@ use hyper::{
     Body, Response as HyperResponse,
 };
 use lagon_runtime_v8_utils::{
-    extract_v8_headers_object, extract_v8_integer, extract_v8_string, v8_headers_object,
+    extract_v8_headers_object, extract_v8_integer, extract_v8_uint8array, v8_headers_object,
     v8_integer, v8_string, v8_uint8array,
 };
 use std::{collections::HashMap, str::FromStr};
@@ -35,7 +35,10 @@ impl Default for Response {
 impl From<&str> for Response {
     fn from(body: &str) -> Self {
         Response {
-            headers: None,
+            headers: Some(HashMap::from([(
+                "content-type".into(),
+                Vec::from(["text/plain;charset=UTF-8".into()]),
+            )])),
             body: Bytes::from(body.to_string()),
             status: 200,
         }
@@ -81,7 +84,7 @@ impl FromV8 for Response {
         let body_key = v8_string(scope, "b");
 
         if let Some(body_value) = response.get(scope, body_key.into()) {
-            body = extract_v8_string(body_value, scope)?;
+            body = extract_v8_uint8array(body_value)?;
         } else {
             return Err(anyhow!("Could not find body"));
         }