aquatic_ws: add tungstenite::Message encode and decode, not tested

aquatic_ws/src/lib/protocol.rs

@@ -1,14 +1,18 @@
 use std::net::IpAddr;
 
 use hashbrown::HashMap;
+use serde::{Serialize, Deserialize};
 
 
+#[derive(Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
 pub struct PeerId(pub [u8; 20]);
 
 
+#[derive(Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
 pub struct InfoHash(pub [u8; 20]);
 
 
+#[derive(Clone, Serialize)]
 pub struct ResponsePeer {
     pub peer_id: PeerId,
     pub ip: IpAddr, // From src socket addr
@@ -17,6 +21,7 @@ pub struct ResponsePeer {
 }
 
 
+#[derive(Clone, Deserialize)]
 pub enum AnnounceEvent {
     Started,
     Stopped,
@@ -35,6 +40,7 @@ impl Default for AnnounceEvent {
 /// Apparently, these are sent to a number of peers when they are set
 /// in an AnnounceRequest
 /// action = "announce"
+#[derive(Clone, Serialize)]
 pub struct MiddlemanOfferToPeer {
     pub peer_id: PeerId, // Peer id of peer sending offer
     pub info_hash: InfoHash,
@@ -46,6 +52,7 @@ pub struct MiddlemanOfferToPeer {
 /// If announce request has answer = true, send this to peer with
 /// peer id == "to_peer_id" field
 /// Action field should be 'announce'
+#[derive(Clone, Serialize)]
 pub struct MiddlemanAnswerToPeer {
     pub peer_id: PeerId,
     pub info_hash: InfoHash,
@@ -55,12 +62,14 @@ pub struct MiddlemanAnswerToPeer {
 
 
 /// Element of AnnounceRequest.offers
+#[derive(Clone, Deserialize)]
 pub struct AnnounceRequestOffer {
     pub offer: (), // TODO: Check client for what this is
     pub offer_id: (), // TODO: Check client for what this is
 }
 
 
+#[derive(Clone, Deserialize)]
 pub struct AnnounceRequest {
     pub info_hash: InfoHash, // FIXME: I think these are actually really just strings with 20 len, same with peer id
     pub peer_id: PeerId,
@@ -78,6 +87,7 @@ pub struct AnnounceRequest {
 }
 
 
+#[derive(Clone, Serialize)]
 pub struct AnnounceResponse {
     pub info_hash: InfoHash,
     pub complete: usize,
@@ -93,6 +103,7 @@ pub struct AnnounceResponse {
 }
 
 
+#[derive(Clone, Deserialize)]
 pub struct ScrapeRequest {
     // If omitted, scrape for all torrents, apparently
     // There is some kind of parsing here too which accepts a single info hash
@@ -101,6 +112,7 @@ pub struct ScrapeRequest {
 }
 
 
+#[derive(Clone, Serialize)]
 pub struct ScrapeStatistics {
     pub complete: usize,
     pub incomplete: usize,
@@ -108,12 +120,44 @@ pub struct ScrapeStatistics {
 }
 
 
+#[derive(Clone, Serialize)]
 pub struct ScrapeResponse {
     pub files: HashMap<InfoHash, ScrapeStatistics>, // InfoHash to Scrape stats
     pub flags: HashMap<String, usize>,
 }
 
 
+#[derive(Clone, Serialize, Deserialize)]
+pub enum Action {
+    Announce,
+    Scrape
+}
+
+
+#[derive(Clone, Serialize, Deserialize)]
+struct ActionWrapper<T> {
+    pub action: Action,
+    #[serde(flatten)]
+    pub inner: T,
+}
+
+
+impl <T>ActionWrapper<T> {
+    pub fn announce(t: T) -> Self {
+        Self {
+            action: Action::Announce,
+            inner: t
+        }
+    }
+    pub fn scrape(t: T) -> Self {
+        Self {
+            action: Action::Scrape,
+            inner: t
+        }
+    }
+}
+
+
 pub enum InMessage {
     AnnounceRequest(AnnounceRequest),
     ScrapeRequest(ScrapeRequest),
@@ -121,8 +165,34 @@ pub enum InMessage {
 
 
 impl InMessage {
-    fn from_ws_message(ws_messge: tungstenite::Message) -> Result<Self, ()> {
-        unimplemented!()
+    /// Try parsing as announce request first. If that fails, try parsing as
+    /// scrape request, or return None
+    pub fn from_ws_message(ws_message: tungstenite::Message) -> Option<Self> {
+        use tungstenite::Message::{Text, Binary};
+
+        let text = match ws_message {
+            Text(text) => Some(text),
+            Binary(bytes) => String::from_utf8(bytes).ok(),
+            _ => None
+        }?;
+
+        let res: Result<ActionWrapper<AnnounceRequest>, _> = serde_json::from_str(&text);
+
+        if let Ok(wrapper) = res {
+            if let Action::Announce = wrapper.action {
+                return Some(InMessage::AnnounceRequest(wrapper.inner));
+            }
+        }
+        
+        let res: Result<ActionWrapper<ScrapeRequest>, _> = serde_json::from_str(&text);
+
+        if let Ok(wrapper) = res {
+            if let Action::Scrape = wrapper.action {
+                return Some(InMessage::ScrapeRequest(wrapper.inner));
+            }
+        }
+
+        None
     }
 }
 
@@ -136,7 +206,30 @@ pub enum OutMessage {
 
 
 impl OutMessage {
-    fn to_ws_message(self) -> tungstenite::Message {
-        unimplemented!()
+    pub fn to_ws_message(self) -> tungstenite::Message {
+        let json = match self {
+            Self::AnnounceResponse(message) => {
+                serde_json::to_string(
+                    &ActionWrapper::announce(message)
+                ).unwrap()
+            },
+            Self::Offer(message) => {
+                serde_json::to_string(
+                    &ActionWrapper::announce(message)
+                ).unwrap()
+            },
+            Self::Answer(message) => {
+                serde_json::to_string(
+                    &ActionWrapper::announce(message)
+                ).unwrap()
+            },
+            Self::ScrapeResponse(message) => {
+                serde_json::to_string(
+                    &ActionWrapper::scrape(message)
+                ).unwrap()
+            },
+        };
+                
+        tungstenite::Message::from(json)
     }
 }