Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions packages/client/lib/net/server/rlpxserver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export class RlpxServer extends Server {
return false
}
await super.start()
this.initDpt()
await this.initDpt()
await this.initRlpx()
this.started = true

Expand Down Expand Up @@ -205,26 +205,32 @@ export class RlpxServer extends Server {
* Initializes DPT for peer discovery
* @private
*/
initDpt() {
this.dpt = new Devp2pDPT(this.key, {
refreshInterval: this.refreshInterval,
endpoint: {
address: '0.0.0.0',
udpPort: null,
tcpPort: null,
},
shouldFindNeighbours: this.config.discV4,
shouldGetDnsPeers: this.config.discDns,
dnsRefreshQuantity: this.config.maxPeers,
dnsNetworks: this.dnsNetworks,
dnsAddr: this.config.dnsAddr,
})
async initDpt() {
return new Promise<void>((resolve) => {
this.dpt = new Devp2pDPT(this.key, {
refreshInterval: this.refreshInterval,
endpoint: {
address: '0.0.0.0',
udpPort: null,
tcpPort: null,
},
shouldFindNeighbours: this.config.discV4,
shouldGetDnsPeers: this.config.discDns,
dnsRefreshQuantity: this.config.maxPeers,
dnsNetworks: this.dnsNetworks,
dnsAddr: this.config.dnsAddr,
})

this.dpt.on('error', (e: Error) => this.error(e))
this.dpt.on('error', (e: Error) => this.error(e))

if (this.config.port) {
this.dpt.bind(this.config.port, '0.0.0.0')
}
this.dpt.on('listening', () => {
resolve()
})

if (this.config.port) {
this.dpt.bind(this.config.port, '0.0.0.0')
}
})
}

/**
Expand Down
4 changes: 3 additions & 1 deletion packages/client/test/net/server/rlpxserver.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ tape('[RlpxServer]', async (t) => {
t.plan(1)
const config = new Config({ loglevel: 'error', transports: [] })
const server = new RlpxServer({ config })
server.initDpt()
server.initDpt().catch((error) => {
throw error
})
td.verify((server.dpt as any).bind(server.config.port, '0.0.0.0'))
server.on('error', (err: any) => t.equals(err, 'err0', 'got error'))
;(server.dpt as any).emit('error', 'err0')
Expand Down