Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: webtorrent/bittorrent-tracker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v9.2.4
Choose a base ref
...
head repository: webtorrent/bittorrent-tracker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v9.3.0
Choose a head ref
  • 12 commits
  • 6 files changed
  • 4 contributors

Commits on Jan 5, 2018

  1. fix(package): update ws to version 4.0.0

    @greenkeeper
    greenkeeper[bot] committed Jan 5, 2018
    Copy the full SHA
    682ba92 View commit details

  2. Merge pull request #246 from webtorrent/greenkeeper/ws-4.0.0 

    Update ws to the latest version 🚀
    @DiegoRBaquero
    DiegoRBaquero authored Jan 5, 2018
    Copy the full SHA
    f0ada14 View commit details

Commits on Jan 14, 2018

  1. Fix IPv6 in Travis

    @alxhotel
    alxhotel committed Jan 14, 2018
    Copy the full SHA
    1cd922e View commit details

Commits on Jan 15, 2018

  1. Merge pull request #249 from alxhotel/fix-travis-ipv6 

    Fix IPv6 in Travis
    @DiegoRBaquero
    DiegoRBaquero authored Jan 15, 2018
    Copy the full SHA
    310ef46 View commit details

Commits on Jan 29, 2018

  1. fix(package): update simple-websocket to version 6.0.0

    @greenkeeper
    greenkeeper[bot] committed Jan 29, 2018
    Copy the full SHA
    bf4671c View commit details

  2. chore(package): update simple-peer to version 8.3.0

    @greenkeeper
    greenkeeper[bot] committed Jan 29, 2018
    Copy the full SHA
    baad1e0 View commit details

  3. Update README.md

    @feross
    feross authored Jan 29, 2018
    Copy the full SHA
    c5e4841 View commit details

  4. Merge pull request #251 from webtorrent/greenkeeper/simple-websocket-… 

    …6.0.0

Update simple-websocket to the latest version 🚀
    @DiegoRBaquero
    DiegoRBaquero authored Jan 29, 2018
    Copy the full SHA
    fa36b05 View commit details

  5. Merge branch 'master' into greenkeeper/simple-peer-8.3.0

    @DiegoRBaquero
    DiegoRBaquero authored Jan 29, 2018
    Copy the full SHA
    83e2795 View commit details

  6. Merge pull request #253 from webtorrent/greenkeeper/simple-peer-8.3.0 

    chore(package): update simple-peer to version 8.3.0
    @DiegoRBaquero
    DiegoRBaquero authored Jan 29, 2018
    Copy the full SHA
    bbe1152 View commit details

Commits on Feb 3, 2018

  1. move images around, npmignore the tracker stats image

    @feross
    feross committed Feb 3, 2018
    Copy the full SHA
    9288865 View commit details

  2. 9.3.0

    @feross
    feross committed Feb 3, 2018
    Copy the full SHA
    7b890b0 View commit details
Showing with 13 additions and 10 deletions.
  1. +1 −1 .npmignore
  2. +5 −0 .travis.yml
  3. +3 −5 README.md
  4. BIN { → img}/img.png
  5. BIN { → img}/trackerStats.png
  6. +4 −4 package.json
2 changes: 1 addition & 1 deletion .npmignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
img.png
img/
5 changes: 5 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -3,4 +3,9 @@ sudo: false
node_js:
- "node"
before_script:
# Add an IPv6 config - see the corresponding Travis issue
# https://github.com/travis-ci/travis-ci/issues/8361
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
fi
- export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start
8 changes: 3 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# bittorrent-tracker [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url] [![Greenkeeper badge][greenkeeper-image]][greenkeeper-url]
# bittorrent-tracker [![travis][travis-image]][travis-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
@@ -8,12 +8,10 @@
[downloads-url]: https://npmjs.org/package/bittorrent-tracker
[standard-image]: https://img.shields.io/badge/code_style-standard-brightgreen.svg
[standard-url]: https://standardjs.com
[greenkeeper-image]: https://badges.greenkeeper.io/webtorrent/bittorrent-tracker.svg
[greenkeeper-url]: https://greenkeeper.io/

#### Simple, robust, BitTorrent tracker (client & server) implementation

![tracker](https://raw.githubusercontent.com/webtorrent/bittorrent-tracker/master/img.png)
![tracker visualization](img/img.png)

Node.js implementation of a [BitTorrent tracker](https://wiki.theory.org/BitTorrentSpecification#Tracker_HTTP.2FHTTPS_Protocol), client and server.

@@ -42,7 +40,7 @@ Also see [bittorrent-dht](https://www.npmjs.com/package/bittorrent-dht).

### Tracker stats

![Screenshot](trackerStats.png)
![Screenshot](img/trackerStats.png)

## install

0 img.png → img/img.png
View file
File renamed without changes
0 trackerStats.png → img/trackerStats.png
View file
File renamed without changes
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bittorrent-tracker",
"description": "Simple, robust, BitTorrent tracker (client & server) implementation",
"version": "9.2.4",
"version": "9.3.0",
"author": {
"name": "WebTorrent, LLC",
"email": "feross@webtorrent.io",
@@ -36,12 +36,12 @@
"run-series": "^1.0.2",
"safe-buffer": "^5.0.0",
"simple-get": "^2.0.0",
"simple-peer": "^8.0.0",
"simple-websocket": "^5.0.0",
"simple-peer": "^8.3.0",
"simple-websocket": "^6.0.0",
"string2compact": "^1.1.1",
"uniq": "^1.0.1",
"unordered-array-remove": "^1.0.2",
"ws": "^3.3.1",
"ws": "^4.0.0",
"xtend": "^4.0.0"
},
"devDependencies": {