diff options
author | Feross Aboukhadijeh <feross@feross.org> | 2013-11-07 01:39:27 +0400 |
---|---|---|
committer | Feross Aboukhadijeh <feross@feross.org> | 2013-11-07 01:39:27 +0400 |
commit | 1a1db8d9916c99b7a961da27bbb3de58df723191 (patch) | |
tree | dee7d519d6382891aa0b1cefe52ae8986e802d8a /lib | |
parent | 5fb70e3660ba0e2791f8f23ddb6126ec6b27a83a (diff) |
bittorrent-dht should use chrome-app-socket module
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bittorrent-dht/.jshintrc | 9 | ||||
-rw-r--r-- | lib/bittorrent-dht/index.js | 20 |
2 files changed, 19 insertions, 10 deletions
diff --git a/lib/bittorrent-dht/.jshintrc b/lib/bittorrent-dht/.jshintrc new file mode 100644 index 0000000..c1bb5e9 --- /dev/null +++ b/lib/bittorrent-dht/.jshintrc @@ -0,0 +1,9 @@ +{ + "asi": true, + "laxbreak": true, + "expr": true, + "strict": false, + "node": true, + "browser": true, + "devel": true +}
\ No newline at end of file diff --git a/lib/bittorrent-dht/index.js b/lib/bittorrent-dht/index.js index 4d47f16..2b306c4 100644 --- a/lib/bittorrent-dht/index.js +++ b/lib/bittorrent-dht/index.js @@ -10,7 +10,7 @@ var bencode = require('bncode') var bops = require('bops') var compact2string = require('compact2string') var EventEmitter = require('events').EventEmitter -var socket = require('../../socket') +var socket = require('chrome-app-socket') var is = require('core-util-is') // added in Node 0.12 var util = require('util') @@ -76,7 +76,7 @@ function DHT (infoHash) { self.missingPeers = 0 self.nodeId = randomId() - log('our node id: ' + bops.to(self.nodeId, 'hex')) + console.log('our node id: ' + bops.to(self.nodeId, 'hex')) self.requestId = 1 self.pendingRequests = {} @@ -90,7 +90,7 @@ function DHT (infoHash) { info_hash: self.infoHash } } - log('created message: ' + JSON.stringify(self.message)) + console.log('created message: ' + JSON.stringify(self.message)) self.message = bencode.encode(self.message) self.pendingRequests[self.requestId] = 1 @@ -106,7 +106,7 @@ function DHT (infoHash) { DHT.prototype._handleNode = function (addr) { var self = this if (self.nodes[addr]) { - // log('already know about this node!') + // console.log('already know about this node!') return } @@ -139,9 +139,9 @@ DHT.prototype._onData = function (data, host, port) { var message try { - // log('got response from ' + addr) + // console.log('got response from ' + addr) message = bencode.decode(data) - // log(JSON.stringify(message)) + // console.log(JSON.stringify(message)) if (!message) throw new Error('message is undefined') } catch (err) { console.error('Failed to decode UDP data from node ' + addr) @@ -150,7 +150,7 @@ DHT.prototype._onData = function (data, host, port) { } if (!message.t || (bops.to(message.t) !== self.requestId.toString())) { - log('wrong message requestId: ', bops.to(message.t), self.requestId.toString(), host, port) + console.log('wrong message requestId: ', bops.to(message.t), self.requestId.toString(), host, port) return } @@ -160,11 +160,11 @@ DHT.prototype._onData = function (data, host, port) { var r = message && message.r if (r && bops.is(r.nodes)) { - // log('got nodes') + // console.log('got nodes') parseNodeInfo(r.nodes).forEach(self._handleNode.bind(self)) } if (r && is.isArray(r.values)) { - // log('got peers') + // console.log('got peers') parsePeerInfo(r.values).forEach(self._handlePeer.bind(self)) } } @@ -193,7 +193,7 @@ DHT.prototype.findPeers = function (num) { // the bootstrap nodes. setTimeout(function () { if (Object.keys(self.nodes).length === 0) { - log('No nodes replied, retry with bootstrap nodes') + console.log('No nodes replied, retry with bootstrap nodes') self.queue.push.apply(self.queue, BOOTSTRAP_NODES) self.findPeers(num) } |