feat: update version to 0.2.54 and enhance error handling with status codes

Author: shenjinti

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rsipstack"
-version = "0.2.53"
+version = "0.2.54"
 edition = "2021"
 description = "SIP Stack Rust library for building SIP applications"
 license = "MIT"

src/bin/bench_ua.rs

@@ -284,14 +284,12 @@ async fn process_dialog_state(
             }
             DialogState::Terminated(id, status) => {
                 match status {
-                    TerminatedReason::UacOther(Some(status)) => {
+                    TerminatedReason::UacOther(status) => {
                         info!("dialog terminated with status: {}", status);
                     }
-                    TerminatedReason::UasOther(Some(status)) => {
+                    TerminatedReason::UasOther(status) => {
                         info!("dialog terminated with status: {}", status);
                     }
-                    TerminatedReason::UacOther(None) => {}
-                    TerminatedReason::UasOther(None) => {}
                     _ => {}
                 }
                 dialog_layer.remove_dialog(&id);

src/dialog/authenticate.rs

@@ -194,10 +194,12 @@ pub async fn handle_client_authenticate(
     let header = match resp.www_authenticate_header() {
         Some(h) => Header::WwwAuthenticate(h.clone()),
         None => {
+            let code = resp.status_code.clone();
             let proxy_header = rsip::header_opt!(resp.headers().iter(), Header::ProxyAuthenticate);
             let proxy_header = proxy_header.ok_or(crate::Error::DialogError(
                 "missing proxy/www authenticate".to_string(),
                 DialogId::try_from(&tx.original)?,
+                code,
             ))?;
             Header::ProxyAuthenticate(proxy_header.clone())
         }

src/dialog/client_dialog.rs

@@ -420,6 +420,7 @@ impl ClientInviteDialog {
                     return Err(crate::Error::DialogError(
                         "invalid request".to_string(),
                         self.id(),
+                        rsip::StatusCode::MethodNotAllowed,
                     ));
                 }
             }
@@ -562,15 +563,20 @@ impl ClientInviteDialog {
                             break;
                         }
                         _ => {
-                            let mut reason = format!("{}", resp.status_code);
-                            if let Some(reason_phrase) = resp.reason_phrase() {
-                                reason = format!("{};{}", reason, reason_phrase);
-                            }
+                            let reason = if let Some(reason_phrase) = resp.reason_phrase() {
+                                format!("{reason_phrase}")
+                            } else {
+                                format!("{}", resp.status_code)
+                            };
                             self.inner.transition(DialogState::Terminated(
                                 self.id(),
-                                TerminatedReason::UasOther(Some(resp.status_code.clone())),
+                                TerminatedReason::UasOther(resp.status_code.clone()),
                             ))?;
-                            return Err(crate::Error::DialogError(reason, self.id()));
+                            return Err(crate::Error::DialogError(
+                                reason,
+                                self.id(),
+                                resp.status_code,
+                            ));
                         }
                     }
                 }

src/dialog/dialog.rs

@@ -92,8 +92,8 @@ pub enum TerminatedReason {
     UasDecline,
     ProxyError(rsip::StatusCode),
     ProxyAuthRequired,
-    UacOther(Option<rsip::StatusCode>),
-    UasOther(Option<rsip::StatusCode>),
+    UacOther(rsip::StatusCode),
+    UasOther(rsip::StatusCode),
 }
 
 /// SIP Dialog

src/dialog/dialog_layer.rs

@@ -160,6 +160,7 @@ impl DialogLayer {
                     return Err(crate::Error::DialogError(
                         "the dialog not found".to_string(),
                         id,
+                        rsip::StatusCode::CallTransactionDoesNotExist,
                     ));
                 }
             }

src/dialog/registration.rs

@@ -488,6 +488,7 @@ impl Registration {
         return Err(crate::Error::DialogError(
             "registration transaction is already terminated".to_string(),
             DialogId::try_from(&tx.original)?,
+            StatusCode::BadRequest,
         ));
     }
 

src/dialog/server_dialog.rs

@@ -593,6 +593,7 @@ impl ServerInviteDialog {
                     return Err(crate::Error::DialogError(
                         "invalid request in confirmed state".to_string(),
                         self.id(),
+                        rsip::StatusCode::MethodNotAllowed,
                     ));
                 }
                 rsip::Method::Bye => return self.handle_bye(tx).await,
@@ -605,6 +606,7 @@ impl ServerInviteDialog {
                     return Err(crate::Error::DialogError(
                         "invalid request".to_string(),
                         self.id(),
+                        rsip::StatusCode::MethodNotAllowed,
                     ));
                 }
             }
@@ -721,6 +723,7 @@ impl TryFrom<&Dialog> for ServerInviteDialog {
             _ => Err(crate::Error::DialogError(
                 "Dialog is not a ServerInviteDialog".to_string(),
                 dlg.id(),
+                rsip::StatusCode::BadRequest,
             )),
         }
     }

src/error.rs

@@ -1,7 +1,5 @@
 use crate::{dialog::DialogId, transaction::key::TransactionKey, transport::SipAddr};
-use std::env::VarError;
 use thiserror::Error as ThisError;
-use wasm_bindgen::prelude::*;
 
 #[derive(Debug, ThisError)]
 pub enum Error {
@@ -21,44 +19,23 @@ pub enum Error {
     EndpointError(String),
 
     #[error("Dialog error: {0}: {1}")]
-    DialogError(String, DialogId),
+    DialogError(String, DialogId, rsip::StatusCode),
 
     #[error("I/O error: {0}")]
     IoError(#[from] std::io::Error),
 
-    #[error("Format error: {0}")]
-    FormatError(#[from] std::fmt::Error),
-
-    #[error("Environment variable error: {0}")]
-    VarError(#[from] VarError),
-
     #[error("Address parse error: {0}")]
     AddrParseError(#[from] std::net::AddrParseError),
 
-    #[error("TLS error: {0}")]
-    TlsError(#[from] tokio_rustls::rustls::Error),
-
     #[error("WebSocket error: {0}")]
     WebSocketError(#[from] tokio_tungstenite::tungstenite::Error),
 
-    #[error("Channel send error: {0}")]
-    ChannelSendError(String),
-
-    #[error("Broadcast receive error: {0}")]
-    BroadcastRecvError(#[from] tokio::sync::broadcast::error::RecvError),
-
     #[error("Error: {0}")]
     Error(String),
 }
 
-impl From<Error> for JsValue {
-    fn from(e: Error) -> Self {
-        e.to_string().into()
-    }
-}
-
 impl<T> From<tokio::sync::mpsc::error::SendError<T>> for Error {
     fn from(e: tokio::sync::mpsc::error::SendError<T>) -> Self {
-        Error::ChannelSendError(e.to_string())
+        Error::Error(e.to_string())
     }
 }

src/transaction/key.rs

@@ -89,7 +89,8 @@ impl TransactionKey {
                     role, method, cseq, call_id, from_tag, via.uri.host_with_port
                 )
             }
-        }?;
+        }
+        .map_err(|e| Error::Error(e.to_string()))?;
         Ok(TransactionKey(key))
     }
 }