Skip to content

Commit b6793bb

Browse files
committed
Merge pull request webtorrent#69 from ahdinosaur/master
add --ws boolean to command line script
2 parents d341783 + 3167197 commit b6793bb

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ var Server = require('bittorrent-tracker').Server
111111
var server = new Server({
112112
udp: true, // enable udp server? [default=true]
113113
http: true, // enable http server? [default=true]
114+
ws: true, // enable websocket server? [default=false]
114115
filter: function (infoHash, params) {
115116
// black/whitelist for disallowing/allowing torrents [default=allow all]
116117
// this example only allows this one torrent
@@ -122,9 +123,10 @@ var server = new Server({
122123
})
123124
})
124125

125-
// Internal http and udp servers exposed as public properties.
126+
// Internal http, udp, and websocket servers exposed as public properties.
126127
server.http
127128
server.udp
129+
server.ws
128130

129131
server.on('error', function (err) {
130132
// fatal server error!
@@ -178,6 +180,7 @@ Easily start a tracker server:
178180
$ bittorrent-tracker
179181
http server listening on 8000
180182
udp server listening on 8000
183+
ws server listening on 8000
181184
```
182185

183186
Lots of options:
@@ -195,6 +198,7 @@ $ bittorrent-tracker --help
195198
--interval tell clients to announce on this interval (ms)
196199
--http enable http server [default: true]
197200
--udp enable udp server [default: true]
201+
--ws enable ws server [default: false]
198202
-q, --quiet only show error output
199203
-s, --silent show no output
200204
-v, --version print the current version

bin/cmd.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ var argv = minimist(process.argv.slice(2), {
1818
'silent',
1919
'trust-proxy',
2020
'udp',
21-
'version'
21+
'version',
22+
'ws'
2223
],
2324
default: {
2425
http: true,
2526
port: 8000,
26-
udp: true
27+
udp: true,
28+
ws: false
2729
}
2830
})
2931

@@ -46,6 +48,7 @@ if (argv.help) {
4648
--interval tell clients to announce on this interval (ms)
4749
--http enable http server [default: true]
4850
--udp enable udp server [default: true]
51+
--ws enable websocket server [default: false]
4952
-q, --quiet only show error output
5053
-s, --silent show no output
5154
-v, --version print the current version
@@ -63,7 +66,8 @@ var server = new Server({
6366
http: argv.http,
6467
interval: argv.interval,
6568
trustProxy: argv['trust-proxy'],
66-
udp: argv.udp
69+
udp: argv.udp,
70+
ws: argv.ws
6771
})
6872

6973
server.on('error', function (err) {
@@ -92,4 +96,7 @@ server.listen(argv.port, function () {
9296
if (server.udp && !argv.quiet) {
9397
console.log('udp server listening on ' + server.udp.address().port)
9498
}
99+
if (server.ws && !argv.quiet) {
100+
console.log('ws server listening on ' + server.http.address().port)
101+
}
95102
})

0 commit comments

Comments
 (0)