From b75754ef4efac6147957c978c10cc7dcec5c8d8f Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Wed, 3 Jan 2024 18:00:11 +0100
Subject: [PATCH] fix(tracker): some guards around sender

---
 tracker/tracker/src/main/app/index.ts  | 17 +++++++++--------
 tracker/tracker/src/webworker/index.ts |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/tracker/tracker/src/main/app/index.ts b/tracker/tracker/src/main/app/index.ts
index d11c57134..bd735655b 100644
--- a/tracker/tracker/src/main/app/index.ts
+++ b/tracker/tracker/src/main/app/index.ts
@@ -261,9 +261,9 @@ export default class App {
                   this.restartAttempts += 1
                   void this.start({}, true)
                 }
+              } else {
+                this.worker?.postMessage({ type: 'compressed', batch: result })
               }
-              // @ts-ignore
-              this.worker?.postMessage({ type: 'compressed', batch: result })
             })
           } else {
             this.worker?.postMessage({ type: 'uncompressed', batch: batch })
@@ -690,6 +690,13 @@ export default class App {
           timestamp: startTimestamp || timestamp,
           projectID,
         })
+
+        this.worker.postMessage({
+          type: 'auth',
+          token,
+          beaconSizeLimit,
+        })
+
         if (!isNewSession && token === sessionToken) {
           this.debug.log('continuing session on new tab', this.session.getTabId())
           // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -701,12 +708,6 @@ export default class App {
         )
         this.localStorage.setItem(this.options.local_uuid_key, userUUID)
 
-        this.worker.postMessage({
-          type: 'auth',
-          token,
-          beaconSizeLimit,
-        })
-
         this.compressionThreshold = compressionThreshold
         const onStartInfo = { sessionToken: token, userUUID, sessionID }
 
diff --git a/tracker/tracker/src/webworker/index.ts b/tracker/tracker/src/webworker/index.ts
index d70ccde48..08ee76fc1 100644
--- a/tracker/tracker/src/webworker/index.ts
+++ b/tracker/tracker/src/webworker/index.ts
@@ -119,7 +119,7 @@ self.onmessage = ({ data }: { data: ToWorkerData }): any => {
       initiateRestart()
       return
     }
-    sender.sendCompressed(data.batch)
+    data.batch && sender.sendCompressed(data.batch)
   }
   if (data.type === 'uncompressed') {
     if (!sender) {
@@ -127,7 +127,7 @@ self.onmessage = ({ data }: { data: ToWorkerData }): any => {
       initiateRestart()
       return
     }
-    sender.sendUncompressed(data.batch)
+    data.batch && sender.sendUncompressed(data.batch)
   }
 
   if (data.type === 'start') {