diff options
Diffstat (limited to 'src/Remote/KRPC.hs')
-rw-r--r-- | src/Remote/KRPC.hs | 75 |
1 files changed, 41 insertions, 34 deletions
diff --git a/src/Remote/KRPC.hs b/src/Remote/KRPC.hs index 22dbf3aa..719b9a25 100644 --- a/src/Remote/KRPC.hs +++ b/src/Remote/KRPC.hs | |||
@@ -26,10 +26,12 @@ import Control.Monad | |||
26 | import Control.Monad.Trans.Control | 26 | import Control.Monad.Trans.Control |
27 | import Control.Monad.IO.Class | 27 | import Control.Monad.IO.Class |
28 | import Data.BEncode | 28 | import Data.BEncode |
29 | import Data.ByteString.Char8 as BC | ||
29 | import Data.List as L | 30 | import Data.List as L |
30 | import Data.Map as M | 31 | import Data.Map as M |
31 | import Data.Set as S | 32 | import Data.Set as S |
32 | import Data.Text as T | 33 | import Data.Text as T |
34 | import Data.Text.Encoding as T | ||
33 | import Data.Typeable | 35 | import Data.Typeable |
34 | import Network | 36 | import Network |
35 | 37 | ||
@@ -47,14 +49,25 @@ type RemoteAddr = KRemoteAddr | |||
47 | 49 | ||
48 | 50 | ||
49 | queryCall :: BEncodable param | 51 | queryCall :: BEncodable param |
52 | => Extractable param | ||
50 | => KRemote -> KRemoteAddr | 53 | => KRemote -> KRemoteAddr |
51 | -> Method param result -> param -> IO () | 54 | -> Method param result -> param -> IO () |
52 | queryCall sock addr m arg = sendMessage q addr sock | 55 | queryCall sock addr m arg = sendMessage q addr sock |
53 | where | 56 | where |
54 | q = kquery (L.head (methodName m)) [(L.head (methodParams m), toBEncode arg)] | 57 | q = kquery (methodName m) (mkVals (methodParams m) (injector arg)) |
58 | mkVals = L.zip | ||
59 | |||
60 | |||
61 | extractArgs :: [ParamName] -> Map ParamName BEncode -> Result [BEncode] | ||
62 | extractArgs as d = mapM f as | ||
63 | where | ||
64 | f x | Just y <- M.lookup x d = return y | ||
65 | | otherwise = Left ("not found key " ++ BC.unpack x) | ||
66 | {-# INLINE extractArgs #-} | ||
55 | 67 | ||
56 | -- TODO check scheme | 68 | -- TODO check scheme |
57 | getResult :: BEncodable result | 69 | getResult :: BEncodable result |
70 | => Extractable result | ||
58 | => KRemote -> KRemoteAddr | 71 | => KRemote -> KRemoteAddr |
59 | -> Method param result -> IO result | 72 | -> Method param result -> IO result |
60 | getResult sock addr m = do | 73 | getResult sock addr m = do |
@@ -62,15 +75,9 @@ getResult sock addr m = do | |||
62 | case resp of | 75 | case resp of |
63 | Left e -> throw (RPCException e) | 76 | Left e -> throw (RPCException e) |
64 | Right (respVals -> dict) -> do | 77 | Right (respVals -> dict) -> do |
65 | let valName = L.head (methodVals m) | 78 | case extractArgs (methodVals m) dict >>= extractor of |
66 | case M.lookup valName dict of | 79 | Right vals -> return vals |
67 | Just val | Right res <- fromBEncode val -> return res | 80 | Left e -> throw (RPCException (ProtocolError (T.pack e))) |
68 | Nothing -> throw (RPCException (ProtocolError msg)) | ||
69 | where | ||
70 | msg = T.concat | ||
71 | [ "Unable to find return value: ", T.pack (show valName), "\n" | ||
72 | , "in response: ", T.pack (show dict) | ||
73 | ] | ||
74 | 81 | ||
75 | -- TODO async call | 82 | -- TODO async call |
76 | -- | Makes remote procedure call. Throws RPCException if server | 83 | -- | Makes remote procedure call. Throws RPCException if server |
@@ -78,6 +85,7 @@ getResult sock addr m = do | |||
78 | -- | 85 | -- |
79 | call :: (MonadBaseControl IO host, MonadIO host) | 86 | call :: (MonadBaseControl IO host, MonadIO host) |
80 | => (BEncodable param, BEncodable result) | 87 | => (BEncodable param, BEncodable result) |
88 | => (Extractable param, Extractable result) | ||
81 | => RemoteAddr | 89 | => RemoteAddr |
82 | -> Method param result | 90 | -> Method param result |
83 | -> param | 91 | -> param |
@@ -92,6 +100,7 @@ newtype Async result = Async { waitResult :: IO result } | |||
92 | -- TODO document errorneous usage | 100 | -- TODO document errorneous usage |
93 | async :: MonadIO host | 101 | async :: MonadIO host |
94 | => (BEncodable param, BEncodable result) | 102 | => (BEncodable param, BEncodable result) |
103 | => (Extractable param, Extractable result) | ||
95 | => RemoteAddr | 104 | => RemoteAddr |
96 | -> Method param result | 105 | -> Method param result |
97 | -> param | 106 | -> param |
@@ -104,52 +113,50 @@ async addr m arg = do | |||
104 | 113 | ||
105 | await :: MonadIO host => Async result -> host result | 114 | await :: MonadIO host => Async result -> host result |
106 | await = liftIO . waitResult | 115 | await = liftIO . waitResult |
116 | {-# INLINE await #-} | ||
117 | |||
107 | 118 | ||
108 | type HandlerBody remote = (BEncode -> remote (Result BEncode), KResponseScheme) | 119 | type HandlerBody remote = KQuery -> remote (Either KError KResponse) |
109 | 120 | ||
110 | type MethodHandler remote = (KQueryScheme, HandlerBody remote) | 121 | type MethodHandler remote = (MethodName, HandlerBody remote) |
111 | 122 | ||
112 | 123 | ||
113 | -- we can safely erase types in (==>) | 124 | -- we can safely erase types in (==>) |
114 | (==>) :: forall (remote :: * -> *) (param :: *) (result :: *). | 125 | (==>) :: forall (remote :: * -> *) (param :: *) (result :: *). |
115 | (BEncodable param, BEncodable result) | 126 | (BEncodable param, BEncodable result) |
127 | => (Extractable param, Extractable result) | ||
116 | => Monad remote | 128 | => Monad remote |
117 | => Method param result | 129 | => Method param result |
118 | -> (param -> remote result) | 130 | -> (param -> remote result) |
119 | -> MethodHandler remote | 131 | -> MethodHandler remote |
120 | m ==> body = (methodQueryScheme m, (newbody, methodRespScheme m)) | 132 | {-# INLINE (==>) #-} |
133 | m ==> body = (methodName m, newbody) | ||
121 | where | 134 | where |
122 | newbody x = case fromBEncode x of | 135 | {-# INLINE newbody #-} |
123 | Right a -> liftM (Right . toBEncode) (body a) | 136 | newbody q = |
124 | Left e -> return (Left e) | 137 | case extractArgs (methodParams m) (queryArgs q) >>= extractor of |
138 | Left e -> return (Left (ProtocolError (T.pack e))) | ||
139 | Right a -> do | ||
140 | r <- body a | ||
141 | return (Right (kresponse (mkVals (methodVals m) (injector r)))) | ||
125 | 142 | ||
143 | mkVals :: [ValName] -> [BEncode] -> [(ValName, BEncode)] | ||
144 | mkVals = L.zip | ||
126 | 145 | ||
127 | -- TODO: allow forkIO | 146 | -- TODO: allow forkIO |
128 | -- TODO: allow overloading | ||
129 | server :: (MonadBaseControl IO remote, MonadIO remote) | 147 | server :: (MonadBaseControl IO remote, MonadIO remote) |
130 | => PortNumber | 148 | => PortNumber |
131 | -> [MethodHandler remote] | 149 | -> [MethodHandler remote] |
132 | -> remote () | 150 | -> remote () |
133 | server servport handlers = do | 151 | server servport handlers = do |
134 | remoteServer servport $ \_ q -> do | 152 | remoteServer servport $ \_ q -> do |
135 | case dispatch (scheme q) of | 153 | case dispatch (queryMethod q) of |
136 | Nothing -> return (Left (MethodUnknown "method")) | 154 | Nothing -> return $ Left $ MethodUnknown (decodeUtf8 (queryMethod q)) |
137 | Just (m, rsc) -> do | 155 | Just m -> invoke m q |
138 | let arg = snd (L.head (M.toList (queryArgs q))) | ||
139 | |||
140 | res <- invoke m arg | ||
141 | let valName = L.head (S.toList (rscVals rsc)) | ||
142 | return $ bimap (ProtocolError . T.pack) | ||
143 | (kresponse . return . (,) valName) res | ||
144 | where | 156 | where |
145 | handlerMap = M.fromList handlers | 157 | handlerMap = M.fromList handlers |
146 | 158 | dispatch s = M.lookup s handlerMap | |
147 | -- dispatch :: KQueryScheme -> MethodHandler remote | 159 | invoke m q = m q |
148 | dispatch s | Just m <- M.lookup s handlerMap = return m | ||
149 | | otherwise = Nothing | ||
150 | |||
151 | -- invoke :: MethodHandler remote -> BEncode -> remote BEncode | ||
152 | invoke m args = m args | ||
153 | 160 | ||
154 | bimap f _ (Left x) = Left (f x) | 161 | bimap f _ (Left x) = Left (f x) |
155 | bimap _ g (Right x) = Right (g x) \ No newline at end of file | 162 | bimap _ g (Right x) = Right (g x) \ No newline at end of file |