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

Support ws noServer option and server option objects

Browse Source
This commit is contained in:
John Hiesey 2021-01-27 19:27:39 -08:00
parent 2a828292b8
commit db1b63dec9
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
server.js
View File

@ -23,14 +23,14 @@ const hasOwnProperty = Object.prototype.hasOwnProperty
* metrics from clients that help the tracker keep overall statistics about the torrent. * metrics from clients that help the tracker keep overall statistics about the torrent.
* Responses include a peer list that helps the client participate in the torrent. * Responses include a peer list that helps the client participate in the torrent.
* *
* @param {Object} opts options object * @param {Object} opts options object
* @param {Number} opts.interval tell clients to announce on this interval (ms) * @param {Number} opts.interval tell clients to announce on this interval (ms)
* @param {Number} opts.trustProxy trust 'x-forwarded-for' header from reverse proxy * @param {Number} opts.trustProxy trust 'x-forwarded-for' header from reverse proxy
* @param {boolean} opts.http start an http server? (default: true) * @param {boolean|Object} opts.http start an http server?, or options for http.createServer (default: true)
* @param {boolean} opts.udp start a udp server? (default: true) * @param {boolean|Object} opts.udp start a udp server?, or extra options for dgram.createSocket (default: true)
* @param {boolean} opts.ws start a websocket server? (default: true) * @param {boolean|Object} opts.ws start a websocket server?, or extra options for new WebSocketServer (default: true)
* @param {boolean} opts.stats enable web-based statistics? (default: true) * @param {boolean} opts.stats enable web-based statistics? (default: true)
* @param {function} opts.filter black/whitelist fn for disallowing/allowing torrents * @param {function} opts.filter black/whitelist fn for disallowing/allowing torrents
*/ */
class Server extends EventEmitter { class Server extends EventEmitter {
constructor (opts = {}) { constructor (opts = {}) {
@ -59,7 +59,7 @@ class Server extends EventEmitter {
// start an http tracker unless the user explictly says no // start an http tracker unless the user explictly says no
if (opts.http !== false) { if (opts.http !== false) {
this.http = http.createServer() this.http = http.createServer(isObject(opts.http) ? opts.http : undefined)
this.http.on('error', err => { this._onError(err) }) this.http.on('error', err => { this._onError(err) })
this.http.on('listening', onListening) this.http.on('listening', onListening)
@ -75,18 +75,20 @@ class Server extends EventEmitter {
// start a udp tracker unless the user explicitly says no // start a udp tracker unless the user explicitly says no
if (opts.udp !== false) { if (opts.udp !== false) {
const isNode10 = /^v0.10./.test(process.version) this.udp4 = this.udp = dgram.createSocket({
type: 'udp4',
this.udp4 = this.udp = dgram.createSocket( reuseAddr: true,
isNode10 ? 'udp4' : { type: 'udp4', reuseAddr: true } ...(isObject(opts.udp) ? opts.udp : undefined)
) })
this.udp4.on('message', (msg, rinfo) => { this.onUdpRequest(msg, rinfo) }) this.udp4.on('message', (msg, rinfo) => { this.onUdpRequest(msg, rinfo) })
this.udp4.on('error', err => { this._onError(err) }) this.udp4.on('error', err => { this._onError(err) })
this.udp4.on('listening', onListening) this.udp4.on('listening', onListening)
this.udp6 = dgram.createSocket( this.udp6 = dgram.createSocket({
isNode10 ? 'udp6' : { type: 'udp6', reuseAddr: true } type: 'udp6',
) reuseAddr: true,
...(isObject(opts.udp) ? opts.udp : undefined)
})
this.udp6.on('message', (msg, rinfo) => { this.onUdpRequest(msg, rinfo) }) this.udp6.on('message', (msg, rinfo) => { this.onUdpRequest(msg, rinfo) })
this.udp6.on('error', err => { this._onError(err) }) this.udp6.on('error', err => { this._onError(err) })
this.udp6.on('listening', onListening) this.udp6.on('listening', onListening)
@ -94,7 +96,8 @@ class Server extends EventEmitter {
// start a websocket tracker (for WebTorrent) unless the user explicitly says no // start a websocket tracker (for WebTorrent) unless the user explicitly says no
if (opts.ws !== false) { if (opts.ws !== false) {
if (!this.http) { const noServer = isObject(opts.ws) && opts.ws.noServer
if (!this.http && !noServer) {
this.http = http.createServer() this.http = http.createServer()
this.http.on('error', err => { this._onError(err) }) this.http.on('error', err => { this._onError(err) })
this.http.on('listening', onListening) this.http.on('listening', onListening)
@ -112,12 +115,15 @@ class Server extends EventEmitter {
}) })
} }
this.ws = new WebSocketServer({ this.ws = new WebSocketServer({
server: this.http, server: noServer ? undefined : this.http,
perMessageDeflate: false, perMessageDeflate: false,
clientTracking: false clientTracking: false,
...(isObject(opts.ws) ? opts.ws : undefined)
}) })
this.ws.address = () => { if (!noServer) {
return this.http.address() this.ws.address = () => {
return this.http.address()
}
} }
this.ws.on('error', err => { this._onError(err) }) this.ws.on('error', err => { this._onError(err) })
this.ws.on('connection', (socket, req) => { this.ws.on('connection', (socket, req) => {
@ -297,10 +303,6 @@ class Server extends EventEmitter {
debug('listen (port: %o hostname: %o)', port, hostname) debug('listen (port: %o hostname: %o)', port, hostname)
function isObject (obj) {
return typeof obj === 'object' && obj !== null
}
const httpPort = isObject(port) ? (port.http || 0) : port const httpPort = isObject(port) ? (port.http || 0) : port
const udpPort = isObject(port) ? (port.udp || 0) : port const udpPort = isObject(port) ? (port.udp || 0) : port
@ -801,6 +803,10 @@ function makeUdpPacket (params) {
return packet return packet
} }
function isObject (obj) {
return typeof obj === 'object' && obj !== null
}
function toNumber (x) { function toNumber (x) {
x = Number(x) x = Number(x)
return x >= 0 ? x : false return x >= 0 ? x : false