Mirror/bittorrent-tracker
1
0
Fork 0
mirror of https://github.com/webtorrent/bittorrent-tracker.git synced 2025-01-19 04:31:36 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ws server: ignore all future socket errors after socket close

Browse Source
This commit is contained in:
Feross Aboukhadijeh 2016-03-18 22:35:01 -07:00
parent a327348222
commit 4902a99260
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server.js
View File

@ -168,7 +168,7 @@ Server.prototype.listen = function (/* port, hostname, onlistening */) {
Server.prototype.close = function (cb) { Server.prototype.close = function (cb) {
var self = this var self = this
if (!cb) cb = function () {} if (!cb) cb = noop
debug('close') debug('close')
self.listening = false self.listening = false
@ -298,6 +298,7 @@ Server.prototype.onWebSocketConnection = function (socket, opts) {
var self = this var self = this
if (!opts) opts = {} if (!opts) opts = {}
opts.trustProxy = opts.trustProxy || self._trustProxy opts.trustProxy = opts.trustProxy || self._trustProxy
socket.peerId = null // as hex socket.peerId = null // as hex
socket.infoHashes = [] // swarms that this socket is participating in socket.infoHashes = [] // swarms that this socket is participating in
socket.onSend = self._onWebSocketSend.bind(self, socket) socket.onSend = self._onWebSocketSend.bind(self, socket)
@ -331,6 +332,7 @@ Server.prototype._onWebSocketRequest = function (socket, opts, params) {
if (!socket.peerId) socket.peerId = params.peer_id // as hex if (!socket.peerId) socket.peerId = params.peer_id // as hex
self._onRequest(params, function (err, response) { self._onRequest(params, function (err, response) {
if (self.destroyed) return
if (err) { if (err) {
socket.send(JSON.stringify({ socket.send(JSON.stringify({
action: params.action === common.ACTIONS.ANNOUNCE ? 'announce' : 'scrape', action: params.action === common.ACTIONS.ANNOUNCE ? 'announce' : 'scrape',
@ -341,7 +343,6 @@ Server.prototype._onWebSocketRequest = function (socket, opts, params) {
self.emit('warning', err) self.emit('warning', err)
return return
} }
if (self.destroyed) return
response.action = params.action === common.ACTIONS.ANNOUNCE ? 'announce' : 'scrape' response.action = params.action === common.ACTIONS.ANNOUNCE ? 'announce' : 'scrape'
@ -612,14 +613,17 @@ Server.prototype._onWebSocketClose = function (socket) {
event: 'stopped', event: 'stopped',
numwant: 0, numwant: 0,
peer_id: socket.peerId peer_id: socket.peerId
}, function () {}) }, noop)
} }
}) })
} }
// ignore all future errors
socket.onSend = noop
socket.on('error', noop)
socket.peerId = null socket.peerId = null
socket.infoHashes = null socket.infoHashes = null
socket.onSend = null
socket.removeListener('message', socket.onMessageBound) socket.removeListener('message', socket.onMessageBound)
socket.onMessageBound = null socket.onMessageBound = null
@ -642,3 +646,5 @@ function toNumber (x) {
x = Number(x) x = Number(x)
return x >= 0 ? x : false return x >= 0 ? x : false
} }
function noop () {}