diff options
Diffstat (limited to 'lampada/src/connection/write.rs')
-rw-r--r-- | lampada/src/connection/write.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lampada/src/connection/write.rs b/lampada/src/connection/write.rs index 1070cdf..b982eea 100644 --- a/lampada/src/connection/write.rs +++ b/lampada/src/connection/write.rs @@ -1,6 +1,6 @@ use std::ops::{Deref, DerefMut}; -use luz::{connection::Tls, jabber_stream::bound_stream::BoundJabberWriter}; +use luz::jabber_stream::bound_stream::BoundJabberWriter; use stanza::{ client::Stanza, stream::Error as StreamErrorStanza, stream_error::Error as StreamError, }; @@ -8,12 +8,14 @@ use tokio::{ sync::{mpsc, oneshot}, task::JoinHandle, }; +#[cfg(target_arch = "wasm32")] +use tokio_with_wasm::alias as tokio; use crate::error::WriteError; /// actor that receives jabber stanzas to write, and if there is an error, sends a message back to the supervisor then aborts, so the supervisor can spawn a new stream. pub struct Write { - stream: BoundJabberWriter<Tls>, + stream: BoundJabberWriter, /// connection session write queue stanza_receiver: mpsc::Receiver<WriteMessage>, @@ -41,7 +43,7 @@ pub enum WriteControl { impl Write { fn new( - stream: BoundJabberWriter<Tls>, + stream: BoundJabberWriter, stanza_receiver: mpsc::Receiver<WriteMessage>, control_receiver: mpsc::Receiver<WriteControl>, on_crash: oneshot::Sender<(WriteMessage, WriteState)>, @@ -192,7 +194,7 @@ impl DerefMut for WriteHandle { pub struct WriteControlHandle { sender: mpsc::Sender<WriteControl>, - pub(crate) handle: JoinHandle<()>, + // pub(crate) handle: JoinHandle<()>, } impl Deref for WriteControlHandle { @@ -211,14 +213,14 @@ impl DerefMut for WriteControlHandle { impl WriteControlHandle { pub fn new( - stream: BoundJabberWriter<Tls>, + stream: BoundJabberWriter, on_crash: oneshot::Sender<(WriteMessage, WriteState)>, ) -> (WriteHandle, Self) { let (control_sender, control_receiver) = mpsc::channel(20); let (stanza_sender, stanza_receiver) = mpsc::channel(20); let actor = Write::new(stream, stanza_receiver, control_receiver, on_crash); - let handle = tokio::spawn(async move { actor.run().await }); + tokio::spawn(async move { actor.run().await }); ( WriteHandle { @@ -226,13 +228,12 @@ impl WriteControlHandle { }, Self { sender: control_sender, - handle, }, ) } pub fn reconnect_retry( - stream: BoundJabberWriter<Tls>, + stream: BoundJabberWriter, on_crash: oneshot::Sender<(WriteMessage, WriteState)>, stanza_receiver: mpsc::Receiver<WriteMessage>, retry_msg: WriteMessage, @@ -240,27 +241,26 @@ impl WriteControlHandle { let (control_sender, control_receiver) = mpsc::channel(20); let actor = Write::new(stream, stanza_receiver, control_receiver, on_crash); - let handle = tokio::spawn(async move { actor.run_reconnected(retry_msg).await }); + tokio::spawn(async move { actor.run_reconnected(retry_msg).await }); Self { sender: control_sender, - handle, } } pub fn reconnect( - stream: BoundJabberWriter<Tls>, + stream: BoundJabberWriter, on_crash: oneshot::Sender<(WriteMessage, WriteState)>, stanza_receiver: mpsc::Receiver<WriteMessage>, ) -> Self { let (control_sender, control_receiver) = mpsc::channel(20); let actor = Write::new(stream, stanza_receiver, control_receiver, on_crash); - let handle = tokio::spawn(async move { actor.run().await }); + + tokio::spawn(async move { actor.run().await }); Self { sender: control_sender, - handle, } } } |