From 4365d14923cc468daa5305f33593fed91a5e6651 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Sat, 21 Jan 2023 14:05:37 +0100
Subject: [PATCH] Add logging to instance

---
 src/bot/instance.rs | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/bot/instance.rs b/src/bot/instance.rs
index 1312d80..937d19c 100644
--- a/src/bot/instance.rs
+++ b/src/bot/instance.rs
@@ -3,17 +3,17 @@
 //! See [`Instance`] for more details.
 
 // TODO Cookies
-// TODO Logging
 
 use std::future::Future;
 use std::time::Duration;
 
+use log::{debug, warn};
 use tokio::select;
 use tokio::sync::{mpsc, oneshot};
 
 use crate::api::packet::ParsedPacket;
 use crate::api::{Auth, AuthOption, Data, Nick};
-use crate::conn::{Conn, ConnTx, State};
+use crate::conn::{self, Conn, ConnTx, State};
 
 const EUPH_DOMAIN: &str = "euphoria.io";
 const TIMEOUT: Duration = Duration::from_secs(30);
@@ -121,6 +121,7 @@ impl Instance {
         F: FnMut(Event) -> Fut + Send + 'static,
         Fut: Future<Output = Result<(), ()>> + Send + 'static,
     {
+        debug!("{}: Created with config {config:?}", config.name);
         let (request_tx, request_rx) = mpsc::unbounded_channel();
         tokio::spawn(Self::run::<F, Fut>(config.clone(), on_event, request_rx));
         Self { config, request_tx }
@@ -144,8 +145,14 @@ impl Instance {
         F: FnMut(Event) -> Fut,
         Fut: Future<Output = Result<(), ()>>,
     {
+        // TODO Only delay reconnecting if previous reconnect attempt failed
         loop {
             Self::run_once::<F, Fut>(&config, &mut on_event, &mut request_rx).await;
+            debug!(
+                "{}: Waiting {} seconds before reconnecting",
+                config.name,
+                RECONNECT.as_secs()
+            );
             tokio::time::sleep(RECONNECT).await;
         }
     }
@@ -159,26 +166,35 @@ impl Instance {
         F: FnMut(Event) -> Fut,
         Fut: Future<Output = Result<(), ()>>,
     {
+        debug!("{}: Connecting...", config.name);
         let (mut conn, _) =
             Conn::connect(&config.domain, &config.room, config.human, None, TIMEOUT)
                 .await
                 .ok()?;
         let conn_tx = conn.tx().clone();
 
-        select! {
-            _ = Self::receive::<F, Fut>(config, &mut conn, on_event) => (),
-            _ = Self::handle_requests(request_rx, &conn_tx) => (),
+        let result = select! {
+            r = Self::receive::<F, Fut>(config, &mut conn, on_event) => r,
+            _ = Self::handle_requests(request_rx, &conn_tx) => Ok(()),
+        };
+        if let Err(err) = result {
+            if matches!(err, conn::Error::ConnectionClosed) {
+                debug!("{}: Connection closed, reconnecting", config.name);
+            } else {
+                warn!("{}: An error occurred, reconnecting: {err}", config.name);
+            }
         }
 
         Some(())
     }
 
-    async fn receive<F, Fut>(config: &Config, conn: &mut Conn, on_event: &mut F)
+    async fn receive<F, Fut>(config: &Config, conn: &mut Conn, on_event: &mut F) -> conn::Result<()>
     where
         F: FnMut(Event) -> Fut,
         Fut: Future<Output = Result<(), ()>>,
     {
-        while let Ok(packet) = conn.recv().await {
+        loop {
+            let packet = conn.recv().await?;
             let event = Event {
                 packet,
                 snapshot: Snapshot {
@@ -191,18 +207,21 @@ impl Instance {
             match &event.packet.content {
                 Ok(Data::SnapshotEvent(_)) => {
                     if let Some(username) = &config.username {
+                        debug!("{}: Setting nick to username {}", config.name, username);
                         let name = username.to_string();
                         let _ = conn.tx().send(Nick { name });
                     }
                 }
                 Ok(Data::BounceEvent(_)) => {
                     if let Some(password) = &config.password {
+                        debug!("{}: Authenticating with password", config.name);
                         let cmd = Auth {
                             r#type: AuthOption::Passcode,
                             passcode: Some(password.to_string()),
                         };
                         let _ = conn.tx().send(cmd);
                     } else {
+                        warn!("{}: Auth required but no password configured", config.name);
                         break;
                     }
                 }
@@ -210,9 +229,12 @@ impl Instance {
             }
 
             if on_event(event).await.is_err() {
+                warn!("{}: on_event handler returned Err(())", config.name);
                 break;
             }
         }
+
+        Ok(())
     }
 
     async fn handle_requests(