diff options
author | Sam Truzjan <pxqr.sta@gmail.com> | 2014-02-08 07:31:23 +0400 |
---|---|---|
committer | Sam Truzjan <pxqr.sta@gmail.com> | 2014-02-08 07:31:23 +0400 |
commit | 240f025f6e631a7b3b14173472028ae5f225fc7b (patch) | |
tree | e6ae54cf9ee71e9526abb941a78bb8eb278f00a3 /src/Network/BitTorrent/Client | |
parent | c197ad8fde170d414bdd869df20f28a48ac475e6 (diff) |
Redesign core of client
Diffstat (limited to 'src/Network/BitTorrent/Client')
-rw-r--r-- | src/Network/BitTorrent/Client/Handle.hs | 138 | ||||
-rw-r--r-- | src/Network/BitTorrent/Client/Swarm.hs | 52 | ||||
-rw-r--r-- | src/Network/BitTorrent/Client/Types.hs | 84 |
3 files changed, 222 insertions, 52 deletions
diff --git a/src/Network/BitTorrent/Client/Handle.hs b/src/Network/BitTorrent/Client/Handle.hs new file mode 100644 index 00000000..467d5745 --- /dev/null +++ b/src/Network/BitTorrent/Client/Handle.hs | |||
@@ -0,0 +1,138 @@ | |||
1 | module Network.BitTorrent.Client.Handle | ||
2 | ( -- * Handle | ||
3 | Handle | ||
4 | |||
5 | -- * Initialization | ||
6 | , openTorrent | ||
7 | , openMagnet | ||
8 | , closeHandle | ||
9 | |||
10 | -- * Control | ||
11 | , start | ||
12 | , pause | ||
13 | , stop | ||
14 | |||
15 | -- * Query | ||
16 | , getHandle | ||
17 | , HandleState | ||
18 | , getState | ||
19 | ) where | ||
20 | |||
21 | import Control.Applicative | ||
22 | import Control.Concurrent | ||
23 | import Control.Monad | ||
24 | import Control.Monad.Trans | ||
25 | import Data.HashMap.Strict as HM | ||
26 | |||
27 | import Data.Torrent | ||
28 | import Data.Torrent.InfoHash | ||
29 | import Data.Torrent.Magnet | ||
30 | import Network.BitTorrent.Client.Types | ||
31 | import Network.BitTorrent.DHT as DHT | ||
32 | import Network.BitTorrent.Tracker as Tracker | ||
33 | |||
34 | {----------------------------------------------------------------------- | ||
35 | -- Safe handle set manupulation | ||
36 | -----------------------------------------------------------------------} | ||
37 | |||
38 | -- | Guarantees that we newer allocate the same handle twice. | ||
39 | allocHandle :: InfoHash -> BitTorrent Handle -> BitTorrent Handle | ||
40 | allocHandle ih m = do | ||
41 | c @ Client {..} <- getClient | ||
42 | liftIO $ modifyMVar clientTorrents $ \ handles -> do | ||
43 | case HM.lookup ih handles of | ||
44 | Just h -> return (handles, h) | ||
45 | Nothing -> do | ||
46 | h <- runBitTorrent c m | ||
47 | return (HM.insert ih h handles, h) | ||
48 | |||
49 | -- | | ||
50 | freeHandle :: InfoHash -> BitTorrent () -> BitTorrent () | ||
51 | freeHandle ih finalizer = do | ||
52 | c @ Client {..} <- getClient | ||
53 | liftIO $ modifyMVar_ clientTorrents $ \ handles -> do | ||
54 | case HM.lookup ih handles of | ||
55 | Nothing -> return handles | ||
56 | Just _ -> do | ||
57 | runBitTorrent c finalizer | ||
58 | return (HM.delete ih handles) | ||
59 | |||
60 | -- | | ||
61 | lookupHandle :: InfoHash -> BitTorrent (Maybe Handle) | ||
62 | lookupHandle ih = do | ||
63 | Client {..} <- getClient | ||
64 | handles <- liftIO $ readMVar clientTorrents | ||
65 | return (HM.lookup ih handles) | ||
66 | |||
67 | {----------------------------------------------------------------------- | ||
68 | -- Initialization | ||
69 | -----------------------------------------------------------------------} | ||
70 | |||
71 | -- | Open a torrent in 'stop'ed state. Use 'nullTorrent' to open | ||
72 | -- handle from 'InfoDict'. This operation do not block. | ||
73 | openTorrent :: Torrent -> BitTorrent Handle | ||
74 | openTorrent t @ Torrent {..} = do | ||
75 | let ih = idInfoHash tInfoDict | ||
76 | allocHandle ih $ do | ||
77 | ses <- liftIO (Tracker.newSession ih (trackerList t)) | ||
78 | return $ Handle ih (idPrivate tInfoDict) ses | ||
79 | |||
80 | -- | Use 'nullMagnet' to open handle from 'InfoHash'. | ||
81 | openMagnet :: Magnet -> BitTorrent Handle | ||
82 | openMagnet = undefined | ||
83 | |||
84 | -- | Stop torrent and destroy all sessions. You don't need to close | ||
85 | -- handles at application exit, all handles will be automatically | ||
86 | -- closed at 'Network.BitTorrent.Client.closeClient'. This operation | ||
87 | -- may block. | ||
88 | closeHandle :: Handle -> BitTorrent () | ||
89 | closeHandle h @ Handle {..} = do | ||
90 | freeHandle topic $ do | ||
91 | stop h | ||
92 | liftIO $ Tracker.closeSession trackers | ||
93 | |||
94 | {----------------------------------------------------------------------- | ||
95 | -- Control | ||
96 | -----------------------------------------------------------------------} | ||
97 | |||
98 | -- | Start downloading, uploading and announcing this torrent. | ||
99 | -- | ||
100 | -- This operation is blocking, use | ||
101 | -- 'Control.Concurrent.Async.Lifted.async' if needed. | ||
102 | start :: Handle -> BitTorrent () | ||
103 | start Handle {..} = do | ||
104 | Client {..} <- getClient | ||
105 | liftIO $ Tracker.notify trackerManager trackers Tracker.Started | ||
106 | unless private $ do | ||
107 | liftDHT $ DHT.insert topic undefined | ||
108 | |||
109 | -- | Stop downloading this torrent. | ||
110 | pause :: Handle -> BitTorrent () | ||
111 | pause _ = return () | ||
112 | |||
113 | -- | Stop downloading, uploading and announcing this torrent. | ||
114 | stop :: Handle -> BitTorrent () | ||
115 | stop Handle {..} = do | ||
116 | Client {..} <- getClient | ||
117 | unless private $ do | ||
118 | liftDHT $ DHT.delete topic undefined | ||
119 | liftIO $ Tracker.notify trackerManager trackers Tracker.Stopped | ||
120 | |||
121 | {----------------------------------------------------------------------- | ||
122 | -- Query | ||
123 | -----------------------------------------------------------------------} | ||
124 | |||
125 | data HandleState | ||
126 | = Running | ||
127 | | Paused | ||
128 | | Stopped | ||
129 | |||
130 | getHandle :: InfoHash -> BitTorrent Handle | ||
131 | getHandle ih = do | ||
132 | mhandle <- lookupHandle ih | ||
133 | case mhandle of | ||
134 | Nothing -> error "should we throw some exception?" | ||
135 | Just h -> return h | ||
136 | |||
137 | getState :: Handle -> IO HandleState | ||
138 | getState = undefined \ No newline at end of file | ||
diff --git a/src/Network/BitTorrent/Client/Swarm.hs b/src/Network/BitTorrent/Client/Swarm.hs deleted file mode 100644 index bd48f8a4..00000000 --- a/src/Network/BitTorrent/Client/Swarm.hs +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | module Network.BitTorrent.Client.Swarm | ||
2 | ( Swarm | ||
3 | , newLeecher | ||
4 | , askPeers | ||
5 | ) where | ||
6 | |||
7 | import Data.Default | ||
8 | import Data.Maybe | ||
9 | import Network | ||
10 | |||
11 | import Data.Torrent | ||
12 | import Data.Torrent.InfoHash | ||
13 | import Network.BitTorrent.Core | ||
14 | import Network.BitTorrent.Tracker.Message | ||
15 | import Network.BitTorrent.Tracker.RPC as RPC | ||
16 | |||
17 | |||
18 | data Swarm = Swarm | ||
19 | { swarmTopic :: InfoHash | ||
20 | , thisPeerId :: PeerId | ||
21 | , listenerPort :: PortNumber | ||
22 | } | ||
23 | |||
24 | newLeecher :: PeerId -> PortNumber -> Torrent -> IO Swarm | ||
25 | newLeecher pid port Torrent {..} = do | ||
26 | return Swarm | ||
27 | { swarmTopic = idInfoHash tInfoDict | ||
28 | , thisPeerId = pid | ||
29 | , listenerPort = port | ||
30 | } | ||
31 | |||
32 | getAnnounceQuery :: Swarm -> AnnounceQuery | ||
33 | getAnnounceQuery Swarm {..} = AnnounceQuery | ||
34 | { reqInfoHash = swarmTopic | ||
35 | , reqPeerId = thisPeerId | ||
36 | , reqPort = listenerPort | ||
37 | , reqProgress = def | ||
38 | , reqIP = Nothing | ||
39 | , reqNumWant = Nothing | ||
40 | , reqEvent = Nothing | ||
41 | } | ||
42 | |||
43 | askPeers :: Swarm -> IO [PeerAddr IP] | ||
44 | askPeers s @ Swarm {..} = do | ||
45 | -- AnnounceInfo {..} <- RPC.announce (getAnnounceQuery s) trackerConn | ||
46 | return [] -- (getPeerList respPeers) | ||
47 | |||
48 | --reannounce :: HTracker -> IO () | ||
49 | --reannounce = undefined | ||
50 | |||
51 | --forceReannounce :: HTracker -> IO () | ||
52 | --forceReannounce = undefined | ||
diff --git a/src/Network/BitTorrent/Client/Types.hs b/src/Network/BitTorrent/Client/Types.hs new file mode 100644 index 00000000..0da24dc2 --- /dev/null +++ b/src/Network/BitTorrent/Client/Types.hs | |||
@@ -0,0 +1,84 @@ | |||
1 | {-# LANGUAGE GeneralizedNewtypeDeriving #-} | ||
2 | module Network.BitTorrent.Client.Types | ||
3 | ( -- * Core types | ||
4 | Handle (..) | ||
5 | , Client (..) | ||
6 | |||
7 | -- * Monad BitTorrent | ||
8 | , BitTorrent (..) | ||
9 | , runBitTorrent | ||
10 | , getClient | ||
11 | |||
12 | , MonadBitTorrent (..) | ||
13 | ) where | ||
14 | |||
15 | import Control.Concurrent | ||
16 | import Control.Monad.Logger | ||
17 | import Control.Monad.Reader | ||
18 | import Control.Monad.Trans.Resource | ||
19 | import Data.Function | ||
20 | import Data.HashMap.Strict as HM | ||
21 | import Data.Ord | ||
22 | import Network | ||
23 | import System.Log.FastLogger | ||
24 | |||
25 | import Data.Torrent.InfoHash | ||
26 | import Network.BitTorrent.Core | ||
27 | import Network.BitTorrent.DHT as DHT | ||
28 | import Network.BitTorrent.Tracker as Tracker | ||
29 | import Network.BitTorrent.Exchange.Message | ||
30 | |||
31 | |||
32 | data Handle = Handle | ||
33 | { topic :: !InfoHash | ||
34 | , private :: !Bool | ||
35 | , trackers :: !Tracker.Session | ||
36 | } | ||
37 | |||
38 | data Client = Client | ||
39 | { clientPeerId :: !PeerId | ||
40 | , clientListenerPort :: !PortNumber | ||
41 | , allowedExtensions :: !Caps | ||
42 | , trackerManager :: !Tracker.Manager | ||
43 | , clientNode :: !(Node IPv4) | ||
44 | , clientTorrents :: !(MVar (HashMap InfoHash Handle)) | ||
45 | , clientLogger :: !LogFun | ||
46 | } | ||
47 | |||
48 | instance Eq Client where | ||
49 | (==) = (==) `on` clientPeerId | ||
50 | |||
51 | instance Ord Client where | ||
52 | compare = comparing clientPeerId | ||
53 | |||
54 | {----------------------------------------------------------------------- | ||
55 | -- BitTorrent monad | ||
56 | -----------------------------------------------------------------------} | ||
57 | |||
58 | newtype BitTorrent a = BitTorrent | ||
59 | { unBitTorrent :: ReaderT Client (ResourceT IO) a | ||
60 | } deriving (Functor, Monad, MonadIO) | ||
61 | |||
62 | class MonadBitTorrent m where | ||
63 | liftBT :: BitTorrent a -> m a | ||
64 | |||
65 | instance MonadBitTorrent BitTorrent where | ||
66 | liftBT = id | ||
67 | |||
68 | instance MonadDHT BitTorrent where | ||
69 | liftDHT action = BitTorrent $ do | ||
70 | node <- asks clientNode | ||
71 | liftIO $ runResourceT $ runDHT node action | ||
72 | |||
73 | instance MonadLogger BitTorrent where | ||
74 | monadLoggerLog loc src lvl msg = BitTorrent $ do | ||
75 | logger <- asks clientLogger | ||
76 | liftIO $ logger loc src lvl (toLogStr msg) | ||
77 | |||
78 | runBitTorrent :: Client -> BitTorrent a -> IO a | ||
79 | runBitTorrent client action = runResourceT $ | ||
80 | runReaderT (unBitTorrent action) client | ||
81 | {-# INLINE runBitTorrent #-} | ||
82 | |||
83 | getClient :: BitTorrent Client | ||
84 | getClient = BitTorrent ask | ||