Mirror/bittorrent-tracker
1
0
Fork 0
mirror of https://github.com/webtorrent/bittorrent-tracker.git synced 2025-01-18 12:11:36 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Adds a type param to identify the source of the peer

Browse Source
This commit is contained in:
Yoann Ciabaud 2016-03-11 10:09:09 +01:00
parent 60f03b9529
commit 2f37e6c476
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/common-node.js
View File

@ -24,6 +24,11 @@ exports.EVENT_NAMES = {
started: 'start',
stopped: 'stop'
}
exports.PEER_TYPES = {
http: 'http',
udp: 'udp',
websocket: 'ws'
}
function toUInt32 (n) {
var buf = new Buffer(4)

1
lib/server/parse-http.js
View File

@ -9,6 +9,7 @@ function parseHttpRequest (req, opts) {
if (opts.action === 'announce' || s[0] === '/announce') {
params.action = common.ACTIONS.ANNOUNCE
params.type = common.PEER_TYPES.http
if (typeof params.info_hash !== 'string' || params.info_hash.length !== 20) {
throw new Error('invalid info_hash')

3
lib/server/parse-udp.js
View File

@ -10,7 +10,8 @@ function parseUdpRequest (msg, rinfo) {
var params = {
connectionId: msg.slice(0, 8), // 64-bit
action: msg.readUInt32BE(8),
transactionId: msg.readUInt32BE(12)
transactionId: msg.readUInt32BE(12),
type: common.PEER_TYPES.udp
}
if (!bufferEqual(params.connectionId, common.CONNECTION_ID)) {

3
lib/server/parse-websocket.js
View File

@ -7,6 +7,7 @@ function parseWebSocketRequest (socket, opts, params) {
params = JSON.parse(params) // may throw
params.action = common.ACTIONS.ANNOUNCE
params.type = common.PEER_TYPES.websocket
params.socket = socket
if (typeof params.info_hash !== 'string' || params.info_hash.length !== 20) {
@ -35,7 +36,7 @@ function parseWebSocketRequest (socket, opts, params) {
params.ip = opts.trustProxy
? socket.upgradeReq.headers['x-forwarded-for'] || socket.upgradeReq.connection.remoteAddress
: (socket.upgradeReq.connection.remoteAddress && socket.upgradeReq.connection.remoteAddress.replace(common.REMOVE_IPV4_MAPPED_IPV6_RE, '')) // force ipv4
: socket.upgradeReq.connection.remoteAddress.replace(common.REMOVE_IPV4_MAPPED_IPV6_RE, '') // force ipv4
params.port = socket.upgradeReq.connection.remotePort
if (params.port) {
params.addr = (common.IPV6_RE.test(params.ip) ? '[' + params.ip + ']' : params.ip) + ':' + params.port

10
lib/server/swarm.js
View File

@ -2,6 +2,7 @@ module.exports = Swarm
var debug = require('debug')('bittorrent-tracker')
var randomIterate = require('random-iterate')
var common = require('../common')
// Regard this as the default implementation of an interface that you
// need to support when overriding Server.createSwarm() and Server.getSwarm()
@ -13,7 +14,8 @@ function Swarm (infoHash, server) {
Swarm.prototype.announce = function (params, cb) {
var self = this
var peer = self.peers[params.addr || params.peer_id]
var id = params.type === common.PEER_TYPES.websocket ? params.peer_id : params.addr
var peer = self.peers[id]
if (params.event === 'started') {
self._onAnnounceStarted(params, peer)
@ -49,7 +51,8 @@ Swarm.prototype._onAnnounceStarted = function (params, peer) {
if (params.left === 0) this.complete += 1
else this.incomplete += 1
peer = this.peers[params.addr || params.peer_id] = {
var id = params.type === common.PEER_TYPES.websocket ? params.peer_id : params.addr
peer = this.peers[id] = {
complete: params.left === 0,
peerId: params.peer_id, // as hex
ip: params.ip, // only http, udp
@ -66,7 +69,8 @@ Swarm.prototype._onAnnounceStopped = function (params, peer) {
if (peer.complete) this.complete -= 1
else this.incomplete -= 1
this.peers[params.addr || params.peer_id] = null
var id = params.type === common.PEER_TYPES.websocket ? params.peer_id : params.addr
this.peers[id] = null
}
Swarm.prototype._onAnnounceCompleted = function (params, peer) {