From e38dc39508100ab6113a9784bd374f534764972b Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 29 Aug 2023 21:12:49 +0700 Subject: [PATCH 1/6] Change formatter that collides with new libp2p version --- packages/core/js-client/src/jsPeer/FluencePeer.ts | 6 +++--- packages/core/js-client/src/util/logger.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/js-client/src/jsPeer/FluencePeer.ts b/packages/core/js-client/src/jsPeer/FluencePeer.ts index 58ea5cd4d..d94228407 100644 --- a/packages/core/js-client/src/jsPeer/FluencePeer.ts +++ b/packages/core/js-client/src/jsPeer/FluencePeer.ts @@ -380,7 +380,7 @@ export abstract class FluencePeer { // Otherwise the race might occur corrupting the prevData 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: %b', item.particle.id, prevData); const args = serializeAvmArgs( { @@ -442,13 +442,13 @@ export abstract class FluencePeer { item.result.retCode, item.result.errorMessage, ); - log_particle.trace('id %s. avm data: %a', item.particle.id, item.result.data); + log_particle.trace('id %s. avm data: %b', item.particle.id, item.result.data); item.onStageChange({ stage: 'interpreterError', errorMessage: item.result.errorMessage }); return; } log_particle.trace( - 'id %s. interpreter result: retCode: %d, avm data: %a', + 'id %s. interpreter result: retCode: %d, avm data: %b', item.particle.id, item.result.retCode, item.result.data, diff --git a/packages/core/js-client/src/util/logger.ts b/packages/core/js-client/src/util/logger.ts index 5e05e3eb8..8a30a76b7 100644 --- a/packages/core/js-client/src/util/logger.ts +++ b/packages/core/js-client/src/util/logger.ts @@ -18,7 +18,7 @@ import debug from 'debug'; import { Buffer } from 'buffer'; // Format avm data as a string -debug.formatters.a = (avmData: Uint8Array) => { +debug.formatters.b = (avmData: Uint8Array) => { return new TextDecoder().decode(Buffer.from(avmData)); }; From 4094343c442c0282fd02f597535530440a46a4ba Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 29 Aug 2023 21:47:55 +0700 Subject: [PATCH 2/6] Change formatter letter --- packages/core/js-client/src/jsPeer/FluencePeer.ts | 6 +++--- packages/core/js-client/src/util/logger.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/js-client/src/jsPeer/FluencePeer.ts b/packages/core/js-client/src/jsPeer/FluencePeer.ts index d94228407..b4c5f899b 100644 --- a/packages/core/js-client/src/jsPeer/FluencePeer.ts +++ b/packages/core/js-client/src/jsPeer/FluencePeer.ts @@ -380,7 +380,7 @@ export abstract class FluencePeer { // Otherwise the race might occur corrupting the prevData log_particle.debug('id %s. sending particle to interpreter', item.particle.id); - log_particle.trace('id %s. prevData: %b', item.particle.id, prevData); + log_particle.trace('id %s. prevData: %d', item.particle.id, prevData); const args = serializeAvmArgs( { @@ -442,13 +442,13 @@ export abstract class FluencePeer { item.result.retCode, item.result.errorMessage, ); - log_particle.trace('id %s. avm data: %b', item.particle.id, item.result.data); + log_particle.trace('id %s. avm data: %d', item.particle.id, item.result.data); item.onStageChange({ stage: 'interpreterError', errorMessage: item.result.errorMessage }); return; } log_particle.trace( - 'id %s. interpreter result: retCode: %d, avm data: %b', + 'id %s. interpreter result: retCode: %d, avm data: %d', item.particle.id, item.result.retCode, item.result.data, diff --git a/packages/core/js-client/src/util/logger.ts b/packages/core/js-client/src/util/logger.ts index 8a30a76b7..12e7a878e 100644 --- a/packages/core/js-client/src/util/logger.ts +++ b/packages/core/js-client/src/util/logger.ts @@ -18,7 +18,7 @@ import debug from 'debug'; import { Buffer } from 'buffer'; // Format avm data as a string -debug.formatters.b = (avmData: Uint8Array) => { +debug.formatters.d = (avmData: Uint8Array) => { return new TextDecoder().decode(Buffer.from(avmData)); }; From d55507800aab7a95d401b46353a98397405c01f8 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 29 Aug 2023 21:53:15 +0700 Subject: [PATCH 3/6] Fix pipeline --- packages/@tests/smoke/node/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@tests/smoke/node/package.json b/packages/@tests/smoke/node/package.json index 14b223b9b..745418edc 100644 --- a/packages/@tests/smoke/node/package.json +++ b/packages/@tests/smoke/node/package.json @@ -18,6 +18,6 @@ "license": "Apache-2.0", "dependencies": { "@fluencelabs/js-client": "workspace:*", - "@test/aqua_for_test": "workspace:../../aqua" + "@test/aqua_for_test": "workspace:*" } } From 3cc70bf2583b3d4ce32acf6f804322ac085a611b Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 29 Aug 2023 22:21:15 +0700 Subject: [PATCH 4/6] Remove custom formatter --- packages/core/js-client/src/jsPeer/FluencePeer.ts | 8 ++++---- packages/core/js-client/src/util/logger.ts | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/core/js-client/src/jsPeer/FluencePeer.ts b/packages/core/js-client/src/jsPeer/FluencePeer.ts index b4c5f899b..4bb5b6c76 100644 --- a/packages/core/js-client/src/jsPeer/FluencePeer.ts +++ b/packages/core/js-client/src/jsPeer/FluencePeer.ts @@ -380,7 +380,7 @@ export abstract class FluencePeer { // Otherwise the race might occur corrupting the prevData log_particle.debug('id %s. sending particle to interpreter', item.particle.id); - log_particle.trace('id %s. prevData: %d', item.particle.id, prevData); + log_particle.trace('id %s. prevData: %s', item.particle.id, new TextDecoder().decode(prevData)); const args = serializeAvmArgs( { @@ -442,16 +442,16 @@ export abstract class FluencePeer { item.result.retCode, item.result.errorMessage, ); - log_particle.trace('id %s. avm data: %d', item.particle.id, item.result.data); + log_particle.trace('id %s. avm data: %s', item.particle.id, new TextDecoder().decode(item.result.data)); item.onStageChange({ stage: 'interpreterError', errorMessage: item.result.errorMessage }); return; } log_particle.trace( - 'id %s. interpreter result: retCode: %d, avm data: %d', + 'id %s. interpreter result: retCode: %d, avm data: %s', item.particle.id, item.result.retCode, - item.result.data, + new TextDecoder().decode(item.result.data), ); setTimeout(() => { diff --git a/packages/core/js-client/src/util/logger.ts b/packages/core/js-client/src/util/logger.ts index 12e7a878e..d359ebc13 100644 --- a/packages/core/js-client/src/util/logger.ts +++ b/packages/core/js-client/src/util/logger.ts @@ -15,12 +15,6 @@ */ import debug from 'debug'; -import { Buffer } from 'buffer'; - -// Format avm data as a string -debug.formatters.d = (avmData: Uint8Array) => { - return new TextDecoder().decode(Buffer.from(avmData)); -}; type Logger = (formatter: any, ...args: any[]) => void; From ce58ac6db8f339ff27524e7e0de44e0b574003f2 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 29 Aug 2023 23:06:06 +0700 Subject: [PATCH 5/6] Fix tests --- packages/core/js-client/src/jsPeer/FluencePeer.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/js-client/src/jsPeer/FluencePeer.ts b/packages/core/js-client/src/jsPeer/FluencePeer.ts index 4bb5b6c76..55e56c883 100644 --- a/packages/core/js-client/src/jsPeer/FluencePeer.ts +++ b/packages/core/js-client/src/jsPeer/FluencePeer.ts @@ -380,7 +380,7 @@ export abstract class FluencePeer { // Otherwise the race might occur corrupting the prevData log_particle.debug('id %s. sending particle to interpreter', item.particle.id); - log_particle.trace('id %s. prevData: %s', item.particle.id, new TextDecoder().decode(prevData)); + log_particle.trace('id %s. prevData: %s', item.particle.id, new TextDecoder().decode(prevData.buffer)); const args = serializeAvmArgs( { @@ -442,7 +442,7 @@ export abstract class FluencePeer { item.result.retCode, item.result.errorMessage, ); - log_particle.trace('id %s. avm data: %s', item.particle.id, new TextDecoder().decode(item.result.data)); + log_particle.trace('id %s. avm data: %s', item.particle.id, new TextDecoder().decode(item.result.data.buffer)); item.onStageChange({ stage: 'interpreterError', errorMessage: item.result.errorMessage }); return; } @@ -451,7 +451,7 @@ export abstract class FluencePeer { 'id %s. interpreter result: retCode: %d, avm data: %s', item.particle.id, item.result.retCode, - new TextDecoder().decode(item.result.data), + new TextDecoder().decode(item.result.data.buffer), ); setTimeout(() => { From e4a60d5738aa542970888a727120ac8618cffa99 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 29 Aug 2023 23:13:14 +0700 Subject: [PATCH 6/6] refactor --- packages/core/js-client/src/jsPeer/FluencePeer.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/core/js-client/src/jsPeer/FluencePeer.ts b/packages/core/js-client/src/jsPeer/FluencePeer.ts index 55e56c883..cdd31a8b6 100644 --- a/packages/core/js-client/src/jsPeer/FluencePeer.ts +++ b/packages/core/js-client/src/jsPeer/FluencePeer.ts @@ -359,6 +359,10 @@ export abstract class FluencePeer { item.onStageChange({ stage: 'expired' }); } + + private decodeAvmData(data: Uint8Array) { + return new TextDecoder().decode(data.buffer); + } private _createParticlesProcessingQueue() { const particlesQueue = new Subject(); @@ -380,7 +384,7 @@ export abstract class FluencePeer { // Otherwise the race might occur corrupting the prevData log_particle.debug('id %s. sending particle to interpreter', item.particle.id); - log_particle.trace('id %s. prevData: %s', item.particle.id, new TextDecoder().decode(prevData.buffer)); + log_particle.trace('id %s. prevData: %s', item.particle.id, this.decodeAvmData(prevData)); const args = serializeAvmArgs( { @@ -442,7 +446,7 @@ export abstract class FluencePeer { item.result.retCode, item.result.errorMessage, ); - log_particle.trace('id %s. avm data: %s', item.particle.id, new TextDecoder().decode(item.result.data.buffer)); + log_particle.trace('id %s. avm data: %s', item.particle.id, this.decodeAvmData(item.result.data)); item.onStageChange({ stage: 'interpreterError', errorMessage: item.result.errorMessage }); return; } @@ -451,7 +455,7 @@ export abstract class FluencePeer { 'id %s. interpreter result: retCode: %d, avm data: %s', item.particle.id, item.result.retCode, - new TextDecoder().decode(item.result.data.buffer), + this.decodeAvmData(item.result.data) ); setTimeout(() => {