Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion crates/hyli-bus/src/utils/logger.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
use anyhow::{Context, Result};
#[cfg(feature = "instrumentation")]
use anyhow::Context;
use anyhow::Result;
#[cfg(feature = "instrumentation")]
use opentelemetry::trace::TracerProvider;
use tracing::level_filters::LevelFilter;
Expand Down
47 changes: 47 additions & 0 deletions crates/hyli-net/src/tcp.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#[cfg(feature = "turmoil")]
pub mod intercept;
pub mod middleware;
pub mod p2p_server;
pub mod tcp_client;
pub mod tcp_server;
Expand Down Expand Up @@ -41,6 +42,52 @@ pub use hyli_net_traits::TcpMessageLabel;

pub type TcpHeaders = Vec<(String, String)>;

/// Common interface for `TcpServer` and middleware wrappers.
#[allow(async_fn_in_trait)]
pub trait TcpServerLike<Req, Res> {
type EventOut;
type ConnectedClients<'a>: Iterator<Item = &'a String>
where
Self: 'a;

async fn listen_next(&mut self) -> Option<Self::EventOut>;
fn send(
&mut self,
socket_addr: String,
msg: Res,
headers: TcpHeaders,
) -> anyhow::Result<crate::tcp::middleware::SendStatus>;
fn send_ref(&mut self, socket_addr: &str, msg: &Res, headers: &TcpHeaders) -> anyhow::Result<()>
where
Res: Clone,
{
self.send(socket_addr.to_string(), msg.clone(), headers.clone())
.map(|_| ())
}
fn connected_clients(&self) -> Self::ConnectedClients<'_>;
fn connected(&self, socket_addr: &str) -> bool {
self.connected_clients().any(|addr| addr == socket_addr)
}
fn drop_peer_stream(&mut self, peer_ip: String);
fn poll_send_completion(&mut self) -> Option<crate::tcp::middleware::SendCompletion> {
None
}

fn broadcast(&mut self, msg: Res, headers: TcpHeaders) -> Vec<(String, anyhow::Error)>
where
Res: Clone,
{
let peers: Vec<String> = self.connected_clients().cloned().collect();
let mut errors = Vec::new();
for peer in peers {
if let Err(error) = self.send(peer.clone(), msg.clone(), headers.clone()) {
errors.push((peer, error));
}
}
errors
}
}

pub(crate) type FramedStream = Framed<TcpStream, LengthDelimitedCodec>;

pub(crate) fn framed_stream(stream: TcpStream, max_frame_length: Option<usize>) -> FramedStream {
Expand Down
Loading
Loading