app_bridge 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26bd5103440c1de1bd93ea671635a87e8f25d39fc56fef5025752799e6731edd
-  data.tar.gz: 92157e6b2962fadcca66aa24b9baf234bf04e093f0c016cd51d8e7542a8da0b1
+  metadata.gz: 75adf9317aff9d59ed25ed829aa465be4df1d8fe289c8cc44b5970a7f7cdd990
+  data.tar.gz: 114acaec678f72a06e2971520b8118bf33c937875874b290ef053e20a190e8c1
 SHA512:
-  metadata.gz: f7f8c267d373d1e0f5ffa730956fc5e2d0bdc43f9143c61e3866596efae583d6e9403c2cf4ead9972af4cd16ee6d6097c5fa01d8974017de6f4a8c571316b7a9
-  data.tar.gz: 2bebe7b17a804216f59846866d374b4d2b2439ad77aee6ab1e4d51766dbeba6053b896f2906c0feda378d9cbbaa64b695897351113aa3ee3e157cdec20586d4a
+  metadata.gz: ff6f8b38c7d515e5d022faeeb9bff7032025996a6aec023b5a21dbb3871cc13924c3555a7d2ae1c060c45817c7f370d310071aed577c1ad6ce2f5df9cf4397f6
+  data.tar.gz: 7d572d45508f625c0d48ce6e50049ecca71ba9abe86a130600556c0335974df5502d67848a9935dd6984036ad838f8ba19e89be9f6439cbf2f6435433882317b

data/Cargo.lock

@@ -55,7 +55,7 @@ checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "app_bridge"
-version = "4.1.0"
+version = "4.1.1"
 dependencies = [
  "base64",
  "httpmock",

data/ext/app_bridge/Cargo.toml

@@ -2,7 +2,7 @@
 name = "app_bridge"
 # When updating the version, please also update the version in the
 # lib/app_bridge/version.rb file to keep them in sync.
-version = "4.1.0"
+version = "4.1.1"
 edition = "2021"
 authors = ["Alexander Ross <ross@standout.se>"]
 publish = false

data/ext/app_bridge/src/request_builder.rs

@@ -1,6 +1,6 @@
 use crate::app_state::AppState;
 use crate::component::{v3, v4, v4_1};
-use crate::component::v4::standout::app::http::{Method, Request, RequestError, Response};
+use crate::component::v4::standout::app::http::{Method, Request, RequestError};
 use reqwest::Method as ReqwestMethod;
 use std::result::Result::Ok;
 use wasmtime::component::Resource;
@@ -212,16 +212,6 @@ macro_rules! impl_http_type_conversions {
             }
         }
 
-        impl From<Response> for $v::standout::app::http::Response {
-            fn from(r: Response) -> Self {
-                Self {
-                    status: r.status,
-                    headers: r.headers,
-                    body: r.body,
-                }
-            }
-        }
-
         impl From<Request> for $v::standout::app::http::Request {
             fn from(r: Request) -> Self {
                 Self {
@@ -243,6 +233,32 @@ macro_rules! impl_http_type_conversions {
     };
 }
 
+macro_rules! impl_http_response_conversion {
+    ($v:ident, with_bytes) => {
+        impl From<Response> for $v::standout::app::http::Response {
+            fn from(r: Response) -> Self {
+                Self {
+                    status: r.status,
+                    headers: r.headers,
+                    body: r.body,
+                    body_bytes: r.body_bytes,
+                }
+            }
+        }
+    };
+    ($v:ident, no_bytes) => {
+        impl From<Response> for $v::standout::app::http::Response {
+            fn from(r: Response) -> Self {
+                Self {
+                    status: r.status,
+                    headers: r.headers,
+                    body: r.body,
+                }
+            }
+        }
+    };
+}
+
 // ============================================================================
 // Generate implementations for all supported versions
 // When adding v5, just add:
@@ -255,13 +271,23 @@ impl_host_request_builder!(v4, no);
 impl_host_request_builder!(v4_1, yes);
 
 impl_http_type_conversions!(v3);
-// Note: v4 doesn't need conversions since we use v4 types as the canonical internal types
 impl_http_type_conversions!(v4_1);
+impl_http_response_conversion!(v3, no_bytes);
+impl_http_response_conversion!(v4, no_bytes);
+impl_http_response_conversion!(v4_1, with_bytes);
 
 // ============================================================================
 // Shared request sending logic
 // ============================================================================
 
+#[derive(Debug, Clone)]
+struct Response {
+    status: u16,
+    headers: Vec<(String, String)>,
+    body: String,
+    body_bytes: Option<Vec<u8>>,
+}
+
 fn send_request(
     client: &std::sync::Arc<std::sync::Mutex<reqwest::blocking::Client>>,
     request: &Request,
@@ -281,6 +307,7 @@ fn send_request(
 
     match builder.send() {
         Ok(resp) => {
+            let status = resp.status().as_u16();
             let headers = resp
                 .headers()
                 .iter()
@@ -292,10 +319,14 @@ fn send_request(
                 })
                 .collect();
 
+            let bytes = resp.bytes().unwrap_or_default().to_vec();
+            let body = String::from_utf8(bytes.clone()).unwrap_or_default();
+
             Ok(Response {
-                status: resp.status().as_u16(),
+                status,
                 headers,
-                body: resp.text().unwrap_or_default(),
+                body,
+                body_bytes: Some(bytes),
             })
         }
         Err(error) => Err(RequestError::Other(format!(
@@ -343,6 +374,7 @@ impl Default for Response {
             status: 0,
             headers: Vec::new(),
             body: String::new(),
+            body_bytes: None,
         }
     }
 }
@@ -422,4 +454,30 @@ mod tests {
         assert_eq!(response.status, 200);
         mock.assert();
     }
+
+    #[test]
+    fn returns_binary_response_body_bytes() {
+        use v4_1::standout::app::http::HostRequestBuilder;
+
+        let server = MockServer::start();
+        let body = b"%PDF-1.3".to_vec();
+        let mock = server.mock(|when, then| {
+            when.method(POST).path("/download");
+            then.status(200)
+                .header("Content-Type", "application/pdf")
+                .body(body.clone());
+        });
+        let url = format!("{}/download", server.base_url());
+
+        let mut app_state = AppState::default();
+        let builder = app_state.new();
+        let builder = app_state.method(builder, v4_1::standout::app::http::Method::Post);
+        let builder = app_state.url(builder, url);
+
+        let response = app_state.send(builder).expect("Request failed");
+
+        assert_eq!(response.status, 200);
+        assert_eq!(response.body_bytes, Some(body));
+        mock.assert();
+    }
 }

data/ext/app_bridge/wit/v4_1/world.wit

@@ -243,6 +243,8 @@ interface http {
     status: u16,
     headers: headers,
     body: string,
+    /// Raw response payload for binary responses.
+    body-bytes: option<list<u8>>,
   }
 
   record request {

data/lib/app_bridge/version.rb

@@ -4,5 +4,5 @@
 # ext/app_bridge/Cargo.toml file to keep them in sync.
 
 module AppBridge
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_bridge
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Alexander Ross