2 files changed, 100 insertions, 15 deletions

diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index abd607c3..1eec93b9 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -400,20 +400,61 @@ unsendNodes _                    = Nothing
 unwrapNodes :: SendNodes -> ( [NodeInfo], [NodeInfo], Maybe () )
 unwrapNodes (SendNodes ns) = (ns,ns,Just ())
 
+data SendableQuery x a b = SendableQuery
+    { sendableSerializer :: MethodSerializer TransactionId NodeInfo Message PacketKind a (Maybe x)
+    , sendableQuery      :: NodeId -> a
+    , sendableResult     :: Maybe (Maybe x) -> IO b
+    }
+
+sendQ :: SendableQuery x a b
+               -> QR.Client err PacketKind TransactionId NodeInfo Message
+               -> NodeId
+               -> NodeInfo
+               -> IO b
+sendQ s client nid addr = do
+    reply <- QR.sendQuery client (sendableSerializer s) (sendableQuery s nid) addr
+    sendableResult s reply
+
+asyncQ :: SendableQuery x a b
+            -> QR.Client err PacketKind TransactionId NodeInfo Message
+            -> NodeId
+            -> NodeInfo
+            -> (b -> IO ())
+            -> IO ()
+asyncQ s client nid addr go = do
+    QR.asyncQuery client (sendableSerializer s) (sendableQuery s nid) addr
+        $ sendableResult s >=> go
+
+getNodesSendable :: TVar (HashMap NodeId [NodeInfoCallback])
+                    -> NodeInfo
+                    -> SendableQuery SendNodes GetNodes (Maybe ([NodeInfo], [NodeInfo], Maybe ()))
+getNodesSendable cbvar addr = SendableQuery (serializer GetNodesType DHTGetNodes unsendNodes)
+                                            GetNodes
+                                            go
+  where
+    go reply = do
+        forM_ (join reply) $ \(SendNodes ns) ->
+            forM_ ns $ \n -> do
+                now <- getPOSIXTime
+                atomically $ do
+                    mcbs <- HashMap.lookup (nodeId n) <$> readTVar cbvar
+                    forM_ mcbs $ \cbs -> do
+                        forM_ cbs $ \cb -> do
+                            rumoredAddress cb now (nodeAddr addr) n
+        return $ fmap unwrapNodes $ join reply
+
 getNodes :: Client -> TVar (HashMap NodeId [NodeInfoCallback]) -> NodeId -> NodeInfo -> IO (Maybe ([NodeInfo],[NodeInfo],Maybe ()))
-getNodes client cbvar nid addr = do
-    -- dput XMisc $ show addr ++ " <-- getnodes " ++ show nid
-    reply <- QR.sendQuery client (serializer GetNodesType DHTGetNodes unsendNodes) (GetNodes nid) addr
-    -- dput XMisc $ show addr ++ " -sendnodes-> " ++ show reply
-    forM_ (join reply) $ \(SendNodes ns) -> 
-        forM_ ns $ \n -> do
-            now <- getPOSIXTime
-            atomically $ do
-                mcbs <- HashMap.lookup (nodeId n) <$> readTVar cbvar
-                forM_ mcbs $ \cbs -> do
-                    forM_ cbs $ \cb -> do
-                        rumoredAddress cb now (nodeAddr addr) n
-    return $ fmap unwrapNodes $ join reply
+getNodes client cbvar nid addr =
+    sendQ (getNodesSendable cbvar addr) client nid addr
+
+asyncGetNodes :: QR.Client err PacketKind TransactionId NodeInfo Message
+                 -> TVar (HashMap NodeId [NodeInfoCallback])
+                 -> NodeId
+                 -> NodeInfo
+                 -> (Maybe ([NodeInfo], [NodeInfo], Maybe ()) -> IO ())
+                 -> IO ()
+asyncGetNodes client cbvar nid addr go =
+    asyncQ (getNodesSendable cbvar addr) client nid addr go
 
 updateRouting :: Client -> Routing
                         -> (TVar (R.BucketList NodeInfo) -> RoutingTransition NodeInfo -> STM ())
@@ -525,7 +566,7 @@ nodeSearch :: Client -> TVar (HashMap NodeId [NodeInfoCallback]) -> Search NodeI
 nodeSearch client cbvar = Search
     { searchSpace       = toxSpace
     , searchNodeAddress = nodeIP &&& nodePort
-    , searchQuery       = Left $ getNodes client cbvar
+    , searchQuery       = Right $ asyncGetNodes client cbvar
     , searchAlpha       = 8
     , searchK           = 16
 
diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index edbbbb49..f44dd79c 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -218,7 +218,7 @@ toxidSearch :: (TransactionId -> OnionDestination r -> STM (OnionDestination r,
 toxidSearch getTimeout crypto client = Search
     { searchSpace       = toxSpace
     , searchNodeAddress = nodeIP &&& nodePort
-    , searchQuery       = Left $ getRendezvous getTimeout crypto client
+    , searchQuery       = Right $ asyncGetRendezvous getTimeout crypto client
     , searchAlpha = 3
     , searchK     = 6
     }
@@ -290,6 +290,30 @@ sendOnion getTimeout client req oaddr unwrap =
           (return . Just . unwrap (onionNodeInfo oaddr))
           $ join mb
 
+asyncOnion :: (TransactionId
+                     -> OnionDestination r -> STM (OnionDestination r, Int))
+                    -> QR.Client
+                         err
+                         PacketKind
+                         TransactionId
+                         (OnionDestination r)
+                         (OnionMessage Identity)
+                    -> AnnounceRequest
+                    -> OnionDestination r
+                    -> (NodeInfo -> AnnounceResponse -> a)
+                    -> (Maybe a -> IO ())
+                    -> IO ()
+asyncOnion getTimeout client req oaddr unwrap go =
+    -- Four tries and then we tap out.
+    flip fix 4 $ \loop n -> do
+    QR.asyncQuery client (announceSerializer getTimeout) req oaddr
+        $ \mb -> do
+            forM_ mb $ \r -> dput XAnnounce $ show (onionNodeInfo oaddr) ++ " sent response: " ++ show r
+            maybe (if n>0 then loop $! n - 1 else go Nothing)
+                  (go . Just . unwrap (onionNodeInfo oaddr))
+                  $ join mb
+
+
 -- | Lookup the secret counterpart for a given alias key.
 getRendezvous :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
             -> TransportCrypto
@@ -308,6 +332,26 @@ getRendezvous getTimeout crypto client nid ni = do
         oaddr
         (unwrapAnnounceResponse rkey)
 
+asyncGetRendezvous
+    :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
+       -> TransportCrypto
+       -> Client r
+       -> NodeId
+       -> NodeInfo
+       -> (Maybe ([NodeInfo], [Rendezvous], Maybe Nonce32) -> IO ())
+       -> IO ()
+asyncGetRendezvous getTimeout crypto client nid ni go = do
+    asel <- atomically $ selectAlias crypto nid
+    let oaddr = OnionDestination asel ni Nothing
+        rkey  = case asel of
+                    SearchingAlias -> Nothing
+                    _              -> Just $ key2id $ rendezvousPublic crypto
+    asyncOnion getTimeout client
+        (AnnounceRequest zeros32 nid $ fromMaybe zeroID rkey)
+        oaddr
+        (unwrapAnnounceResponse rkey)
+        go
+
 putRendezvous :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
                -> TransportCrypto
                -> Client r