2 files changed, 29 insertions, 1 deletions

diff --git a/src/Network/BitTorrent/Exchange.hs b/src/Network/BitTorrent/Exchange.hs
index 015bae3d..3843addf 100644
--- a/src/Network/BitTorrent/Exchange.hs
+++ b/src/Network/BitTorrent/Exchange.hs
@@ -27,8 +27,13 @@ module Network.BitTorrent.Exchange
 
          -- * Connections
        , connect
+
+         -- * Events
+       , SessionEvent    (..)
+       , subscribe
        ) where
 
+import Network.BitTorrent.Exchange.Connection hiding (Options)
 import Network.BitTorrent.Exchange.Manager
 import Network.BitTorrent.Exchange.Message
 import Network.BitTorrent.Exchange.Session
\ No newline at end of file
diff --git a/src/Network/BitTorrent/Exchange/Session.hs b/src/Network/BitTorrent/Exchange/Session.hs
index 32f8eabd..c4664827 100644
--- a/src/Network/BitTorrent/Exchange/Session.hs
+++ b/src/Network/BitTorrent/Exchange/Session.hs
@@ -16,13 +16,18 @@ module Network.BitTorrent.Exchange.Session
        , connect
        , establish
 
-         -- * Events
+         -- * Query
        , waitMetadata
        , takeMetadata
+
+         -- * Events
+       , SessionEvent (..)
+       , subscription
        ) where
 
 import Control.Applicative
 import Control.Concurrent
+import Control.Concurrent.Chan.Split as CS
 import Control.Concurrent.STM
 import Control.Exception hiding (Handler)
 import Control.Lens
@@ -91,6 +96,7 @@ data Session = Session
   { sessionPeerId          :: !(PeerId)
   , sessionTopic           :: !(InfoHash)
   , sessionLogger          :: !(LogFun)
+  , sessionEvents          :: !(SendPort SessionEvent)
 
   , metadata               :: !(MVar Metadata.Status)
   , infodict               :: !(MVar (Cached InfoDict))
@@ -137,11 +143,13 @@ newSession logFun addr rootPath dict = do
   pSetVar     <- newTVarIO S.empty
   eSetVar     <- newTVarIO M.empty
   chan        <- newChan
+  eventStream <- newSendPort
 
   return Session
     { sessionPeerId          = pid
     , sessionTopic           = idInfoHash dict
     , sessionLogger          = logFun
+    , sessionEvents          = eventStream
 
     , metadata               = metadataVar
     , infodict               = infodictVar
@@ -171,6 +179,21 @@ withSession :: ()
 withSession = error "withSession"
 
 {-----------------------------------------------------------------------
+--  Session events
+-----------------------------------------------------------------------}
+
+data SessionEvent
+  = ConnectingTo (PeerAddr IP)
+  | ConnectionEstablished (PeerAddr IP)
+  | ConnectionAborted
+  | ConnectionClosed (PeerAddr IP)
+  | SessionClosed
+    deriving Show
+
+subscription :: Session -> IO (ReceivePort SessionEvent)
+subscription Session {..} = listen sessionEvents
+
+{-----------------------------------------------------------------------
 --  Logging
 -----------------------------------------------------------------------}