Skip to content

Add http tracker announce url to warning messages. #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crass wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add http tracker announce url to warning messages. #561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions lib/client/http-tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class HTTPTracker extends Tracker {
if (this._trackerId) params.trackerid = this._trackerId

this._request(this.announceUrl, params, (err, data) => {
if (err) return this.client.emit('warning', err)
if (err) return this.onError(err)
this._onAnnounceResponse(data)
})
}
Expand All @@ -80,7 +80,7 @@ class HTTPTracker extends Tracker {
info_hash: infoHashes
}
this._request(this.scrapeUrl, params, (err, data) => {
if (err) return this.client.emit('warning', err)
if (err) return this.onError(err)
this._onScrapeResponse(data)
})
}
Expand Down Expand Up @@ -120,6 +120,16 @@ class HTTPTracker extends Tracker {
}
}

onError (err) {
try {
// Error.message is readonly on some platforms.
if (err.message) err.message += ` (${this.announceUrl})`
} catch (ignoredErr) {}
// errors will often happen if a tracker is offline, so don't treat it as fatal

this.client.emit('warning', err)
}

async _request (requestUrl, params, cb) {
const parsedUrl = new URL(requestUrl + (requestUrl.indexOf('?') === -1 ? '?' : '&') + common.querystringStringify(params))
let agent
Expand Down Expand Up @@ -164,7 +174,7 @@ class HTTPTracker extends Tracker {
return cb(new Error(`Non-200 response code ${res.status} from ${this.announceUrl}`))
}
if (!data || data.length === 0) {
return cb(new Error(`Invalid tracker response from${this.announceUrl}`))
return cb(new Error(`Invalid tracker response from ${this.announceUrl}`))
}

try {
Expand All @@ -181,7 +191,7 @@ class HTTPTracker extends Tracker {
const warning = data['warning message'] && arr2text(data['warning message'])
if (warning) {
debug(`warning from ${requestUrl} (${warning})`)
this.client.emit('warning', new Error(warning))
this.onError(new Error(warning))
}

debug(`response from ${requestUrl}`)
Expand Down Expand Up @@ -211,7 +221,7 @@ class HTTPTracker extends Tracker {
try {
addrs = compact2string.multi(Buffer.from(data.peers))
} catch (err) {
return this.client.emit('warning', err)
return this.onError(err)
}
addrs.forEach(addr => {
this.client.emit('peer', addr)
Expand All @@ -228,7 +238,7 @@ class HTTPTracker extends Tracker {
try {
addrs = compact2string.multi6(Buffer.from(data.peers6))
} catch (err) {
return this.client.emit('warning', err)
return this.onError(err)
}
addrs.forEach(addr => {
this.client.emit('peer', addr)
Expand All @@ -251,7 +261,7 @@ class HTTPTracker extends Tracker {

const keys = Object.keys(data)
if (keys.length === 0) {
this.client.emit('warning', new Error('invalid scrape response'))
this.onError(new Error('invalid scrape response'))
return
}

Expand Down