3 files changed, 28 insertions, 32 deletions

diff --git a/krpc.cabal b/krpc.cabal
index 46968874..aa081a54 100644
--- a/krpc.cabal
+++ b/krpc.cabal
@@ -40,13 +40,10 @@ library
                      , Network.KRPC.Message
   build-depends:       base          == 4.*
                      , bytestring   >= 0.10
-
                      , lifted-base   >= 0.1.1
                      , transformers  >= 0.2
                      , monad-control >= 0.3
-
-                     , bencoding    == 0.4.*
-
+                     , bencoding    >= 0.4.3
                      , network      >= 2.3
 
   if impl(ghc < 7.6)
diff --git a/src/Network/KRPC.hs b/src/Network/KRPC.hs
index 8e158f48..2c3a1b48 100644
--- a/src/Network/KRPC.hs
+++ b/src/Network/KRPC.hs
@@ -208,7 +208,7 @@ call :: forall req resp host.
         (MonadBaseControl IO host, MonadIO host, KRPC req resp)
      => SockAddr -> req -> host resp
 call addr arg = liftIO $ withRemote $ \sock -> do
-     sendMessage (KQuery name (toBEncode arg)) addr sock
+     sendMessage (KQuery (toBEncode arg) name undefined) addr sock
      getResult sock
   where
     Method name = method :: Method req resp
@@ -231,12 +231,12 @@ handler body = (name, newbody)
     Method name = method :: Method req resp
 
     {-# INLINE newbody #-}
-    newbody addr q =
-      case fromBEncode (queryArgs q) of
+    newbody addr KQuery {..} =
+      case fromBEncode queryArgs of
         Left  e -> return (Left (ProtocolError (BC.pack e)))
         Right a -> do
           r <- body addr a
-          return (Right (KResponse (toBEncode r)))
+          return (Right (KResponse (toBEncode r) queryId))
 
 sockAddrFamily :: SockAddr -> Family
 sockAddrFamily (SockAddrInet  _ _    ) = AF_INET
diff --git a/src/Network/KRPC/Message.hs b/src/Network/KRPC/Message.hs
index 854b733c..1a004c64 100644
--- a/src/Network/KRPC/Message.hs
+++ b/src/Network/KRPC/Message.hs
@@ -100,6 +100,8 @@ serverError = ServerError . BC.pack . show
 
 type MethodName = ByteString
 
+type TransactionId = ByteString
+
 -- | 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.
@@ -109,27 +111,24 @@ type MethodName = ByteString
 --    > { "y" : "q", "q" : "<method_name>", "a" : [<arg1>, <arg2>, ...] }
 --
 data KQuery = KQuery
-  { queryMethod :: !MethodName
-  , queryArgs   :: !BValue
+  { queryArgs   :: !BValue
+  , queryMethod :: !MethodName
+  , queryId     :: !TransactionId
   } deriving (Show, Read, Eq, Ord, Typeable)
 
 instance BEncode KQuery where
-  {-# SPECIALIZE instance BEncode KQuery #-}
-  {-# INLINE toBEncode #-}
-  toBEncode (KQuery m args) = toDict $
-       "a" .=! args
-    .: "q" .=! m
+  toBEncode KQuery {..} = toDict $
+       "a" .=! queryArgs
+    .: "q" .=! queryMethod
+    .: "t" .=! queryId
     .: "y" .=! ("q" :: ByteString)
     .: endDict
+  {-# INLINE toBEncode #-}
 
+  fromBEncode = fromDict $ do
+    lookAhead $ match "y" (BString "q")
+    KQuery <$>! "a" <*>! "q" <*>! "t"
   {-# INLINE fromBEncode #-}
-  fromBEncode bv @ (BDict d)
-    | BE.lookup "y" d == Just (BString "q") = (`fromDict` bv) $ do
-      a <- field (req "a")
-      q <- field (req "q")
-      return $! KQuery q a
-
-  fromBEncode _ = decodingError "KQuery"
 
 -- | KResponse used to signal that callee successufully process a
 -- procedure call and to return values from procedure. KResponse should
@@ -140,20 +139,20 @@ instance BEncode KQuery where
 --
 --   > { "y" : "r", "r" : [<val1>, <val2>, ...] }
 --
-newtype KResponse = KResponse
+data KResponse = KResponse
   { respVals :: BValue
+  , respId   :: TransactionId
   } deriving (Show, Read, Eq, Ord, Typeable)
 
 instance BEncode KResponse where
-  {-# INLINE toBEncode #-}
-  toBEncode (KResponse vals) = toDict $
-       "r" .=! vals
+  toBEncode KResponse {..} = toDict $
+       "r" .=! respVals
+    .: "t" .=! respId
     .: "y" .=! ("r" :: ByteString)
     .: endDict
+  {-# INLINE toBEncode #-}
 
-  {-# INLINE fromBEncode #-}
-  fromBEncode bv @ (BDict d)
-    | BE.lookup "y" d == Just (BString "r") = (`fromDict` bv) $ do
-      KResponse <$>! "r"
-
-  fromBEncode _ = decodingError "KDict"
+  fromBEncode = fromDict $ do
+    lookAhead $ match "y" (BString "r")
+    KResponse <$>! "r" <*>! "t"
+  {-# INLINE fromBEncode #-}
\ No newline at end of file