mirror of
https://github.com/fluencelabs/js-libp2p
synced 2025-03-15 23:20:51 +00:00
fix: update muxer behavior (#1289)
- use `direction` in `muxerFactory.createStreamMuxer` - use `muxer.close` instead of `muxer.streams.forEach(s => s.close())`
This commit is contained in:
parent
e6f646ed36
commit
b1b91398e2
@ -315,6 +315,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
|
|||||||
if (muxerFactory != null) {
|
if (muxerFactory != null) {
|
||||||
// Create the muxer
|
// Create the muxer
|
||||||
muxer = muxerFactory.createStreamMuxer({
|
muxer = muxerFactory.createStreamMuxer({
|
||||||
|
direction,
|
||||||
// Run anytime a remote stream is created
|
// Run anytime a remote stream is created
|
||||||
onIncomingStream: muxedStream => {
|
onIncomingStream: muxedStream => {
|
||||||
if (connection == null) {
|
if (connection == null) {
|
||||||
@ -469,7 +470,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
|
|||||||
await maConn.close()
|
await maConn.close()
|
||||||
// Ensure remaining streams are closed
|
// Ensure remaining streams are closed
|
||||||
if (muxer != null) {
|
if (muxer != null) {
|
||||||
muxer.streams.forEach(s => s.close())
|
muxer.close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
/* eslint-env mocha */
|
/* eslint-env mocha */
|
||||||
|
|
||||||
import { expect } from 'aegir/chai'
|
import { expect } from 'aegir/chai'
|
||||||
|
import { pEvent } from 'p-event'
|
||||||
import defer from 'p-defer'
|
import defer from 'p-defer'
|
||||||
import pWaitFor from 'p-wait-for'
|
import pWaitFor from 'p-wait-for'
|
||||||
import sinon from 'sinon'
|
import sinon from 'sinon'
|
||||||
@ -205,6 +206,7 @@ describe('auto-relay', () => {
|
|||||||
|
|
||||||
// Disconnect from peer used for relay
|
// Disconnect from peer used for relay
|
||||||
await relayLibp2p2.stop()
|
await relayLibp2p2.stop()
|
||||||
|
await pEvent(relayLibp2p1.connectionManager, 'peer:disconnect', { timeout: 500 })
|
||||||
|
|
||||||
// Should not be using the relay any more
|
// Should not be using the relay any more
|
||||||
await expect(usingAsRelay(relayLibp2p1, relayLibp2p2, {
|
await expect(usingAsRelay(relayLibp2p1, relayLibp2p2, {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user