Make serverinfo always accessible

715209 · 715209 · commit 4af9aad54e5e · 2024-12-08T07:18:43.000+01:00
Previously, serverinfo would return an error if OBS was connected but not actively streaming. This change ensures serverinfo is always available whenever OBS is connected, regardless of stream state. Additionally, this update adds the CPU, memory, and available disk space metrics to the response. Closes #181
diff --git a/locales/de.yml b/locales/de.yml
@@ -34,7 +34,7 @@ sourceinfo:
     notFound: Fehler kein Server mit dem Namen %{name} gefunden
 serverinfo:
     noInfo: Keine Serverinformationen verfügbar
-    success: "Szene: %{scene}, Bitrate: %{bitrate} Kbps, fps: %{fps}, Framedrop wegen: Netzwerk: %{network}, Renderverzögerung: %{rendering}, Codierungsverzögerung: %{encoding}"
+    success: "Szene: %{scene}, Bitrate: %{bitrate} Kbps, fps: %{fps}, Framedrop wegen: Netzwerk: %{network}, Renderverzögerung: %{rendering}, Codierungsverzögerung: %{encoding}, CPU: %{cpu}, Speicher: %{memory}, freier Speicherplatz: %{disk}"
 rec:
     started: Aufnahme gestartet
     stopped: Aufnahme gestoppt
diff --git a/locales/dk.yml b/locales/dk.yml
@@ -30,11 +30,11 @@ trigger:
     current: Nuværende trigger er sat til %{number}
     disabled: Current trigger is disabled
 sourceinfo:
-    noInfo: No information
-    notFound: "Error no server found with the name: %{name}"
+    noInfo: Ingen information
+    notFound: "Fejl ingen server fundet med navnet: %{name}"
 serverinfo:
-    noInfo: No server information available
-    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, dropped due to: network: %{network}, rendering lag: %{rendering}, encoding lag: %{encoding}"
+    noInfo: Ingen serverinformation tilgængelig
+    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, tabt på grund af: netværk: %{network}, rendering forsinkelse: %{rendering}, encoding forsinkelse: %{encoding}, CPU: %{cpu}, hukommelse: %{memory}, ledig diskplads: %{disk}"
 rec:
     started: Optagelse startet!
     stopped: Optagelse stoppet!
diff --git a/locales/en.yml b/locales/en.yml
@@ -34,7 +34,7 @@ sourceinfo:
     notFound: "Error no server found with the name: %{name}"
 serverinfo:
     noInfo: No server information available
-    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, dropped due to: network: %{network}, rendering lag: %{rendering}, encoding lag: %{encoding}"
+    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, dropped due to: network: %{network}, rendering lag: %{rendering}, encoding lag: %{encoding}, CPU: %{cpu}, memory: %{memory}, free disk space: %{disk}"
 rec:
     started: Recording started
     stopped: Recording stopped
diff --git a/locales/es.yml b/locales/es.yml
@@ -33,8 +33,8 @@ sourceinfo:
     noInfo: Sin informacion
     notFound: "Error. No se encontro server con el nombre: %{name}"
 serverinfo:
-    noInfo: No server information available
-    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, dropped due to: network: %{network}, rendering lag: %{rendering}, encoding lag: %{encoding}"
+    noInfo: Sin información del servidor disponible
+    success: "escena: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, caídas debido a: red: %{network}, retraso de renderización: %{rendering}, retraso de codificación: %{encoding}, CPU: %{cpu}, memoria: %{memory}, espacio libre en disco: %{disk}"
 rec:
     started: Grabacion iniciada
     stopped: Grabacion detenida
diff --git a/locales/fr.yml b/locales/fr.yml
@@ -34,7 +34,7 @@ sourceinfo:
     notFound: "Erreur aucun serveur trouvé avec le nom: %{name}"
 serverinfo:
     noInfo: Aucun serveur disponible
-    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, dropped due to: network: %{network}, rendering lag: %{rendering}, encoding lag: %{encoding}"
+    success: "scène: %{scene}, débit: %{bitrate} Kbps, fps: %{fps}, pertes dues à: réseau : %{network}, décalage de rendu: %{rendering}, décalage d'encodage: %{encoding}, CPU: %{cpu}, mémoire: %{memory}, espace disque libre: %{disk}"
 rec:
     started: Enregistrement démarré
     stopped: Enregistrement stoppé
