feat: update version to 0.2.26 and enhance EndpointOption with callid_suffix

Author: shenjinti

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rsipstack"
-version = "0.2.25"
+version = "0.2.26"
 edition = "2021"
 description = "SIP Stack Rust library for building SIP applications"
 license = "MIT"
@@ -33,7 +33,6 @@ console_error_panic_hook = { version = "0.1.7", optional = true }
 wasm-bindgen-futures = "0.4.45"
 tokio-util = { version = "0.7.15", features = ["full"] }
 tracing-subscriber = { version = "0.3.19", features = ["local-time"] }
-uuid = { version = "1.16.0", features = ["v4"] }
 rand = { version = "0.9.1" }
 get_if_addrs = "0.5.3"
 rsip-dns = { version = "0.1.4", features = ["trust-dns"] }
@@ -56,7 +55,6 @@ all-transports = ["rustls", "websocket"]
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 tokio = { version = "1.44.2", features = ["time", "sync", "macros", "io-util"] }
 getrandom = { version = "0.3.2" }
-uuid = { version = "1.16.0" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tokio = { version = "1.44.2", features = ["full"] }

src/transaction/endpoint.rs

@@ -23,11 +23,13 @@ use tokio::{
 use tokio_util::sync::CancellationToken;
 use tracing::{debug, info, trace, warn};
 
+#[derive(Debug, Clone)]
 pub struct EndpointOption {
     pub t1: Duration,
     pub t4: Duration,
     pub t1x64: Duration,
     pub ignore_out_of_dialog_option: bool,
+    pub callid_suffix: Option<String>,
 }
 
 impl Default for EndpointOption {
@@ -37,6 +39,7 @@ impl Default for EndpointOption {
             t4: Duration::from_secs(4),
             t1x64: Duration::from_millis(64 * 500),
             ignore_out_of_dialog_option: true,
+            callid_suffix: None,
         }
     }
 }
@@ -111,6 +114,7 @@ pub struct EndpointBuilder {
     transport_layer: Option<TransportLayer>,
     cancel_token: Option<CancellationToken>,
     timer_interval: Option<Duration>,
+    option: Option<EndpointOption>,
 }
 
 /// SIP Endpoint
@@ -175,6 +179,7 @@ impl EndpointInner {
         cancel_token: CancellationToken,
         timer_interval: Option<Duration>,
         allows: Vec<rsip::Method>,
+        option: Option<EndpointOption>,
     ) -> Arc<Self> {
         Arc::new(EndpointInner {
             allows: Mutex::new(Some(allows)),
@@ -186,7 +191,7 @@ impl EndpointInner {
             timer_interval: timer_interval.unwrap_or(Duration::from_millis(20)),
             cancel_token,
             incoming_sender: Mutex::new(None),
-            option: EndpointOption::default(),
+            option: option.unwrap_or_default(),
         })
     }
 
@@ -434,9 +439,13 @@ impl EndpointBuilder {
             transport_layer: None,
             cancel_token: None,
             timer_interval: None,
+            option: None,
         }
     }
-
+    pub fn with_option(&mut self, option: EndpointOption) -> &mut Self {
+        self.option = Some(option);
+        self
+    }
     pub fn with_user_agent(&mut self, user_agent: &str) -> &mut Self {
         self.user_agent = user_agent.to_string();
         self
@@ -471,13 +480,15 @@ impl EndpointBuilder {
         let allows = self.allows.to_owned();
         let user_agent = self.user_agent.to_owned();
         let timer_interval = self.timer_interval.to_owned();
+        let option = self.option.to_owned();
 
         let core = EndpointInner::new(
             user_agent,
             transport_layer,
             cancel_token,
             timer_interval,
             allows,
+            option,
         );
 
         Endpoint { inner: core }

src/transaction/message.rs

@@ -93,7 +93,7 @@ impl EndpointInner {
     ) -> rsip::Request {
         let headers = vec![
             Header::Via(via.into()),
-            Header::CallId(make_call_id(None)),
+            Header::CallId(make_call_id(self.option.callid_suffix.as_deref())),
             Header::From(from.into()),
             Header::To(to.into()),
             Header::CSeq(rsip::typed::CSeq { seq, method }.into()),

src/transaction/mod.rs

@@ -3,7 +3,6 @@ use key::TransactionKey;
 use std::time::Duration;
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
 use transaction::Transaction;
-use uuid::Uuid;
 
 pub mod endpoint;
 pub mod key;
@@ -18,7 +17,7 @@ mod tests;
 pub const TO_TAG_LEN: usize = 8;
 pub const BRANCH_LEN: usize = 12;
 pub const CNONCE_LEN: usize = 8;
-
+pub const CALL_ID_LEN: usize = 22;
 pub struct IncomingRequest {
     pub request: rsip::Request,
     pub connection: SipConnection,
@@ -272,7 +271,12 @@ pub fn make_via_branch() -> rsip::Param {
 }
 
 pub fn make_call_id(domain: Option<&str>) -> rsip::headers::CallId {
-    format!("{}@{}", Uuid::new_v4(), domain.unwrap_or("restsend.com")).into()
+    format!(
+        "{}@{}",
+        random_text(CALL_ID_LEN),
+        domain.unwrap_or("restsend.com")
+    )
+    .into()
 }
 
 pub fn make_tag() -> rsip::param::Tag {