nostr: fix NEG messages deserialization

Author: yukibtc

crates/nostr/src/message/client.rs

@@ -307,12 +307,12 @@ impl ClientMessage {
             if v_len != 5 {
                 return Err(MessageHandleError::InvalidMessageFormat);
             }
-            let subscription_id = SubscriptionId::new(v[1].to_string());
-            let filter = Filter::from_json(v[2].to_string())?;
-            let id_size = v[3]
-                .as_u64()
-                .ok_or(MessageHandleError::InvalidMessageFormat)? as u8;
-            let initial_message = v[4].to_string();
+            let subscription_id: SubscriptionId = serde_json::from_value(v[1].clone())?;
+            let filter: Filter = Filter::from_json(v[2].to_string())?;
+            let id_size: u8 =
+                v[3].as_u64()
+                    .ok_or(MessageHandleError::InvalidMessageFormat)? as u8;
+            let initial_message: String = serde_json::from_value(v[4].clone())?;
             return Ok(Self::NegOpen {
                 subscription_id,
                 filter: Box::new(filter),
@@ -327,8 +327,8 @@ impl ClientMessage {
             if v_len != 3 {
                 return Err(MessageHandleError::InvalidMessageFormat);
             }
-            let subscription_id: SubscriptionId = SubscriptionId::new(v[1].to_string());
-            let message: String = v[2].to_string();
+            let subscription_id: SubscriptionId = serde_json::from_value(v[1].clone())?;
+            let message: String = serde_json::from_value(v[2].clone())?;
             return Ok(Self::NegMsg {
                 subscription_id,
                 message,
@@ -341,7 +341,7 @@ impl ClientMessage {
             if v_len != 2 {
                 return Err(MessageHandleError::InvalidMessageFormat);
             }
-            let subscription_id: SubscriptionId = SubscriptionId::new(v[1].to_string());
+            let subscription_id: SubscriptionId = serde_json::from_value(v[1].clone())?;
             return Ok(Self::NegClose { subscription_id });
         }
 

crates/nostr/src/message/relay.rs

@@ -314,11 +314,8 @@ impl RelayMessage {
             }
 
             let event_id: EventId = serde_json::from_value(v[1].clone())?;
-
             let status: bool = serde_json::from_value(v[2].clone())?;
-
             let message: String = serde_json::from_value(v[3].clone())?;
-
             return Ok(Self::new_ok(event_id, status, message));
         }
 
@@ -358,8 +355,8 @@ impl RelayMessage {
             if v_len != 3 {
                 return Err(MessageHandleError::InvalidMessageFormat);
             }
-            let subscription_id: SubscriptionId = SubscriptionId::new(v[1].to_string());
-            let message: String = v[2].to_string();
+            let subscription_id: SubscriptionId = serde_json::from_value(v[1].clone())?;
+            let message: String = serde_json::from_value(v[2].clone())?;
             return Ok(Self::NegMsg {
                 subscription_id,
                 message,
@@ -372,8 +369,8 @@ impl RelayMessage {
             if v_len != 3 {
                 return Err(MessageHandleError::InvalidMessageFormat);
             }
-            let subscription_id: SubscriptionId = SubscriptionId::new(v[1].to_string());
-            let code: NegentropyErrorCode = NegentropyErrorCode::from(v[2].to_string());
+            let subscription_id: SubscriptionId = serde_json::from_value(v[1].clone())?;
+            let code: NegentropyErrorCode = serde_json::from_value(v[2].clone())?;
             return Ok(Self::NegErr {
                 subscription_id,
                 code,

crates/nostr/src/message/subscription.rs

@@ -162,7 +162,7 @@ impl<'de> Deserialize<'de> for Alphabet {
 }
 
 /// Subscription ID
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct SubscriptionId(String);
 
 impl SubscriptionId {
@@ -199,6 +199,26 @@ impl fmt::Display for SubscriptionId {
     }
 }
 
+impl Serialize for SubscriptionId {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&self.to_string())
+    }
+}
+
+impl<'de> Deserialize<'de> for SubscriptionId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let value = Value::deserialize(deserializer)?;
+        let id: String = serde_json::from_value(value).map_err(serde::de::Error::custom)?;
+        Ok(Self::new(id))
+    }
+}
+
 /// Subscription filters
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Filter {