Use safetyCatch err handlers instead of noop

index.js

@@ -2,6 +2,7 @@ const { EventEmitter } = require('events')
 const DHT = require('hyperdht')
 const spq = require('shuffled-priority-queue')
 const b4a = require('b4a')
+const safetyCatch = require('safety-catch')
 
 const PeerInfo = require('./lib/peer-info')
 const RetryTimer = require('./lib/retry-timer')
@@ -175,7 +176,7 @@ module.exports = class Hyperswarm extends EventEmitter {
       opened = true
       this._connectDone()
       this.connections.add(conn)
-      conn.removeListener('error', noop)
+      conn.removeListener('error', safetyCatch)
       peerInfo._connected()
       peerInfo.client = true
       this.emit('connection', conn, peerInfo)
@@ -247,13 +248,13 @@ module.exports = class Hyperswarm extends EventEmitter {
     existing.on('close', () => {
       if (closed) return
 
-      conn.removeListener('error', noop)
+      conn.removeListener('error', safetyCatch)
       conn.removeListener('close', onclose)
 
       this._handleServerConnection(conn)
     })
 
-    conn.on('error', noop)
+    conn.on('error', safetyCatch)
     conn.on('close', onclose)
 
     function onclose () {
@@ -265,7 +266,7 @@ module.exports = class Hyperswarm extends EventEmitter {
   _handleServerConnection (conn) {
     if (this.destroyed) {
       // TODO: Investigate why a final server connection can be received after close
-      conn.on('error', noop)
+      conn.on('error', safetyCatch)
       return conn.destroy(ERR_DESTROYED)
     }
 
@@ -278,12 +279,12 @@ module.exports = class Hyperswarm extends EventEmitter {
 
       if (keepNew === false) {
         existing.write(KEEP_ALIVE) // check to see if its still alive actually
-        conn.on('error', noop)
+        conn.on('error', safetyCatch)
         conn.destroy(new Error(ERR_DUPLICATE))
         return
       }
 
-      existing.on('error', noop)
+      existing.on('error', safetyCatch)
       existing.destroy(new Error(ERR_DUPLICATE))
       this._handleServerConnectionSwap(existing, conn)
       return
@@ -516,8 +517,6 @@ module.exports = class Hyperswarm extends EventEmitter {
   }
 }
 
-function noop () { }
-
 function allowAll () {
   return false
 }

lib/peer-discovery.js

@@ -229,7 +229,7 @@ module.exports = class PeerDiscovery {
   resume () {
     if (!this.suspended) return
     this.suspended = false
-    this.refresh().catch(noop)
+    this.refresh().catch(safetyCatch)
   }
 }
 

test/chaos.js

@@ -1,6 +1,7 @@
 const test = require('brittle')
 const crypto = require('hypercore-crypto')
 const createTestnet = require('hyperdht/testnet')
+const safetyCatch = require('safety-catch')
 const { timeout } = require('./helpers')
 
 const Hyperswarm = require('..')
@@ -37,7 +38,7 @@ test('chaos - recovers after random disconnections (takes ~60s)', async (t) => {
     swarm.on('connection', conn => {
       connections.push(conn)
 
-      conn.on('error', noop)
+      conn.on('error', safetyCatch)
       conn.on('close', () => {
         clearInterval(timer)
         const idx = connections.indexOf(conn)
@@ -110,5 +111,3 @@ test('chaos - recovers after random disconnections (takes ~60s)', async (t) => {
 
   for (const swarm of swarms) await swarm.destroy()
 })
-
-function noop () {}

test/dups.js

@@ -1,5 +1,6 @@
 const test = require('brittle')
 const createTestnet = require('hyperdht/testnet')
+const safetyCatch = require('safety-catch')
 const Hyperswarm = require('../')
 
 test('many servers', async t => {
@@ -23,7 +24,7 @@ test('many servers', async t => {
     swarm.on('connection', conn => {
       missing.add(conn.remotePublicKey.toString('hex'))
 
-      conn.on('error', noop)
+      conn.on('error', safetyCatch)
       conn.on('close', function () {
         missing.delete(conn.remotePublicKey.toString('hex'))
       })
@@ -51,5 +52,3 @@ test('many servers', async t => {
 
   for (const swarm of swarms) await swarm.destroy()
 })
-
-function noop () {}

test/peer-join.js

@@ -1,5 +1,6 @@
 const test = require('brittle')
 const createTestnet = require('hyperdht/testnet')
+const safetyCatch = require('safety-catch')
 
 const Hyperswarm = require('..')
 
@@ -21,15 +22,15 @@ test('join peer - can establish direct connections to public keys', async (t) =>
   let s1Connected = false
 
   swarm2.on('connection', conn => {
-    conn.on('error', noop)
+    conn.on('error', safetyCatch)
     if (!s2Connected) {
       firstConnection.pass('swarm2 got its first connection')
       s2Connected = true
     }
     connections.pass('swarm2 got a connection')
   })
   swarm1.on('connection', conn => {
-    conn.on('error', noop)
+    conn.on('error', safetyCatch)
     if (!s1Connected) {
       firstConnection.pass('swarm1 got its first connection')
       s1Connected = true
@@ -157,12 +158,12 @@ test('leave peer - no memory leak if other side closed connection first', async
   swarm2.on('connection', conn => {
     conn.once('close', () => close.pass('swarm2 connection closed'))
     open.pass('swarm2 got a connection')
-    conn.on('error', noop)
+    conn.on('error', safetyCatch)
   })
   swarm1.on('connection', conn => {
     conn.once('close', () => close.pass('swarm1 connection closed'))
     open.pass('swarm1 got a connection')
-    conn.on('error', noop)
+    conn.on('error', safetyCatch)
   })
 
   swarm1.joinPeer(swarm2.keyPair.publicKey)
@@ -183,5 +184,3 @@ test('leave peer - no memory leak if other side closed connection first', async
 
   swarm1.leavePeer(swarm2.keyPair.publicKey)
 })
-
-function noop () {}