Skip to content

Commit f427cfc

Browse files
authored
fix: updated multiaddr logging (#1797)
Some logs are not particularly useful in debugging due to the formatting e.g. ``` libp2p:connection-manager:dial-queue dial to { bytes: [Object] } succeeded +709ms ``` Updated the logs given the changes in libp2p/js-libp2p-logger#36
1 parent 05abd49 commit f427cfc

File tree

9 files changed

+30
-30
lines changed

9 files changed

+30
-30
lines changed

packages/libp2p/src/autonat/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class DefaultAutoNATService implements Startable {
258258
.filter(ma => {
259259
const isFromSameHost = ma.toOptions().host === data.connection.remoteAddr.toOptions().host
260260

261-
log.trace('request to dial %s was sent from %s is same host %s', ma, data.connection.remoteAddr, isFromSameHost)
261+
log.trace('request to dial %a was sent from %a is same host %s', ma, data.connection.remoteAddr, isFromSameHost)
262262
// skip any Multiaddrs where the target node's IP does not match the sending node's IP
263263
return isFromSameHost
264264
})
@@ -281,7 +281,7 @@ class DefaultAutoNATService implements Startable {
281281
.filter(ma => {
282282
const isSupportedTransport = Boolean(self.components.transportManager.transportForMultiaddr(ma))
283283

284-
log.trace('transport for %s is supported %s', ma, isSupportedTransport)
284+
log.trace('transport for %a is supported %s', ma, isSupportedTransport)
285285
// skip any Multiaddrs that have transports we do not support
286286
return isSupportedTransport
287287
})
@@ -324,7 +324,7 @@ class DefaultAutoNATService implements Startable {
324324
})
325325

326326
if (!connection.remoteAddr.equals(multiaddr)) {
327-
log.error('tried to dial %s but dialed %s', multiaddr, connection.remoteAddr)
327+
log.error('tried to dial %a but dialed %a', multiaddr, connection.remoteAddr)
328328
throw new Error('Unexpected remote address')
329329
}
330330

packages/libp2p/src/circuit-relay/server/index.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class CircuitRelayServer extends EventEmitter<RelayServerEvents> implements Star
193193
}
194194

195195
async onHop ({ connection, stream }: IncomingStreamData): Promise<void> {
196-
log('received circuit v2 hop protocol stream from %s', connection.remotePeer)
196+
log('received circuit v2 hop protocol stream from %p', connection.remotePeer)
197197

198198
const hopTimeoutPromise = pDefer<HopMessage>()
199199
const timeout = setTimeout(() => {
@@ -239,15 +239,15 @@ class CircuitRelayServer extends EventEmitter<RelayServerEvents> implements Star
239239
case HopMessage.Type.RESERVE: await this.handleReserve({ stream, request, connection }); break
240240
case HopMessage.Type.CONNECT: await this.handleConnect({ stream, request, connection }); break
241241
default: {
242-
log.error('invalid hop request type %s via peer %s', request.type, connection.remotePeer)
242+
log.error('invalid hop request type %s via peer %p', request.type, connection.remotePeer)
243243
stream.pb(HopMessage).write({ type: HopMessage.Type.STATUS, status: Status.UNEXPECTED_MESSAGE })
244244
}
245245
}
246246
}
247247

248248
async handleReserve ({ stream, request, connection }: HopProtocolOptions): Promise<void> {
249249
const hopstr = stream.pb(HopMessage)
250-
log('hop reserve request from %s', connection.remotePeer)
250+
log('hop reserve request from %p', connection.remotePeer)
251251

252252
if (isRelayAddr(connection.remoteAddr)) {
253253
log.error('relay reservation over circuit connection denied for peer: %p', connection.remotePeer)
@@ -329,7 +329,7 @@ class CircuitRelayServer extends EventEmitter<RelayServerEvents> implements Star
329329
return
330330
}
331331

332-
log('hop connect request from %s', connection.remotePeer)
332+
log('hop connect request from %p', connection.remotePeer)
333333

334334
let dstPeer: PeerId
335335

@@ -381,7 +381,7 @@ class CircuitRelayServer extends EventEmitter<RelayServerEvents> implements Star
381381
})
382382

383383
if (destinationStream == null) {
384-
log.error('failed to open stream to destination peer %s', destinationConnection?.remotePeer)
384+
log.error('failed to open stream to destination peer %p', destinationConnection?.remotePeer)
385385
hopstr.write({ type: HopMessage.Type.STATUS, status: Status.CONNECTION_FAILED })
386386
return
387387
}
@@ -414,17 +414,17 @@ class CircuitRelayServer extends EventEmitter<RelayServerEvents> implements Star
414414
try {
415415
response = await stopstr.read()
416416
} catch (err) {
417-
log.error('error parsing stop message response from %s', connection.remotePeer)
417+
log.error('error parsing stop message response from %p', connection.remotePeer)
418418
}
419419

420420
if (response == null) {
421-
log.error('could not read response from %s', connection.remotePeer)
421+
log.error('could not read response from %p', connection.remotePeer)
422422
stream.close()
423423
return
424424
}
425425

426426
if (response.status === Status.OK) {
427-
log('stop request to %s was successful', connection.remotePeer)
427+
log('stop request to %p was successful', connection.remotePeer)
428428
return pbstr.unwrap()
429429
}
430430

packages/libp2p/src/circuit-relay/transport/index.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ class CircuitRelayTransport implements Transport {
266266
localAddr: relayAddr.encapsulate(`/p2p-circuit/p2p/${this.peerId.toString()}`)
267267
})
268268

