1 files changed, 65 insertions, 7 deletions

diff --git a/src/Network/DHT/Mainline.hs b/src/Network/DHT/Mainline.hs
index 540b74f9..d7aed430 100644
--- a/src/Network/DHT/Mainline.hs
+++ b/src/Network/DHT/Mainline.hs
@@ -1,18 +1,76 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 module Network.DHT.Mainline where
 
-import Network.Socket
-import Network.RPC
-import Network.KRPC.Message as KRPC
-import Data.BEncode as BE
-import qualified Data.ByteString.Lazy as L
-import Network.BitTorrent.Address as BT (NodeId)
+import Data.BEncode                    as BE
+import Data.Bits
+import Data.ByteString                 (ByteString)
+import Data.ByteString.Base16          as Base16
+import qualified Data.ByteString.Char8 as Char8
+import qualified Data.ByteString.Lazy  as L
+import Data.Default
+import Data.LargeWord
+import Data.Serialize                  as S
+import Data.String
+import Data.Typeable
+import Network.KRPC.Message            as KRPC
+import qualified Network.RPC           as RPC (NodeId)
+         ;import Network.RPC           as RPC hiding (NodeId)
+import Text.PrettyPrint                as PP hiding ((<>))
+import Text.PrettyPrint.HughesPJClass  hiding (($$), (<>))
+
+-- | Each node has a globally unique identifier known as the \"node
+-- ID.\"
+--
+--   Normally, /this/ node id should be saved between invocations
+--   of the client software.
+newtype NodeId = NodeId Word160
+  deriving (Show, Eq, Ord, Typeable, Bits, FiniteBits)
+
+instance BEncode NodeId where
+    toBEncode (NodeId w) = toBEncode $ S.encode w
+    fromBEncode bval = fromBEncode bval >>= S.decode
+
+-- | NodeId size in bytes.
+nodeIdSize :: Int
+nodeIdSize = 20
+
+
+-- instance BEncode NodeId where TODO
+
+-- TODO: put this somewhere appropriate
+instance (Serialize a, Serialize b) => Serialize (LargeKey a b) where
+   put (LargeKey lo hi) = put hi >> put lo
+   get = flip LargeKey <$> get <*> get
+
+instance Serialize NodeId where
+  get = NodeId <$> get
+  {-# INLINE get #-}
+  put (NodeId bs) = put bs
+  {-# INLINE put #-}
+
+-- | ASCII encoded.
+instance IsString NodeId where
+  fromString str
+    | length str == nodeIdSize     = NodeId (either error id $ S.decode (fromString str :: ByteString))
+    | length str == 2 * nodeIdSize = NodeId (either error id $ S.decode (fst $ Base16.decode $ fromString str))
+    |           otherwise = error "fromString: invalid NodeId length"
+  {-# INLINE fromString #-}
+
+-- | Meaningless node id, for testing purposes only.
+instance Default NodeId where
+  def = NodeId 0
+
+-- | base16 encoded.
+instance Pretty NodeId where
+  pPrint (NodeId nid) = PP.text $ Char8.unpack $ Base16.encode $ S.encode nid
 
 instance Envelope KMessageOf where
     type TransactionID KMessageOf = KRPC.TransactionId
-    type NodeId KMessageOf = BT.NodeId
+    type NodeId KMessageOf = Network.DHT.Mainline.NodeId
 
     envelopePayload (Q q) = queryArgs q
     envelopePayload (R r) = respVals r