From d1b9047c03203e02dbea816e4ed7b02388217430 Mon Sep 17 00:00:00 2001 From: Justin Kalland Date: Thu, 20 Dec 2018 12:36:54 -0700 Subject: [PATCH] Remove declarations from inside switch statements --- lib/client/udp-tracker.js | 8 +++++--- server.js | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/client/udp-tracker.js b/lib/client/udp-tracker.js index 239ae12..19bb25d 100644 --- a/lib/client/udp-tracker.js +++ b/lib/client/udp-tracker.js @@ -127,6 +127,9 @@ class UDPTracker extends Tracker { } const action = msg.readUInt32BE(0) + let interval + let addrs + let infoHashes debug('UDP response %s, action %s', self.announceUrl, action) switch (action) { case 0: // handshake @@ -146,7 +149,7 @@ class UDPTracker extends Tracker { if (msg.length < 20) return onError(new Error('invalid announce message')) - const interval = msg.readUInt32BE(8) + interval = msg.readUInt32BE(8) if (interval) self.setInterval(interval * 1000) self.client.emit('update', { @@ -155,7 +158,6 @@ class UDPTracker extends Tracker { incomplete: msg.readUInt32BE(12) }) - let addrs try { addrs = compact2string.multi(msg.slice(20)) } catch (err) { @@ -174,7 +176,7 @@ class UDPTracker extends Tracker { if (msg.length < 20 || (msg.length - 8) % 12 !== 0) { return onError(new Error('invalid scrape message')) } - const infoHashes = (Array.isArray(opts.infoHash) && opts.infoHash.length > 0) + infoHashes = (Array.isArray(opts.infoHash) && opts.infoHash.length > 0) ? opts.infoHash.map(infoHash => { return infoHash.toString('hex') }) : [ (opts.infoHash && opts.infoHash.toString('hex')) || self.client.infoHash ] diff --git a/server.js b/server.js index 9d29bef..9a68544 100644 --- a/server.js +++ b/server.js @@ -749,6 +749,7 @@ Server.Swarm = Swarm function makeUdpPacket (params) { let packet + let scrapeResponse switch (params.action) { case common.ACTIONS.CONNECT: packet = Buffer.concat([ @@ -768,7 +769,7 @@ function makeUdpPacket (params) { ]) break case common.ACTIONS.SCRAPE: - const scrapeResponse = [ + scrapeResponse = [ common.toUInt32(common.ACTIONS.SCRAPE), common.toUInt32(params.transactionId) ]