269-
log('new outbound connection %s', maConn.remoteAddr)
269+
log('new outbound connection %a', maConn.remoteAddr)
270270
return await this.upgrader.upgradeOutbound(maConn)
271271
} catch (err) {
272272
log.error(`Circuit relay dial to destination ${destinationPeer.toString()} via relay ${connection.remotePeer.toString()} failed`, err)
@@ -312,17 +312,17 @@ class CircuitRelayTransport implements Transport {
312312
}
313313

314314
const stopstr = pbstr.pb(StopMessage)
315-
log('new circuit relay v2 stop stream from %s', connection.remotePeer)
315+
log('new circuit relay v2 stop stream from %p', connection.remotePeer)
316316

317317
// Validate the STOP request has the required input
318318
if (request.type !== StopMessage.Type.CONNECT) {
319-
log.error('invalid stop connect request via peer %s', connection.remotePeer)
319+
log.error('invalid stop connect request via peer %p', connection.remotePeer)
320320
stopstr.write({ type: StopMessage.Type.STATUS, status: Status.UNEXPECTED_MESSAGE })
321321
return
322322
}
323323

324324
if (!isValidStop(request)) {
325-
log.error('invalid stop connect request via peer %s', connection.remotePeer)
325+
log.error('invalid stop connect request via peer %p', connection.remotePeer)
326326
stopstr.write({ type: StopMessage.Type.STATUS, status: Status.MALFORMED_MESSAGE })
327327
return
328328
}
@@ -346,7 +346,7 @@ class CircuitRelayTransport implements Transport {
346346

347347
log('new inbound connection %s', maConn.remoteAddr)
348348
await this.upgrader.upgradeInbound(maConn)
349-
log('%s connection %s upgraded', 'inbound', maConn.remoteAddr)
349+
log('%s connection %a upgraded', 'inbound', maConn.remoteAddr)
350350
}
351351
}
352352

packages/libp2p/src/circuit-relay/transport/listener.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class CircuitRelayTransportListener extends EventEmitter<ListenerEvents> impleme
3737
}
3838

3939
async listen (addr: Multiaddr): Promise<void> {
40-
log('listen on %s', addr)
40+
log('listen on %a', addr)
4141

4242
const relayPeerStr = addr.getPeerId()
4343
let relayConn: Connection | undefined

packages/libp2p/src/circuit-relay/transport/reservation-store.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ export class ReservationStore extends EventEmitter<ReservationStoreEvents> imple
237237
}
238238

239239
async #createReservation (connection: Connection): Promise<Reservation> {
240-
log('requesting reservation from %s', connection.remotePeer)
240+
log('requesting reservation from %p', connection.remotePeer)
241241
const stream = await connection.newStream(RELAY_V2_HOP_CODEC)
242242
const pbstr = pbStream(stream)
243243
const hopstr = pbstr.pb(HopMessage)

