From 18a972b573559d0717ec93a95b8c63dd1cbcd93b Mon Sep 17 00:00:00 2001
From: Akim <59872966+akim-bow@users.noreply.github.com>
Date: Tue, 29 Aug 2023 23:32:10 +0700
Subject: [PATCH] fix(logger): Change formatter that collides with new libp2p
 version [fixes DXJ-459] (#334)

* Change formatter that collides with new libp2p version
---
 packages/@tests/smoke/node/package.json           |  2 +-
 packages/core/js-client/src/jsPeer/FluencePeer.ts | 12 ++++++++----
 packages/core/js-client/src/util/logger.ts        |  6 ------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/@tests/smoke/node/package.json b/packages/@tests/smoke/node/package.json
index 14b223b9..745418ed 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:*"
     }
 }
diff --git a/packages/core/js-client/src/jsPeer/FluencePeer.ts b/packages/core/js-client/src/jsPeer/FluencePeer.ts
index 58ea5cd4..cdd31a8b 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<ParticleQueueItem>();
@@ -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: %a', item.particle.id, prevData);
+                    log_particle.trace('id %s. prevData: %s', item.particle.id, this.decodeAvmData(prevData));
 
                     const args = serializeAvmArgs(
                         {
@@ -442,16 +446,16 @@ 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: %s', item.particle.id, this.decodeAvmData(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: %s',
                     item.particle.id,
                     item.result.retCode,
-                    item.result.data,
+                    this.decodeAvmData(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 5e05e3eb..d359ebc1 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.a = (avmData: Uint8Array) => {
-    return new TextDecoder().decode(Buffer.from(avmData));
-};
 
 type Logger = (formatter: any, ...args: any[]) => void;