libp2p-tcp - npm Package Compare versions

Comparing version 0.10.0 to 0.10.1

package.json

 {
   "name": "libp2p-tcp",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
@@ -46,7 +46,7 @@ "main": "src/index.js",
     "interface-connection": "~0.3.2",
-    "ip-address": "^5.8.6",
+    "ip-address": "^5.8.8",
     "lodash.includes": "^4.3.0",
     "lodash.isfunction": "^3.0.8",
-    "mafmt": "^2.1.7",
-    "multiaddr": "^2.2.3",
+    "mafmt": "^2.1.8",
+    "multiaddr": "^2.3.0",
     "once": "^1.4.0",
@@ -53,0 +53,0 @@ "stream-to-pull-stream": "^1.7.2"

src/index.js

@@ -15,14 +15,14 @@ 'use strict'
 
-module.exports = class TCP {
-  dial (ma, options, cb) {
+function noop () {}
+
+class TCP {
+  dial (ma, options, callback) {
     if (isFunction(options)) {
-      cb = options
+      callback = options
       options = {}
     }
 
-    if (!cb) {
-      cb = () => {}
-    }
+    callback = callback || noop
 
-    cb = once(cb)
+    callback = once(callback)
     const cOpts = ma.toOptions()
@@ -32,2 +32,3 @@ log('Connecting to %s %s', cOpts.port, cOpts.host)
     const rawSocket = net.connect(cOpts)
+
     rawSocket.once('timeout', () => {
@@ -38,7 +39,7 @@ log('timeout')
 
-    rawSocket.once('error', cb)
+    rawSocket.once('error', callback)
 
     rawSocket.once('connect', () => {
-      rawSocket.removeListener('error', cb)
-      cb()
+      rawSocket.removeListener('error', callback)
+      callback()
     })
@@ -50,4 +51,4 @@
 
-    conn.getObservedAddrs = (cb) => {
-      return cb(null, [ma])
+    conn.getObservedAddrs = (callback) => {
+      return callback(null, [ma])
     }
@@ -81,1 +82,3 @@
 }
+
+module.exports = TCP

src/listener.js

@@ -17,2 +17,3 @@ 'use strict'
 const CLOSE_TIMEOUT = 2000
+function noop () {}
 
@@ -23,2 +24,5 @@ module.exports = (handler) => {
   const server = net.createServer((socket) => {
+    // Avoid uncaught errors cause by unstable connections
+    socket.on('error', noop)
+
     const addr = getMultiaddr(socket)
@@ -28,4 +32,5 @@ log('new connection', addr.toString())
     const s = toPull.duplex(socket)
+
     s.getObservedAddrs = (cb) => {
-      return cb(null, [addr])
+      cb(null, [addr])
     }
@@ -40,27 +45,20 @@
 
-  server.on('listening', () => {
-    listener.emit('listening')
-  })
+  server.on('listening', () => listener.emit('listening'))
+  server.on('error', (err) => listener.emit('error', err))
+  server.on('close', () => listener.emit('close'))
 
-  server.on('error', (err) => {
-    listener.emit('error', err)
-  })
-
-  server.on('close', () => {
-    listener.emit('close')
-  })
-
   // Keep track of open connections to destroy in case of timeout
   server.__connections = {}
 
-  listener.close = (options, cb) => {
+  listener.close = (options, callback) => {
     if (typeof options === 'function') {
-      cb = options
+      callback = options
       options = {}
     }
-    cb = cb || (() => {})
+    callback = callback || noop
     options = options || {}
 
     let closed = false
-    server.close(cb)
+    server.close(callback)
+
     server.once('close', () => {
@@ -70,3 +68,5 @@ closed = true
     setTimeout(() => {
-      if (closed) return
+      if (closed) {
+        return
+      }
 
@@ -84,3 +84,3 @@ log('unable to close graciously, destroying conns')
 
-  listener.listen = (ma, cb) => {
+  listener.listen = (ma, callback) => {
     listeningAddr = ma
@@ -94,6 +94,6 @@ if (includes(ma.protoNames(), 'ipfs')) {
     log('Listening on %s %s', lOpts.port, lOpts.host)
-    return server.listen(lOpts.port, lOpts.host, cb)
+    return server.listen(lOpts.port, lOpts.host, callback)
   }
 
-  listener.getAddrs = (cb) => {
+  listener.getAddrs = (callback) => {
     const multiaddrs = []
@@ -103,3 +103,3 @@ const address = server.address()
     if (!address) {
-      return cb(new Error('Listener is not ready yet'))
+      return callback(new Error('Listener is not ready yet'))
     }
@@ -139,3 +139,3 @@
 
-    cb(null, multiaddrs)
+    callback(null, multiaddrs)
   }
@@ -142,0 +142,0 @@

No alert changes

Improved metrics

Total package byte prevSize

15679

increased by1.4%

Worsened metrics

Lines of code

198

decreased by-0.5%

Dependency changes

• Updatedip-address@^5.8.8

• Updatedmafmt@^2.1.8

• Updatedmultiaddr@^2.3.0