code style

This commit is contained in:
Feross Aboukhadijeh 2014-12-11 12:53:39 -08:00
parent 20cb18272e
commit edb5c6e854
4 changed files with 15 additions and 17 deletions

View File

@ -1,16 +1,16 @@
module.exports = parseHttpRequest
var common = require('./common')
var REMOVE_IPV6_RE = /^::ffff:/
module.exports = parseHttpRequest
function parseHttpRequest (req, options) {
var s = req.url.split('?')
var params = common.querystringParse(s[1])
if (s[0] === '/announce') {
params.action = common.ACTIONS.ANNOUNCE
params.peer_id = typeof params.peer_id === 'string' && common.binaryToUtf8(params.peer_id)
params.port = Number(params.port)

View File

@ -1,10 +1,9 @@
module.exports = parseUdpRequest
var bufferEqual = require('buffer-equal')
var ipLib = require('ip')
var common = require('./common')
module.exports = parseUdpRequest
function parseUdpRequest (msg, rinfo) {
if (msg.length < 16) {
throw new Error('received packet is too short')
@ -20,7 +19,7 @@ function parseUdpRequest (msg, rinfo) {
transactionId: msg.readUInt32BE(12)
}
// TODO: randomize:
// TODO: randomize
if (!bufferEqual(params.connectionId, common.CONNECTION_ID)) {
throw new Error('received packet with invalid connection id')
}

View File

@ -1,7 +1,7 @@
var debug = require('debug')('bittorrent-tracker')
module.exports = Swarm
var debug = require('debug')('bittorrent-tracker')
// Regard this as the default implementation of an interface that you
// need to support when overriding Server.getSwarm()
function Swarm (infoHash, server) {
@ -110,7 +110,7 @@ Swarm.prototype._getPeers = function (numwant) {
return peers
}
Swarm.prototype.scrape = function (infoHash, params, cb) {
Swarm.prototype.scrape = function (params, cb) {
cb(null, {
complete: this.complete,
incomplete: this.incomplete

View File

@ -147,7 +147,7 @@ Server.prototype._onHttpRequest = function (req, res) {
// even though it's an error for the client, it's just a warning for the server.
// don't crash the server because a client sent bad data :)
self.emit('warning', error)
return
}
@ -185,7 +185,7 @@ Server.prototype._onUdpRequest = function (msg, rinfo) {
'failure reason': err.message
}
}
var socket = dgram.createSocket('udp4')
response.transactionId = params.transactionId
response.connectionId = params.connectionId
@ -199,7 +199,6 @@ Server.prototype._onUdpRequest = function (msg, rinfo) {
}
Server.prototype._onRequest = function (params, cb) {
var response
if (params && params.action === common.ACTIONS.CONNECT) {
cb(null, { action: common.ACTIONS.CONNECT })
} else if (params && params.action === common.ACTIONS.ANNOUNCE) {
@ -230,7 +229,7 @@ Server.prototype._onAnnounce = function (params, cb) {
Server.prototype._onScrape = function (params, cb) {
var self = this
if (typeof params.info_hash === 'string') {
params.info_hash = [ params.info_hash ]
} else if (params.info_hash == null) {
@ -238,13 +237,13 @@ Server.prototype._onScrape = function (params, cb) {
// TODO: make this configurable!
params.info_hash = Object.keys(self.torrents)
}
if (!Array.isArray(params.info_hash)) {
var err = new Error('invalid info_hash')
self.emit('warning', err)
return cb(err)
}
var response = {
action: common.ACTIONS.SCRAPE,
files: {},
@ -256,7 +255,7 @@ Server.prototype._onScrape = function (params, cb) {
series(params.info_hash.map(function (infoHash) {
var swarm = self.getSwarm(infoHash)
return function (cb) {
swarm.scrape(infoHash, params, function (err, scrapeInfo) {
swarm.scrape(params, function (err, scrapeInfo) {
cb(err, scrapeInfo && {
infoHash: infoHash,
complete: scrapeInfo.complete || 0,