mirror of
https://github.com/fluencelabs/js-libp2p
synced 2025-07-31 00:12:00 +00:00
fix: emit peer:connect after all (#1171)
**Motivation** In lodestar, when we handle "peer:connect" event, we dial the peer which gives another "peer:connect" event and it causes other issues **Motivation** In `onConnect` function, "peer:connect" event should be emitted after we add connection to the `connections` map so that when app dial the peer in "peer:connect" event handler, it uses the same/existing connection
This commit is contained in:
@@ -29,6 +29,7 @@ import { createFromJSON } from '@libp2p/peer-id-factory'
|
||||
import Peers from '../fixtures/peers.js'
|
||||
import { MULTIADDRS_WEBSOCKETS } from '../fixtures/browser.js'
|
||||
import type { PeerId } from '@libp2p/interfaces/peer-id'
|
||||
import { pEvent } from 'p-event'
|
||||
|
||||
const unsupportedAddr = new Multiaddr('/ip4/127.0.0.1/tcp/9999')
|
||||
|
||||
@@ -430,21 +431,15 @@ describe('libp2p.dialer (direct, WebSockets)', () => {
|
||||
|
||||
const identifySpy = sinon.spy(libp2p.identifyService, 'identify')
|
||||
const protobookSetSpy = sinon.spy(libp2p.components.getPeerStore().protoBook, 'set')
|
||||
const connectionPromise = pDefer()
|
||||
const connectionPromise = pEvent(libp2p.connectionManager, 'peer:connect')
|
||||
|
||||
await libp2p.start()
|
||||
|
||||
libp2p.components.getUpgrader().addEventListener('connection', () => {
|
||||
connectionPromise.resolve()
|
||||
}, {
|
||||
once: true
|
||||
})
|
||||
|
||||
const connection = await libp2p.dial(MULTIADDRS_WEBSOCKETS[0])
|
||||
expect(connection).to.exist()
|
||||
|
||||
// Wait for connection event to be emitted
|
||||
await connectionPromise.promise
|
||||
await connectionPromise
|
||||
|
||||
expect(identifySpy.callCount).to.equal(1)
|
||||
await identifySpy.firstCall.returnValue
|
||||
|
@@ -496,9 +496,12 @@ describe('Identify', () => {
|
||||
|
||||
const identityServiceIdentifySpy = sinon.spy(libp2p.identifyService, 'identify')
|
||||
const identityServicePushSpy = sinon.spy(libp2p.identifyService, 'push')
|
||||
|
||||
const connectionPromise = pEvent(libp2p.connectionManager, 'peer:connect')
|
||||
const connection = await libp2p.dial(remoteAddr)
|
||||
|
||||
expect(connection).to.exist()
|
||||
// Wait for connection event to be emitted
|
||||
await connectionPromise
|
||||
|
||||
// Wait for identify to finish
|
||||
await identityServiceIdentifySpy.firstCall.returnValue
|
||||
@@ -560,9 +563,12 @@ describe('Identify', () => {
|
||||
|
||||
const identityServiceIdentifySpy = sinon.spy(libp2p.identifyService, 'identify')
|
||||
const identityServicePushSpy = sinon.spy(libp2p.identifyService, 'push')
|
||||
|
||||
const connectionPromise = pEvent(libp2p.connectionManager, 'peer:connect')
|
||||
const connection = await libp2p.dial(remoteAddr)
|
||||
|
||||
expect(connection).to.exist()
|
||||
// Wait for connection event to be emitted
|
||||
await connectionPromise
|
||||
|
||||
// Wait for identify to finish
|
||||
await identityServiceIdentifySpy.firstCall.returnValue
|
||||
|
@@ -26,6 +26,7 @@ import type { StreamMuxer, StreamMuxerFactory, StreamMuxerInit } from '@libp2p/i
|
||||
import type { Stream } from '@libp2p/interfaces/connection'
|
||||
import pDefer from 'p-defer'
|
||||
import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
|
||||
import { pEvent } from 'p-event'
|
||||
|
||||
const addrs = [
|
||||
new Multiaddr('/ip4/127.0.0.1/tcp/0'),
|
||||
@@ -495,10 +496,12 @@ describe('libp2p.upgrader', () => {
|
||||
const connectionManagerDispatchEventSpy = sinon.spy(libp2p.components.getConnectionManager(), 'dispatchEvent')
|
||||
|
||||
// Upgrade and check the connect event
|
||||
const connectionPromise = pEvent(libp2p.connectionManager, 'peer:connect')
|
||||
const connections = await Promise.all([
|
||||
libp2p.components.getUpgrader().upgradeOutbound(outbound),
|
||||
remoteLibp2p.components.getUpgrader().upgradeInbound(inbound)
|
||||
])
|
||||
await connectionPromise
|
||||
expect(connectionManagerDispatchEventSpy.callCount).to.equal(1)
|
||||
|
||||
let [event] = connectionManagerDispatchEventSpy.getCall(0).args
|
||||
|
Reference in New Issue
Block a user