close and cleanup connections

libp2p/multistream.nim

@@ -112,7 +112,6 @@ proc handle*(m: MultisteamSelect, conn: Connection) {.async, gcsafe.} =
   trace "handle: starting multistream handling"
   try:
     while not conn.closed:
-      await sleepAsync(1.millis)
       var ms = cast[string]((await conn.readLp()))
       ms.removeSuffix("\n")
 

libp2p/muxers/mplex/mplex.nim

@@ -125,6 +125,7 @@ method handle*(m: Mplex) {.async, gcsafe.} =
     trace "exception occurred", exception = exc.msg
   finally:
     trace "stopping mplex main loop"
+    if not m.connection.closed():
       await m.connection.close()
 
 proc newMplex*(conn: Connection,
@@ -136,7 +137,8 @@ proc newMplex*(conn: Connection,
   result.local = initTable[uint, LPChannel]()
 
   let m = result
-  conn.closeEvent.wait().addCallback do (udata: pointer):
+  conn.closeEvent.wait()
+  .addCallback do (udata: pointer):
     trace "connection closed, cleaning up mplex"
     asyncCheck m.close()
 

libp2p/stream/bufferstream.nim

@@ -350,6 +350,7 @@ proc `|`*(s: BufferStream, target: BufferStream): BufferStream =
 method close*(s: BufferStream) {.async.} =
   ## close the stream and clear the buffer
   for r in s.readReqs:
+    if not(isNil(r)) and not(r.finished()):
       r.cancel()
   s.dataReadEvent.fire()
   s.readBuf.clear()