show overall upload/download speed

webtorrent · Mar 3, 2014 · 6d028d8 · 6d028d8
1 parent ac599e8
commit 6d028d8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/chrome/app.html b/chrome/app.html
@@ -31,8 +31,8 @@
     <div class="overall-stats">
       <!-- TODO: heart should be colored red/green based on ratio -->
       <span class="ratio"><i class="fa fa-heart fa-lg"></i>Ratio: <span></span></span>
-      <span class="upload"><i class="fa fa-arrow-up fa-lg"></i><span>0.0 KB/s</span></span>
-      <span class="download"><i class="fa fa-arrow-down fa-lg"></i><span>0.0 KB/s</span></span>
+      <span class="uploadSpeed"><i class="fa fa-arrow-up fa-lg"></i><span></span>/s</span>
+      <span class="downloadSpeed"><i class="fa fa-arrow-down fa-lg"></i><span></span>/s</span>
     </div>
 
     <main id="torrents">

diff --git a/css/main.styl b/css/main.styl
@@ -91,7 +91,7 @@ toolbar()
     vertical-align: baseline
   .ratio
     float: left
-  .upload, .download
+  .uploadSpeed, .downloadSpeed
     float: right
     margin-left: 20px
 

diff --git a/lib/app.js b/lib/app.js
@@ -118,6 +118,8 @@ App.prototype.updateUI = function () {
   })
 
   $('.overall-stats .ratio span').text(self.torrentManager.ratio)
+  $('.overall-stats .uploadSpeed span').text(humanize.filesize(self.torrentManager.uploadSpeed()))
+  $('.overall-stats .downloadSpeed span').text(humanize.filesize(self.torrentManager.downloadSpeed()))
 
   // Number of transfers
   if (self.torrentManager.torrents.length === 1)

diff --git a/lib/torrent-manager.js b/lib/torrent-manager.js
@@ -7,6 +7,7 @@ var EventEmitter = require('events').EventEmitter
 var hat = require('hat')
 var inherits = require('inherits')
 var portfinder = require('chrome-portfinder')
+var speedometer = require('speedometer')
 var Torrent = require('./torrent')
 
 var MAX_PEERS = 200
@@ -24,17 +25,19 @@ function TorrentManager () {
   self.nodeId = new Buffer(hat(160), 'hex')
 
   self.torrents = []
+  self.ready = false
+  this.downloadSpeed = speedometer()
+  this.uploadSpeed = speedometer()
 
   self.dht = new DHT({ nodeId: self.nodeId })
 
-  self._reemitEvents(self.dht, 'dht', ['node', 'peer'])
+  // self._reemitEvents(self.dht, 'dht', ['node', 'peer'])
 
   self.dht.on('peer', function (addr, infoHash) {
     var torrent = self.getTorrent(infoHash)
     torrent.addPeer(addr)
   })
 
-  self.ready = false
 
   self._installWindowEvents()
 
@@ -95,7 +98,14 @@ TorrentManager.prototype.add = function (uri) {
   })
   self.torrents.push(torrent)
 
-  self._reemitEvents(torrent, 'torrent', ['listening'])
+  torrent.swarm.on('download', function (downloaded) {
+    self.downloadSpeed(downloaded)
+  })
+  torrent.swarm.on('upload', function (uploaded) {
+    self.uploadSpeed(uploaded)
+  })
+
+  // self._reemitEvents(torrent, 'torrent', ['listening'])
   self.emit('addTorrent', torrent)
 
   torrent.on('listening', function (port) {