[pull] master from webtorrent:master

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [9.18.3](https://github.com/webtorrent/bittorrent-tracker/compare/v9.18.2...v9.18.3) (2021-10-29)
+
+
+### Bug Fixes
+
+* **deps:** update dependency clone to v2 ([#393](https://github.com/webtorrent/bittorrent-tracker/issues/393)) ([dc6f796](https://github.com/webtorrent/bittorrent-tracker/commit/dc6f7966844216c39491d6623dd412d5ca65d4c4))
+
 ## [9.18.2](https://github.com/webtorrent/bittorrent-tracker/compare/v9.18.1...v9.18.2) (2021-09-02)
 
 

README.md

@@ -189,6 +189,7 @@ var server = new Server({
   http: true, // enable http server? [default=true]
   ws: true, // enable websocket server? [default=true]
   stats: true, // enable web-based statistics? [default=true]
+  trustProxy: false // enable trusting x-forwarded-for header for remote IP [default=false]
   filter: function (infoHash, params, cb) {
     // Blacklist/whitelist function for allowing/disallowing torrents. If this option is
     // omitted, all torrents are allowed. It is possible to interface with a database or

lib/client/http-tracker.js

@@ -125,7 +125,7 @@ class HTTPTracker extends Tracker {
 
     let request = get.concat({
       url: parsedUrl.toString(),
-      agent: agent,
+      agent,
       timeout: common.REQUEST_TIMEOUT,
       headers: {
         'user-agent': this.client._userAgent || ''

lib/client/udp-tracker.js

@@ -258,7 +258,7 @@ class UDPTracker extends Tracker {
 
     function send (message, proxyInfo) {
       if (proxyInfo) {
-        const pack = Socks.createUDPFrame({ host: hostname, port: port }, message)
+        const pack = Socks.createUDPFrame({ host: hostname, port }, message)
         socket.send(pack, 0, pack.length, proxyInfo.port, proxyInfo.host)
       } else {
         socket.send(message, 0, message.length, port, hostname)

lib/client/websocket-tracker.js

@@ -186,7 +186,7 @@ class WebSocketTracker extends Tracker {
           agent = new Socks.Agent(clone(this.client._proxyOpts.socksProxy), (parsedUrl.protocol === 'wss:'))
         }
       }
-      this.socket = socketPool[this.announceUrl] = new Socket({ url: this.announceUrl, agent: agent })
+      this.socket = socketPool[this.announceUrl] = new Socket({ url: this.announceUrl, agent })
       this.socket.consumers = 1
       this.socket.once('connect', this._onSocketConnectBound)
     }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bittorrent-tracker",
   "description": "Simple, robust, BitTorrent tracker (client & server) implementation",
-  "version": "9.18.2",
+  "version": "9.18.3",
   "author": {
     "name": "WebTorrent LLC",
     "email": "[email protected]",
@@ -30,7 +30,7 @@
     "bittorrent-peerid": "^1.3.3",
     "bn.js": "^5.2.0",
     "chrome-dgram": "^3.0.6",
-    "clone": "^1.0.2",
+    "clone": "^2.0.0",
     "compact2string": "^1.4.1",
     "debug": "^4.1.1",
     "ip": "^1.1.5",
@@ -53,9 +53,9 @@
   "devDependencies": {
     "@webtorrent/semantic-release-config": "1.0.7",
     "magnet-uri": "6.2.0",
-    "semantic-release": "17.4.7",
+    "semantic-release": "18.0.1",
     "standard": "*",
-    "tape": "5.3.1",
+    "tape": "5.3.2",
     "webtorrent-fixtures": "1.7.5",
     "wrtc": "0.4.7"
   },

test/client.js

@@ -582,7 +582,7 @@ function testClientStartHttpAgent (t, serverType) {
       infoHash: fixtures.leaves.parsedTorrent.infoHash,
       announce: announceUrl,
       peerId: peerId1,
-      port: port,
+      port,
       wrtc: {},
       proxyOpts: {
         httpAgent: agent