fix: explicitly close streams when connnections close (#1221)

Make sure we don't leave streams open.

Updates all deps to close multiplexed streams when closing connections.

examples/package.json

@@ -11,6 +11,7 @@
   "dependencies": {
     "@libp2p/pubsub-peer-discovery": "^5.0.2",
     "@libp2p/floodsub": "^1.0.6",
+    "@nodeutils/defaults-deep": "^1.1.0",
     "execa": "^2.1.0",
     "fs-extra": "^8.1.0",
     "libp2p": "../",

package.json

@@ -93,9 +93,9 @@
   },
   "dependencies": {
     "@achingbrain/nat-port-mapper": "^1.0.3",
-    "@libp2p/connection": "^1.1.5",
+    "@libp2p/connection": "^2.0.2",
     "@libp2p/crypto": "^0.22.11",
-    "@libp2p/interfaces": "^1.3.31",
+    "@libp2p/interfaces": "^2.0.1",
     "@libp2p/logger": "^1.1.4",
     "@libp2p/multistream-select": "^1.0.4",
     "@libp2p/peer-collections": "^1.0.2",
@@ -153,24 +153,21 @@
     "@libp2p/delegated-content-routing": "^1.0.2",
     "@libp2p/delegated-peer-routing": "^1.0.2",
     "@libp2p/floodsub": "^1.0.6",
-    "@libp2p/interface-compliance-tests": "^1.1.32",
+    "@libp2p/interface-compliance-tests": "^2.0.1",
     "@libp2p/interop": "^1.0.3",
     "@libp2p/kad-dht": "^1.0.9",
     "@libp2p/mdns": "^1.0.5",
-    "@libp2p/mplex": "^1.0.4",
+    "@libp2p/mplex": "^1.1.0",
     "@libp2p/pubsub": "^1.2.18",
     "@libp2p/tcp": "^1.0.9",
     "@libp2p/topology": "^1.1.7",
     "@libp2p/webrtc-star": "^1.0.8",
     "@libp2p/websockets": "^1.0.7",
-    "@nodeutils/defaults-deep": "^1.1.0",
-    "@types/node": "^16.11.26",
     "@types/node-forge": "^1.0.0",
     "@types/p-fifo": "^1.0.0",
     "@types/varint": "^6.0.0",
     "@types/xsalsa20": "^1.1.0",
     "aegir": "^37.0.9",
-    "buffer": "^6.0.3",
     "cborg": "^1.8.1",
     "delay": "^5.0.0",
     "execa": "^6.1.0",
@@ -187,7 +184,7 @@
     "p-wait-for": "^4.1.0",
     "protons": "^3.0.4",
     "rimraf": "^3.0.2",
-    "sinon": "^13.0.1",
+    "sinon": "^14.0.0",
     "ts-sinon": "^2.0.2"
   },
   "browser": {

src/connection-manager/dialer/dial-request.ts

@@ -1,7 +1,6 @@
 import errCode from 'err-code'
 import { anySignal } from 'any-signal'
 import FIFO from 'p-fifo'
-// @ts-expect-error setMaxListeners is missing from the node 16 types
 import { setMaxListeners } from 'events'
 import { codes } from '../../errors.js'
 import { logger } from '@libp2p/logger'

src/connection-manager/dialer/index.ts

@@ -7,7 +7,6 @@ import { Multiaddr, Resolver } from '@multiformats/multiaddr'
 import { TimeoutController } from 'timeout-abort-controller'
 import { AbortError } from '@libp2p/interfaces/errors'
 import { anySignal } from 'any-signal'
-// @ts-expect-error setMaxListeners is missing from the node 16 types
 import { setMaxListeners } from 'events'
 import { DialAction, DialRequest } from './dial-request.js'
 import { publicAddressesFirst } from '@libp2p/utils/address-sort'

src/connection-manager/index.ts

@@ -10,7 +10,6 @@ import type { Startable } from '@libp2p/interfaces/startable'
 import { trackedMap } from '@libp2p/tracked-map'
 import { codes } from '../errors.js'
 import { isPeerId, PeerId } from '@libp2p/interfaces/peer-id'
-// @ts-expect-error setMaxListeners is missing from the node 16 types
 import { setMaxListeners } from 'events'
 import type { Connection } from '@libp2p/interfaces/connection'
 import type { ConnectionManager } from '@libp2p/interfaces/connection-manager'
@@ -254,10 +253,16 @@ export class DefaultConnectionManager extends EventEmitter<ConnectionManagerEven
    */
   async _close () {
     // Close all connections we're tracking
-    const tasks = []
+    const tasks: Array<Promise<void>> = []
     for (const connectionList of this.connections.values()) {
       for (const connection of connectionList) {
-        tasks.push(connection.close())
+        tasks.push((async () => {
+          try {
+            await connection.close()
+          } catch (err) {
+            log.error(err)
+          }
+        })())
       }
     }
 

src/peer-routing.ts

@@ -17,7 +17,6 @@ import {
   clearDelayedInterval
 // @ts-expect-error module with no types
 } from 'set-delayed-interval'
-// @ts-expect-error setMaxListeners is missing from the node 16 types
 import { setMaxListeners } from 'events'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import type { PeerRouting } from '@libp2p/interfaces/peer-routing'

src/upgrader.ts

@@ -382,9 +382,11 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
       getStreams: () => muxer != null ? muxer.streams : errConnectionNotMultiplexed(),
       close: async () => {
         await maConn.close()
-        // Ensure remaining streams are aborted
+        // Ensure remaining streams are closed
         if (muxer != null) {
-          muxer.streams.map(stream => stream.abort())
+          await Promise.all(muxer.streams.map(async stream => {
+            await stream.close()
+          }))
         }
       }
     })