Mirror/bittorrent-tracker
1
0
Fork 0
mirror of https://github.com/webtorrent/bittorrent-tracker.git synced 2024-12-15 11:56:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #275 from webtorrent/feross-patch-1

Browse Source 
server: Improve style of announce/filter logic
This commit is contained in:
Feross Aboukhadijeh 2018-05-01 16:34:11 -07:00 committed by GitHub
commit b3400a9eb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
server.js
View File

@ -657,31 +657,35 @@ Server.prototype._onRequest = function (params, cb) {
Server.prototype._onAnnounce = function (params, cb) { Server.prototype._onAnnounce = function (params, cb) {
var self = this var self = this
self.getSwarm(params.info_hash, function (err, swarm) { if (self._filter) {
if (err) return cb(err) self._filter(params.info_hash, params, function (err) {
// Presence of `err` means that this announce request is disallowed
if (err) return cb(err)
if (self._filter) { getOrCreateSwarm(function (err, swarm) {
self._filter(params.info_hash, params, function (err) { if (err) return cb(err)
// Precense of err means that this torrent or user is disallowd announce(swarm)
if (err) cb(err)
else {
if (swarm) announce(swarm)
else createSwarm()
}
}) })
} else { })
if (swarm) announce(swarm) } else {
else createSwarm() getOrCreateSwarm(function (err, swarm) {
}
})
function createSwarm () {
self.createSwarm(params.info_hash, function (err, swarm) {
if (err) return cb(err) if (err) return cb(err)
announce(swarm) announce(swarm)
}) })
} }
// Get existing swarm, or create one if one does not exist
function getOrCreateSwarm (cb) {
self.getSwarm(params.info_hash, function (err, swarm) {
if (err) return cb(err)
if (swarm) return cb(null, swarm)
self.createSwarm(params.info_hash, function (err, swarm) {
if (err) return cb(err)
cb(null, swarm)
})
})
}
function announce (swarm) { function announce (swarm) {
if (!params.event || params.event === 'empty') params.event = 'update' if (!params.event || params.event === 'empty') params.event = 'update'
swarm.announce(params, function (err, response) { swarm.announce(params, function (err, response) {