2 files changed, 14 insertions, 20 deletions

diff --git a/src/Network/BitTorrent/Client/Handle.hs b/src/Network/BitTorrent/Client/Handle.hs
index 25316a0a..0d1b7f92 100644
--- a/src/Network/BitTorrent/Client/Handle.hs
+++ b/src/Network/BitTorrent/Client/Handle.hs
@@ -14,11 +14,7 @@ module Network.BitTorrent.Client.Handle
 
          -- * Query
        , getHandle
-       , HandleStatus (..)
        , getStatus
-
-         -- * Events
-       , HandleEvent (..)
        ) where
 
 import Control.Concurrent.Chan.Split
@@ -192,6 +188,3 @@ getHandle ih = do
 
 getStatus :: Handle -> IO HandleStatus
 getStatus Handle {..} = readMVar handleStatus
-
-subscription :: Handle -> IO (ReceivePort HandleEvent)
-subscription Handle {..} = listen handleEvents
diff --git a/src/Network/BitTorrent/Client/Types.hs b/src/Network/BitTorrent/Client/Types.hs
index aa876ff1..c019bc5f 100644
--- a/src/Network/BitTorrent/Client/Types.hs
+++ b/src/Network/BitTorrent/Client/Types.hs
@@ -17,13 +17,12 @@ module Network.BitTorrent.Client.Types
        , MonadBitTorrent (..)
 
          -- * Events
-       , ClientEvent (..)
-       , HandleEvent (..)
+       , Types.Event (..)
        ) where
 
 import Control.Applicative
 import Control.Concurrent
-import Control.Concurrent.Chan.Split
+import Control.Concurrent.Chan.Split as CS
 import Control.Monad.Base
 import Control.Monad.Logger
 import Control.Monad.Reader
@@ -36,19 +35,17 @@ import Network
 import System.Log.FastLogger
 
 import Data.Torrent.InfoHash
+import Network.BitTorrent.Internal.Types as Types
 import Network.BitTorrent.Core
 import Network.BitTorrent.DHT      as DHT
 import Network.BitTorrent.Exchange as Exchange
-import Network.BitTorrent.Tracker  as Tracker
+import Network.BitTorrent.Tracker  as Tracker hiding (Event)
 
 data HandleStatus
   = Running
   | Stopped
     deriving (Show, Eq)
 
-data HandleEvent
-  = StatusChanged HandleStatus
-
 data Handle = Handle
   { handleTopic    :: !InfoHash
   , handlePrivate  :: !Bool
@@ -56,9 +53,13 @@ data Handle = Handle
   , handleStatus   :: !(MVar HandleStatus)
   , handleTrackers :: !Tracker.Session
   , handleExchange :: !Exchange.Session
-  , handleEvents   :: !(SendPort HandleEvent)
+  , handleEvents   :: !(SendPort (Event Handle))
   }
 
+instance EventSource Handle where
+  data Event Handle  = StatusChanged HandleStatus
+  listen Handle {..} = CS.listen undefined
+
 data Client = Client
   { clientPeerId       :: !PeerId
   , clientListenerPort :: !PortNumber
@@ -69,7 +70,7 @@ data Client = Client
   , clientNode         :: !(Node IPv4)
   , clientTorrents     :: !(MVar (HashMap InfoHash Handle))
   , clientLogger       :: !LogFun
-  , clientEvents       :: !(SendPort ClientEvent)
+  , clientEvents       :: !(SendPort (Event Client))
   }
 
 instance Eq Client where
@@ -78,6 +79,10 @@ instance Eq Client where
 instance Ord Client where
   compare = comparing clientPeerId
 
+instance EventSource Client where
+  data Event Client = TorrentAdded InfoHash
+  listen Client {..} = CS.listen clientEvents
+
 -- | External IP address of a host running a bittorrent client
 -- software may be used to acknowledge remote peer the host connected
 -- to. See 'Network.BitTorrent.Exchange.Message.ExtendedHandshake'.
@@ -88,10 +93,6 @@ externalAddr Client {..} = PeerAddr
   , peerPort = clientListenerPort
   }
 
-data ClientEvent
-  = TorrentAdded InfoHash
-    deriving (Show, Eq)
-
 {-----------------------------------------------------------------------
 --  BitTorrent monad
 -----------------------------------------------------------------------}