Skip to content

Commit 67db4e2

Browse files
committed
detecting innactive multiaddresses after starting
1 parent 96a008c commit 67db4e2

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

src/index.js

+15-10
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,15 @@ class Node extends EventEmitter {
156156
// so that we can have webrtc-star addrs without adding manually the id
157157
const maOld = []
158158
const maNew = []
159-
this.peerInfo.multiaddrs.forEach((ma) => {
159+
this.peerInfo.multiaddrs.toArray().forEach((ma) => {
160160
if (!ma.getPeerId()) {
161161
maOld.push(ma)
162162
maNew.push(ma.encapsulate('/ipfs/' + this.peerInfo.id.toB58String()))
163163
}
164164
})
165165
this.peerInfo.multiaddrs.replace(maOld, maNew)
166-
const multiaddrs = this.peerInfo.multiaddrs.toArray()
167166

167+
const multiaddrs = this.peerInfo.multiaddrs.toArray()
168168
transports.forEach((transport) => {
169169
if (transport.filter(multiaddrs).length > 0) {
170170
this.swarm.transport.add(
@@ -177,14 +177,6 @@ class Node extends EventEmitter {
177177
}
178178
})
179179

180-
// detect which multiaddrs we don't have a transport for and remove them
181-
multiaddrs.forEach((multiaddr) => {
182-
if (!multiaddr.toString().match(/\/p2p-circuit($|\/)/) &&
183-
!transports.find((transport) => transport.filter(multiaddr).length > 0)) {
184-
this.peerInfo.multiaddrs.delete(multiaddr)
185-
}
186-
})
187-
188180
series([
189181
(cb) => this.swarm.listen(cb),
190182
(cb) => {
@@ -208,6 +200,19 @@ class Node extends EventEmitter {
208200
}
209201
cb()
210202
},
203+
(cb) => {
204+
// detect which multiaddrs we don't have a transport for and remove them
205+
const multiaddrs = this.peerInfo.multiaddrs.toArray()
206+
transports.forEach((transport) => {
207+
multiaddrs.forEach((multiaddr) => {
208+
if (!multiaddr.toString().match(/\/p2p-circuit($|\/)/) &&
209+
!transports.find((transport) => transport.filter(multiaddr).length > 0)) {
210+
this.peerInfo.multiaddrs.delete(multiaddr)
211+
}
212+
})
213+
})
214+
cb()
215+
},
211216
(cb) => {
212217
this.emit('start')
213218
cb()

test/nodejs-bundle/multiaddr-trim.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ chai.use(require('dirty-chai'))
66
const expect = chai.expect
77
const createNode = require('./utils').createNode
88

9-
describe.only('multiaddr trim', () => {
9+
describe('multiaddr trim', () => {
1010
let node
1111
it('can create a test node with an irrelevant multiaddr', (done) => {
1212
createNode(

0 commit comments

Comments
 (0)