REFACTOR: Lint indentation

Jon-Biz · Jon-Biz · commit 01a4128a613f · 2020-09-24T18:31:23.000-07:00
diff --git a/lib/client/websocket-tracker.js b/lib/client/websocket-tracker.js
@@ -15,9 +15,9 @@ const RECONNECT_MINIMUM = 10 * 1000
 const RECONNECT_MAXIMUM = 60 * 60 * 1000
 const RECONNECT_VARIANCE = 5 * 60 * 1000
 const OFFER_TIMEOUT = 50 * 1000
-const TRICKLE_TIMEOUT = 10 * 1000
 
-const SDP_TRICKLE_REGEX = /a=ice-options:trickle\s\n/
+// const TRICKLE_TIMEOUT = 10 * 1000
+// const SDP_TRICKLE_REGEX = /a=ice-options:trickle\s\n/
 
 class WebSocketTracker extends Tracker {
   constructor (client, announceUrl, opts) {
@@ -52,9 +52,9 @@ class WebSocketTracker extends Tracker {
       })
     }
     const baseParams = {
-        action: 'announce',
-        info_hash: this.client._infoHashBinary,
-        peer_id: this.client._peerIdBinary,
+      action: 'announce',
+      info_hash: this.client._infoHashBinary,
+      peer_id: this.client._peerIdBinary
     }
     const params = Object.assign({}, opts, baseParams)
     if (this._trackerId) params.trackerid = this._trackerId
