fluencelabs/fluence-js
1
0
Fork 0
mirror of https://github.com/fluencelabs/fluence-js.git synced 2025-04-26 18:22:12 +00:00
Code Issues Projects Releases Wiki Activity

fix(logger): Change formatter that collides with new libp2p version [fixes DXJ-459] (#334)

Browse Source 
* Change formatter that collides with new libp2p version
This commit is contained in:
Akim 2023-08-29 23:32:10 +07:00 committed by GitHub
parent ea62bafc45
commit 18a972b573
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/@tests/smoke/node/package.json
View File

@ -18,6 +18,6 @@
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@fluencelabs/js-client": "workspace:*", "@fluencelabs/js-client": "workspace:*",
"@test/aqua_for_test": "workspace:../../aqua" "@test/aqua_for_test": "workspace:*"
} }
} }

12
packages/core/js-client/src/jsPeer/FluencePeer.ts
View File

@ -360,6 +360,10 @@ export abstract class FluencePeer {
item.onStageChange({ stage: 'expired' }); item.onStageChange({ stage: 'expired' });
} }
private decodeAvmData(data: Uint8Array) {
return new TextDecoder().decode(data.buffer);
}
private _createParticlesProcessingQueue() { private _createParticlesProcessingQueue() {
const particlesQueue = new Subject<ParticleQueueItem>(); const particlesQueue = new Subject<ParticleQueueItem>();
let prevData: Uint8Array = Buffer.from([]); let prevData: Uint8Array = Buffer.from([]);
@ -380,7 +384,7 @@ export abstract class FluencePeer {
// Otherwise the race might occur corrupting the prevData // Otherwise the race might occur corrupting the prevData
log_particle.debug('id %s. sending particle to interpreter', item.particle.id); log_particle.debug('id %s. sending particle to interpreter', item.particle.id);
log_particle.trace('id %s. prevData: %a', item.particle.id, prevData); log_particle.trace('id %s. prevData: %s', item.particle.id, this.decodeAvmData(prevData));
const args = serializeAvmArgs( const args = serializeAvmArgs(
{ {
@ -442,16 +446,16 @@ export abstract class FluencePeer {
item.result.retCode, item.result.retCode,
item.result.errorMessage, item.result.errorMessage,
); );
log_particle.trace('id %s. avm data: %a', item.particle.id, item.result.data); log_particle.trace('id %s. avm data: %s', item.particle.id, this.decodeAvmData(item.result.data));
item.onStageChange({ stage: 'interpreterError', errorMessage: item.result.errorMessage }); item.onStageChange({ stage: 'interpreterError', errorMessage: item.result.errorMessage });
return; return;
} }
log_particle.trace( log_particle.trace(
'id %s. interpreter result: retCode: %d, avm data: %a', 'id %s. interpreter result: retCode: %d, avm data: %s',
item.particle.id, item.particle.id,
item.result.retCode, item.result.retCode,
item.result.data, this.decodeAvmData(item.result.data)
); );
setTimeout(() => { setTimeout(() => {

6
packages/core/js-client/src/util/logger.ts
View File

@ -15,12 +15,6 @@
*/ */
import debug from 'debug'; import debug from 'debug';
import { Buffer } from 'buffer';
// Format avm data as a string
debug.formatters.a = (avmData: Uint8Array) => {
return new TextDecoder().decode(Buffer.from(avmData));
};
type Logger = (formatter: any, ...args: any[]) => void; type Logger = (formatter: any, ...args: any[]) => void;