Merge pull request #158 from hyperware-ai/develop

develop

Author: nick1udwig

Cargo.lock

@@ -1,16 +1,17 @@
 [package]
 name = "hyperware_process_lib"
 authors = ["Sybil Technologies AG"]
-version = "2.1.0"
+version = "2.2.0"
 edition = "2021"
 description = "A library for writing Hyperware processes in Rust."
 homepage = "https://hyperware.ai"
 repository = "https://github.com/hyperware-ai/process_lib"
 license = "Apache-2.0"
 
 [features]
+hyperapp = ["dep:futures-util", "dep:futures-channel", "dep:uuid", "logging"]
 logging = ["dep:color-eyre", "dep:tracing", "dep:tracing-error", "dep:tracing-subscriber"]
-hyperwallet = []
+hyperwallet = ["dep:hex", "dep:sha3"]
 simulation-mode = []
 
 [dependencies]
@@ -29,19 +30,25 @@ alloy = { version = "0.8.1", features = [
 anyhow = "1.0"
 base64 = "0.22.1"
 bincode = "1.3.3"
-color-eyre = { version = "0.6", features = ["capture-spantrace"], optional = true }
-hex = "0.4.3"
 http = "1.0.0"
 mime_guess = "2.0"
 rand = "0.8"
 regex = "1.11.1"
 rmp-serde = "1.1.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.120"
-sha3 = "0.10.8"
 thiserror = "1.0"
+url = "2.4.1"
+wit-bindgen = "0.42.1"
+
+futures-util = { version = "0.3", optional = true }
+futures-channel = { version = "0.3", optional = true }
+uuid = { version = "1.0", features = ["v4"], optional = true }
+
+color-eyre = { version = "0.6", features = ["capture-spantrace"], optional = true }
 tracing = { version = "0.1", optional = true }
 tracing-error = { version = "0.2", optional = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "std"], optional = true }
-url = "2.4.1"
-wit-bindgen = "0.42.1"
+
+hex = { version = "0.4.3", optional = true }
+sha3 = { version = "0.10.8", optional = true }

Cargo.toml

@@ -1,11 +1,16 @@
 pub use super::server::{HttpResponse, WsMessageType};
-use crate::{get_blob, LazyLoadBlob as KiBlob, Message, Request as KiRequest};
+#[cfg(not(feature = "hyperapp"))]
+use crate::Message;
+use crate::{get_blob, LazyLoadBlob as KiBlob, Request as KiRequest};
 use http::Method;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::str::FromStr;
 use thiserror::Error;
 
+#[cfg(feature = "hyperapp")]
+use crate::hyperapp;
+
 /// [`crate::Request`] type sent to the `http-client:distro:sys` service in order to open a
 /// WebSocket connection, send a WebSocket message on an existing connection, or
 /// send an HTTP request.
@@ -131,6 +136,7 @@ pub fn send_request(
 /// Make an HTTP request using http-client and await its response.
 ///
 /// Returns HTTP response from the `http` crate if successful, with the body type as bytes.
+#[cfg(not(feature = "hyperapp"))]
 pub fn send_request_await_response(
     method: Method,
     url: url::Url,
@@ -190,6 +196,64 @@ pub fn send_request_await_response(
         .unwrap())
 }
 
+/// Make an HTTP request using http-client and await its response.
+///
+/// Returns HTTP response from the `http` crate if successful, with the body type as bytes.
+#[cfg(feature = "hyperapp")]
+pub async fn send_request_await_response(
+    method: Method,
+    url: url::Url,
+    headers: Option<HashMap<String, String>>,
+    timeout: u64,
+    body: Vec<u8>,
+) -> std::result::Result<http::Response<Vec<u8>>, HttpClientError> {
+    let request = KiRequest::to(("our", "http-client", "distro", "sys"))
+        .body(
+            serde_json::to_vec(&HttpClientAction::Http(OutgoingHttpRequest {
+                method: method.to_string(),
+                version: None,
+                url: url.to_string(),
+                headers: headers.unwrap_or_default(),
+            }))
+            .map_err(|_| HttpClientError::MalformedRequest)?,
+        )
+        .blob_bytes(body)
+        .expects_response(timeout);
+
+    let resp_result =
+        hyperapp::send::<std::result::Result<HttpClientResponse, HttpClientError>>(request)
+            .await
+            .map_err(|_| {
+                HttpClientError::ExecuteRequestFailed("http-client timed out".to_string())
+            })?;
+
+    let resp = match resp_result {
+        Ok(HttpClientResponse::Http(resp)) => resp,
+        Ok(HttpClientResponse::WebSocketAck) => {
+            return Err(HttpClientError::ExecuteRequestFailed(
+                "http-client gave unexpected response".to_string(),
+            ))
+        }
+        Err(e) => return Err(e),
+    };
+    let mut http_response = http::Response::builder()
+        .status(http::StatusCode::from_u16(resp.status).unwrap_or_default());
+    let headers = http_response.headers_mut().unwrap();
+    for (key, value) in &resp.headers {
+        let Ok(key) = http::header::HeaderName::from_str(key) else {
+            continue;
+        };
+        let Ok(value) = http::header::HeaderValue::from_str(value) else {
+            continue;
+        };
+        headers.insert(key, value);
+    }
+    Ok(http_response
+        .body(get_blob().unwrap_or_default().bytes)
+        .unwrap())
+}
+
+#[cfg(not(feature = "hyperapp"))]
 pub fn open_ws_connection(
     url: String,
     headers: Option<HashMap<String, String>>,
@@ -231,7 +295,37 @@ pub fn send_ws_client_push(channel_id: u32, message_type: WsMessageType, blob: K
         .unwrap()
 }
 
+#[cfg(feature = "hyperapp")]
+pub async fn open_ws_connection(
+    url: String,
+    headers: Option<HashMap<String, String>>,
+    channel_id: u32,
+) -> std::result::Result<(), HttpClientError> {
+    let request = KiRequest::to(("our", "http-client", "distro", "sys"))
+        .body(
+            serde_json::to_vec(&HttpClientAction::WebSocketOpen {
+                url: url.clone(),
+                headers: headers.unwrap_or(HashMap::new()),
+                channel_id,
+            })
+            .unwrap(),
+        )
+        .expects_response(5);
+
+    let resp_result =
+        hyperapp::send::<std::result::Result<HttpClientResponse, HttpClientError>>(request)
+            .await
+            .map_err(|_| HttpClientError::WsOpenFailed { url: url.clone() })?;
+
+    match resp_result {
+        Ok(HttpClientResponse::WebSocketAck) => Ok(()),
+        Err(e) => Err(e),
+        _ => Err(HttpClientError::WsOpenFailed { url }),
+    }
+}
+
 /// Close a WebSocket connection.
+#[cfg(not(feature = "hyperapp"))]
 pub fn close_ws_connection(channel_id: u32) -> std::result::Result<(), HttpClientError> {
     let Ok(Ok(Message::Response { body, .. })) =
         KiRequest::to(("our", "http-client", "distro", "sys"))
@@ -251,3 +345,27 @@ pub fn close_ws_connection(channel_id: u32) -> std::result::Result<(), HttpClien
         _ => Err(HttpClientError::WsCloseFailed { channel_id }),
     }
 }
+
+/// Close a WebSocket connection.
+#[cfg(feature = "hyperapp")]
+pub async fn close_ws_connection(channel_id: u32) -> std::result::Result<(), HttpClientError> {
+    let request = KiRequest::to(("our", "http-client", "distro", "sys"))
+        .body(
+            serde_json::json!(HttpClientAction::WebSocketClose { channel_id })
+                .to_string()
+                .as_bytes()
+                .to_vec(),
+        )
+        .expects_response(5);
+
+    let resp_result =
+        hyperapp::send::<std::result::Result<HttpClientResponse, HttpClientError>>(request)
+            .await
+            .map_err(|_| HttpClientError::WsCloseFailed { channel_id })?;
+
+    match resp_result {
+        Ok(HttpClientResponse::WebSocketAck) => Ok(()),
+        Err(e) => Err(e),
+        _ => Err(HttpClientError::WsCloseFailed { channel_id }),
+    }
+}