minor refactors, add OutgoingMessage

Author: ranfdev

ntfy-daemon/src/actor_utils.rs

@@ -0,0 +1,14 @@
+macro_rules! send_command {
+    ($self:expr, $command:expr) => {{
+        let (resp_tx, rx) = oneshot::channel();
+        $self
+            .command_tx
+            .send($command(resp_tx))
+            .await
+            .map_err(|_| anyhow::anyhow!("Actor mailbox error"))?;
+        rx.await
+            .map_err(|_| anyhow::anyhow!("Actor response error"))?
+    }};
+}
+
+pub(crate) use send_command;

ntfy-daemon/src/lib.rs

@@ -1,3 +1,4 @@
+mod actor_utils;
 pub mod credentials;
 mod http_client;
 mod listener;
@@ -31,6 +32,8 @@ pub enum Error {
     InvalidTopic(String),
     #[error("invalid server base url {0:?}")]
     InvalidServer(#[from] url::ParseError),
+    #[error("multiple errors in subscription model: {0:?}")]
+    InvalidSubscription(Vec<Error>),
     #[error("duplicate message")]
     DuplicateMessage,
     #[error("can't parse the minimum set of required fields from the message {0}")]

ntfy-daemon/src/listener.rs

@@ -36,7 +36,7 @@ pub enum ServerEvent {
         topic: String,
     },
     #[serde(rename = "message")]
-    Message(models::Message),
+    Message(models::ReceivedMessage),
     #[serde(rename = "keepalive")]
     KeepAlive {
         id: String,
@@ -48,7 +48,7 @@ pub enum ServerEvent {
 
 #[derive(Debug, Clone)]
 pub enum ListenerEvent {
-    Message(models::Message),
+    Message(models::ReceivedMessage),
     ConnectionStateChanged(ConnectionState),
 }
 
@@ -281,7 +281,7 @@ impl ListenerHandle {
     }
 
     // the response will be sent as an event in self.events
-    pub async fn request_state(&self) -> ConnectionState {
+    pub async fn state(&self) -> ConnectionState {
         let (tx, rx) = oneshot::channel();
         self.commands
             .send(ListenerCommand::GetState(tx))
@@ -300,20 +300,6 @@ mod tests {
 
     use super::*;
 
-    // takes a list of pattern matches. It recvs events and then matches them
-    // against the macro parameters
-    macro_rules! assert_event_matches {
-        ($listener:expr, $( $pattern:pat_param ),+ $(,)?) => {
-            $(
-                $listener.events.changed().await.unwrap();
-                let event = $listener.events.borrow().clone();
-
-                panic!("{:?}", &event);
-                assert!(matches!(event, $pattern));
-            )+
-        };
-    }
-
     #[tokio::test]
     async fn test_listener_reconnects_on_http_status_500() {
         let local_set = LocalSet::new();

ntfy-daemon/src/models.rs

@@ -27,7 +27,7 @@ pub fn validate_topic(topic: &str) -> Result<&str, Error> {
 }
 
 #[derive(Default, Clone, Debug, Serialize, Deserialize)]
-pub struct Message {
+pub struct ReceivedMessage {
     pub id: String,
     pub topic: String,
     pub expires: Option<u64>,
@@ -59,7 +59,7 @@ pub struct Message {
     pub actions: Vec<Action>,
 }
 
-impl Message {
+impl ReceivedMessage {
     fn extend_with_emojis(&self, text: &mut String) {
         // Add emojis
         for t in &self.tags {
@@ -107,6 +107,37 @@ impl Message {
     }
 }
 
+#[derive(Default, Clone, Debug, Serialize, Deserialize)]
+pub struct OutgoingMessage {
+    pub topic: String,
+    pub message: Option<String>,
+    #[serde(default = "Default::default")]
+    pub time: u64,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub tags: Vec<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub priority: Option<i8>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(default)]
+    pub attachment: Option<Attachment>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub icon: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub filename: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub delay: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub email: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub call: Option<String>,
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub actions: Vec<Action>,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct MinMessage {
     pub id: String,
@@ -167,7 +198,7 @@ impl Subscription {
             .push("auth");
         Ok(url)
     }
-    pub fn validate(self) -> Result<Self, Vec<crate::Error>> {
+    pub fn validate(self) -> Result<Self, crate::Error> {
         let mut errs = vec![];
         if let Err(e) = validate_topic(&self.topic) {
             errs.push(e);
@@ -176,7 +207,7 @@ impl Subscription {
             errs.push(e);
         };
         if !errs.is_empty() {
-            return Err(errs);
+            return Err(Error::InvalidSubscription(errs));
         }
         Ok(self)
     }
@@ -239,7 +270,7 @@ impl SubscriptionBuilder {
         self
     }
 
-    pub fn build(self) -> Result<Subscription, Vec<Error>> {
+    pub fn build(self) -> Result<Subscription, Error> {
         let res = Subscription {
             server: self.server,
             topic: self.topic,