+ Add JSON instances for Tracker info.

3 files changed, 39 insertions, 23 deletions

diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index a1df0034..1dab1541 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -16,13 +16,14 @@
 --   <http://www.bittorrent.org/beps/bep_0003.html#metainfo-files>,
 --   <https://wiki.theory.org/BitTorrentSpecification#Metainfo_File_Structure>
 --
-{-# OPTIONS -fno-warn-orphans #-}
-{-# LANGUAGE CPP               #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
-{-# LANGUAGE BangPatterns      #-}
-{-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE RecordWildCards            #-}
+{-# LANGUAGE CPP                        #-}
+{-# LANGUAGE FlexibleInstances          #-}
+{-# LANGUAGE BangPatterns               #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TemplateHaskell            #-}
+{-# OPTIONS -fno-warn-orphans           #-}
 -- TODO refine interface
 module Data.Torrent
        ( -- * Torrent
@@ -69,6 +70,7 @@ import Control.Monad
 
 import qualified Crypto.Hash.SHA1 as C
 
+import Data.Aeson
 import Data.Aeson.TH
 import Data.BEncode as BE
 import Data.Char
@@ -98,7 +100,7 @@ import Numeric
 
 -- | Exactly 20 bytes long SHA1 hash of the info part of torrent file.
 newtype InfoHash = InfoHash { getInfoHash :: ByteString }
-                   deriving (Eq, Ord)
+                   deriving (Eq, Ord, ToJSON, FromJSON)
 
 instance Show InfoHash where
   show = render . ppInfoHash
diff --git a/src/Network/BitTorrent/Peer.hs b/src/Network/BitTorrent/Peer.hs
index 7e4a1b5d..27f9ac10 100644
--- a/src/Network/BitTorrent/Peer.hs
+++ b/src/Network/BitTorrent/Peer.hs
@@ -28,10 +28,12 @@
 --     capabilities (such as supported enchancements), this should be
 --     done using 'Network.BitTorrent.Extension'!
 --
-{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE RecordWildCards #-}
-{-# OPTIONS  -fno-warn-orphans #-}
+{-# LANGUAGE StandaloneDeriving         #-}
+{-# LANGUAGE TemplateHaskell            #-}
+{-# OPTIONS  -fno-warn-orphans          #-}
 module Network.BitTorrent.Peer
        ( -- * Peer identificators
          PeerId (getPeerId), ppPeerId
@@ -70,8 +72,12 @@ module Network.BitTorrent.Peer
 
 
 import Control.Applicative
+import Data.Aeson
+import Data.Aeson.TH
 import Data.BEncode
 import Data.Bits
+import Data.Char
+import Data.List as L
 import Data.Word
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
@@ -106,7 +112,7 @@ version = Version [0, 10, 0, 0] []
 
 -- | Peer identifier is exactly 20 bytes long bytestring.
 newtype PeerId = PeerId { getPeerId :: ByteString }
-                 deriving (Show, Eq, Ord, BEncodable)
+                 deriving (Show, Eq, Ord, BEncodable, ToJSON, FromJSON)
 
 instance Serialize PeerId where
   put = putByteString . getPeerId
@@ -492,6 +498,21 @@ nameMap =
 {-----------------------------------------------------------------------
     Peer address
 -----------------------------------------------------------------------}
+deriving instance ToJSON PortNumber
+deriving instance FromJSON PortNumber
+
+instance BEncodable PortNumber where
+  toBEncode = toBEncode . fromEnum
+  fromBEncode b = toEnum <$> fromBEncode b
+
+instance Serialize PortNumber where
+  get = fromIntegral <$> getWord16be
+  {-# INLINE get #-}
+  put = putWord16be . fromIntegral
+  {-# INLINE put #-}
+
+-- TODO check semantic of ord and eq instances
+
 
 -- | Peer address info normally extracted from peer list or peer
 -- compact list encoding.
@@ -501,11 +522,7 @@ data PeerAddr = PeerAddr {
     , peerPort :: {-# UNPACK #-} !PortNumber
     } deriving (Show, Eq, Ord)
 
--- TODO check semantic of ord and eq instances
-
-instance BEncodable PortNumber where
-  toBEncode = toBEncode . fromEnum
-  fromBEncode b = toEnum <$> fromBEncode b
+$(deriveJSON (L.map toLower . L.dropWhile isLower) ''PeerAddr)
 
 instance BEncodable PeerAddr where
   toBEncode (PeerAddr pid pip pport) = fromAssocs
@@ -521,12 +538,6 @@ instance BEncodable PeerAddr where
 
   fromBEncode _ = decodingError "PeerAddr"
 
-instance Serialize PortNumber where
-  get = fromIntegral <$> getWord16be
-  {-# INLINE get #-}
-  put = putWord16be . fromIntegral
-  {-# INLINE put #-}
-
 instance Serialize PeerAddr where
   put PeerAddr {..} = put peerID >> put peerPort
   {-# INLINE put #-}
diff --git a/src/Network/BitTorrent/Tracker/Protocol.hs b/src/Network/BitTorrent/Tracker/Protocol.hs
index 23bbe498..5ee61185 100644
--- a/src/Network/BitTorrent/Tracker/Protocol.hs
+++ b/src/Network/BitTorrent/Tracker/Protocol.hs
@@ -71,6 +71,7 @@ data Event = Started
              -- ^ To be sent when the peer completes a download.
              deriving (Show, Read, Eq, Ord, Enum, Bounded)
 
+$(deriveJSON (L.map toLower . L.dropWhile isLower) ''Event)
 
 -- | A tracker request is HTTP GET request; used to include metrics
 --   from clients that help the tracker keep overall statistics about
@@ -111,6 +112,7 @@ data AnnounceQuery = AnnounceQuery {
       -- ^ If not specified, the request is regular periodic request.
    } deriving Show
 
+$(deriveJSON (L.map toLower . L.dropWhile isLower) ''AnnounceQuery)
 
 -- | The tracker response includes a peer list that helps the client
 --   participate in the torrent. The most important is 'respPeer' list
@@ -141,6 +143,7 @@ data AnnounceInfo =
        -- ^ Peers that must be contacted.
      } deriving Show
 
+$(deriveJSON (L.map toLower . L.dropWhile isLower) ''AnnounceInfo)
 
 -- | Ports typically reserved for bittorrent P2P listener.
 defaultPorts :: [PortNumber]