From ca81fd40d2594dca0c4ec49bf124e328635b7a30 Mon Sep 17 00:00:00 2001
From: Feross Aboukhadijeh <feross@feross.org>
Date: Tue, 16 Feb 2016 17:55:16 -0800
Subject: [PATCH] sync with instant.io repo

---
 client/index.js | 18 ++++++++++++------
 package.json    |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/client/index.js b/client/index.js
index 93433174..d158f962 100644
--- a/client/index.js
+++ b/client/index.js
@@ -4,6 +4,7 @@ var dragDrop = require('drag-drop')
 // var listify = require('listify')
 var path = require('path')
 var prettyBytes = require('pretty-bytes')
+var throttle = require('throttleit')
 var thunky = require('thunky')
 var uploadElement = require('upload-element')
 var WebTorrent = require('webtorrent')
@@ -50,7 +51,7 @@ dragDrop('body', onFiles)
 // Download via input element
 document.querySelector('form').addEventListener('submit', function (e) {
   e.preventDefault()
-  downloadTorrent(document.querySelector('form input[name=torrentId]').value)
+  downloadTorrent(document.querySelector('form input[name=torrentId]').value.trim())
 })
 
 // Download by URL hash
@@ -138,11 +139,16 @@ function onTorrent (torrent) {
 
   var torrentFileName = path.basename(torrent.name, path.extname(torrent.name)) + '.torrent'
 
+  util.log('"' + torrentFileName + '" contains ' + torrent.files.length + ' files:')
+  torrent.files.forEach(function (file) {
+    util.log('&nbsp;&nbsp;- ' + file.name + ' (' + prettyBytes(file.length) + ')')
+  })
+
   util.log(
     'Torrent info hash: ' + torrent.infoHash + ' ' +
     '<a href="/#' + torrent.infoHash + '" onclick="prompt(\'Share this link with anyone you want to download this torrent:\', this.href);return false;">[Share link]</a> ' +
     '<a href="' + torrent.magnetURI + '" target="_blank">[Magnet URI]</a> ' +
-    '<a href="' + torrent.torrentFileURL + '" target="_blank" download="' + torrentFileName + '">[Download .torrent]</a>'
+    '<a href="' + torrent.torrentFileBlobURL + '" target="_blank" download="' + torrentFileName + '">[Download .torrent]</a>'
   )
 
   function updateSpeed () {
@@ -150,13 +156,13 @@ function onTorrent (torrent) {
     util.updateSpeed(
       '<b>Peers:</b> ' + torrent.swarm.wires.length + ' ' +
       '<b>Progress:</b> ' + progress + '% ' +
-      '<b>Download speed:</b> ' + prettyBytes(window.client.downloadSpeed()) + '/s ' +
-      '<b>Upload speed:</b> ' + prettyBytes(window.client.uploadSpeed()) + '/s'
+      '<b>Download speed:</b> ' + prettyBytes(window.client.downloadSpeed) + '/s ' +
+      '<b>Upload speed:</b> ' + prettyBytes(window.client.uploadSpeed) + '/s'
     )
   }
 
-  torrent.swarm.on('download', updateSpeed)
-  torrent.swarm.on('upload', updateSpeed)
+  torrent.on('download', throttle(updateSpeed, 250))
+  torrent.on('upload', throttle(updateSpeed, 250))
   setInterval(updateSpeed, 5000)
   updateSpeed()
 
diff --git a/package.json b/package.json
index e7e29377..9530e1f4 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "drag-drop": "^2.3.1",
     "electron-debug": "^0.5.0",
     "pretty-bytes": "^3.0.0",
+    "throttleit": "^1.0.0",
     "thunky": "^0.1.0",
     "upload-element": "^1.0.1",
     "webtorrent": "^0.68.0",