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.1
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.2.2
Choose a head ref
  • 2 commits
  • 7 files changed
  • 1 contributor

Commits on Apr 14, 2017

  1. feross -> webtorrent

    feross committed Apr 14, 2017
    Copy the full SHA
    056a83d View commit details
  2. 9.2.2

    feross committed Apr 14, 2017
    Copy the full SHA
    0b21ee6 View commit details
Showing with 16 additions and 20 deletions.
  1. +1 −1 CONTRIBUTING.md
  2. +1 −1 LICENSE
  3. +6 −8 README.md
  4. +0 −2 bin/cmd.js
  5. +1 −1 client.js
  6. +6 −6 package.json
  7. +1 −1 test/querystring.js
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ and to avoid style arguments. `npm test` runs `standard` automatically, so you d
to!

[standard-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
[standard-url]: https://github.com/feross/standard
[standard-url]: https://standardjs.com

## Project Governance

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) Feross Aboukhadijeh
Copyright (c) Feross Aboukhadijeh and WebTorrent, LLC

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -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]

[travis-image]: https://img.shields.io/travis/feross/bittorrent-tracker/master.svg
[travis-url]: https://travis-ci.org/feross/bittorrent-tracker
[travis-image]: https://img.shields.io/travis/webtorrent/bittorrent-tracker/master.svg
[travis-url]: https://travis-ci.org/webtorrent/bittorrent-tracker
[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
@@ -11,7 +11,7 @@

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

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

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

@@ -33,10 +33,10 @@ This module is used by [WebTorrent](http://webtorrent.io).
- Supports tracker "scrape" extension
- Robust and well-tested
- Comprehensive test suite (runs entirely offline, so it's reliable)
- Used by popular clients: [WebTorrent](http://webtorrent.io), [peerflix](https://github.com/mafintosh/peerflix), and [playback](https://mafintosh.github.io/playback/)
- Used by popular clients: [WebTorrent](http://webtorrent.io), [peerflix](https://www.npmjs.com/package/peerflix), and [playback](https://mafintosh.github.io/playback/)
- Tracker statistics available via web interface at `/stats` or JSON data at `/stats.json`

Also see [bittorrent-dht](https://github.com/feross/bittorrent-dht).
Also see [bittorrent-dht](https://www.npmjs.com/package/bittorrent-dht).

## install

@@ -268,10 +268,8 @@ $ bittorrent-tracker --help
-q, --quiet only show error output
-s, --silent show no output
-v, --version print the current version
Please report bugs! https://github.com/feross/bittorrent-tracker/issues
```

## license

MIT. Copyright (c) [Feross Aboukhadijeh](http://feross.org).
MIT. Copyright (c) [Feross Aboukhadijeh](https://feross.org) and [WebTorrent, LLC](https://webtorrent.io).
2 changes: 0 additions & 2 deletions bin/cmd.js
Original file line number Diff line number Diff line change
@@ -63,8 +63,6 @@ if (argv.help) {
-s, --silent show no output
-v, --version print the current version
Please report bugs! https://github.com/feross/bittorrent-tracker/issues
*/
}.toString().split(/\n/).slice(2, -2).join('\n'))
process.exit(0)
2 changes: 1 addition & 1 deletion client.js
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ function Client (opts) {
self._userAgent = opts.userAgent

// Support lazy 'wrtc' module initialization
// See: https://github.com/feross/webtorrent-hybrid/issues/46
// See: https://github.com/webtorrent/webtorrent-hybrid/issues/46
self._wrtc = typeof opts.wrtc === 'function' ? opts.wrtc() : opts.wrtc

var announce = typeof opts.announce === 'string'
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "bittorrent-tracker",
"description": "Simple, robust, BitTorrent tracker (client & server) implementation",
"version": "9.2.1",
"version": "9.2.2",
"author": {
"name": "Feross Aboukhadijeh",
"email": "feross@feross.org",
"url": "http://feross.org/"
"name": "WebTorrent, LLC",
"email": "feross@webtorrent.io",
"url": "https://webtorrent.io"
},
"bin": {
"bittorrent-tracker": "./bin/cmd.js"
@@ -17,7 +17,7 @@
"./server.js": false
},
"bugs": {
"url": "https://github.com/feross/bittorrent-tracker/issues"
"url": "https://github.com/webtorrent/bittorrent-tracker/issues"
},
"dependencies": {
"bencode": "^0.11.0",
@@ -68,7 +68,7 @@
"main": "index.js",
"repository": {
"type": "git",
"url": "git://github.com/feross/bittorrent-tracker.git"
"url": "git://github.com/webtorrent/bittorrent-tracker.git"
},
"scripts": {
"update-authors": "./bin/update-authors.sh",
2 changes: 1 addition & 1 deletion test/querystring.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ var Buffer = require('safe-buffer').Buffer
var common = require('../lib/common')
var test = require('tape')

// https://github.com/feross/webtorrent/issues/196
// https://github.com/webtorrent/webtorrent/issues/196
test('encode special chars +* in http tracker urls', function (t) {
var q = {
info_hash: Buffer.from('a2a15537542b22925ad10486bf7a8b2a9c42f0d1', 'hex').toString('binary')