Skip to content

Commit 474c3ed

Browse files
authored
fix: use trace logging (#298)
Noise logs in-progress business-as-usual style messages which can make the logs quite noisy. This PR switches to using trace logging for those messages, you can see them if you include `*:trace` or similar in the debug string.
1 parent f38b04a commit 474c3ed

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

src/handshake-xx.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,37 +62,37 @@ export class XXHandshake implements IHandshake {
6262
public async propose (): Promise<void> {
6363
logLocalStaticKeys(this.session.hs.s)
6464
if (this.isInitiator) {
65-
logger('Stage 0 - Initiator starting to send first message.')
65+
logger.trace('Stage 0 - Initiator starting to send first message.')
6666
const messageBuffer = this.xx.sendMessage(this.session, new Uint8Array(0))
6767
this.connection.writeLP(encode0(messageBuffer))
68-
logger('Stage 0 - Initiator finished sending first message.')
68+
logger.trace('Stage 0 - Initiator finished sending first message.')
6969
logLocalEphemeralKeys(this.session.hs.e)
7070
} else {
71-
logger('Stage 0 - Responder waiting to receive first message...')
71+
logger.trace('Stage 0 - Responder waiting to receive first message...')
7272
const receivedMessageBuffer = decode0((await this.connection.readLP()).subarray())
7373
const { valid } = this.xx.recvMessage(this.session, receivedMessageBuffer)
7474
if (!valid) {
7575
throw new InvalidCryptoExchangeError('xx handshake stage 0 validation fail')
7676
}
77-
logger('Stage 0 - Responder received first message.')
77+
logger.trace('Stage 0 - Responder received first message.')
7878
logRemoteEphemeralKey(this.session.hs.re)
7979
}
8080
}
8181

8282
// stage 1
8383
public async exchange (): Promise<void> {
8484
if (this.isInitiator) {
85-
logger('Stage 1 - Initiator waiting to receive first message from responder...')
85+
logger.trace('Stage 1 - Initiator waiting to receive first message from responder...')
8686
const receivedMessageBuffer = decode1((await this.connection.readLP()).subarray())
8787
const { plaintext, valid } = this.xx.recvMessage(this.session, receivedMessageBuffer)
8888
if (!valid) {
8989
throw new InvalidCryptoExchangeError('xx handshake stage 1 validation fail')
9090
}
91-
logger('Stage 1 - Initiator received the message.')
91+
logger.trace('Stage 1 - Initiator received the message.')
9292
logRemoteEphemeralKey(this.session.hs.re)
9393
logRemoteStaticKey(this.session.hs.rs)
9494

95-
logger("Initiator going to check remote's signature...")
95+
logger.trace("Initiator going to check remote's signature...")
9696
try {
9797
const decodedPayload = decodePayload(plaintext)
9898
this.remotePeer = this.remotePeer || await getPeerIdFromPayload(decodedPayload)
@@ -102,31 +102,31 @@ export class XXHandshake implements IHandshake {
102102
const err = e as Error
103103
throw new UnexpectedPeerError(`Error occurred while verifying signed payload: ${err.message}`)
104104
}
105-
logger('All good with the signature!')
105+
logger.trace('All good with the signature!')
106106
} else {
107-
logger('Stage 1 - Responder sending out first message with signed payload and static key.')
107+
logger.trace('Stage 1 - Responder sending out first message with signed payload and static key.')
108108
const messageBuffer = this.xx.sendMessage(this.session, this.payload)
109109
this.connection.writeLP(encode1(messageBuffer))
110-
logger('Stage 1 - Responder sent the second handshake message with signed payload.')
110+
logger.trace('Stage 1 - Responder sent the second handshake message with signed payload.')
111111
logLocalEphemeralKeys(this.session.hs.e)
112112
}
113113
}
114114

115115
// stage 2
116116
public async finish (): Promise<void> {
117117
if (this.isInitiator) {
118-
logger('Stage 2 - Initiator sending third handshake message.')
118+
logger.trace('Stage 2 - Initiator sending third handshake message.')
119119
const messageBuffer = this.xx.sendMessage(this.session, this.payload)
120120
this.connection.writeLP(encode2(messageBuffer))
121-
logger('Stage 2 - Initiator sent message with signed payload.')
121+
logger.trace('Stage 2 - Initiator sent message with signed payload.')
122122
} else {
123-
logger('Stage 2 - Responder waiting for third handshake message...')
123+
logger.trace('Stage 2 - Responder waiting for third handshake message...')
124124
const receivedMessageBuffer = decode2((await this.connection.readLP()).subarray())
125125
const { plaintext, valid } = this.xx.recvMessage(this.session, receivedMessageBuffer)
126126
if (!valid) {
127127
throw new InvalidCryptoExchangeError('xx handshake stage 2 validation fail')
128128
}
129-
logger('Stage 2 - Responder received the message, finished handshake.')
129+
logger.trace('Stage 2 - Responder received the message, finished handshake.')
130130

131131
try {
132132
const decodedPayload = decodePayload(plaintext)

src/handshakes/abstract-handshake.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export abstract class AbstractHandshake {
111111
return derivedU8.subarray(0, 32)
112112
} catch (e) {
113113
const err = e as Error
114-
logger(err.message)
114+
logger.error(err)
115115
return new Uint8Array(32)
116116
}
117117
}

0 commit comments

Comments
 (0)