bump dependencies 2

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="0.15.3"></a>
+## [0.15.3](https://github.com/libp2p/js-libp2p-tcp/compare/v0.15.2...v0.15.3) (2021-02-03)
+
+
+### Bug Fixes
+
+* hanging close promise ([#140](https://github.com/libp2p/js-libp2p-tcp/issues/140)) ([3813100](https://github.com/libp2p/js-libp2p-tcp/commit/3813100))
+
+
+
 <a name="0.15.2"></a>
 ## [0.15.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.2...v0.15.2) (2020-12-28)
 

README.md

@@ -9,11 +9,11 @@
 [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-tcp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-tcp)
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
 
-[![](https://raw.githubusercontent.com/libp2p/interface-transport/master/img/badge.png)](https://github.com/libp2p/interface-transport)
-[![](https://raw.githubusercontent.com/libp2p/interface-connection/master/img/badge.png)](https://github.com/libp2p/interface-connection)
+[![](https://raw.githubusercontent.com/libp2p/js-libp2p-interfaces/master/src/transport/img/badge.png)](https://github.com/libp2p/js-libp2p-interfaces/tree/master/src/transport)
+[![](https://raw.githubusercontent.com/libp2p/js-libp2p-interfaces/master/src/connection/img/badge.png)](https://github.com/libp2p/js-libp2p-interfaces/tree/master/src/connection)
 
 
-> JavaScript implementation of the TCP module for libp2p. It exposes the [interface-transport](https://github.com/libp2p/interface-connection) for dial/listen. `libp2p-tcp` is a very thin shim that adds support for dialing to a `multiaddr`. This small shim will enable libp2p to use other transports.
+> JavaScript implementation of the TCP module for libp2p. It exposes the [interface-transport](https://github.com/libp2p/js-libp2p-interfaces/tree/master/src/transport) for dial/listen. `libp2p-tcp` is a very thin shim that adds support for dialing to a `multiaddr`. This small shim will enable libp2p to use other transports.
 
 ## Lead Maintainer
 
@@ -87,7 +87,7 @@ Value: hello
 
 ### Transport
 
-[![](https://raw.githubusercontent.com/libp2p/interface-transport/master/img/badge.png)](https://github.com/libp2p/interface-transport)
+[![](https://raw.githubusercontent.com/libp2p/js-libp2p-interfaces/master/src/transport/img/badge.png)](https://github.com/libp2p/js-libp2p-interfaces/tree/master/src/transport)
 
 `libp2p-tcp` accepts TCP addresses as both IPFS and non IPFS encapsulated addresses, i.e:
 
@@ -98,7 +98,8 @@ Value: hello
 
 ### Connection
 
-[![](https://raw.githubusercontent.com/libp2p/interface-connection/master/img/badge.png)](https://github.com/libp2p/interface-connection)
+[![](https://raw.githubusercontent.com/libp2p/js-libp2p-interfaces/master/src/connection/img/badge.png)](https://github.com/libp2p/js-libp2p-interfaces/tree/master/src/connection)
+
 
 ## Contribute
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2p-tcp",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
   "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
   "main": "src/index.js",
@@ -35,7 +35,7 @@
   "devDependencies": {
     "aegir": "^25.0.0",
     "it-pipe": "^1.1.0",
-    "libp2p-interfaces": "^0.4.0",
+    "libp2p-interfaces": "fluencelabs/js-libp2p-interfaces",
     "sinon": "^9.0.0",
     "streaming-iterables": "^5.0.2"
   },
@@ -44,9 +44,9 @@
     "class-is": "^1.1.0",
     "debug": "^4.1.1",
     "err-code": "^2.0.0",
-    "libp2p-utils": "^0.2.0",
-    "mafmt": "^8.0.0",
-    "multiaddr": "^8.0.0",
+    "libp2p-utils": "fluencelabs/js-libp2p-utils",
+    "mafmt": "fluencelabs/js-mafmt",
+    "multiaddr": "^9.0.1",
     "stream-to-it": "^0.2.2"
   },
   "contributors": [
@@ -54,19 +54,20 @@
     "Jacob Heun <jacobheun@gmail.com>",
     "Stephen Whitmore <stephen.whitmore@gmail.com>",
     "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
-    "Alex Potsides <alex@achingbrain.net>",
     "Vasco Santos <vasco.santos@moxy.studio>",
+    "Alex Potsides <alex@achingbrain.net>",
     "Richard Littauer <richard.littauer@gmail.com>",
     "Tom White <tomtinkerer@gmail.com>",
     "Alan Shaw <alan@tableflip.io>",
+    "Pedro Teixeira <i@pgte.me>",
     "Prashanth Chandra <coolshanth94@gmail.com>",
     "João Antunes <j.goncalo.antunes@gmail.com>",
+    "Cayman <caymannava@gmail.com>",
     "Diogo Silva <fsdiogo@gmail.com>",
     "Dmitriy Ryajov <dryajov@gmail.com>",
     "Drew Stone <drewstone329@gmail.com>",
     "Evan Schwartz <evan.mark.schwartz@gmail.com>",
     "Linus Unnebäck <linus@folkdatorn.se>",
-    "Mikeal Rogers <mikeal.rogers@gmail.com>",
-    "Pedro Teixeira <i@pgte.me>"
+    "Mikeal Rogers <mikeal.rogers@gmail.com>"
   ]
 }

src/socket-to-conn.js

@@ -78,7 +78,10 @@ module.exports = (socket, options) => {
           resolve()
         }, CLOSE_TIMEOUT)
 
-        socket.once('close', () => clearTimeout(timeout))
+        socket.once('close', () => {
+          clearTimeout(timeout)
+          resolve()
+        })
         socket.end(err => {
           maConn.timeline.close = Date.now()
           if (err) return reject(err)

src/utils.js

@@ -16,7 +16,7 @@ function multiaddrToNetConfig (addr) {
 }
 
 function getMultiaddrs (proto, ip, port) {
-  const toMa = ip => multiaddr(`/${proto}/${ip}/tcp/${port}`)
+  const toMa = ip => new multiaddr.Multiaddr(`/${proto}/${ip}/tcp/${port}`)
   return (isAnyAddr(ip) ? getNetworkAddrs(ProtoFamily[proto]) : [ip]).map(toMa)
 }
 

test/compliance.spec.js

@@ -12,9 +12,9 @@ describe('interface-transport compliance', () => {
     setup ({ upgrader }) {
       const tcp = new TCP({ upgrader })
       const addrs = [
-        multiaddr('/ip4/127.0.0.1/tcp/9091'),
-        multiaddr('/ip4/127.0.0.1/tcp/9092'),
-        multiaddr('/ip4/127.0.0.1/tcp/9093')
+        new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9091'),
+        new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9092'),
+        new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9093')
       ]
 
       // Used by the dial tests to simulate a delayed connect

test/connection.spec.js

@@ -17,7 +17,7 @@ describe('valid localAddr and remoteAddr', () => {
     tcp = new TCP({ upgrader: mockUpgrader })
   })
 
-  const ma = multiaddr('/ip4/127.0.0.1/tcp/0')
+  const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0')
 
   it('should resolve port 0', async () => {
     // Create a Promise that resolves when a connection is handled
@@ -50,4 +50,36 @@ describe('valid localAddr and remoteAddr', () => {
     expect(dialerConn.remoteAddr.toString())
       .to.equal(listenerConn.localAddr.toString())
   })
+
+  it('should handle multiple simultaneous closes', async () => {
+    // Create a Promise that resolves when a connection is handled
+    let handled
+    const handlerPromise = new Promise(resolve => { handled = resolve })
+
+    const handler = conn => handled(conn)
+
+    // Create a listener with the handler
+    const listener = tcp.createListener(handler)
+
+    // Listen on the multi-address
+    await listener.listen(ma)
+
+    const localAddrs = listener.getAddrs()
+    expect(localAddrs.length).to.equal(1)
+
+    // Dial to that address
+    const dialerConn = await tcp.dial(localAddrs[0])
+
+    // Wait for the incoming dial to be handled
+    await handlerPromise
+
+    // Close the listener with two simultaneous calls to `close`
+    await Promise.race([
+      new Promise((resolve, reject) => setTimeout(() => reject(new Error('Timed out waiting for connection close')), 500)),
+      await Promise.all([
+        dialerConn.close(),
+        dialerConn.close()
+      ])
+    ])
+  })
 })

test/filter.spec.js

@@ -16,14 +16,14 @@ describe('filter addrs', () => {
   })
 
   it('filter valid addrs for this transport', () => {
-    const ma1 = multiaddr(base + '/tcp/9090')
-    const ma2 = multiaddr(base + '/udp/9090')
-    const ma3 = multiaddr(base + '/tcp/9090/http')
-    const ma4 = multiaddr(base + '/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-    const ma5 = multiaddr(base + '/tcp/9090/http' + ipfs)
-    const ma6 = multiaddr('/ip4/127.0.0.1/tcp/9090/p2p-circuit' + ipfs)
-    const ma7 = multiaddr('/dns4/libp2p.io/tcp/9090')
-    const ma8 = multiaddr('/dnsaddr/libp2p.io/tcp/9090')
+    const ma1 = new multiaddr.Multiaddr(base + '/tcp/9090')
+    const ma2 = new multiaddr.Multiaddr(base + '/udp/9090')
+    const ma3 = new multiaddr.Multiaddr(base + '/tcp/9090/http')
+    const ma4 = new multiaddr.Multiaddr(base + '/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    const ma5 = new multiaddr.Multiaddr(base + '/tcp/9090/http' + ipfs)
+    const ma6 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/p2p-circuit' + ipfs)
+    const ma7 = new multiaddr.Multiaddr('/dns4/libp2p.io/tcp/9090')
+    const ma8 = new multiaddr.Multiaddr('/dnsaddr/libp2p.io/tcp/9090')
 
     const valid = tcp.filter([ma1, ma2, ma3, ma4, ma5, ma6, ma7, ma8])
     expect(valid.length).to.equal(4)
@@ -32,7 +32,7 @@ describe('filter addrs', () => {
   })
 
   it('filter a single addr for this transport', () => {
-    const ma1 = multiaddr(base + '/tcp/9090')
+    const ma1 = new multiaddr.Multiaddr(base + '/tcp/9090')
 
     const valid = tcp.filter(ma1)
     expect(valid.length).to.equal(1)

test/listen-dial.spec.js

@@ -37,7 +37,7 @@ describe('listen', () => {
   })
 
   it('close listener with connections, through timeout', async () => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    const mh = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
     listener = tcp.createListener((conn) => {
       pipe(conn, conn)
     })
@@ -62,14 +62,14 @@ describe('listen', () => {
 
   // Windows doesn't support unix paths
   skipOnWindows('listen on path', async () => {
-    const mh = multiaddr(`/unix${path.resolve(os.tmpdir(), '/tmp/p2pd.sock')}`)
+    const mh = new multiaddr.Multiaddr(`/unix${path.resolve(os.tmpdir(), '/tmp/p2pd.sock')}`)
 
     listener = tcp.createListener((conn) => {})
     await listener.listen(mh)
   })
 
   it('listen on port 0', async () => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/0')
+    const mh = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0')
     listener = tcp.createListener((conn) => {})
     await listener.listen(mh)
   })
@@ -78,19 +78,19 @@ describe('listen', () => {
     if (isCI) {
       return
     }
-    const mh = multiaddr('/ip6/::/tcp/9090')
+    const mh = new multiaddr.Multiaddr('/ip6/::/tcp/9090')
     listener = tcp.createListener((conn) => {})
     await listener.listen(mh)
   })
 
   it('listen on any Interface', async () => {
-    const mh = multiaddr('/ip4/0.0.0.0/tcp/9090')
+    const mh = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/9090')
     listener = tcp.createListener((conn) => {})
     await listener.listen(mh)
   })
 
   it('getAddrs', async () => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
+    const mh = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090')
     listener = tcp.createListener((conn) => {})
     await listener.listen(mh)
 
@@ -100,7 +100,7 @@ describe('listen', () => {
   })
 
   it('getAddrs on port 0 listen', async () => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/0')
+    const mh = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0')
     listener = tcp.createListener((conn) => {})
     await listener.listen(mh)
 
@@ -109,7 +109,7 @@ describe('listen', () => {
   })
 
   it('getAddrs from listening on 0.0.0.0', async () => {
-    const mh = multiaddr('/ip4/0.0.0.0/tcp/9090')
+    const mh = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/9090')
     listener = tcp.createListener((conn) => {})
     await listener.listen(mh)
 
@@ -119,7 +119,7 @@ describe('listen', () => {
   })
 
   it('getAddrs from listening on 0.0.0.0 and port 0', async () => {
-    const mh = multiaddr('/ip4/0.0.0.0/tcp/0')
+    const mh = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/0')
     listener = tcp.createListener((conn) => {})
     await listener.listen(mh)
 
@@ -129,7 +129,7 @@ describe('listen', () => {
   })
 
   it('getAddrs preserves IPFS Id', async () => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    const mh = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
     listener = tcp.createListener((conn) => {})
     await listener.listen(mh)
 
@@ -142,7 +142,7 @@ describe('listen', () => {
 describe('dial', () => {
   let tcp
   let listener
-  const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
+  const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090')
 
   beforeEach(async () => {
     tcp = new TCP({
@@ -177,7 +177,7 @@ describe('dial', () => {
       return
     }
 
-    const ma = multiaddr('/ip6/::/tcp/9066')
+    const ma = new multiaddr.Multiaddr('/ip6/::/tcp/9066')
     const listener = tcp.createListener((conn) => {
       pipe(conn, conn)
     })
@@ -195,7 +195,7 @@ describe('dial', () => {
 
   // Windows doesn't support unix paths
   skipOnWindows('dial on path', async () => {
-    const ma = multiaddr(`/unix${path.resolve(os.tmpdir(), '/tmp/p2pd.sock')}`)
+    const ma = new multiaddr.Multiaddr(`/unix${path.resolve(os.tmpdir(), '/tmp/p2pd.sock')}`)
 
     const listener = tcp.createListener((conn) => {
       pipe(conn, conn)
@@ -220,7 +220,7 @@ describe('dial', () => {
       handled = resolve
     })
 
-    const ma = multiaddr('/ip6/::/tcp/0')
+    const ma = new multiaddr.Multiaddr('/ip6/::/tcp/0')
 
     const listener = tcp.createListener(async (conn) => {
       await pipe(
@@ -248,7 +248,7 @@ describe('dial', () => {
       handled = resolve
     })
 
-    const ma = multiaddr('/ip6/::/tcp/0')
+    const ma = new multiaddr.Multiaddr('/ip6/::/tcp/0')
 
     const listener = tcp.createListener(async (conn) => {
       // pull(conn, pull.onEnd(destroyed))
@@ -265,7 +265,7 @@ describe('dial', () => {
   })
 
   it('dial on IPv4 with IPFS Id', async () => {
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
     const conn = await tcp.dial(ma)
 
     const res = await pipe(