1 files changed, 68 insertions, 7 deletions

diff --git a/src/Network/KRPC/Message.hs b/src/Network/KRPC/Message.hs
index 6f4ae620..d48fa8ac 100644
--- a/src/Network/KRPC/Message.hs
+++ b/src/Network/KRPC/Message.hs
@@ -12,8 +12,10 @@
 --
 --   See <http://www.bittorrent.org/beps/bep_0005.html#krpc-protocol>
 --
+{-# LANGUAGE CPP                    #-}
 {-# LANGUAGE OverloadedStrings      #-}
 {-# LANGUAGE FlexibleContexts       #-}
+{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE TypeSynonymInstances   #-}
 {-# LANGUAGE MultiParamTypeClasses  #-}
 {-# LANGUAGE FunctionalDependencies #-}
@@ -31,6 +33,11 @@ module Network.KRPC.Message
 
          -- * Query
        , KQuery(..)
+#ifndef VERSION_bencoding
+       , queryArgs
+       , queryMethod
+       , queryId
+#endif
        , MethodName
 
          -- * Response
@@ -39,12 +46,18 @@ module Network.KRPC.Message
 
          -- * Message
        , KMessage (..)
+       , KQueryArgs
+
        ) where
 
 import Control.Applicative
 import Control.Arrow
 import Control.Exception.Lifted as Lifted
+#ifdef VERSION_bencoding
 import Data.BEncode as BE
+#else
+import qualified Data.Tox as Tox
+#endif
 import Data.ByteString as B
 import Data.ByteString.Char8 as BC
 import qualified Data.Serialize as S
@@ -53,15 +66,23 @@ import Data.Typeable
 import Network.Socket (SockAddr (..),PortNumber,HostAddress)
 
 
+#ifdef VERSION_bencoding
 -- | This transaction ID is generated by the querying node and is
 -- echoed in the response, so responses may be correlated with
 -- multiple queries to the same node. The transaction ID should be
 -- encoded as a short string of binary numbers, typically 2 characters
 -- are enough as they cover 2^16 outstanding queries.
 type TransactionId = ByteString
+#else
+type TransactionId = Tox.Nonce24 -- msgNonce
+#endif
 
 unknownTransaction :: TransactionId
+#ifdef VERSION_bencoding
 unknownTransaction = ""
+#else
+unknownTransaction = 0
+#endif
 
 {-----------------------------------------------------------------------
 -- Error messages
@@ -98,13 +119,16 @@ instance Enum ErrorCode where
   toEnum _   = GenericError
   {-# INLINE toEnum #-}
 
+#ifdef VERSION_bencoding
 instance BEncode ErrorCode where
   toBEncode = toBEncode . fromEnum
   {-# INLINE toBEncode #-}
 
   fromBEncode b = toEnum <$> fromBEncode b
   {-# INLINE fromBEncode #-}
+#endif
 
+#ifdef VERSION_bencoding
 -- | Errors are sent when a query cannot be fulfilled. Error message
 --   can be send only from server to client but not in the opposite
 --   direction.
@@ -113,7 +137,10 @@ data KError = KError
   { errorCode    :: !ErrorCode     -- ^ the type of error;
   , errorMessage :: !ByteString    -- ^ human-readable text message;
   , errorId      :: !TransactionId -- ^ match to the corresponding 'queryId'.
-  } deriving (Show, Read, Eq, Ord, Typeable)
+  } deriving ( Show, Eq, Ord, Typeable, Read )
+#else
+type KError = Tox.Message ByteString -- TODO TOX unused
+#endif
 
 -- | Errors, or KRPC message dictionaries with a \"y\" value of \"e\",
 --   contain one additional key \"e\". The value of \"e\" is a
@@ -129,6 +156,7 @@ data KError = KError
 --
 --   > d1:eli201e23:A Generic Error Ocurrede1:t2:aa1:y1:ee
 --
+#ifdef VERSION_bencoding
 instance BEncode KError where
   toBEncode KError {..} = toDict $
        "e" .=! (errorCode, errorMessage)
@@ -142,33 +170,49 @@ instance BEncode KError where
     (code, msg) <- field (req "e")
     KError code msg <$>! "t"
   {-# INLINE fromBEncode #-}
+#endif
 
 instance Exception KError
 
 -- | Received 'queryArgs' or 'respVals' can not be decoded.
 decodeError :: String -> TransactionId -> KError
+#ifdef VERSION_bencoding
 decodeError msg = KError ProtocolError (BC.pack msg)
+#else
+decodeError msg = error "TODO TOX Error packet"
+#endif
 
 -- | A remote node has send some 'KMessage' this node is unable to
 -- decode.
 unknownMessage :: String -> KError
+#ifdef VERSION_bencoding
 unknownMessage msg = KError ProtocolError (BC.pack msg) unknownTransaction
+#else
+unknownMessage msg = error "TODO TOX Protocol error"
+#endif
 
 {-----------------------------------------------------------------------
 -- Query messages
 -----------------------------------------------------------------------}
 
+#ifdef VERSION_bencoding
 type MethodName = ByteString
+type KQueryArgs = BValue
+#else
+type MethodName = Tox.MessageType -- msgType
+type KQueryArgs = ByteString      -- msgPayload
+#endif
 
+#ifdef VERSION_bencoding
 -- | Query used to signal that caller want to make procedure call to
 -- callee and pass arguments in. Therefore query may be only sent from
 -- client to server but not in the opposite direction.
 --
 data KQuery = KQuery
-  { queryArgs   :: !BValue         -- ^ values to be passed to method;
+  { queryArgs   :: !KQueryArgs     -- ^ values to be passed to method;
   , queryMethod :: !MethodName     -- ^ method to call;
   , queryId     :: !TransactionId  -- ^ one-time query token.
-  } deriving (Show, Read, Eq, Ord, Typeable)
+  } deriving ( Show, Eq, Ord, Typeable, Read )
 
 -- | Queries, or KRPC message dictionaries with a \"y\" value of
 -- \"q\", contain two additional keys; \"q\" and \"a\". Key \"q\" has
@@ -193,13 +237,19 @@ instance BEncode KQuery where
     KQuery <$>! "a" <*>! "q" <*>! "t"
   {-# INLINE fromBEncode #-}
 
-newtype ReflectedIP = ReflectedIP SockAddr
-  deriving (Eq, Ord, Show)
-
 instance BEncode ReflectedIP where
   toBEncode (ReflectedIP addr) = BString (encodeAddr addr)
   fromBEncode (BString bs) = ReflectedIP <$> decodeAddr bs
   fromBEncode _            = Left "ReflectedIP should be a bencoded string"
+#else
+type KQuery = Tox.Message KQueryArgs
+queryArgs   = Tox.msgPayload
+queryMethod = Tox.msgType
+queryId     = Tox.msgNonce
+#endif
+
+newtype ReflectedIP = ReflectedIP SockAddr
+  deriving (Eq, Ord, Show)
 
 port16 :: Word16 -> PortNumber
 port16 = fromIntegral
@@ -237,8 +287,9 @@ encodeAddr _ = B.empty
 --
 --   * KResponse can be only sent from server to client.
 --
+#ifdef VERSION_bencoding
 data KResponse = KResponse
-  { respVals :: BValue         -- ^ 'BDict' containing return values;
+  { respVals :: KQueryArgs     -- ^ 'BDict' containing return values;
   , respId   :: TransactionId  -- ^ match to the corresponding 'queryId'.
   , respIP   :: Maybe ReflectedIP
   } deriving (Show, Eq, Ord, Typeable)
@@ -265,11 +316,18 @@ instance BEncode KResponse where
     addr <- optional (field (req "ip"))
     (\r t -> KResponse r t addr) <$>! "r" <*>! "t"
   {-# INLINE fromBEncode #-}
+#else
+type KResponse = Tox.Message KQueryArgs
+respVals       = Tox.msgPayload
+respId         = Tox.msgNonce
+respIP         = Nothing :: Maybe ReflectedIP
+#endif
 
 {-----------------------------------------------------------------------
 -- Summed messages
 -----------------------------------------------------------------------}
 
+#ifdef VERSION_bencoding
 -- | Generic KRPC message.
 data KMessage
   = Q KQuery
@@ -287,3 +345,6 @@ instance BEncode KMessage where
     <|> R <$> fromBEncode b
     <|> E <$> fromBEncode b
     <|> decodingError "KMessage: unknown message or message tag"
+#else
+type KMessage = Tox.Message
+#endif