fluencelabs/js-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p synced 2025-06-23 14:01:35 +00:00
Code Issues Projects Releases Wiki Activity

fix: ensure streams are closed on connection close

Browse Source
This commit is contained in:
Jacob Heun
2020-10-20 12:52:17 +02:00
parent 5f50054d94
commit 4c6be91588
3 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/upgrader.js
View File

@ -5,6 +5,7 @@ const log = debug('libp2p:upgrader')
log.error = debug('libp2p:upgrader:error')
const Multistream = require('multistream-select')
const { Connection } = require('libp2p-interfaces/src/connection')
const ConnectionStatus = require('libp2p-interfaces/src/connection/status')
const PeerId = require('peer-id')
const pipe = require('it-pipe')
const errCode = require('err-code')
@ -268,8 +269,13 @@ class Upgrader {
maConn.timeline = new Proxy(_timeline, {
set: (...args) => {
if (connection && args[1] === 'close' && args[2] && !_timeline.close) {
connection.stat.status = 'closed'
this.onConnectionEnd(connection)
// Wait for close to finish before notifying of the closure
(async () => {
if (connection.stat.status === ConnectionStatus.OPEN) {
await connection.close()
}
this.onConnectionEnd(connection)
})()
}
return Reflect.set(...args)
@ -295,7 +301,7 @@ class Upgrader {
},
newStream: newStream || errConnectionNotMultiplexed,
getStreams: () => muxer ? muxer.streams : errConnectionNotMultiplexed,
close: err => maConn.close(err)
close: (err) => maConn.close(err)
})
this.onConnection(connection)