1 files changed, 29 insertions, 14 deletions

diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index c37129cb..8f0f42ce 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -7,35 +7,50 @@
 --
 {-# LANGUAGE RecordWildCards #-}
 module Network.BitTorrent
-       ( module BT
-       , module Data.Torrent
+       (
+         module Data.Torrent
 
-         -- * Tracker
+         -- * Session
+       , ClientSession
+       , newClient
 
-         -- * P2P
-       , ClientSession, newClient
-       , SwarmSession, newLeacher, newSeeder
-       , PeerSession
+       , SwarmSession
+       , newLeacher, newSeeder
+
+         -- * Discovery
        , discover
+
+         -- * Peer to Peer
+       , P2P, PeerSession
+            ( connectedPeerAddr, enabledExtensions
+            , peerBitfield, peerSessionStatus
+            )
+
+       , awaitEvent, signalEvent
        ) where
 
+import Control.Monad
 import Data.IORef
 
 import Data.Torrent
 import Network.BitTorrent.Internal
-import Network.BitTorrent.Extension as BT
-import Network.BitTorrent.Peer as BT
-import Network.BitTorrent.Exchange as BT
-import Network.BitTorrent.Tracker as BT
+import Network.BitTorrent.Exchange
+import Network.BitTorrent.Tracker
+
+
 
 -- discover should hide tracker and DHT communication under the hood
 -- thus we can obtain unified interface
 
-discover :: SwarmSession -> (TSession -> IO a) -> IO a
-discover SwarmSession {..} action = do
+discover :: SwarmSession -> P2P () -> IO ()
+discover swarm @ SwarmSession {..} action = do
   let conn = TConnection (tAnnounce torrentMeta) (tInfoHash torrentMeta)
                          (clientPeerID clientSession) port
   progress <- readIORef (currentProgress clientSession)
-  withTracker progress conn action
+  withTracker progress conn $ \tses -> do
+    forever $ do
+      addr <- getPeerAddr tses
+      withPeer swarm addr action
+
 
 port = 10000