diff --git a/locales/it.yml b/locales/it.yml
@@ -33,8 +33,8 @@ sourceinfo:
     noInfo: Nessuna informazione
     notFound: "Errore nessun server trovato con il nome: %{name}"
 serverinfo:
-    noInfo: No server information available
-    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, dropped due to: network: %{network}, rendering lag: %{rendering}, encoding lag: %{encoding}"
+    noInfo: Nessuna informazione del server disponibile
+    success: "scena: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, frames persi a causa di: rete: %{network}, lag di rendering: %{rendering}, lag di codifica: %{encoding}, CPU: %{cpu}, memoria: %{memory}, spazio libero su disco: %{disk}"
 rec:
     started: registrazione iniziata
     stopped: registrazione finita
diff --git a/locales/nb.yml b/locales/nb.yml
@@ -34,7 +34,7 @@ sourceinfo:
     notFound: "Feil, ingen server funnet med navn: %{name}"
 serverinfo:
     noInfo: Ingen serverinformasjon tilgjengelig
-    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, tapt grunnet: nettverk: %{network}, gjengivelsesforsinkelse: %{rendering}, kodingsforsinkelse: %{encoding}"
+    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, tapt grunnet: nettverk: %{network}, gjengivelsesforsinkelse: %{rendering}, kodingsforsinkelse: %{encoding}, CPU: %{cpu}, minne: %{memory}, ledig diskplass: %{disk}"
 rec:
     started: Opptak startet!
     stopped: Opptak stoppet!
diff --git a/locales/nl.yml b/locales/nl.yml
@@ -34,7 +34,7 @@ sourceinfo:
     notFound: "Fout geen server gevonden met de naam: %{name}"
 serverinfo:
     noInfo: Geen serverinformatie beschikbaar
-    success: "Scène: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, gedaald als gevolg van: netwerk: %{network}, weergavevertraging: %{rendering}, coderingsvertraging: %{encoding}"
+    success: "Scène: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, gedaald als gevolg van: netwerk: %{network}, weergavevertraging: %{rendering}, coderingsvertraging: %{encoding}, CPU: %{cpu}, geheugen: %{memory}, vrije schijfruimte: %{disk}"
 rec:
     started: Opname gestart
     stopped: Opname gestopt
diff --git a/locales/pl.yml b/locales/pl.yml
@@ -33,8 +33,8 @@ sourceinfo:
     noInfo: Brak informacji
     notFound: "Błąd nie znaleziono serwera o tej nazwie: %{name}"
 serverinfo:
-    noInfo: No server information available
-    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, dropped due to: network: %{network}, rendering lag: %{rendering}, encoding lag: %{encoding}"
+    noInfo: Brak informacji o serwerze
+    success: "scena: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, spadki z powodu: sieć: %{network}, opóźnienie renderowania: %{rendering}, opóźnienie kodowania: %{encoding}, CPU: %{cpu}, pamięć: %{memory}, wolne miejsce na dysku: %{disk}"
 rec:
     started: Nagranie rozpoczęte
     stopped: Nagranie zakończone
diff --git a/locales/pt_br.yml b/locales/pt_br.yml
@@ -34,7 +34,7 @@ sourceinfo:
     notFound: "Nenhum servidor encontrado: %{name}"
 serverinfo:
     noInfo: Nenhuma informação do servidor disponível
-    success: "cena: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, caiu devido a network: %{network}, lag de renderização: %{rendering}, lag de encoding: %{encoding}"
+    success: "cena: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, caiu devido a network: %{network}, lag de renderização: %{rendering}, lag de encoding: %{encoding}, CPU: %{cpu}, memória: %{memory}, espaço livre em disco: %{disk}"
 rec:
     started: Gravação iniciada
     stopped: Gravação parada
diff --git a/locales/ru.yml b/locales/ru.yml
@@ -13,7 +13,7 @@ stop:
 switch:
     noParams: "Ошибка: сцена не указана"
     success: Сцена переключена на "%{scene}"
