add dht and better serialization

2 files changed, 91 insertions, 1 deletions

diff --git a/ipfs-api/src/response/dht.rs b/ipfs-api/src/response/dht.rs
index b8493e7..5279299 100644
--- a/ipfs-api/src/response/dht.rs
+++ b/ipfs-api/src/response/dht.rs
@@ -7,6 +7,43 @@
 //
 
 use response::serde;
+use serde::de::{Deserialize, Deserializer, Error};
+
+
+/// See
+/// [libp2p](https://github.com/libp2p/go-libp2p-routing/blob/master/notifications/query.go#L16).
+///
+#[derive(Debug)]
+pub enum DhtType {
+    SendingQuery,
+    PeerResponse,
+    FinalPeer,
+    QueryError,
+    Provider,
+    Value,
+    AddingPeer,
+    DialingPeer,
+}
+
+impl<'de> Deserialize<'de> for DhtType {
+    #[inline]
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        match deserializer.deserialize_i64(serde::IntegerVisitor)? {
+            0 => Ok(DhtType::SendingQuery),
+            1 => Ok(DhtType::PeerResponse),
+            2 => Ok(DhtType::FinalPeer),
+            3 => Ok(DhtType::QueryError),
+            4 => Ok(DhtType::Provider),
+            5 => Ok(DhtType::Value),
+            6 => Ok(DhtType::AddingPeer),
+            7 => Ok(DhtType::DialingPeer),
+            i => Err(D::Error::custom(format!("unknown dht type '{}'", i))),
+        }
+    }
+}
 
 
 #[derive(Debug, Deserialize)]
@@ -27,7 +64,7 @@ pub struct DhtMessage {
     pub id: String,
 
     #[serde(rename = "Type")]
-    pub typ: isize,
+    pub typ: DhtType,
 
     #[serde(deserialize_with = "serde::deserialize_vec")]
     pub responses: Vec<DhtPeerResponse>,
diff --git a/ipfs-api/src/response/serde.rs b/ipfs-api/src/response/serde.rs
index 307e49e..cb96ba2 100644
--- a/ipfs-api/src/response/serde.rs
+++ b/ipfs-api/src/response/serde.rs
@@ -13,6 +13,59 @@ use std::fmt;
 use std::marker::PhantomData;
 
 
+pub struct IntegerVisitor;
+
+impl<'de> Visitor<'de> for IntegerVisitor {
+    type Value = i64;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("integer")
+    }
+
+    fn visit_i8<E>(self, num: i8) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(num as i64)
+    }
+
+    fn visit_i32<E>(self, num: i32) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(num as i64)
+    }
+
+    fn visit_i64<E>(self, num: i64) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(num)
+    }
+
+    fn visit_u8<E>(self, num: u8) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(num as i64)
+    }
+
+    fn visit_u32<E>(self, num: u32) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(num as i64)
+    }
+
+    fn visit_u64<E>(self, num: u64) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(num as i64)
+    }
+}
+
+
 /// Deserializes a sequence or null values as a vec.
 ///
 pub fn deserialize_vec<'de, T, D>(deserializer: D) -> Result<Vec<T>, D::Error>