1 files changed, 18 insertions, 9 deletions
diff --git a/lampada/src/connection/mod.rs b/lampada/src/connection/mod.rs
index a3dde16..3a3187f 100644
--- a/lampada/src/connection/mod.rs
+++ b/lampada/src/connection/mod.rs
@@ -15,6 +15,8 @@ use tokio::{
     sync::{mpsc, oneshot, Mutex},
     task::{JoinHandle, JoinSet},
 };
+#[cfg(target_arch = "wasm32")]
+use tokio_with_wasm::alias as tokio;
 use tracing::info;
 use write::{WriteControl, WriteControlHandle, WriteHandle, WriteMessage, WriteState};
 
@@ -46,7 +48,12 @@ pub enum SupervisorCommand {
     Reconnect(ReadState),
 }
 
-impl<Lgc: Logic + Clone + Send + 'static> Supervisor<Lgc> {
+impl<Lgc> Supervisor<Lgc>
+where
+    Lgc: Logic + Clone + 'static,
+    #[cfg(not(target_arch = "wasm32"))]
+    Lgc: Send,
+{
     fn new(
         command_recv: mpsc::Receiver<SupervisorCommand>,
         reader_crash: oneshot::Receiver<(Option<StreamError>, ReadState)>,
@@ -129,7 +136,7 @@ impl<Lgc: Logic + Clone + Send + 'static> Supervisor<Lgc> {
                                     self.reader_crash = recv;
                                     self.read_control_handle = ReadControlHandle::reconnect(
                                         read,
-                                        read_state.tasks,
+                                        // read_state.tasks,
                                         self.connected.clone(),
                                         self.logic.clone(),
                                         read_state.supervisor_control,
@@ -177,7 +184,7 @@ impl<Lgc: Logic + Clone + Send + 'static> Supervisor<Lgc> {
                             self.reader_crash = recv;
                             self.read_control_handle = ReadControlHandle::reconnect(
                                 read,
-                                read_state.tasks,
+                                // read_state.tasks,
                                 self.connected.clone(),
                                 self.logic.clone(),
                                 read_state.supervisor_control,
@@ -225,7 +232,7 @@ impl<Lgc: Logic + Clone + Send + 'static> Supervisor<Lgc> {
                             self.reader_crash = recv;
                             self.read_control_handle = ReadControlHandle::reconnect(
                                 read,
-                                read_state.tasks,
+                                // read_state.tasks,
                                 self.connected.clone(),
                                 self.logic.clone(),
                                 read_state.supervisor_control,
@@ -295,14 +302,19 @@ impl DerefMut for SupervisorSender {
 }
 
 impl SupervisorHandle {
-    pub fn new<Lgc: Logic + Clone + Send + 'static>(
+    pub fn new<Lgc>(
         streams: BoundJabberStream,
         on_crash: oneshot::Sender<()>,
         jid: JID,
         server: JID,
         password: Arc<String>,
         logic: Lgc,
-    ) -> (WriteHandle, Self) {
+    ) -> (WriteHandle, Self)
+    where
+        Lgc: Logic + Clone + 'static,
+        #[cfg(not(target_arch = "wasm32"))]
+        Lgc: Send,
+    {
         let (command_send, command_recv) = mpsc::channel(20);
         let (writer_crash_send, writer_crash_recv) = oneshot::channel();
         let (reader_crash_send, reader_crash_recv) = oneshot::channel();
@@ -342,9 +354,6 @@ impl SupervisorHandle {
             logic,
         );
 
-        #[cfg(target_arch = "wasm32")]
-        wasm_bindgen_futures::spawn_local(async move { actor.run().await });
-        #[cfg(not(target_arch = "wasm32"))]
         tokio::spawn(async move { actor.run().await });
 
         (