-    error: "Ошибка: не удалось переключиться на сцену \"%{scene}\""
+    error: 'Ошибка: не удалось переключиться на сцену "%{scene}"'
 source:
     noParams: "Ошибка: источник не указан"
     success: Источник "%{name}" %{status}
@@ -31,10 +31,10 @@ trigger:
     disabled: Текущий триггер отключен
 sourceinfo:
     noInfo: Нет информации об источнике
-    notFound: "Ошибка: сервер с именем \"%{name}\" не найден"
+    notFound: 'Ошибка: сервер с именем "%{name}" не найден'
 serverinfo:
     noInfo: Нет информации о сервере
-    success: "Сцена: %{scene}, битрейт: %{bitrate} Kbps, FPS: %{fps}, отключен по причине: сеть: %{network}, задержка рендера: %{rendering}, задержка кодирования: %{encoding}"
+    success: "Сцена: %{scene}, битрейт: %{bitrate} Kbps, FPS: %{fps}, отключен по причине: сеть: %{network}, задержка рендера: %{rendering}, задержка кодирования: %{encoding}, CPU: %{cpu}, память: %{memory}, свободное место на диске: %{disk}"
 rec:
     started: Запись начата
     stopped: Запись остановлена
@@ -83,7 +83,7 @@ scene:
     error: Ошибка переключения на сцену "%{scene}"
 collection:
     noParams: Коллекция сцен не указана
-    notFound: "Ошибка: нет коллекции сцен с названием \"%{collection}\""
+    notFound: 'Ошибка: нет коллекции сцен с названием "%{collection}"'
     success: Коллекция сцен переключена на "%{collection}"
     error: Ошибка переключения на коллекцию сцен "%{collection}"
     note: "Напоминание: профиль будет переключен только если стрим остановлен"
diff --git a/locales/sv.yml b/locales/sv.yml
@@ -33,8 +33,8 @@ sourceinfo:
     noInfo: Ingen information
     notFound: "Fel ingen server hittades med namnet: %{name}"
 serverinfo:
-    noInfo: No server information available
-    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, dropped due to: network: %{network}, rendering lag: %{rendering}, encoding lag: %{encoding}"
+    noInfo: Ingen serverinformation tillgänglig
+    success: "scen: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, tappade på grund av: nätverk: %{network}, renderingslagg: %{rendering}, kodningslagg: %{encoding}, CPU: %{cpu}, minne: %{memory}, ledigt diskutrymme: %{disk}, upplösning: %{resolution}"
 rec:
     started: Inspelning påbörjad
     stopped: Inspelningen har stoppats
diff --git a/locales/tr.yml b/locales/tr.yml
@@ -33,8 +33,8 @@ sourceinfo:
     noInfo: No information
     notFound: "Error no server found with the name: %{name}"
 serverinfo:
-    noInfo: No server information available
-    success: "scene: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, dropped due to: network: %{network}, rendering lag: %{rendering}, encoding lag: %{encoding}"
+    noInfo: Sunucu bilgisi mevcut değil
+    success: "sahne: %{scene}, bitrate: %{bitrate} Kbps, fps: %{fps}, düşürüldü nedeniyle: ağ: %{network}, render gecikmesi: %{rendering}, kodlama gecikmesi: %{encoding}, CPU: %{cpu}, bellek: %{memory}, boş disk alanı: %{disk}"
 rec:
     started: Kayıt başladı
     stopped: Kayıt durduruldu
diff --git a/locales/zh_tw.yml b/locales/zh_tw.yml
@@ -36,7 +36,7 @@ sourceinfo:
     notFound: "錯誤目前沒有伺服器: %{name} 的資訊"
 serverinfo:
     noInfo: 目前讀取不到伺服器的資訊
-    success: "場景: %{scene}, 目前流量: %{bitrate} Kbps, 目前幀數: %{fps}, 當前丟失資料資訊: 網路卡頓丟失影格: %{network}, 繪製錯卡頓失影格率: %{rendering}, 編碼卡頓略過影格率: %{encoding}"
+    success: "場景: %{scene}, 目前流量: %{bitrate} Kbps, 目前幀數: %{fps}, 當前丟失資料資訊: 網路卡頓丟失影格: %{network}, 繪製錯卡頓失影格率: %{rendering}, 編碼卡頓略過影格率: %{encoding}, CPU: %{cpu}, 記憶體: %{memory}, 硬碟剩餘空間: %{disk}"
 rec:
     started: 開始錄影
     stopped: 停止錄影
