feat(blink): improve error handling

Satellite-im · Nov 2, 2023 · b83dec4 · b83dec4
1 parent 32ae7bb
commit b83dec4
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 18 deletions.
diff --git a/extensions/warp-blink-wrtc/src/host_media/audio/opus/sink/mod.rs b/extensions/warp-blink-wrtc/src/host_media/audio/opus/sink/mod.rs
@@ -1,6 +1,6 @@
 use cpal::{
     traits::{DeviceTrait, StreamTrait},
-    SampleRate,
+    BuildStreamError, SampleRate,
 };
 use ringbuf::HeapRb;
 use std::{cmp::Ordering, sync::Arc};
@@ -132,13 +132,25 @@ impl OpusSink {
                 output_data_fn,
                 move |err| {
                     log::error!("an error occurred on stream: {}", err);
-                    if matches!(err, cpal::StreamError::DeviceNotAvailable) {
-                        let _ = event_ch3.send(BlinkEventKind::AudioOutputDeviceNoLongerAvailable);
-                    }
+                    let evt = match err {
+                        cpal::StreamError::DeviceNotAvailable => {
+                            BlinkEventKind::AudioOutputDeviceNoLongerAvailable
+                        }
+                        _ => BlinkEventKind::AudioStreamError,
+                    };
+                    let _ = event_ch3.send(evt);
                 },
                 None,
             )
-            .map_err(|x| Error::OtherWithContext(x.to_string()))?;
+            .map_err(|e| match e {
+                BuildStreamError::StreamConfigNotSupported => Error::InvalidAudioConfig,
+                BuildStreamError::DeviceNotAvailable => Error::AudioDeviceNotFound,
+                e => Error::OtherWithContext(format!(
+                    "failed to build output stream: {e}, {}, {}",
+                    file!(),
+                    line!()
+                )),
+            })?;
 
         Ok(Self {
             peer_id,

diff --git a/extensions/warp-blink-wrtc/src/host_media/audio/opus/source/mod.rs b/extensions/warp-blink-wrtc/src/host_media/audio/opus/source/mod.rs
@@ -1,6 +1,6 @@
 use cpal::{
     traits::{DeviceTrait, StreamTrait},
-    SampleRate,
+    BuildStreamError, SampleRate,
 };
 use rand::Rng;
 use ringbuf::HeapRb;
@@ -196,18 +196,24 @@ fn create_source_track(
             input_data_fn,
             move |err| {
                 log::error!("an error occurred on stream: {}", err);
-                if matches!(err, cpal::StreamError::DeviceNotAvailable) {
-                    let _ = event_ch2.send(BlinkEventKind::AudioInputDeviceNoLongerAvailable);
-                }
+                let evt = match err {
+                    cpal::StreamError::DeviceNotAvailable => {
+                        BlinkEventKind::AudioInputDeviceNoLongerAvailable
+                    }
+                    _ => BlinkEventKind::AudioStreamError,
+                };
+                let _ = event_ch2.send(evt);
             },
             None,
         )
-        .map_err(|e| {
-            anyhow::anyhow!(
+        .map_err(|e| match e {
+            BuildStreamError::StreamConfigNotSupported => Error::InvalidAudioConfig,
+            BuildStreamError::DeviceNotAvailable => Error::AudioDeviceNotFound,
+            e => Error::OtherWithContext(format!(
                 "failed to build input stream: {e}, {}, {}",
                 file!(),
                 line!()
-            )
+            )),
         })?;
 
     let join_handle = tokio::spawn(async move {

diff --git a/warp/src/blink/mod.rs b/warp/src/blink/mod.rs
@@ -148,6 +148,8 @@ pub enum BlinkEventKind {
     AudioOutputDeviceNoLongerAvailable,
     #[display(fmt = "AudioInputDeviceNoLongerAvailable")]
     AudioInputDeviceNoLongerAvailable,
+    #[display(fmt = "AudioStreamError")]
+    AudioStreamError,
 }
 
 #[derive(Serialize, Deserialize, Clone)]

diff --git a/warp/src/error.rs b/warp/src/error.rs
@@ -215,21 +215,23 @@ pub enum Error {
     InvalidDataType,
 
     //Blink Errors
-    #[error("Invalid MIME type: {_0}")]
-    InvalidMimeType(String),
     #[error("Device not found")]
     AudioDeviceNotFound,
     // indicates a problem enumerating audio I/O devices
     #[error("AudioHostError: {_0}")]
     AudioHostError(String),
+    #[error("BlinkNotInitialized")]
+    BlinkNotInitialized,
+    #[error("CallNotInProgress")]
+    CallNotInProgress,
+    #[error("Invalid MIME type: {_0}")]
+    InvalidMimeType(String),
+    #[error("InvalidAudioConfig")]
+    InvalidAudioConfig,
     #[error("MicrophoneMissing")]
     MicrophoneMissing,
     #[error("SpeakerMissing")]
     SpeakerMissing,
-    #[error("CallNotInProgress")]
-    CallNotInProgress,
-    #[error("BlinkNotInitialized")]
-    BlinkNotInitialized,
 
     //Misc
     #[error("Length for '{context}' is invalid. Current length: {current}. Minimum Length: {minimum:?}, Maximum: {maximum:?}")]