release swarm after all peers timeouted

Author: Leask

lib/server/swarm.js

@@ -5,6 +5,7 @@ import LRU from 'lru'
 import randomIterate from 'random-iterate'
 
 const debug = Debug('bittorrent-tracker:swarm')
+const MAX_SWARM_LIFETIME = 20 * 60 * 1000; // 20 minutes
 
 const getLru = (options) => {
   if (!globalThis?.swarmHijack) { return new LRU(options); }
@@ -99,11 +100,11 @@ class Swarm {
     self.infoHash = infoHash
     self.complete = 0
     self.incomplete = 0
+    self.lifeTime = server.peersCacheTtl || MAX_SWARM_LIFETIME;
 
     self.peers = getLru({
       max: server.peersCacheLength || 1000,
-      maxAge: server.peersCacheTtl || 20 * 60 * 1000, // 20 minutes
-      infoHash,
+      maxAge: self.lifeTime, infoHash,
     })
 
     // When a peer is evicted from the LRU store, send a synthetic 'stopped' event
@@ -119,8 +120,23 @@ class Swarm {
       await self._onAnnounceStopped(params, peer, peer.peerId)
       peer.socket = null
     })
+
+    this.touch();
   }
 
+  touch () {
+    return this.touched = new Date();
+  };
+
+  shouldRelease () {
+    return (new Date() - this.touched > MAX_SWARM_LIFETIME);
+  };
+
+  free () {
+    console.log('Freeing torrent 1');
+    return this.peers = null; // @todo: not sure if this is enough for free LRU
+  };
+
   async announce (params, cb) {
     const self = this
     const id = params.type === 'ws' ? params.peer_id : params.addr
@@ -142,6 +158,9 @@ class Swarm {
       cb(new Error('invalid event'))
       return
     }
+
+    this.touch();
+
     cb(null, {
       complete: self.complete,
       incomplete: self.incomplete,

package.json

@@ -28,28 +28,28 @@
   "type": "module",
   "dependencies": {
     "bencode": "^3.0.3",
-    "bittorrent-peerid": "^1.3.3",
-    "bn.js": "^5.2.0",
+    "bittorrent-peerid": "^1.3.6",
+    "bn.js": "^5.2.1",
     "chrome-dgram": "^3.0.6",
-    "clone": "^2.0.0",
+    "clone": "^2.1.2",
     "compact2string": "^1.4.1",
-    "debug": "^4.1.1",
-    "ip": "^1.1.5",
+    "debug": "^4.3.4",
+    "ip": "^1.1.8",
     "lru": "^3.1.0",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.8",
     "once": "^1.4.0",
     "queue-microtask": "^1.2.3",
     "random-iterate": "^1.0.1",
     "randombytes": "^2.1.0",
     "run-parallel": "^1.2.0",
     "run-series": "^1.1.9",
-    "simple-get": "^4.0.0",
-    "simple-peer": "^9.11.0",
+    "simple-get": "^4.0.1",
+    "simple-peer": "^9.11.1",
     "simple-websocket": "^9.1.0",
-    "socks": "^2.0.0",
-    "string2compact": "^2.0.0",
+    "socks": "^2.7.1",
+    "string2compact": "^2.0.1",
     "unordered-array-remove": "^1.0.2",
-    "ws": "^8.0.0"
+    "ws": "^8.13.0"
   },
   "devDependencies": {
     "@mapbox/node-pre-gyp": "1.0.10",
@@ -59,7 +59,7 @@
     "semantic-release": "20.1.3",
     "standard": "*",
     "tape": "5.6.3",
-    "utilitas": "^1992.4.5",
+    "utilitas": "^1992.4.7",
     "webtorrent-fixtures": "2.0.2",
     "wrtc": "0.4.7"
   },
@@ -82,8 +82,8 @@
   "license": "MIT",
   "main": "index.js",
   "optionalDependencies": {
-    "bufferutil": "^4.0.3",
-    "utf-8-validate": "^5.0.5"
+    "bufferutil": "^4.0.7",
+    "utf-8-validate": "^6.0.3"
   },
   "repository": {
     "type": "git",
@@ -92,7 +92,9 @@
   "scripts": {
     "preversion": "npm run update-authors",
     "test": "standard && tape test/*.js",
-    "update-authors": "./tools/update-authors.sh"
+    "update-authors": "./tools/update-authors.sh",
+    "upstream": "git pull [email protected]:webtorrent/bittorrent-tracker.git",
+    "updep": "npx npm-check-updates -u && npm install"
   },
   "funding": [
     {

server.js

@@ -34,7 +34,7 @@ const hasOwnProperty = Object.prototype.hasOwnProperty
  * @param {function} opts.filter        black/whitelist fn for disallowing/allowing torrents
  */
 class Server extends EventEmitter {
-  constructor (opts = {}) {
+  constructor(opts = {}) {
     super()
     debug('new server %s', JSON.stringify(opts))
 
@@ -295,7 +295,7 @@ class Server extends EventEmitter {
     this.emit('error', err)
   }
 
-  listen (...args) /* port, hostname, onlistening */{
+  listen (...args) /* port, hostname, onlistening */ {
     if (this._listenCalled || this.listening) throw new Error('server already listening')
     this._listenCalled = true
 
@@ -330,19 +330,19 @@ class Server extends EventEmitter {
     if (this.udp4) {
       try {
         this.udp4.close()
-      } catch (err) {}
+      } catch (err) { }
     }
 
     if (this.udp6) {
       try {
         this.udp6.close()
-      } catch (err) {}
+      } catch (err) { }
     }
 
     if (this.ws) {
       try {
         this.ws.close()
-      } catch (err) {}
+      } catch (err) { }
     }
 
     if (this.http) this.http.close(cb)
@@ -692,10 +692,20 @@ class Server extends EventEmitter {
         } // else, return full peer objects (used for websocket responses)
 
         cb(null, response)
+        self.free();
       })
     }
   }
 
+  free () {
+    for (let i in this.torrents) {
+      if (!this.torrents[i].shouldRelease()) { continue; }
+      const toFree = this.torrents[i];
+      delete this.torrents[i];
+      toFree?.free?.();
+    }
+  }
+
   _onScrape (params, cb) {
     if (params.info_hash == null) {
       // if info_hash param is omitted, stats for all torrents are returned
@@ -804,6 +814,6 @@ function toNumber (x) {
   return x >= 0 ? x : false
 }
 
-function noop () {}
+function noop () { }
 
 export default Server