From 598c458e0c1dac157b4a4513877c8f55473e4ae4 Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Thu, 23 Apr 2020 18:13:24 +0200 Subject: [PATCH] make sse::Sender::send take an id arg --- examples/sse.rs | 4 ++-- src/sse/mod.rs | 26 ++++---------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/examples/sse.rs b/examples/sse.rs index 68af3bb3a..9e2dcdb23 100644 --- a/examples/sse.rs +++ b/examples/sse.rs @@ -4,8 +4,8 @@ use tide::sse; async fn main() -> Result<(), std::io::Error> { let mut app = tide::new(); app.at("/sse").get(sse::endpoint(|_req, sender| async move { - sender.send("fruit", "banana").await; - sender.send("fruit", "apple").await; + sender.send("fruit", "banana", None).await; + sender.send("fruit", "apple", None).await; Ok(()) })); app.listen("localhost:8080").await?; diff --git a/src/sse/mod.rs b/src/sse/mod.rs index b93232318..365b4ca45 100644 --- a/src/sse/mod.rs +++ b/src/sse/mod.rs @@ -18,8 +18,8 @@ //! //! let mut app = tide::new(); //! app.at("/sse").get(sse::endpoint(|_req, sender| async move { -//! sender.send("fruit", "banana").await; -//! sender.send("fruit", "apple").await; +//! sender.send("fruit", "banana", None).await; +//! sender.send("fruit", "apple", None).await; //! Ok(()) //! })); //! app.listen("localhost:8080").await?; @@ -27,27 +27,9 @@ //! ``` mod endpoint; +mod sender; mod upgrade; pub use endpoint::{endpoint, SseEndpoint}; +pub use sender::Sender; pub use upgrade::upgrade; - -/// An SSE message sender. -#[derive(Debug)] -pub struct Sender { - sender: async_sse::Sender, -} - -impl Sender { - /// Create a new instance of `Sender`. - fn new(sender: async_sse::Sender) -> Self { - Self { sender } - } - - /// Send data from the SSE channel. - /// - /// Each message constists of a "name" and "data". - pub async fn send(&self, name: &str, data: impl AsRef<[u8]>) { - self.sender.send(name, data.as_ref(), None).await; - } -}