Skip to content

Commit

Permalink
fix: update muxer behavior (#1289)
Browse files Browse the repository at this point in the history
- use `direction` in `muxerFactory.createStreamMuxer`
- use `muxer.close` instead of `muxer.streams.forEach(s => s.close())`
  • Loading branch information
wemeetagain committed Jul 14, 2022
1 parent e6f646e commit b1b9139
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/upgrader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
if (muxerFactory != null) {
// Create the muxer
muxer = muxerFactory.createStreamMuxer({
direction,
// Run anytime a remote stream is created
onIncomingStream: muxedStream => {
if (connection == null) {
Expand Down Expand Up @@ -469,7 +470,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
await maConn.close()
// Ensure remaining streams are closed
if (muxer != null) {
muxer.streams.forEach(s => s.close())
muxer.close()
}
}
})
Expand Down
2 changes: 2 additions & 0 deletions test/relay/auto-relay.node.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint-env mocha */

import { expect } from 'aegir/chai'
import { pEvent } from 'p-event'
import defer from 'p-defer'
import pWaitFor from 'p-wait-for'
import sinon from 'sinon'
Expand Down Expand Up @@ -205,6 +206,7 @@ describe('auto-relay', () => {

// Disconnect from peer used for relay
await relayLibp2p2.stop()
await pEvent(relayLibp2p1.connectionManager, 'peer:disconnect', { timeout: 500 })

// Should not be using the relay any more
await expect(usingAsRelay(relayLibp2p1, relayLibp2p2, {
Expand Down

0 comments on commit b1b9139

Please sign in to comment.