2 files changed, 40 insertions, 27 deletions

diff --git a/src/Remote/KRPC/Method.hs b/src/Remote/KRPC/Method.hs
index 420ceacf..8aa6ddc9 100644
--- a/src/Remote/KRPC/Method.hs
+++ b/src/Remote/KRPC/Method.hs
@@ -6,6 +6,7 @@
 --   Portability :  portable
 --
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE FlexibleInstances, UndecidableInstances #-}
 module Remote.KRPC.Method
        ( Method(methodName, methodParams, methodVals)
        , methodQueryScheme, methodRespScheme
@@ -14,13 +15,17 @@ module Remote.KRPC.Method
        , method
 
          -- * Predefined methods
-       , idM, composeM
+       , idM
+
+         -- * Internal
+       , Extractable(..)
        ) where
 
 import Prelude hiding ((.), id)
 import Control.Applicative
 import Control.Category
 import Control.Monad
+import Data.BEncode
 import Data.ByteString as B
 import Data.List as L
 import Data.Set as S
@@ -38,7 +43,7 @@ import Remote.KRPC.Protocol
 --
 data Method param result = Method {
     -- | Name used in query and
-    methodName   :: [MethodName]
+    methodName   :: MethodName
 
     -- | Description of each parameter in /right to left/ order.
   , methodParams :: [ParamName]
@@ -46,17 +51,8 @@ data Method param result = Method {
     -- | Description of each return value in /right to left/ order.
   , methodVals   :: [ValName]
   }
-
-instance Category Method where
-  {-# SPECIALIZE instance Category Method #-}
-  id  = idM
-  {-# INLINE id #-}
-
-  (.) = composeM
-  {-# INLINE (.) #-}
-
 methodQueryScheme :: Method a b -> KQueryScheme
-methodQueryScheme = KQueryScheme <$> B.intercalate "." . methodName
+methodQueryScheme = KQueryScheme <$> methodName
                                  <*> S.fromList . methodParams
 {-# INLINE methodQueryScheme #-}
 
@@ -75,19 +71,32 @@ idM :: Method a a
 idM = method "id" ["x"] ["y"]
 {-# INLINE idM #-}
 
--- | Pipelining of two or more methods.
---
---   NOTE: composed methods will work only with this implementation of
---   KRPC, so both server and client should use this implementation,
---   otherwise you more likely get the 'ProtocolError'.
---
-composeM :: Method b c -> Method a b -> Method a c
-composeM g h = Method (methodName g ++ methodName h)
-                      (methodParams h)
-                      (methodVals g)
-{-# INLINE composeM #-}
+method :: MethodName -> [ParamName] -> [ValName] -> Method param result
+method = Method
+{-# INLINE method #-}
 
 
-method :: MethodName -> [ParamName] -> [ValName] -> Method param result
-method name = Method [name]
-{-# INLINE method #-}
\ No newline at end of file
+
+class Extractable a where
+  injector :: a -> [BEncode]
+  extractor :: [BEncode] -> Result a
+
+instance (BEncodable a, BEncodable b) => Extractable (a, b) where
+  {- SPECIALIZE instance (BEncodable a, BEncodable b) => Extractable (a, b) -}
+  injector (a, b) = [toBEncode a, toBEncode b]
+  {-# INLINE injector #-}
+
+  extractor [a, b] = (,) <$> fromBEncode a <*> fromBEncode b
+  extractor _      = decodingError "unable to match pair"
+  {-# INLINE extractor #-}
+{-
+instance BEncodable a => Extractable a where
+  {-# SPECIALIZE instance BEncodable a => Extractable a #-}
+
+  injector x = [toBEncode x]
+  {-# INLINE injector #-}
+
+  extractor [x] = fromBEncode x
+  extractor _   = decodingError "unable to match single value"
+  {-# INLINE extractor #-}
+-}
\ No newline at end of file
diff --git a/src/Remote/KRPC/Protocol.hs b/src/Remote/KRPC/Protocol.hs
index 625aba25..98674c51 100644
--- a/src/Remote/KRPC/Protocol.hs
+++ b/src/Remote/KRPC/Protocol.hs
@@ -74,7 +74,7 @@ class KMessage message scheme | message -> scheme where
   validate = (==) . scheme
   {-# INLINE validate #-}
 
-
+-- TODO Text -> ByteString
 -- TODO document that it is and how transferred
 data KError
     -- | Some error doesn't fit in any other category.
@@ -213,9 +213,13 @@ type KRemote = Socket
 withRemote :: (MonadBaseControl IO m, MonadIO m) => (KRemote -> m a) -> m a
 withRemote = bracket (liftIO (socket AF_INET Datagram defaultProtocol))
                      (liftIO .  sClose)
+{-# SPECIALIZE withRemote :: (KRemote -> IO a) -> IO a #-}
+
 
 maxMsgSize :: Int
 maxMsgSize = 16 * 1024
+{-# INLINE maxMsgSize #-}
+
 
 -- TODO eliminate toStrict
 sendMessage :: BEncodable msg => msg -> KRemoteAddr -> KRemote -> IO ()