@@ -76,14 +76,14 @@ class WebSocketTracker extends Tracker {
         this._send(trickleParams)
       })
     } else {
-        // Limit the number of offers that are generated, since it can be slow
-        const numwant = Math.min(opts.numwant, 10)
-        this._generateOffers(numwant, offers => {
-          params.numwant = numwant
-          params.offers = offers
-          this._send(params)
-        })
-      }
+      // Limit the number of offers that are generated, since it can be slow
+      const numwant = Math.min(opts.numwant, 10)
+      this._generateOffers(numwant, offers => {
+        params.numwant = numwant
+        params.offers = offers
+        this._send(params)
+      })
+    }
   }
 
   scrape (opts) {
@@ -306,21 +306,20 @@ class WebSocketTracker extends Tracker {
 
         // Save reference to trickling peer to add candidates later
         if (isTrickleSdp) {
-            this.peers[offerId] = peer
+          this.peers[offerId] = peer
         }
 
         this.client.emit('peer', peer)
       } else {
-          peer = this.peers[offerId]
-          if (peer) {
-            this._setPeerTrickleTimeout(peer, offerId)
-          }
+        peer = this.peers[offerId]
+        if (peer) {
+          this._setPeerTrickleTimeout(peer, offerId)
+        }
       }
 
       if ((sdp || candidate) && peer && !peer.destroyed) {
         peer.signal(data.offer)
       }
-
     }
 
     if (data.answer && data.peer_id) {
@@ -329,7 +328,7 @@ class WebSocketTracker extends Tracker {
       if (peer) {
         peer.id = common.binaryToHex(data.peer_id)
         if (!peer.destroyed) {
-            peer.signal(data.answer)
+          peer.signal(data.answer)
         }
 
         clearTimeout(peer.trackerTimeout)
@@ -339,13 +338,13 @@ class WebSocketTracker extends Tracker {
         const isTrickleSdp = /a=ice-options:trickle\s\n/g.test(sdp)
 
         if (sdp) {
-            this.client.emit('peer', peer)
+          this.client.emit('peer', peer)
         }
 
         if ((isTrickleSdp || candidate) && peer) {
-            this._setPeerTrickleTimeout(peer, offerId)
+          this._setPeerTrickleTimeout(peer, offerId)
         } else {
-            delete this.peers[offerId]
+          delete this.peers[offerId]
         }
       } else {
         debug(`got unexpected answer: ${JSON.stringify(data.answer)}`)
@@ -404,9 +403,11 @@ class WebSocketTracker extends Tracker {
   _send (params) {
     if (this.destroyed) return
     if (!this.socket.connected) {
-        this.pendingWrites.push(params)
-        return
+      this.pendingWrites.push(params)
+
+      return
     }
+
     this.expectingResponse = true
     const message = JSON.stringify(params)
     debug('send %s', message)
@@ -416,31 +417,33 @@ class WebSocketTracker extends Tracker {
   _generateOffers (numwant, cb) {
     const self = this
     const offers = []
+
     debug('generating %s offers', numwant)
 
     for (let i = 0; i < numwant; ++i) {
       generateOffer()
     }
+
     checkDone()
 
     function generateOffer () {
-        const offerId = randombytes(20).toString('hex')
-        debug('creating peer (from _generateOffers)')
-        const peer = self.peers[offerId] = self._createPeer({ initiator: true })
-        peer.once('signal', offer => {
-          offers.push({
-            offer,
-            offer_id: common.hexToBinary(offerId)
-          })
-          checkDone()
+      const offerId = randombytes(20).toString('hex')
+      debug('creating peer (from _generateOffers)')
+      const peer = self.peers[offerId] = self._createPeer({ initiator: true })
+      peer.once('signal', offer => {
+        offers.push({
+          offer,
+          offer_id: common.hexToBinary(offerId)
         })
-        peer.trackerTimeout = setTimeout(() => {
-          debug('tracker timeout: destroying peer')
-          peer.trackerTimeout = null
-          delete self.peers[offerId]
-          peer.destroy()
-        }, OFFER_TIMEOUT)
-        if (peer.trackerTimeout.unref) peer.trackerTimeout.unref()
+        checkDone()
+      })
+      peer.trackerTimeout = setTimeout(() => {
+        debug('tracker timeout: destroying peer')
+        peer.trackerTimeout = null
+        delete self.peers[offerId]
+        peer.destroy()
+      }, OFFER_TIMEOUT)
+      if (peer.trackerTimeout.unref) peer.trackerTimeout.unref()
     }
 
     function checkDone () {
@@ -456,57 +459,66 @@ class WebSocketTracker extends Tracker {
     const offers = []
     const candidates = []
     let hasSentOffers = false
+
     debug('generating %s trickle offers', numwant)
 
     for (let i = 0; i < numwant; ++i) {
-        generateTrickleOffer()
+      generateTrickleOffer()
     }
+
     checkOffersDone()
 
     function generateTrickleOffer () {
-        const offerId = randombytes(20).toString('hex')
-        const binaryOfferId = common.hexToBinary(offerId)
-        debug('creating peer (from _generateTrickleOffers)')
-        const opts = { initiator: true, trickle: true }
-        const peer = self.peers[offerId] = self._createPeer(opts)
-        peer.on('signal', offer => {
-          const offerObj = { offer, offer_id: binaryOfferId }
-          if (offer.sdp) {
-            offers.push(offerObj)
-            checkOffersDone()
-          } else if (!hasSentOffers) {
-            // Only send candidates after initial offers are sent
-            candidates.push(offerObj)
-          } else {
-            candidateCb(offerObj)
-          }
-        })
-        peer.trackerTimeout = setTimeout(() => {
-          debug('tracker timeout: destroying peer')
-          peer.trackerTimeout = null
-          delete self.peers[offerId]
-          peer.destroy()
-        }, OFFER_TIMEOUT)
-        if (peer.trackerTimeout.unref) peer.trackerTimeout.unref()
+      const offerId = randombytes(20).toString('hex')
+      const binaryOfferId = common.hexToBinary(offerId)
+      const opts = { initiator: true, trickle: true }
+      const peer = self.peers[offerId] = self._createPeer(opts)
+
+      debug('creating peer (from _generateTrickleOffers)')
+
+      peer.on('signal', offer => {
+        const offerObj = { offer, offer_id: binaryOfferId }
+        if (offer.sdp) {
+          offers.push(offerObj)
+          checkOffersDone()
+        } else if (!hasSentOffers) {
+          // Only send candidates after initial offers are sent
+          candidates.push(offerObj)
+        } else {
+          candidateCb(offerObj)
+        }
+      })
+
+      peer.trackerTimeout = setTimeout(() => {
+        debug('tracker timeout: destroying peer')
+        peer.trackerTimeout = null
+        delete self.peers[offerId]
+        peer.destroy()
+      }, OFFER_TIMEOUT)
+
+      if (peer.trackerTimeout.unref) peer.trackerTimeout.unref()
     }
 
     function checkOffersDone () {
       if (offers.length === numwant) {
         debug('generated %s offers', numwant)
+
         hasSentOffers = true
         offersCb(offers)
         candidates.forEach(candidateCb)
       }
     }
   }
 
-    // Allow time for trickle candidates to arrive before deleting the peer.
+  // Allow time for trickle candidates to arrive before deleting the peer.
   _setPeerTrickleTimeout (peer, offerId) {
     clearTimeout(peer.trickleTimeout)
+
     peer.trickleTimeout = setTimeout(() => {
-        if (this.destroyed) { return }
-        delete this.peers[offerId]
-    }, 10000);
+      if (this.destroyed) { return }
+      delete this.peers[offerId]
+    }, 10000)
+
     if (peer.trickleTimeout.unref) peer.trickleTimeout.unref()
   }
 
diff --git a/lib/server/swarm.js b/lib/server/swarm.js
@@ -6,7 +6,7 @@ var randomIterate = require('random-iterate')
 // Regard this as the default implementation of an interface that you
 // need to support when overriding Server.createSwarm() and Server.getSwarm()
 class Swarm {
-  constructor(infoHash, server) {
+  constructor (infoHash, server) {
     var self = this
     self.infoHash = infoHash
     self.complete = 0
@@ -20,8 +20,8 @@ class Swarm {
     // maps offer_id to peer_id so that trickling candidates
     // can be sent to the correct peer
     self.offers = new LRU({
-        max: 2000,
-        maxAge: 60 * 1000 * 5 // 5 min
+      max: 2000,
+      maxAge: 60 * 1000 * 5 // 5 min
     })
 
     // When a peer is evicted from the LRU store, send a synthetic 'stopped' event
@@ -39,7 +39,7 @@ class Swarm {
     })
   }
 
-  announce(params, cb) {
+  announce (params, cb) {
     var self = this
     var id = params.type === 'ws' ? params.peer_id : params.addr
     // Mark the source peer as recently used in cache
@@ -68,14 +68,14 @@ class Swarm {
     })
   }
 
-  scrape(params, cb) {
+  scrape (params, cb) {
     cb(null, {
       complete: this.complete,
       incomplete: this.incomplete
     })
   }
 
-  _onAnnounceStarted(params, peer, id) {
+  _onAnnounceStarted (params, peer, id) {
     if (peer) {
       debug('unexpected `started` event from peer that is already in swarm')
       return this._onAnnounceUpdate(params, peer, id) // treat as an update
@@ -93,7 +93,7 @@ class Swarm {
     })
   }
 
-  _onAnnounceStopped(params, peer, id) {
+  _onAnnounceStopped (params, peer, id) {
     if (!peer) {
       debug('unexpected `stopped` event from peer that is not in swarm')
       return // do nothing
@@ -112,7 +112,7 @@ class Swarm {
     this.peers.remove(id)
   }
 
-  _onAnnounceCompleted(params, peer, id) {
+  _onAnnounceCompleted (params, peer, id) {
     if (!peer) {
       debug('unexpected `completed` event from peer that is not in swarm')
       return this._onAnnounceStarted(params, peer, id) // treat as a start
@@ -128,7 +128,7 @@ class Swarm {
     this.peers.set(id, peer)
   }
 
-  _onAnnounceUpdate(params, peer, id) {
+  _onAnnounceUpdate (params, peer, id) {
     if (!peer) {
       debug('unexpected `update` event from peer that is not in swarm')
       return this._onAnnounceStarted(params, peer, id) // treat as a start
@@ -142,7 +142,7 @@ class Swarm {
     this.peers.set(id, peer)
   }
 
-  _getPeersByOfferId(params, ownPeerId) {
+  _getPeersByOfferId (params, ownPeerId) {
       const peers = []
       const { offer_id } = params.offers[0]
       const peerId = this.offers.get(offer_id)
