From 3185eace860b8f9e8701c206045450c405ac1620 Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Tue, 7 Mar 2023 12:18:43 +0100
Subject: [PATCH] fix(ui) - player

---
 frontend/app/player/web/MessageManager.ts | 38 +++++++++--------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/frontend/app/player/web/MessageManager.ts b/frontend/app/player/web/MessageManager.ts
index 2752d8bab..c54b86fb8 100644
--- a/frontend/app/player/web/MessageManager.ts
+++ b/frontend/app/player/web/MessageManager.ts
@@ -107,7 +107,7 @@ export default class MessageManager {
 
   private scrollManager: ListWalker<SetViewportScroll> = new ListWalker();
 
-  private readonly decoder = new Decoder();
+  public readonly decoder = new Decoder();
   private readonly lists: Lists;
 
   private activityManager: ActivityManager | null = null;
@@ -211,14 +211,14 @@ export default class MessageManager {
         const sorted = msgs.sort((m1, m2) => m1.time - m2.time)
 
         let indx = sorted[0]._index
-        let counter = 0
+        let outOfOrderCounter = 0
         sorted.forEach(msg => {
-          if (indx > msg._index) counter++
+          if (indx > msg._index) outOfOrderCounter++
           else indx = msg._index
           this.distributeMessage(msg, msg._index)
         })
 
-        if (counter > 0) console.warn("Unsorted mob file, error count: ", counter)
+        if (outOfOrderCounter > 0) console.warn("Unsorted mob file, error count: ", outOfOrderCounter)
         logger.info("Messages count: ", msgs.length, sorted, file)
 
         this._sortMessagesHack(msgs)
@@ -236,7 +236,7 @@ export default class MessageManager {
       // EFS fallback
       .catch((e) =>
         requestEFSDom(this.session.sessionId)
-          .then(createNewParser(false))
+          .then(createNewParser(false, 'domEFS'))
       )
       .then(this.onFileReadSuccess)
       .catch(this.onFileReadFailed)
@@ -249,7 +249,7 @@ export default class MessageManager {
     // EFS fallback
     .catch(() =>
       requestEFSDevtools(this.session.sessionId)
-        .then(createNewParser(false, 'devtools'))
+        .then(createNewParser(false, 'devtoolsEFS'))
     )
     .then(() => {
       this.state.update(this.lists.getFullListsState()) // TODO: also in case of dynamic update through assist
@@ -416,33 +416,19 @@ export default class MessageManager {
         this.lists.lists.fetch.insert(getResourceFromNetworkRequest(msg, this.sessionStart))
         break;
       case MType.Redux:
-        // logger.log('redux', msg)
         this.lists.lists.redux.append(msg);
         break;
       case MType.NgRx:
-        decoded = this.decodeStateMessage(msg, ["state", "action"]);
-        logger.log('ngrx', decoded)
-        if (decoded != null) {
-          this.lists.lists.ngrx.append(decoded);
-        }
+        this.lists.lists.ngrx.append(msg);
         break;
       case MType.Vuex:
-        // logger.log('vuex', msg)
         this.lists.lists.vuex.append(msg);
         break;
       case MType.Zustand:
-        decoded = this.decodeStateMessage(msg, ["state", "mutation"])
-        logger.log('zustand', decoded)
-        if (decoded != null) {
-          this.lists.lists.zustand.append(decoded)
-        }
+        this.lists.lists.zustand.append(msg)
+        break
       case MType.MobX:
-        decoded = this.decodeStateMessage(msg, ["payload"]);
-        logger.log('mobx', decoded)
-
-        if (decoded != null) {
-          this.lists.lists.mobx.append(decoded);
-        }
+        this.lists.lists.mobx.append(msg);
         break;
       case MType.GraphQl:
         this.lists.lists.graphql.append(msg);
@@ -482,6 +468,10 @@ export default class MessageManager {
     this.state.update({ messagesLoading, ready: !messagesLoading && !this.state.get().cssLoading });
   }
 
+  decodeMessage(msg: Message) {
+    return this.decoder.decode(msg)
+  }
+
   private setSize({ height, width }: { height: number, width: number }) {
     this.screen.scale({ height, width });
     this.state.update({ width, height });