logs levelfilters tweak, wip leaving channel, needs more testing

Author: Kevin Souza

src-tauri/src/lib.rs

@@ -36,6 +36,9 @@ pub fn run() {
             tauri_plugin_log::Builder::new()
                 .level(LevelFilter::Debug)
                 .level_for("rustls", LevelFilter::Off)
+                .level_for("h2", LevelFilter::Off)
+                .level_for("hyper_util", LevelFilter::Off)
+                .level_for("sqlx", LevelFilter::Info)
                 .build(),
         )
         .setup(|app| {

src-tauri/src/twitch/chat.rs

@@ -1,4 +1,12 @@
-use std::{collections::HashMap, sync::Arc, thread::sleep, time::Duration};
+use std::{
+    collections::HashMap,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc,
+    },
+    thread::sleep,
+    time::Duration,
+};
 
 use futures_util::{SinkExt, StreamExt};
 use lazy_static::lazy_static;
@@ -8,6 +16,7 @@ use serde::Serialize;
 use tauri::{
     async_runtime::{self, Mutex},
     ipc::Channel,
+    AppHandle, Listener,
 };
 use tokio_tungstenite::tungstenite::Message;
 
@@ -59,7 +68,11 @@ pub enum ChatEvent {
 }
 
 #[tauri::command]
-pub async fn join_chat(username: &str, reader: Channel<ChatEvent>) -> Result<(), String> {
+pub async fn join_chat(
+    app_handle: AppHandle,
+    username: &str,
+    reader: Channel<ChatEvent>,
+) -> Result<(), String> {
     let user_emotes = emote::query_user_emotes(username).await.unwrap_or_default();
 
     let mut ws_stream = match tokio_tungstenite::connect_async(WS_CHAT_URL).await {
@@ -94,7 +107,19 @@ pub async fn join_chat(username: &str, reader: Channel<ChatEvent>) -> Result<(),
 
     let ws_sink = Arc::new(Mutex::new(ws_sink));
 
+    let is_cancelled = Arc::new(AtomicBool::new(false));
+    let cancel_flag = Arc::clone(&is_cancelled);
+
+    let listener = app_handle.listen("leave_chat", move |_event| {
+        cancel_flag.store(true, Ordering::SeqCst);
+    });
+
     while let Some(Ok(Message::Text(text))) = ws_stream.next().await {
+        if is_cancelled.load(Ordering::Relaxed) {
+            break;
+        }
+
+        // Handle PING/PONG messages
         if text.starts_with(PING) {
             let ws_sink = Arc::clone(&ws_sink);
 
@@ -103,9 +128,8 @@ pub async fn join_chat(username: &str, reader: Channel<ChatEvent>) -> Result<(),
                 continue;
             }
 
-            // Ping the server after 60 seconds
+            // Schedule a PING after 60 seconds
             let ws_sink = Arc::clone(&ws_sink);
-
             async_runtime::spawn(async move {
                 sleep(Duration::from_secs(60));
 
@@ -164,6 +188,8 @@ pub async fn join_chat(username: &str, reader: Channel<ChatEvent>) -> Result<(),
         }
     }
 
+    app_handle.unlisten(listener);
+
     Ok(())
 }
 

src/lib/components/Chat.svelte

@@ -3,6 +3,7 @@
 
 	import { openUrl } from '@tauri-apps/plugin-opener';
 	import { Channel, invoke } from '@tauri-apps/api/core';
+	import { emit } from '@tauri-apps/api/event';
 
 	import SimpleBar from 'simplebar';
 
@@ -98,7 +99,11 @@
 			}
 		};
 
-		(async () => await invoke('join_chat', { username: watching.username, reader }))();
+		invoke('join_chat', { username: watching.username, reader });
+
+		return () => {
+			emit('leave_chat', watching.username);
+		};
 	});
 </script>