.npmignore

@@ -1,5 +1,6 @@
 .travis.yml
 CONTRIBUTING.md
-test/
-img/
 examples/
+img/
+test/
+tools/

AUTHORS.md

@@ -41,5 +41,6 @@
 - Brian Clifton (brian@clifton.me)
 - James M Snell (jasnell@gmail.com)
 - crapthings (crapthings@gmail.com)
+- daiyu (qqdaiyu55@gmail.com)
 
-#### Generated by bin/update-authors.sh.
+#### Generated by tools/update-authors.sh.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bittorrent-tracker",
   "description": "Simple, robust, BitTorrent tracker (client & server) implementation",
-  "version": "9.9.0",
+  "version": "9.9.1",
   "author": {
     "name": "WebTorrent, LLC",
     "email": "feross@webtorrent.io",
@@ -71,7 +71,7 @@
     "url": "git://github.com/webtorrent/bittorrent-tracker.git"
   },
   "scripts": {
-    "update-authors": "./bin/update-authors.sh",
+    "update-authors": "./tools/update-authors.sh",
     "test": "standard && tape test/*.js"
   }
 }

server.js

@@ -657,31 +657,35 @@ Server.prototype._onRequest = function (params, cb) {
 Server.prototype._onAnnounce = function (params, cb) {
   var self = this
 
-  self.getSwarm(params.info_hash, function (err, swarm) {
-    if (err) return cb(err)
+  if (self._filter) {
+    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) {
-      self._filter(params.info_hash, params, function (err) {
-        // Precense of err means that this torrent or user is disallowd
-        if (err) cb(err)
-        else {
-          if (swarm) announce(swarm)
-          else createSwarm()
-        }
+      getOrCreateSwarm(function (err, swarm) {
+        if (err) return cb(err)
+        announce(swarm)
       })
-    } else {
-      if (swarm) announce(swarm)
-      else createSwarm()
-    }
-  })
-
-  function createSwarm () {
-    self.createSwarm(params.info_hash, function (err, swarm) {
+    })
+  } else {
+    getOrCreateSwarm(function (err, swarm) {
       if (err) return cb(err)
       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) {
     if (!params.event || params.event === 'empty') params.event = 'update'
     swarm.announce(params, function (err, response) {

bin/update-authors.sh → tools/update-authors.sh

@@ -18,6 +18,6 @@ END {
   print "# Authors\n\n";
   print "#### Ordered by first contribution.\n\n";
   print @authors, "\n";
-  print "#### Generated by bin/update-authors.sh.\n";
+  print "#### Generated by tools/update-authors.sh.\n";
 }
 ' > AUTHORS.md