fix tests

Author: adamchol

examples/client/main.rs

@@ -7,7 +7,6 @@ use rsipstack::dialog::dialog_layer::DialogLayer;
 use rsipstack::dialog::invitation::InviteOption;
 use rsipstack::dialog::server_dialog::ServerInviteDialog;
 use rsipstack::transaction::endpoint::EndpointInnerRef;
-use rsipstack::transaction::key::TransactionRole;
 use rsipstack::Result;
 use rsipstack::{
     dialog::{authenticate::Credential, registration::Registration},

src/dialog/dialog.rs

@@ -105,8 +105,8 @@ impl TransactionHandle {
 /// # fn example() {
 /// # let dialog_id = DialogId {
 /// #     call_id: "test@example.com".to_string(),
-/// #     from_tag: "from-tag".to_string(),
-/// #     to_tag: "to-tag".to_string(),
+/// #     local_tag: "from-tag".to_string(),
+/// #     remote_tag: "to-tag".to_string(),
 /// # };
 /// let state = DialogState::Confirmed(dialog_id, rsip::Response::default());
 /// if state.is_confirmed() {

src/dialog/dialog_layer.rs

@@ -93,11 +93,11 @@ pub type DialogLayerInnerRef = Arc<DialogLayerInner>;
 /// # async fn example() -> rsipstack::Result<()> {
 /// # let dialog_layer: DialogLayer = todo!();
 /// # let request = todo!();
-/// # let transaction = todo!();
+/// # let mut transaction = todo!();
 /// // Find existing dialog for incoming request
-/// if let Some(mut dialog) = dialog_layer.match_dialog(&request) {
+/// if let Some(mut dialog) = dialog_layer.match_dialog(&transaction) {
 ///     // Route to existing dialog
-///     dialog.handle(transaction).await?;
+///     dialog.handle(&mut transaction).await?;
 /// } else {
 ///     // Create new dialog or reject
 /// }

src/dialog/mod.rs

@@ -28,8 +28,8 @@ mod tests;
 /// # Fields
 ///
 /// * `call_id` - The Call-ID header field value from SIP messages, identifying a call session
-/// * `from_tag` - The tag parameter from the From header field, identifying the dialog initiator
-/// * `to_tag` - The tag parameter from the To header field, identifying the dialog recipient
+/// * `local_tag` - The local tag for this endpoint (From tag for client role, To tag for server role)
+/// * `remote_tag` - The remote tag for the peer (To tag for client role, From tag for server role)
 ///
 /// # Examples
 ///
@@ -38,16 +38,16 @@ mod tests;
 ///
 /// let dialog_id = DialogId {
 ///     call_id: "1234567890@example.com".to_string(),
-///     from_tag: "alice-tag-123".to_string(),
-///     to_tag: "bob-tag-456".to_string(),
+///     local_tag: "alice-tag-123".to_string(),
+///     remote_tag: "bob-tag-456".to_string(),
 /// };
 ///
 /// println!("Dialog ID: {}", dialog_id);
 /// ```
 ///
 /// # Notes
 ///
-/// - During early dialog establishment, `to_tag` may be an empty string
+/// - During early dialog establishment, `remote_tag` may be an empty string
 /// - Dialog ID remains constant throughout the dialog lifetime
 /// - Used for managing and routing SIP messages at the dialog layer
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]

src/dialog/tests/test_client_dialog.rs

@@ -55,8 +55,8 @@ async fn test_client_dialog_creation() -> crate::Result<()> {
 
     let dialog_id = DialogId {
         call_id: "test-call-id".to_string(),
-        from_tag: "alice-tag".to_string(),
-        to_tag: "bob-tag".to_string(),
+        local_tag: "alice-tag".to_string(),
+        remote_tag: "bob-tag".to_string(),
     };
 
     let invite_req = create_invite_request("alice-tag", "", "test-call-id");
@@ -90,8 +90,8 @@ async fn test_client_dialog_sequence_handling() -> crate::Result<()> {
 
     let dialog_id = DialogId {
         call_id: "test-call-seq".to_string(),
-        from_tag: "alice-tag".to_string(),
-        to_tag: "bob-tag".to_string(),
+        local_tag: "alice-tag".to_string(),
+        remote_tag: "bob-tag".to_string(),
     };
 
     let invite_req = create_invite_request("alice-tag", "bob-tag", "test-call-seq");
@@ -130,8 +130,8 @@ async fn test_client_dialog_state_transitions() -> crate::Result<()> {
 
     let dialog_id = DialogId {
         call_id: "test-call-flow".to_string(),
-        from_tag: "alice-tag".to_string(),
-        to_tag: "".to_string(),
+        local_tag: "alice-tag".to_string(),
+        remote_tag: "".to_string(),
     };
 
     let invite_req = create_invite_request("alice-tag", "", "test-call-flow");
@@ -208,8 +208,8 @@ async fn test_client_dialog_termination_scenarios() -> crate::Result<()> {
     // Test 1: Early termination (before confirmed)
     let dialog_id_1 = DialogId {
         call_id: "test-call-term-early".to_string(),
-        from_tag: "alice-tag".to_string(),
-        to_tag: "".to_string(),
+        local_tag: "alice-tag".to_string(),
+        remote_tag: "".to_string(),
     };
 
     let invite_req_1 = create_invite_request("alice-tag", "", "test-call-term-early");
@@ -245,8 +245,8 @@ async fn test_client_dialog_termination_scenarios() -> crate::Result<()> {
     // Test 2: Normal termination after confirmed
     let dialog_id_2 = DialogId {
         call_id: "test-call-term-normal".to_string(),
-        from_tag: "alice-tag".to_string(),
-        to_tag: "bob-tag".to_string(),
+        local_tag: "alice-tag".to_string(),
+        remote_tag: "bob-tag".to_string(),
     };
 
     let invite_req_2 = create_invite_request("alice-tag", "bob-tag", "test-call-term-normal");
@@ -294,8 +294,8 @@ async fn test_make_request_preserves_remote_target_and_route_order() -> crate::R
 
     let dialog_id = DialogId {
         call_id: "route-order-call".to_string(),
-        from_tag: "from-tag".to_string(),
-        to_tag: "to-tag".to_string(),
+        local_tag: "from-tag".to_string(),
+        remote_tag: "to-tag".to_string(),
     };
 
     let invite_req = create_invite_request("from-tag", "to-tag", "route-order-call");
@@ -378,8 +378,8 @@ async fn test_route_set_updates_from_200_ok_response() -> crate::Result<()> {
 
     let dialog_id = DialogId {
         call_id: "route-update-call".to_string(),
-        from_tag: "from-tag".to_string(),
-        to_tag: "".to_string(),
+        local_tag: "from-tag".to_string(),
+        remote_tag: "".to_string(),
     };
 
     let invite_req = create_invite_request("from-tag", "", "route-update-call");

src/dialog/tests/test_dialog_layer.rs

@@ -103,8 +103,8 @@ async fn test_server_invite_dialog_creation() -> crate::Result<()> {
     // Dialog ID should have generated to-tag
     let dialog_id = dialog.id();
     assert_eq!(dialog_id.call_id, "call-id-456");
-    assert_eq!(dialog_id.from_tag, "alice-tag-123");
-    assert!(!dialog_id.to_tag.is_empty());
+    assert_eq!(dialog_id.remote_tag, "alice-tag-123");
+    assert!(!dialog_id.local_tag.is_empty());
 
     Ok(())
 }
@@ -139,7 +139,7 @@ async fn test_existing_server_invite_dialog_retrieval() -> crate::Result<()> {
     // Second request with same dialog identifiers should retrieve existing dialog
     let invite_req2 = create_invite_request(
         "alice-tag-123",
-        &dialog_id.to_tag,
+        &dialog_id.local_tag,
         "call-id-456",
         "z9hG4bKnashds2",
     );
@@ -173,7 +173,7 @@ async fn test_dialog_retrieval_and_matching() -> crate::Result<()> {
         key,
         invite_req.clone(),
         endpoint.inner.clone(),
-        Some(mock_conn),
+        Some(mock_conn.clone()),
     );
 
     let (state_sender, _) = unbounded_channel();
@@ -196,15 +196,16 @@ async fn test_dialog_retrieval_and_matching() -> crate::Result<()> {
         method: rsip::Method::Bye,
         uri: rsip::Uri::try_from("sip:bob@example.com:5060")?,
         headers: vec![
+            Via::new("SIP/2.0/UDP alice.example.com:5060;branch=z9hG4bKbye").into(),
             CSeq::new("2 BYE").into(),
             From::new(&format!(
                 "Alice <sip:alice@example.com>;tag={}",
-                dialog_id.from_tag
+                dialog_id.remote_tag
             ))
             .into(),
             To::new(&format!(
                 "Bob <sip:bob@example.com>;tag={}",
-                dialog_id.to_tag
+                dialog_id.local_tag
             ))
             .into(),
             CallId::new(&dialog_id.call_id).into(),
@@ -214,7 +215,9 @@ async fn test_dialog_retrieval_and_matching() -> crate::Result<()> {
         body: vec![],
     };
 
-    let matched_dialog = dialog_layer.match_dialog(&bye_req);
+    let bye_key = TransactionKey::from_request(&bye_req, TransactionRole::Server)?;
+    let bye_tx = Transaction::new_server(bye_key, bye_req, endpoint.inner.clone(), Some(mock_conn));
+    let matched_dialog = dialog_layer.match_dialog(&bye_tx);
     assert!(matched_dialog.is_some());
 
     Ok(())
@@ -281,13 +284,13 @@ async fn test_dialog_layer_with_swapped_tags() -> crate::Result<()> {
     // Create a swapped dialog ID (as if from the other perspective)
     let swapped_id = DialogId {
         call_id: dialog_id.call_id.clone(),
-        from_tag: dialog_id.to_tag.clone(),
-        to_tag: dialog_id.from_tag.clone(),
+        local_tag: dialog_id.remote_tag.clone(),
+        remote_tag: dialog_id.local_tag.clone(),
     };
 
-    // Should be able to find dialog with swapped tags
+    // Swapped tags should NOT match the server-side dialog ID
     let found_dialog = dialog_layer.get_dialog(&swapped_id);
-    assert!(found_dialog.is_some());
+    assert!(found_dialog.is_none());
 
     Ok(())
 }
@@ -329,8 +332,8 @@ async fn test_multiple_dialogs_management() -> crate::Result<()> {
     // Remove one dialog
     let _test_id = DialogId {
         call_id: "test-call-2".to_string(),
-        from_tag: "alice-tag-2".to_string(),
-        to_tag: "".to_string(), // We need to find the actual dialog first
+        local_tag: "".to_string(),
+        remote_tag: "alice-tag-2".to_string(), // We need to find the actual dialog first
     };
 
     // Find all dialogs to get the actual IDs
@@ -340,13 +343,20 @@ async fn test_multiple_dialogs_management() -> crate::Result<()> {
         let from_tag = format!("alice-tag-{}", i);
         let _partial_id = DialogId {
             call_id: call_id.clone(),
-            from_tag: from_tag.clone(),
-            to_tag: "".to_string(),
+            local_tag: "".to_string(),
+            remote_tag: from_tag.clone(),
         };
 
         // Try to find dialog by creating a request and matching
         let test_req = create_invite_request(&from_tag, "", &call_id, "test-branch");
-        if let Some(dialog) = dialog_layer.match_dialog(&test_req) {
+        let test_key = TransactionKey::from_request(&test_req, TransactionRole::Server)?;
+        let test_tx = Transaction::new_server(
+            test_key,
+            test_req,
+            endpoint.inner.clone(),
+            Some(mock_conn.clone()),
+        );
+        if let Some(dialog) = dialog_layer.match_dialog(&test_tx) {
             dialog_ids.push(dialog.id());
         }
     }

src/dialog/tests/test_dialog_states.rs

@@ -72,30 +72,22 @@ pub async fn create_test_endpoint() -> crate::Result<crate::transaction::endpoin
 fn test_dialog_id_eq() {
     let dialog_id_1 = DialogId {
         call_id: "test-call-id-123".to_string(),
-        from_tag: "456".to_string(),
-        to_tag: "789".to_string(),
+        local_tag: "456".to_string(),
+        remote_tag: "789".to_string(),
     };
-    assert!("456" < "789");
-    assert_eq!(dialog_id_1.to_string(), "test-call-id-123-789-456");
-    let dialog_id_2 = DialogId {
-        call_id: "test-call-id-123".to_string(),
-        from_tag: "789".to_string(),
-        to_tag: "456".to_string(),
-    };
-    assert_eq!(dialog_id_2.to_string(), "test-call-id-123-789-456");
-    assert_eq!(dialog_id_1, dialog_id_2);
+    assert_eq!(dialog_id_1.to_string(), "test-call-id-123-456-789");
 
-    let dialog_id_3 = DialogId {
+    let dialog_id_4 = DialogId {
         call_id: "mock".to_string(),
-        from_tag: "M3wnsBf".to_string(),
-        to_tag: "1NyRqPt1".to_string(),
+        local_tag: "M3wnsBf".to_string(),
+        remote_tag: "1NyRqPt1".to_string(),
     };
-    let dialog_id_4 = DialogId {
+    let dialog_id_5 = DialogId {
         call_id: "mock".to_string(),
-        from_tag: "1NyRqPt1".to_string(),
-        to_tag: "M3wnsBf".to_string(),
+        local_tag: "1NyRqPt1".to_string(),
+        remote_tag: "M3wnsBf".to_string(),
     };
-    assert_eq!(dialog_id_3, dialog_id_4);
+    assert_ne!(dialog_id_4, dialog_id_5);
 }
 #[tokio::test]
 async fn test_dialog_state_transitions() -> crate::Result<()> {
@@ -105,8 +97,8 @@ async fn test_dialog_state_transitions() -> crate::Result<()> {
     // Create dialog ID
     let dialog_id = DialogId {
         call_id: "test-call-id-123".to_string(),
-        from_tag: "alice-tag-456".to_string(),
-        to_tag: "bob-tag-789".to_string(),
+        local_tag: "alice-tag-456".to_string(),
+        remote_tag: "bob-tag-789".to_string(),
     };
 
     // Create INVITE request
@@ -173,8 +165,8 @@ async fn test_server_dialog_state_transitions() -> crate::Result<()> {
     // Create dialog ID
     let dialog_id = DialogId {
         call_id: "test-call-id-server-123".to_string(),
-        from_tag: "alice-tag-456".to_string(),
-        to_tag: "bob-tag-789".to_string(),
+        local_tag: "bob-tag-789".to_string(),
+        remote_tag: "alice-tag-456".to_string(),
     };
 
     // Create INVITE request
@@ -230,8 +222,8 @@ async fn test_dialog_in_dialog_requests() -> crate::Result<()> {
     // Create dialog ID
     let dialog_id = DialogId {
         call_id: "test-call-id-in-dialog-123".to_string(),
-        from_tag: "alice-tag-456".to_string(),
-        to_tag: "bob-tag-789".to_string(),
+        local_tag: "alice-tag-456".to_string(),
+        remote_tag: "bob-tag-789".to_string(),
     };
 
     // Create initial INVITE request
@@ -329,8 +321,8 @@ async fn test_dialog_termination_scenarios() -> crate::Result<()> {
     // Test 1: Termination with error status code
     let dialog_id_1 = DialogId {
         call_id: "test-call-id-term-1".to_string(),
-        from_tag: "alice-tag-456".to_string(),
-        to_tag: "bob-tag-789".to_string(),
+        local_tag: "alice-tag-456".to_string(),
+        remote_tag: "bob-tag-789".to_string(),
     };
 
     let invite_req_1 = create_invite_request("alice-tag-456", "", "test-call-id-term-1");
@@ -361,8 +353,8 @@ async fn test_dialog_termination_scenarios() -> crate::Result<()> {
     // Test 2: Normal termination (BYE)
     let dialog_id_2 = DialogId {
         call_id: "test-call-id-term-2".to_string(),
-        from_tag: "alice-tag-456".to_string(),
-        to_tag: "bob-tag-789".to_string(),
+        local_tag: "alice-tag-456".to_string(),
+        remote_tag: "bob-tag-789".to_string(),
     };
 
     let invite_req_2 = create_invite_request("alice-tag-456", "bob-tag-789", "test-call-id-term-2");
@@ -404,8 +396,8 @@ async fn test_dialog_sequence_numbers() -> crate::Result<()> {
 
     let dialog_id = DialogId {
         call_id: "test-call-id-seq-123".to_string(),
-        from_tag: "alice-tag-456".to_string(),
-        to_tag: "bob-tag-789".to_string(),
+        local_tag: "alice-tag-456".to_string(),
+        remote_tag: "bob-tag-789".to_string(),
     };
 
     let invite_req = create_invite_request("alice-tag-456", "bob-tag-789", "test-call-id-seq-123");
@@ -438,8 +430,8 @@ async fn test_dialog_sequence_numbers() -> crate::Result<()> {
 async fn test_dialog_state_display() -> crate::Result<()> {
     let dialog_id = DialogId {
         call_id: "test-call-id-display".to_string(),
-        from_tag: "alice-tag".to_string(),
-        to_tag: "bob-tag".to_string(),
+        local_tag: "alice-tag".to_string(),
+        remote_tag: "bob-tag".to_string(),
     };
 
     // Test all state display formats
@@ -464,10 +456,10 @@ async fn test_dialog_state_display() -> crate::Result<()> {
 async fn test_dialog_id_creation() -> crate::Result<()> {
     // Test from Request
     let request = create_invite_request("alice-tag-123", "", "call-id-456");
-    let dialog_id = DialogId::try_from(&request)?;
+    let dialog_id = DialogId::try_from((&request, TransactionRole::Client))?;
     assert_eq!(dialog_id.call_id, "call-id-456");
-    assert_eq!(dialog_id.from_tag, "alice-tag-123");
-    assert_eq!(dialog_id.to_tag, "");
+    assert_eq!(dialog_id.local_tag, "alice-tag-123");
+    assert_eq!(dialog_id.remote_tag, "");
 
     // Test from Response
     let response = create_response(
@@ -476,10 +468,10 @@ async fn test_dialog_id_creation() -> crate::Result<()> {
         "bob-tag-789",
         "call-id-456",
     );
-    let dialog_id_resp = DialogId::try_from(&response)?;
+    let dialog_id_resp = DialogId::try_from((&response, TransactionRole::Client))?;
     assert_eq!(dialog_id_resp.call_id, "call-id-456");
-    assert_eq!(dialog_id_resp.from_tag, "alice-tag-123");
-    assert_eq!(dialog_id_resp.to_tag, "bob-tag-789");
+    assert_eq!(dialog_id_resp.local_tag, "alice-tag-123");
+    assert_eq!(dialog_id_resp.remote_tag, "bob-tag-789");
 
     // Test display
     let display_str = dialog_id_resp.to_string();