refactor: change dialog storage key type to String and update related methods

Author: shenjinti

Cargo.toml

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

src/dialog/dialog_layer.rs

@@ -33,7 +33,7 @@ use tracing::info;
 /// * `dialogs` uses RwLock for concurrent read access with exclusive writes
 pub struct DialogLayerInner {
     pub(super) last_seq: AtomicU32,
-    pub(super) dialogs: RwLock<HashMap<DialogId, Dialog>>,
+    pub(super) dialogs: RwLock<HashMap<String, Dialog>>,
 }
 pub type DialogLayerInnerRef = Arc<DialogLayerInner>;
 
@@ -154,7 +154,13 @@ impl DialogLayer {
     ) -> Result<ServerInviteDialog> {
         let mut id = DialogId::try_from(&tx.original)?;
         if !id.to_tag.is_empty() {
-            let dlg = self.inner.dialogs.read().unwrap().get(&id).cloned();
+            let dlg = self
+                .inner
+                .dialogs
+                .read()
+                .unwrap()
+                .get(&id.to_string())
+                .cloned();
             match dlg {
                 Some(Dialog::ServerInvite(dlg)) => return Ok(dlg),
                 _ => {
@@ -195,7 +201,7 @@ impl DialogLayer {
             .dialogs
             .write()
             .unwrap()
-            .insert(id.clone(), Dialog::ServerInvite(dialog.clone()));
+            .insert(id.to_string(), Dialog::ServerInvite(dialog.clone()));
         info!(%id, "server invite dialog created");
         Ok(dialog)
     }
@@ -209,7 +215,7 @@ impl DialogLayer {
         self.inner.dialogs.read().unwrap().len()
     }
 
-    pub fn all_dialog_ids(&self) -> Vec<DialogId> {
+    pub fn all_dialog_ids(&self) -> Vec<String> {
         self.inner
             .dialogs
             .read()
@@ -220,6 +226,10 @@ impl DialogLayer {
     }
 
     pub fn get_dialog(&self, id: &DialogId) -> Option<Dialog> {
+        self.get_dialog_with(&id.to_string())
+    }
+
+    pub fn get_dialog_with(&self, id: &String) -> Option<Dialog> {
         match self.inner.dialogs.read() {
             Ok(dialogs) => match dialogs.get(id) {
                 Some(dialog) => Some(dialog.clone()),
@@ -235,7 +245,7 @@ impl DialogLayer {
             .dialogs
             .write()
             .unwrap()
-            .remove(id)
+            .remove(&id.to_string())
             .map(|d| d.on_remove());
     }
 

src/dialog/invitation.rs

@@ -153,7 +153,7 @@ impl DialogGuard {
 impl Drop for DialogGuard {
     fn drop(&mut self) {
         let dlg = match self.dialog_layer_inner.dialogs.write() {
-            Ok(mut dialogs) => match dialogs.remove(&self.id) {
+            Ok(mut dialogs) => match dialogs.remove(&self.id.to_string()) {
                 Some(dlg) => dlg,
                 None => return,
             },
@@ -176,7 +176,7 @@ impl<'a> Drop for DialogGuardForUnconfirmed<'a> {
     fn drop(&mut self) {
         // If the dialog is still unconfirmed, we should try to cancel it
         match self.dialog_layer_inner.dialogs.write() {
-            Ok(mut dialogs) => match dialogs.remove(self.id) {
+            Ok(mut dialogs) => match dialogs.remove(&self.id.to_string()) {
                 Some(dlg) => {
                     info!(%self.id, "unconfirmed dialog dropped, cancelling it");
                     let _ = tokio::spawn(async move {
@@ -421,7 +421,7 @@ impl DialogLayer {
             .dialogs
             .write()
             .as_mut()
-            .map(|ds| ds.insert(id.clone(), Dialog::ClientInvite(dialog.clone())))
+            .map(|ds| ds.insert(id.to_string(), Dialog::ClientInvite(dialog.clone())))
             .ok();
 
         info!(%id, "client invite dialog created");
@@ -435,7 +435,7 @@ impl DialogLayer {
             .dialogs
             .write()
             .as_mut()
-            .map(|ds| ds.remove(&id))
+            .map(|ds| ds.remove(&id.to_string()))
             .ok();
 
         match r {
@@ -451,7 +451,10 @@ impl DialogLayer {
                             .write()
                             .as_mut()
                             .map(|ds| {
-                                ds.insert(new_dialog_id, Dialog::ClientInvite(dialog.clone()))
+                                ds.insert(
+                                    new_dialog_id.to_string(),
+                                    Dialog::ClientInvite(dialog.clone()),
+                                )
                             })
                             .ok();
                     }

src/dialog/server_dialog.rs

@@ -593,23 +593,23 @@ impl ServerInviteDialog {
                     ));
                 }
             }
-        } else {
-            match tx.original.method {
-                rsip::Method::PRack => return self.handle_prack(tx).await,
-                rsip::Method::Ack => {
-                    self.inner.tu_sender.send(TransactionEvent::Received(
-                        tx.original.clone().into(),
-                        tx.connection.clone(),
-                    ))?;
-                }
-                rsip::Method::Invite => {}
-                _ => {
-                    // ignore other requests in non-confirmed state
-                    return Ok(());
-                }
+        }
+
+        match tx.original.method {
+            rsip::Method::Invite => return self.handle_invite(tx).await,
+            rsip::Method::PRack => return self.handle_prack(tx).await,
+            rsip::Method::Ack => {
+                self.inner.tu_sender.send(TransactionEvent::Received(
+                    tx.original.clone().into(),
+                    tx.connection.clone(),
+                ))?;
+                return Ok(());
+            }
+            _ => {
+                // ignore other requests in non-confirmed state
+                return Ok(());
             }
         }
-        self.handle_invite(tx).await
     }
 
     async fn handle_bye(&mut self, tx: &mut Transaction) -> Result<()> {

src/transaction/endpoint.rs

@@ -51,7 +51,7 @@ impl Default for EndpointOption {
     fn default() -> Self {
         EndpointOption {
             t1: Duration::from_millis(500),
-            t4: Duration::from_secs(4),
+            t4: Duration::from_secs(5),
             t1x64: Duration::from_millis(64 * 500),
             timerc: Duration::from_secs(180),
             callid_suffix: None,