diff --git a/src/broadcasting_software/obs.rs b/src/broadcasting_software/obs.rs
@@ -108,6 +108,9 @@ impl Obs {
                     render_missed_frames,
                     output_total_frames,
                     output_skipped_frames,
+                    cpu_usage,
+                    memory_usage,
+                    free_disk_space,
                     ..
                 } => {
                     let ss = state::StreamStatus {
@@ -119,6 +122,9 @@ impl Obs {
                         num_total_frames,
                         render_total_frames,
                         output_total_frames,
+                        cpu_usage,
+                        memory_usage,
+                        available_disk_space: free_disk_space,
                     };
 
                     let mut l = state.write().await;
diff --git a/src/broadcasting_software/obs_v5.rs b/src/broadcasting_software/obs_v5.rs
@@ -490,6 +490,9 @@ impl BroadcastingSoftwareLogic for Obsv5 {
             output_skipped_frames: stats.output_skipped_frames as u64,
             render_missed_frames: stats.render_skipped_frames as u64,
             render_total_frames: stats.render_total_frames as u64,
+            cpu_usage: stats.cpu_usage,
+            memory_usage: stats.memory_usage,
+            available_disk_space: stats.available_disk_space,
         };
 
         if state.broadcasting_software.initial_stream_status.is_some() {
diff --git a/src/chat/chat_handler.rs b/src/chat/chat_handler.rs
@@ -1265,24 +1265,16 @@ impl DispatchCommand {
     async fn server_info(&self) {
         let state = self.user.state.read().await;
 
-        if state.broadcasting_software.initial_stream_status.is_none() {
+        let Some(bsc) = &state.broadcasting_software.connection else {
             self.send(t!("serverinfo.noInfo", locale = &self.lang))
                 .await;
             return;
         };
 
-        let bsc = match &state.broadcasting_software.connection {
-            Some(b) => b,
-            None => return,
-        };
-
-        let ss = match bsc.info(&state).await {
-            Ok(ss) => ss,
-            Err(_) => {
-                self.send(t!("serverinfo.noInfo", locale = &self.lang))
-                    .await;
-                return;
-            }
+        let Ok(ss) = bsc.info(&state).await else {
+            self.send(t!("serverinfo.noInfo", locale = &self.lang))
+                .await;
+            return;
         };
 
         let network = format!(
@@ -1303,6 +1295,10 @@ impl DispatchCommand {
             (ss.output_skipped_frames as f64 / ss.output_total_frames as f64) * 100.0,
         );
 
+        let cpu = format!("{:.1}%", ss.cpu_usage);
+        let memory = format!("{:.1} MB", ss.memory_usage);
+        let disk = format!("{:.1} GB", ss.available_disk_space / 1024.0);
+
         let scene = &state.broadcasting_software.current_scene;
 
         let msg = t!(
@@ -1313,7 +1309,10 @@ impl DispatchCommand {
             network = &network,
             rendering = &rendering,
             encoding = &encoding,
-            scene = scene
+            scene = scene,
+            cpu = &cpu,
+            memory = &memory,
+            disk = &disk
         );
 
         self.send(msg).await;
diff --git a/src/state.rs b/src/state.rs
@@ -155,6 +155,9 @@ pub struct StreamStatus {
     pub render_missed_frames: u64,
     pub output_total_frames: u64,
     pub output_skipped_frames: u64,
+    pub cpu_usage: f64,
+    pub memory_usage: f64,
+    pub available_disk_space: f64,
 }
 
 impl StreamStatus {
@@ -168,6 +171,9 @@ impl StreamStatus {
             render_missed_frames: self.render_missed_frames - old.render_missed_frames,
             output_total_frames: self.output_total_frames - old.output_total_frames,
             output_skipped_frames: self.output_skipped_frames - old.output_skipped_frames,
+            cpu_usage: self.cpu_usage,
+            memory_usage: self.memory_usage,
+            available_disk_space: self.available_disk_space,
         }
     }
 }