packages/libp2p/src/connection-manager/dial-queue.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,13 @@ export class DialQueue {
418418
// let any signal abort the dial
419419
const signal = combineSignals(controller.signal, options.signal)
420420
signal.addEventListener('abort', () => {
421-
log('dial to %s aborted', addr)
421+
log('dial to %a aborted', addr)
422422
})
423423
const deferred = pDefer<Connection>()
424424

425425
await peerDialQueue.add(async () => {
426426
if (signal.aborted) {
427-
log('dial to %s was aborted before reaching the head of the peer dial queue', addr)
427+
log('dial to %a was aborted before reaching the head of the peer dial queue', addr)
428428
deferred.reject(new AbortError())
429429
return
430430
}
@@ -433,7 +433,7 @@ export class DialQueue {
433433
await this.queue.add(async () => {
434434
try {
435435
if (signal.aborted) {
436-
log('dial to %s was aborted before reaching the head of the dial queue', addr)
436+
log('dial to %a was aborted before reaching the head of the dial queue', addr)
437437
deferred.reject(new AbortError())
438438
return
439439
}
@@ -468,13 +468,13 @@ export class DialQueue {
468468
}
469469
})
470470

471-
log('dial to %s succeeded', addr)
471+
log('dial to %a succeeded', addr)
472472

473473
// resolve the connection promise
474474
deferred.resolve(conn)
475475
} catch (err: any) {
476476
// something only went wrong if our signal was not aborted
477-
log.error('error during dial of %s', addr, err)
477+
log.error('error during dial of %a', addr, err)
478478
deferred.reject(err)
479479
}
480480
}, {

packages/libp2p/src/connection-manager/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ export class DefaultConnectionManager implements ConnectionManager, Startable {
547547
})
548548

549549
if (denyConnection) {
550-
log('connection from %s refused - connection remote address was in deny list', maConn.remoteAddr)
550+
log('connection from %a refused - connection remote address was in deny list', maConn.remoteAddr)
551551
return false
552552
}
553553

@@ -564,7 +564,7 @@ export class DefaultConnectionManager implements ConnectionManager, Startable {
564564

565565
// check pending connections
566566
if (this.incomingPendingConnections === this.maxIncomingPendingConnections) {
567-
log('connection from %s refused - incomingPendingConnections exceeded by peer %s', maConn.remoteAddr)
567+
log('connection from %a refused - incomingPendingConnections exceeded by host', maConn.remoteAddr)
568568
return false
569569
}
570570

@@ -574,7 +574,7 @@ export class DefaultConnectionManager implements ConnectionManager, Startable {
574574
try {
575575
await this.inboundConnectionRateLimiter.consume(host, 1)
576576
} catch {
577-
log('connection from %s refused - inboundConnectionThreshold exceeded by host %s', host, maConn.remoteAddr)
577+
log('connection from %a refused - inboundConnectionThreshold exceeded by host %s', maConn.remoteAddr, host)
578578
return false
579579
}
580580
}
@@ -585,7 +585,7 @@ export class DefaultConnectionManager implements ConnectionManager, Startable {
585585
return true
586586
}
587587

588-
log('connection from %s refused - maxConnections exceeded', maConn.remoteAddr)
588+
log('connection from %a refused - maxConnections exceeded', maConn.remoteAddr)
589589
return false
590590
}
591591

packages/libp2p/src/identify/identify.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,11 @@ export class DefaultIdentifyService implements Startable {
322322
const cleanObservedAddr = getCleanMultiaddr(observedAddr)
323323

324324
log('identify completed for peer %p and protocols %o', id, protocols)
325-
log('our observed address is %s', cleanObservedAddr)
325+
log('our observed address is %a', cleanObservedAddr)
326326

327327
if (cleanObservedAddr != null &&
328328
this.addressManager.getObservedAddrs().length < (this.maxObservedAddresses ?? Infinity)) {
329-
log('storing our observed address %s', cleanObservedAddr?.toString())
329+
log('storing our observed address %a', cleanObservedAddr)
330330
this.addressManager.addObservedAddr(cleanObservedAddr)
331331
}
332332

packages/libp2p/src/transport-manager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ export class DefaultTransportManager implements TransportManager, Startable {
190190

191191
// For each supported multiaddr, create a listener
192192
for (const addr of supportedAddrs) {
193-
log('creating listener for %s on %s', key, addr)
193+
log('creating listener for %s on %a', key, addr)
194194
const listener = transport.createListener({
195195
upgrader: this.components.upgrader
196196
})

0 commit comments

Comments
 (0)