fix: transport should not handle connection if upgradeInbound throws (#…

…191)

package.json

@@ -49,8 +49,7 @@
     "chai": "^4.2.0",
     "dirty-chai": "^2.0.1",
     "electron-webrtc": "~0.3.0",
-    "interface-discovery": "~0.1.1",
-    "interface-transport": "libp2p/interface-transport#chore/skip-abort-while-reading-for-webrtc",
+    "libp2p-interfaces": "libp2p/js-interfaces#chore/skip-abort-while-reading-for-webrtc",
     "prom-client": "^11.5.3",
     "sinon": "^7.5.0",
     "wrtc": "~0.4.2"

src/listener.js

@@ -1,7 +1,9 @@
 'use strict'
 
 const EventEmitter = require('events')
-const log = require('debug')('libp2p:webrtc-star:listener')
+const debug = require('debug')
+const log = debug('libp2p:webrtc-star:listener')
+log.error = debug('libp2p:webrtc-star:listener:error')
 
 const multiaddr = require('multiaddr')
 
@@ -48,7 +50,21 @@ module.exports = ({ handler, upgrader }, WebRTCStar, options = {}) => {
       const maConn = toConnection(channel)
       log('new inbound connection %s', maConn.remoteAddr)
 
-      const conn = await upgrader.upgradeInbound(maConn)
+      channel.once('signal', (signal) => {
+        offer.signal = signal
+        offer.answer = true
+        listener.io.emit('ss-handshake', offer)
+      })
+
+      channel.signal(offer.signal)
+
+      let conn
+      try {
+        conn = await upgrader.upgradeInbound(maConn)
+      } catch (err) {
+        log.error('inbound connection failed to upgrade', err)
+        return maConn.close()
+      }
       log('inbound connection %s upgraded', maConn.remoteAddr)
 
       trackConn(listener, maConn)
@@ -57,14 +73,6 @@ module.exports = ({ handler, upgrader }, WebRTCStar, options = {}) => {
         listener.emit('connection', conn)
         handler(conn)
       })
-
-      channel.once('signal', (signal) => {
-        offer.signal = signal
-        offer.answer = true
-        listener.io.emit('ss-handshake', offer)
-      })
-
-      channel.signal(offer.signal)
     }
 
     listener.io.once('connect_error', (err) => defer.reject(err))

test/compliance.spec.js

@@ -4,8 +4,8 @@
 const wrtc = require('wrtc')
 
 const sinon = require('sinon')
-const testsTransport = require('interface-transport')
-const testsDiscovery = require('interface-discovery')
+const testsTransport = require('libp2p-interfaces/src/transport/tests')
+const testsDiscovery = require('libp2p-interfaces/src/peer-discovery/tests')
 const multiaddr = require('multiaddr')
 
 const WStar = require('../src')