add DHT and PEX

Author: eclipseglory

CHANGELOG.md

@@ -6,3 +6,9 @@
 
 - Fix license file error
 - Fix example error
+
+## 0.1.1
+- Add DHT support
+- Add PEX support
+- Change Tracker
+- Fix some bugs

README.md

@@ -3,14 +3,16 @@ Dart library for implementing BitTorrent client.
 
 ## Support:
 - [BEP 0003 The BitTorrent Protocol Specification](http://www.bittorrent.org/beps/bep_0003.html)
-- [BEP 0006 Fast Extension](http://www.bittorrent.org/beps/bep_0006.html)
-- [BEP 0015 UDP Tracker Protocal](http://www.bittorrent.org/beps/bep_0015.html)
 - [BEP 0005 DHT Protocal](http://www.bittorrent.org/beps/bep_0005.html)
-- [BEP 0011	Peer Exchange (PEX)](http://www.bittorrent.org/beps/bep_0011.html)
+- [BEP 0006 Fast Extension](http://www.bittorrent.org/beps/bep_0006.html)
 - [BEP 0010	Extension Protocol](http://www.bittorrent.org/beps/bep_0010.html)
-
+- [BEP 0011	Peer Exchange (PEX)](http://www.bittorrent.org/beps/bep_0011.html)
+- [BEP 0015 UDP Tracker Protocal](http://www.bittorrent.org/beps/bep_0015.html)
 
 Developing:
+- [BEP 0029 uTorrent transport protocol](https://www.bittorrent.org/beps/bep_0029.html)
+- [BEP 0014 Local Service Discovery](https://www.bittorrent.org/beps/bep_0014.html)
+- [BEP 0055 Holepunch extension](https://www.bittorrent.org/beps/bep_0055.html)
 - [BEP 0009	Extension for Peers to Send Metadata Files](http://www.bittorrent.org/beps/bep_0009.html)
 
 Other support will come soon.

example/torrent_client_example.dart

@@ -1,12 +1,36 @@
 import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
 
 import 'package:torrent_model/torrent_model.dart';
 import 'package:torrent_task/torrent_task.dart';
 
 var peers = <Uri>{};
 void main() async {
-  var model = await Torrent.parse('example/sample3.torrent');
-  var task = TorrentTask.newTask(model, 'g:/bttest1/');
+  // https://newtrackon.com/api/stable
+  var alist = <Uri>[];
+  try {
+    var url = Uri.parse('http://newtrackon.com/api/stable');
+    var client = HttpClient();
+    var request = await client.getUrl(url);
+    var response = await request.close();
+    print(response.statusCode);
+    var stream = await utf8.decoder.bind(response);
+    await stream.forEach((element) {
+      try {
+        var r = Uri.parse(element);
+        alist.add(r);
+      } catch (e) {
+        //
+      }
+    });
+  } catch (e) {
+    print(e);
+  }
+  var torrentFile = 'example/test11.torrent';
+  var savePath = 'g:/bttest/';
+  var model = await Torrent.parse(torrentFile);
+  var task = TorrentTask.newTask(model, savePath);
   Timer timer;
   Timer timer1;
   task.onTaskComplete(() {
@@ -18,8 +42,12 @@ void main() async {
   task.onStop(() async {
     print('Task Stopped');
   });
-
   var map = await task.start();
+
+  alist.forEach((element) {
+    task.startAnnounceUrl(element, model.infoHashBuffer);
+  });
+
   model.nodes?.forEach((element) {
     task.addDHTNode(element);
   });
@@ -28,7 +56,7 @@ void main() async {
 
   timer = Timer.periodic(Duration(seconds: 2), (timer) async {
     print(
-        'Progress : ${(task.progress * 100).toStringAsFixed(2)}% , Connect num : ${task.peersNumber}. Download speed : ${((task.downloadSpeed) * 1000 / 1024).toStringAsFixed(2)} KB/S , upload speed : ${((task.uploadSpeed) * 1000 / 1024).toStringAsFixed(2)} KB/S');
+        'Progress : ${(task.progress * 100).toStringAsFixed(2)}% , Peers: ${task.connectedPeersNumber}(${task.seederNumber}/${task.allPeersNumber}). Download speed : ${((task.downloadSpeed) * 1000 / 1024).toStringAsFixed(2)} KB/S , upload speed : ${((task.uploadSpeed) * 1000 / 1024).toStringAsFixed(2)} KB/S');
   });
   // timer1 = Timer.periodic(Duration(seconds: randomInt(21)), (timer) async {
   //   task.pause();

example/torrent_task_comin_example.dart

@@ -5,50 +5,50 @@ import 'package:torrent_task/src/task.dart';
 import 'package:torrent_task/src/utils.dart';
 
 Future<void> main() async {
-  var model = await Torrent.parse('example/test8.torrent');
-  // 不去获取peers
-  model.announces.clear();
-  var task = TorrentTask.newTask(model, 'g:/bttest5/');
-  Timer timer;
-  Timer timer1;
-  // task.addPeer(Uri(host:'127.0.0.1'));
-  task.onFileComplete((filepath) {
-    print('$filepath downloaded complete');
-  });
-
-  task.onTaskComplete(() {
-    print('Complete!');
-    timer?.cancel();
-    timer1?.cancel();
-    task.stop();
-  });
-  task.onStop(() async {
-    print('Task Stopped');
-  });
-  await task.start();
+  // var model = await Torrent.parse('example/test8.torrent');
+  // // 不去获取peers
+  // model.announces.clear();
+  // var task = TorrentTask.newTask(model, 'g:/bttest5/');
+  // Timer timer;
+  // Timer timer1;
+  // // task.addPeer(Uri(host:'127.0.0.1'));
+  // task.onFileComplete((filepath) {
+  //   print('$filepath downloaded complete');
+  // });
 
-  timer = Timer.periodic(Duration(seconds: 2), (timer) {
-    try {
-      print(
-          'Downloaed: ${task.downloaded / (1024 * 1024)} mb , ${((task.downloaded / model.length) * 100).toStringAsFixed(2)}%');
-    } finally {}
-  });
+  // task.onTaskComplete(() {
+  //   print('Complete!');
+  //   timer?.cancel();
+  //   timer1?.cancel();
+  //   task.stop();
+  // });
+  // task.onStop(() async {
+  //   print('Task Stopped');
+  // });
+  // await task.start();
 
-  timer = Timer.periodic(Duration(seconds: 10), (timer) async {
-    print(
-        'download speed : ${(await task.downloadSpeed) * 1000 / 1024} , upload speed : ${task.uploadSpeed * 1000 / 1024}');
-  });
-  timer1 = Timer.periodic(Duration(seconds: randomInt(21)), (timer) async {
-    task.pause();
-    await Future.delayed(Duration(seconds: randomInt(121)));
-    task.resume();
-  });
+  // timer = Timer.periodic(Duration(seconds: 2), (timer) {
+  //   try {
+  //     print(
+  //         'Downloaed: ${task.downloaded / (1024 * 1024)} mb , ${((task.downloaded / model.length) * 100).toStringAsFixed(2)}%');
+  //   } finally {}
+  // });
 
-  // Timer(Duration(seconds: 20), () async {
+  // timer = Timer.periodic(Duration(seconds: 10), (timer) async {
+  //   print(
+  //       'download speed : ${(await task.downloadSpeed) * 1000 / 1024} , upload speed : ${task.uploadSpeed * 1000 / 1024}');
+  // });
+  // timer1 = Timer.periodic(Duration(seconds: randomInt(21)), (timer) async {
   //   task.pause();
-  //   await Future.delayed(Duration(seconds: 120));
+  //   await Future.delayed(Duration(seconds: randomInt(121)));
   //   task.resume();
   // });
-  // 自己下载自己
-  task.addPeer(Uri(host: '127.0.0.1', port: 53191));
+
+  // // Timer(Duration(seconds: 20), () async {
+  // //   task.pause();
+  // //   await Future.delayed(Duration(seconds: 120));
+  // //   task.resume();
+  // // });
+  // // 自己下载自己
+  // task.addPeer(Uri(host: '127.0.0.1', port: 53191));
 }