bump version to 0.4.6 and add support for optional headers in hangup, close, and unsubscribe methods

Author: shenjinti

Cargo.toml

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

src/dialog/dialog.rs

@@ -1397,13 +1397,17 @@ impl Dialog {
     }
 
     pub async fn hangup(&self) -> Result<()> {
+        self.hangup_with_headers(None).await
+    }
+
+    pub async fn hangup_with_headers(&self, headers: Option<Vec<rsip::Header>>) -> Result<()> {
         match self {
-            Dialog::ServerInvite(d) => d.bye().await,
-            Dialog::ClientInvite(d) => d.hangup().await,
-            Dialog::ServerSubscription(d) => d.unsubscribe().await,
-            Dialog::ClientSubscription(d) => d.unsubscribe().await,
-            Dialog::ServerPublication(d) => d.close().await,
-            Dialog::ClientPublication(d) => d.close().await,
+            Dialog::ServerInvite(d) => d.bye_with_headers(headers).await,
+            Dialog::ClientInvite(d) => d.hangup_with_headers(headers).await,
+            Dialog::ServerSubscription(d) => d.unsubscribe_with_headers(headers).await,
+            Dialog::ClientSubscription(d) => d.unsubscribe_with_headers(headers).await,
+            Dialog::ServerPublication(d) => d.close_with_headers(headers).await,
+            Dialog::ClientPublication(d) => d.close_with_headers(headers).await,
         }
     }
 

src/dialog/publication.rs

@@ -65,7 +65,12 @@ impl ClientPublicationDialog {
     }
 
     pub async fn close(&self) -> Result<()> {
-        let mut headers = vec![Header::Expires(0.into())];
+        self.close_with_headers(None).await
+    }
+
+    pub async fn close_with_headers(&self, extra_headers: Option<Vec<rsip::Header>>) -> Result<()> {
+        let mut headers = extra_headers.unwrap_or_default();
+        headers.push(Header::Expires(0.into()));
         if let Some(etag) = self.etag() {
             headers.push(Header::Other("SIP-If-Match".into(), etag.into()));
         }
@@ -186,6 +191,16 @@ impl ServerPublicationDialog {
     }
 
     pub async fn close(&self) -> Result<()> {
+        self.close_with_headers(None).await
+    }
+
+    pub async fn close_with_headers(&self, extra_headers: Option<Vec<rsip::Header>>) -> Result<()> {
+        let mut headers = extra_headers.unwrap_or_default();
+        headers.push(Header::Expires(0.into()));
+        if let Some(etag) = self.etag() {
+            headers.push(Header::Other("SIP-If-Match".into(), etag.into()));
+        }
+        self.request(Method::Publish, Some(headers), None).await?;
         self.inner
             .transition(DialogState::Terminated(self.id(), TerminatedReason::UasBye))?;
         Ok(())

src/dialog/subscription.rs

@@ -32,7 +32,12 @@ impl ClientSubscriptionDialog {
     }
 
     pub async fn unsubscribe(&self) -> Result<()> {
-        let headers = vec![Header::Expires(0.into())];
+        self.unsubscribe_with_headers(None).await
+    }
+
+    pub async fn unsubscribe_with_headers(&self, headers: Option<Vec<Header>>) -> Result<()> {
+        let mut headers = headers.unwrap_or_default();
+        headers.push(Header::Expires(0.into()));
         self.request(Method::Subscribe, Some(headers), None).await?;
         self.inner
             .transition(DialogState::Terminated(self.id(), TerminatedReason::UacBye))?;
@@ -158,6 +163,13 @@ impl ServerSubscriptionDialog {
     }
 
     pub async fn unsubscribe(&self) -> Result<()> {
+        self.unsubscribe_with_headers(None).await
+    }
+
+    pub async fn unsubscribe_with_headers(&self, headers: Option<Vec<Header>>) -> Result<()> {
+        let mut headers = headers.unwrap_or_default();
+        headers.push(Header::Expires(0.into()));
+        self.request(Method::Subscribe, Some(headers), None).await?;
         self.inner
             .transition(DialogState::Terminated(self.id(), TerminatedReason::UasBye))?;
         Ok(())