Merge tag 'v9.13.0' into upgrade_to_9.13.0

9.13.0

Author: yrliou

AUTHORS.md

@@ -43,5 +43,8 @@
 - crapthings ([email protected])
 - daiyu ([email protected])
 - LI ([email protected])
+- Jimmy Wärting ([email protected])
+- Justin Kalland ([email protected])
+- greenkeeper[bot] (23040076+greenkeeper[bot]@users.noreply.github.com)
 
 #### Generated by tools/update-authors.sh.

client.js

@@ -1,11 +1,9 @@
-const { Buffer } = require('safe-buffer')
 const debug = require('debug')('bittorrent-tracker:client')
 const EventEmitter = require('events')
 const once = require('once')
 const parallel = require('run-parallel')
 const Peer = require('simple-peer')
 const uniq = require('uniq')
-const url = require('url')
 
 const common = require('./lib/common')
 const HTTPTracker = require('./lib/client/http-tracker') // empty object in browser
@@ -62,7 +60,7 @@ class Client extends EventEmitter {
     this._wrtc = typeof opts.wrtc === 'function' ? opts.wrtc() : opts.wrtc
 
     let announce = typeof opts.announce === 'string'
-      ? [ opts.announce ]
+      ? [opts.announce]
       : opts.announce == null ? [] : opts.announce
 
     // Remove trailing slash from trackers to catch duplicates
@@ -85,7 +83,14 @@ class Client extends EventEmitter {
 
     this._trackers = announce
       .map(announceUrl => {
-        const parsedUrl = url.parse(announceUrl)
+        let parsedUrl
+        try {
+          parsedUrl = new URL(announceUrl)
+        } catch (err) {
+          nextTickWarn(new Error(`Invalid tracker URL: ${announceUrl}`))
+          return null
+        }
+
         const port = parsedUrl.port
         if (port < 0 || port > 65535) {
           nextTickWarn(new Error(`Invalid tracker port: ${announceUrl}`))

lib/client/udp-tracker.js

@@ -1,11 +1,9 @@
 const arrayRemove = require('unordered-array-remove')
 const BN = require('bn.js')
-const Buffer = require('safe-buffer').Buffer
 const compact2string = require('compact2string')
 const debug = require('debug')('bittorrent-tracker:udp-tracker')
 const dgram = require('dgram')
 const randombytes = require('randombytes')
-const url = require('url')
 
 const common = require('../common')
 const Tracker = require('./tracker')
@@ -73,7 +71,7 @@ class UDPTracker extends Tracker {
   _request (opts) {
     const self = this
     if (!opts) opts = {}
-    const parsedUrl = url.parse(this.announceUrl)
+    const parsedUrl = new URL(this.announceUrl)
     let transactionId = genTransactionId()
     let socket = dgram.createSocket('udp4')
 
@@ -176,7 +174,7 @@ class UDPTracker extends Tracker {
           }
           const infoHashes = (Array.isArray(opts.infoHash) && opts.infoHash.length > 0)
             ? opts.infoHash.map(infoHash => { return infoHash.toString('hex') })
-            : [ (opts.infoHash && opts.infoHash.toString('hex')) || self.client.infoHash ]
+            : [(opts.infoHash && opts.infoHash.toString('hex')) || self.client.infoHash]
 
           for (let i = 0, len = (msg.length - 8) / 12; i < len; i += 1) {
             self.client.emit('scrape', {

lib/common-node.js

@@ -3,14 +3,13 @@
  * These are separate from common.js so they can be skipped when bundling for the browser.
  */
 
-var Buffer = require('safe-buffer').Buffer
 var querystring = require('querystring')
 
 exports.IPV4_RE = /^[\d.]+$/
 exports.IPV6_RE = /^[\da-fA-F:]+$/
 exports.REMOVE_IPV4_MAPPED_IPV6_RE = /^::ffff:/
 
-exports.CONNECTION_ID = Buffer.concat([ toUInt32(0x417), toUInt32(0x27101980) ])
+exports.CONNECTION_ID = Buffer.concat([toUInt32(0x417), toUInt32(0x27101980)])
 exports.ACTIONS = { CONNECT: 0, ANNOUNCE: 1, SCRAPE: 2, ERROR: 3 }
 exports.EVENTS = { update: 0, completed: 1, started: 2, stopped: 3 }
 exports.EVENT_IDS = {

lib/common.js

@@ -2,8 +2,6 @@
  * Functions/constants needed by both the client and server.
  */
 
-var Buffer = require('safe-buffer').Buffer
-
 exports.DEFAULT_ANNOUNCE_PEERS = 50
 exports.MAX_ANNOUNCE_PEERS = 82
 

lib/server/parse-http.js

@@ -42,7 +42,7 @@ function parseHttpRequest (req, opts) {
   } else if (opts.action === 'scrape' || s[0] === '/scrape') {
     params.action = common.ACTIONS.SCRAPE
 
-    if (typeof params.info_hash === 'string') params.info_hash = [ params.info_hash ]
+    if (typeof params.info_hash === 'string') params.info_hash = [params.info_hash]
     if (Array.isArray(params.info_hash)) {
       params.info_hash = params.info_hash.map(function (binaryInfoHash) {
         if (typeof binaryInfoHash !== 'string' || binaryInfoHash.length !== 20) {

lib/server/parse-websocket.js

@@ -39,7 +39,7 @@ function parseWebSocketRequest (socket, opts, params) {
   } else if (params.action === 'scrape') {
     params.action = common.ACTIONS.SCRAPE
 
-    if (typeof params.info_hash === 'string') params.info_hash = [ params.info_hash ]
+    if (typeof params.info_hash === 'string') params.info_hash = [params.info_hash]
     if (Array.isArray(params.info_hash)) {
       params.info_hash = params.info_hash.map(function (binaryInfoHash) {
         if (typeof binaryInfoHash !== 'string' || binaryInfoHash.length !== 20) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bittorrent-tracker",
   "description": "Simple, robust, BitTorrent tracker (client & server) implementation",
-  "version": "9.11.0",
+  "version": "9.13.0",
   "author": {
     "name": "WebTorrent, LLC",
     "email": "[email protected]",
@@ -19,7 +19,7 @@
   "dependencies": {
     "bencode": "^2.0.0",
     "bittorrent-peerid": "^1.0.2",
-    "bn.js": "^4.4.0",
+    "bn.js": "^5.0.0",
     "compact2string": "^1.2.0",
     "debug": "^4.0.1",
     "ip": "^1.0.1",
@@ -30,14 +30,13 @@
     "randombytes": "^2.0.3",
     "run-parallel": "^1.1.2",
     "run-series": "^1.0.2",
-    "safe-buffer": "^5.0.0",
     "simple-get": "^3.0.0",
     "simple-peer": "^9.0.0",
-    "simple-websocket": "^7.0.1",
+    "simple-websocket": "^8.0.0",
     "string2compact": "^1.1.1",
     "uniq": "^1.0.1",
     "unordered-array-remove": "^1.0.2",
-    "ws": "^6.0.0"
+    "ws": "^7.0.0"
   },
   "devDependencies": {
     "electron-webrtc": "^0.3.0",
@@ -46,9 +45,8 @@
     "tape": "^4.0.0",
     "webtorrent-fixtures": "^1.3.0"
   },
-  "optionalDependencies": {
-    "bufferutil": "^4.0.0",
-    "utf-8-validate": "^5.0.1"
+  "engines": {
+    "node": ">=10"
   },
   "keywords": [
     "bittorrent",
@@ -62,12 +60,16 @@
   ],
   "license": "MIT",
   "main": "index.js",
+  "optionalDependencies": {
+    "bufferutil": "^4.0.0",
+    "utf-8-validate": "^5.0.1"
+  },
   "repository": {
     "type": "git",
     "url": "git://github.com/webtorrent/bittorrent-tracker.git"
   },
   "scripts": {
-    "update-authors": "./tools/update-authors.sh",
-    "test": "standard && tape test/*.js"
+    "test": "standard && tape test/*.js",
+    "update-authors": "./tools/update-authors.sh"
   }
 }

server.js

@@ -1,4 +1,3 @@
-const { Buffer } = require('safe-buffer')
 const bencode = require('bencode')
 const debug = require('debug')('bittorrent-tracker:server')
 const dgram = require('dgram')
@@ -15,6 +14,8 @@ const parseHttpRequest = require('./lib/server/parse-http')
 const parseUdpRequest = require('./lib/server/parse-udp')
 const parseWebSocketRequest = require('./lib/server/parse-websocket')
 
+const hasOwnProperty = Object.prototype.hasOwnProperty
+
 /**
  * BitTorrent tracker server.
  *
@@ -147,7 +148,7 @@ class Server extends EventEmitter {
           let key
 
           for (key in allPeers) {
-            if (allPeers.hasOwnProperty(key) && filterFunction(allPeers[key])) {
+            if (hasOwnProperty.call(allPeers, key) && filterFunction(allPeers[key])) {
               count++
             }
           }
@@ -158,7 +159,7 @@ class Server extends EventEmitter {
         function groupByClient () {
           const clients = {}
           for (const key in allPeers) {
-            if (allPeers.hasOwnProperty(key)) {
+            if (hasOwnProperty.call(allPeers, key)) {
               const peer = allPeers[key]
 
               if (!clients[peer.client.client]) {
@@ -179,10 +180,10 @@ class Server extends EventEmitter {
         function printClients (clients) {
           let html = '<ul>\n'
           for (const name in clients) {
-            if (clients.hasOwnProperty(name)) {
+            if (hasOwnProperty.call(clients, name)) {
               const client = clients[name]
               for (const version in client) {
-                if (client.hasOwnProperty(version)) {
+                if (hasOwnProperty.call(client, version)) {
                   html += `<li><strong>${name}</strong> ${version} : ${client[version]}</li>\n`
                 }
               }
@@ -203,7 +204,7 @@ class Server extends EventEmitter {
               const peer = peers.peek(peerId)
               if (peer == null) return // peers.peek() can evict the peer
 
-              if (!allPeers.hasOwnProperty(peerId)) {
+              if (!hasOwnProperty.call(allPeers, peerId)) {
                 allPeers[peerId] = {
                   ipv4: false,
                   ipv6: false,
@@ -247,7 +248,7 @@ class Server extends EventEmitter {
             clients: groupByClient()
           }
 
-          if (req.url === '/stats.json' || req.headers['accept'] === 'application/json') {
+          if (req.url === '/stats.json' || req.headers.accept === 'application/json') {
             res.write(JSON.stringify(stats))
             res.end()
           } else if (req.url === '/stats') {

test/client-large-torrent.js

@@ -1,4 +1,3 @@
-var Buffer = require('safe-buffer').Buffer
 var Client = require('../')
 var common = require('./common')
 var fixtures = require('webtorrent-fixtures')