Skip to content

Commit 18a972b

Browse files
author
Akim
authored
fix(logger): Change formatter that collides with new libp2p version [fixes DXJ-459] (#334)
* Change formatter that collides with new libp2p version
1 parent ea62baf commit 18a972b

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

packages/@tests/smoke/node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
"license": "Apache-2.0",
1919
"dependencies": {
2020
"@fluencelabs/js-client": "workspace:*",
21-
"@test/aqua_for_test": "workspace:../../aqua"
21+
"@test/aqua_for_test": "workspace:*"
2222
}
2323
}

packages/core/js-client/src/jsPeer/FluencePeer.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,10 @@ export abstract class FluencePeer {
359359

360360
item.onStageChange({ stage: 'expired' });
361361
}
362+
363+
private decodeAvmData(data: Uint8Array) {
364+
return new TextDecoder().decode(data.buffer);
365+
}
362366

363367
private _createParticlesProcessingQueue() {
364368
const particlesQueue = new Subject<ParticleQueueItem>();
@@ -380,7 +384,7 @@ export abstract class FluencePeer {
380384
// Otherwise the race might occur corrupting the prevData
381385

382386
log_particle.debug('id %s. sending particle to interpreter', item.particle.id);
383-
log_particle.trace('id %s. prevData: %a', item.particle.id, prevData);
387+
log_particle.trace('id %s. prevData: %s', item.particle.id, this.decodeAvmData(prevData));
384388

385389
const args = serializeAvmArgs(
386390
{
@@ -442,16 +446,16 @@ export abstract class FluencePeer {
442446
item.result.retCode,
443447
item.result.errorMessage,
444448
);
445-
log_particle.trace('id %s. avm data: %a', item.particle.id, item.result.data);
449+
log_particle.trace('id %s. avm data: %s', item.particle.id, this.decodeAvmData(item.result.data));
446450
item.onStageChange({ stage: 'interpreterError', errorMessage: item.result.errorMessage });
447451
return;
448452
}
449453

450454
log_particle.trace(
451-
'id %s. interpreter result: retCode: %d, avm data: %a',
455+
'id %s. interpreter result: retCode: %d, avm data: %s',
452456
item.particle.id,
453457
item.result.retCode,
454-
item.result.data,
458+
this.decodeAvmData(item.result.data)
455459
);
456460

457461
setTimeout(() => {

packages/core/js-client/src/util/logger.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@
1515
*/
1616

1717
import debug from 'debug';
18-
import { Buffer } from 'buffer';
19-
20-
// Format avm data as a string
21-
debug.formatters.a = (avmData: Uint8Array) => {
22-
return new TextDecoder().decode(Buffer.from(avmData));
23-
};
2418

2519
type Logger = (formatter: any, ...args: any[]) => void;
2620

0 commit comments

Comments
 (0)