Skip to content

Commit 146d4d4

Browse files
committed
Extension point on requests and responses
1 parent f5a32ff commit 146d4d4

File tree

2 files changed

+93
-8
lines changed

2 files changed

+93
-8
lines changed

server.js

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ inherits(Server, EventEmitter)
2727
* metrics from clients that help the tracker keep overall statistics about the torrent.
2828
* Responses include a peer list that helps the client participate in the torrent.
2929
*
30-
* @param {Object} opts options object
31-
* @param {Number} opts.interval tell clients to announce on this interval (ms)
32-
* @param {Number} opts.trustProxy trust 'x-forwarded-for' header from reverse proxy
33-
* @param {boolean} opts.http start an http server? (default: true)
34-
* @param {boolean} opts.udp start a udp server? (default: true)
35-
* @param {boolean} opts.ws start a websocket server? (default: true)
36-
* @param {boolean} opts.stats enable web-based statistics? (default: true)
37-
* @param {function} opts.filter black/whitelist fn for disallowing/allowing torrents
30+
* @param {Object} opts options object
31+
* @param {Number} opts.interval tell clients to announce on this interval (ms)
32+
* @param {Number} opts.trustProxy trust 'x-forwarded-for' header from reverse proxy
33+
* @param {boolean} opts.http start an http server? (default: true)
34+
* @param {boolean} opts.udp start a udp server? (default: true)
35+
* @param {boolean} opts.ws start a websocket server? (default: true)
36+
* @param {boolean} opts.stats enable web-based statistics? (default: true)
37+
* @param {function} opts.filter black/whitelist fn for disallowing/allowing torrents
38+
* @param {function} opts.requestHandler functions to handle params / response
3839
*/
3940
function Server (opts) {
4041
var self = this
@@ -64,6 +65,18 @@ function Server (opts) {
6465
self.udp6 = null
6566
self.ws = null
6667

68+
self._reqHandler = opts.requestHandler || {}
69+
if (!self._reqHandler.getParams) {
70+
self._reqHandler.getParams = function (params) {
71+
return params
72+
}
73+
}
74+
if (!self._reqHandler.getResponse) {
75+
self._reqHandler.getResponse = function (params, cb) {
76+
return cb
77+
}
78+
}
79+
6780
// start an http tracker unless the user explictly says no
6881
if (opts.http !== false) {
6982
self.http = http.createServer()
@@ -636,6 +649,8 @@ Server.prototype._onWebSocketError = function (socket, err) {
636649

637650
Server.prototype._onRequest = function (params, cb) {
638651
var self = this
652+
params = self._reqHandler.getParams(params)
653+
cb = self._reqHandler.getResponse(params, cb)
639654
if (params && params.action === common.ACTIONS.CONNECT) {
640655
cb(null, { action: common.ACTIONS.CONNECT })
641656
} else if (params && params.action === common.ACTIONS.ANNOUNCE) {

test/request-handler.js

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
var Buffer = require('safe-buffer').Buffer
2+
var Client = require('../')
3+
var common = require('./common')
4+
var fixtures = require('webtorrent-fixtures')
5+
var test = require('tape')
6+
7+
var peerId = Buffer.from('01234567890123456789')
8+
9+
function testRequestHandler (t, serverType) {
10+
t.plan(4)
11+
12+
var opts = { serverType: serverType } // this is test-suite-only option
13+
opts.requestHandler = {
14+
getParams: function (params) {
15+
params.extra = 123
16+
return params
17+
},
18+
getResponse: function (params, cb) {
19+
return function (err, response) {
20+
response.complete = params.extra * 2
21+
cb(err, response)
22+
}
23+
}
24+
}
25+
26+
common.createServer(t, opts, function (server, announceUrl) {
27+
var client1 = new Client({
28+
infoHash: fixtures.alice.parsedTorrent.infoHash,
29+
announce: announceUrl,
30+
peerId: peerId,
31+
port: 6881,
32+
wrtc: {}
33+
})
34+
35+
client1.on('error', function (err) { t.error(err) })
36+
if (serverType === 'ws') common.mockWebsocketTracker(client1)
37+
38+
server.once('start', function () {
39+
t.pass('got start message from client1')
40+
})
41+
42+
client1.once('update', function (data) {
43+
console.log(data)
44+
45+
t.equal(data.complete, 246)
46+
47+
client1.destroy(function () {
48+
t.pass('client1 destroyed')
49+
})
50+
51+
server.close(function () {
52+
t.pass('server destroyed')
53+
})
54+
})
55+
56+
client1.start()
57+
})
58+
}
59+
60+
test('http: request handler option intercepts announce requests and responses', function (t) {
61+
testRequestHandler(t, 'http')
62+
})
63+
64+
test('udp: request handler option intercepts announce requests and responses', function (t) {
65+
testRequestHandler(t, 'udp')
66+
})
67+
68+
test('ws: request handler option intercepts announce requests and responses', function (t) {
69+
testRequestHandler(t, 'ws')
70+
})

0 commit comments

Comments
 (0)