Merge branch 'master' into proxy

Author: alxhotel

.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: ci
+'on':
+  - push
+  - pull_request
+jobs:
+  test:
+    name: Node ${{ matrix.node }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        node:
+          - '14'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+      - run: npm install
+      - run: npm run build --if-present
+      - run: npm test

.github/workflows/release.yml

@@ -0,0 +1,36 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-npm-${{ hashFiles('**/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-npm-
+      - name: Install dependencies
+        run: npm i
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npx semantic-release

.github/workflows/stale.yml

@@ -0,0 +1,23 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '0 12 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v4
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?'
+        stale-pr-message: 'Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?'
+        exempt-issue-labels: accepted,blocked,bug,dependency,enhancement,'help wanted',question,security,meta
+        exempt-pr-labels: accepted,blocked,bug,dependency,enhancement,'help wanted',question,security,meta
+        stale-issue-label: 'stale'
+        stale-pr-label: 'stale'

.npmignore

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

.travis.yml

@@ -50,5 +50,11 @@
 - Koushik Dutta ([email protected])
 - KayleePop ([email protected])
 - Diego Rodriguez Baquero ([email protected])
+- Diego Rodríguez Baquero ([email protected])
+- Renovate Bot ([email protected])
+- Diego Rodríguez Baquero ([email protected])
+- Diego Rodriguez Baquero ([email protected])
+- semantic-release-bot ([email protected])
+- renovate[bot] (29139614+renovate[bot]@users.noreply.github.com)
 
 #### Generated by tools/update-authors.sh.

AUTHORS.md

@@ -0,0 +1,35 @@
+## [9.17.4](https://github.com/webtorrent/bittorrent-tracker/compare/v9.17.3...v9.17.4) (2021-07-22)
+
+
+### Bug Fixes
+
+* if websocket closed, don't produce a response ([ca88435](https://github.com/webtorrent/bittorrent-tracker/commit/ca88435617e59714a456031c75b3a329897d97bd))
+
+## [9.17.3](https://github.com/webtorrent/bittorrent-tracker/compare/v9.17.2...v9.17.3) (2021-07-02)
+
+
+### Bug Fixes
+
+* auto update authors on version ([b5ffc70](https://github.com/webtorrent/bittorrent-tracker/commit/b5ffc708ada0bef66e7fa0cd1872527ea6dd8d53))
+
+## [9.17.2](https://github.com/webtorrent/bittorrent-tracker/compare/v9.17.1...v9.17.2) (2021-06-15)
+
+
+### Bug Fixes
+
+* modernize ([e5994d2](https://github.com/webtorrent/bittorrent-tracker/commit/e5994d2ebdec10fe2165e31f5b498382eeeaaf5f))
+
+## [9.17.1](https://github.com/webtorrent/bittorrent-tracker/compare/v9.17.0...v9.17.1) (2021-06-15)
+
+
+### Bug Fixes
+
+* add package-lock ([0e486b0](https://github.com/webtorrent/bittorrent-tracker/commit/0e486b09d80d30e1c13d4624e29c4251000d4092))
+* **deps:** update dependency bn.js to ^5.2.0 ([2d36e4a](https://github.com/webtorrent/bittorrent-tracker/commit/2d36e4ae60b1bac51773f2dca81c1a158b51cb28))
+* **deps:** update dependency chrome-dgram to ^3.0.6 ([a82aaaa](https://github.com/webtorrent/bittorrent-tracker/commit/a82aaaa31963a0d9adb640166f417142c5d7b970))
+* **deps:** update dependency run-parallel to ^1.2.0 ([fcf25ed](https://github.com/webtorrent/bittorrent-tracker/commit/fcf25ed40e1fd64e630b10a0281bc09604b901d3))
+* **deps:** update dependency run-series to ^1.1.9 ([fa2c33f](https://github.com/webtorrent/bittorrent-tracker/commit/fa2c33fc91f8ef0a47d0f40b7a046ae179ee328a))
+* **deps:** update dependency simple-websocket to ^9.1.0 ([96fedbd](https://github.com/webtorrent/bittorrent-tracker/commit/96fedbdf56ddcf6627eb373a33589db885cb4fb7))
+* **deps:** update dependency ws to ^7.4.5 ([6ad7ead](https://github.com/webtorrent/bittorrent-tracker/commit/6ad7ead994e5cb99980a406aea908e4b9ff6151c))
+* **deps:** update webtorrent ([1e8d47d](https://github.com/webtorrent/bittorrent-tracker/commit/1e8d47dcd8f5f53b42aa75265a129f950d16feef))
+* UDP url parsing ([8e24a8c](https://github.com/webtorrent/bittorrent-tracker/commit/8e24a8c97b55bbaaf2c92a496d1cd30b0c008934))

CHANGELOG.md

@@ -1,7 +1,7 @@
-# bittorrent-tracker [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url]
+# bittorrent-tracker [![ci][ci-image]][ci-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url]
 
-[travis-image]: https://img.shields.io/travis/webtorrent/bittorrent-tracker/master.svg
-[travis-url]: https://travis-ci.org/webtorrent/bittorrent-tracker
+[ci-image]: https://img.shields.io/github/workflow/status/webtorrent/bittorrent-tracker/ci/master
+[ci-url]: https://github.com/webtorrent/bittorrent-tracker/actions
 [npm-image]: https://img.shields.io/npm/v/bittorrent-tracker.svg
 [npm-url]: https://npmjs.org/package/bittorrent-tracker
 [downloads-image]: https://img.shields.io/npm/dm/bittorrent-tracker.svg

README.md

@@ -39,7 +39,7 @@ if (argv.version) {
 }
 
 if (argv.help) {
-  console.log(function () {
+  console.log((() => {
   /*
   bittorrent-tracker - Start a bittorrent tracker server
 
@@ -64,7 +64,7 @@ if (argv.help) {
     -v, --version                 print the current version
 
   */
-  }.toString().split(/\n/).slice(2, -2).join('\n'))
+  }).toString().split(/\n/).slice(2, -2).join('\n'))
   process.exit(0)
 }
 
@@ -85,23 +85,23 @@ const server = new Server({
   ws: argv.ws
 })
 
-server.on('error', function (err) {
-  if (!argv.silent) console.error('ERROR: ' + err.message)
+server.on('error', err => {
+  if (!argv.silent) console.error(`ERROR: ${err.message}`)
 })
-server.on('warning', function (err) {
-  if (!argv.quiet) console.log('WARNING: ' + err.message)
+server.on('warning', err => {
+  if (!argv.quiet) console.log(`WARNING: ${err.message}`)
 })
-server.on('update', function (addr) {
-  if (!argv.quiet) console.log('update: ' + addr)
+server.on('update', addr => {
+  if (!argv.quiet) console.log(`update: ${addr}`)
 })
-server.on('complete', function (addr) {
-  if (!argv.quiet) console.log('complete: ' + addr)
+server.on('complete', addr => {
+  if (!argv.quiet) console.log(`complete: ${addr}`)
 })
-server.on('start', function (addr) {
-  if (!argv.quiet) console.log('start: ' + addr)
+server.on('start', addr => {
+  if (!argv.quiet) console.log(`start: ${addr}`)
 })
-server.on('stop', function (addr) {
-  if (!argv.quiet) console.log('stop: ' + addr)
+server.on('stop', addr => {
+  if (!argv.quiet) console.log(`stop: ${addr}`)
 })
 
 const hostname = {
@@ -110,35 +110,35 @@ const hostname = {
   udp6: argv['udp6-hostname']
 }
 
-server.listen(argv.port, hostname, function () {
+server.listen(argv.port, hostname, () => {
   if (server.http && argv.http && !argv.quiet) {
     const httpAddr = server.http.address()
     const httpHost = httpAddr.address !== '::' ? httpAddr.address : 'localhost'
     const httpPort = httpAddr.port
-    console.log('HTTP tracker: http://' + httpHost + ':' + httpPort + '/announce')
+    console.log(`HTTP tracker: http://${httpHost}:${httpPort}/announce`)
   }
   if (server.udp && !argv.quiet) {
     const udpAddr = server.udp.address()
     const udpHost = udpAddr.address
     const udpPort = udpAddr.port
-    console.log('UDP tracker: udp://' + udpHost + ':' + udpPort)
+    console.log(`UDP tracker: udp://${udpHost}:${udpPort}`)
   }
   if (server.udp6 && !argv.quiet) {
     const udp6Addr = server.udp6.address()
     const udp6Host = udp6Addr.address !== '::' ? udp6Addr.address : 'localhost'
     const udp6Port = udp6Addr.port
-    console.log('UDP6 tracker: udp://' + udp6Host + ':' + udp6Port)
+    console.log(`UDP6 tracker: udp://${udp6Host}:${udp6Port}`)
   }
   if (server.ws && !argv.quiet) {
     const wsAddr = server.http.address()
     const wsHost = wsAddr.address !== '::' ? wsAddr.address : 'localhost'
     const wsPort = wsAddr.port
-    console.log('WebSocket tracker: ws://' + wsHost + ':' + wsPort)
+    console.log(`WebSocket tracker: ws://${wsHost}:${wsPort}`)
   }
   if (server.http && argv.stats && !argv.quiet) {
     const statsAddr = server.http.address()
     const statsHost = statsAddr.address !== '::' ? statsAddr.address : 'localhost'
     const statsPort = statsAddr.port
-    console.log('Tracker stats: http://' + statsHost + ':' + statsPort + '/stats')
+    console.log(`Tracker stats: http://${statsHost}:${statsPort}/stats`)
   }
 })

bin/cmd.js

@@ -3,6 +3,7 @@ const EventEmitter = require('events')
 const once = require('once')
 const parallel = require('run-parallel')
 const Peer = require('simple-peer')
+const queueMicrotask = require('queue-microtask')
 
 const common = require('./lib/common')
 const HTTPTracker = require('./lib/client/http-tracker') // empty object in browser
@@ -78,7 +79,7 @@ class Client extends EventEmitter {
     const webrtcSupport = this._wrtc !== false && (!!this._wrtc || Peer.WEBRTC_SUPPORT)
 
     const nextTickWarn = err => {
-      process.nextTick(() => {
+      queueMicrotask(() => {
         this.emit('warning', err)
       })
     }
@@ -87,7 +88,7 @@ class Client extends EventEmitter {
       .map(announceUrl => {
         let parsedUrl
         try {
-          parsedUrl = new URL(announceUrl)
+          parsedUrl = common.parseUrl(announceUrl)
         } catch (err) {
           nextTickWarn(new Error(`Invalid tracker URL: ${announceUrl}`))
           return null
@@ -282,9 +283,7 @@ Client.scrape = (opts, cb) => {
   })
 
   opts.infoHash = Array.isArray(opts.infoHash)
-    ? opts.infoHash.map(infoHash => {
-        return Buffer.from(infoHash, 'hex')
-      })
+    ? opts.infoHash.map(infoHash => Buffer.from(infoHash, 'hex'))
     : Buffer.from(opts.infoHash, 'hex')
   client.scrape({ infoHash: opts.infoHash })
   return client