fix: dev backmerge resolution

100mslive · Dec 11, 2024 · 52baccf · 52baccf
1 parent 3fa18cf
commit 52baccf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/packages/hms-video-store/src/analytics/stats/BaseStatsAnalytics.ts b/packages/hms-video-store/src/analytics/stats/BaseStatsAnalytics.ts
@@ -43,7 +43,9 @@ export abstract class BaseStatsAnalytics {
   }
 
   stop = () => {
+    console.log({ t: this });
     if (this.shouldSendEvent) {
+      this.createSampleFromTrackAnalytics();
       this.sendEvent();
     }
     this.eventBus.statsUpdate.unsubscribe(this.handleStatsUpdate.bind(this));
@@ -81,6 +83,23 @@ export abstract class BaseStatsAnalytics {
     }
   }
 
+  cleanTrackAnalytics() {
+    // delete track analytics if track is not present in store and no samples are present
+    this.trackAnalytics.forEach(trackAnalytic => {
+      if (!this.store.hasTrack(trackAnalytic.track) && !(trackAnalytic.samples.length > 0)) {
+        console.log('delete track analytics', { samples: JSON.stringify(trackAnalytic.samples) });
+        this.trackAnalytics.delete(trackAnalytic.track_id);
+      }
+    });
+  }
+
+  createSampleFromTrackAnalytics() {
+    this.trackAnalytics?.forEach(trackAnalytic => {
+      console.log('createSample track', { samples: JSON.stringify(trackAnalytic.samples) });
+      trackAnalytic.createSample();
+    });
+  }
+
   protected abstract toAnalytics(): PublishAnalyticPayload | SubscribeAnalyticPayload;
 
   protected abstract handleStatsUpdate(hmsStats: HMSWebrtcStats): void;
@@ -137,7 +156,8 @@ export abstract class RunningTrackAnalytics {
     if (this.tempStats.length === 0) {
       return;
     }
-
+    console.log(JSON.parse(JSON.stringify(this)));
+    console.log(JSON.stringify({ tempStats: this.tempStats }));
     this.samples.push(this.collateSample());
     this.prevLatestStat = this.getLatestStat();
     this.tempStats.length = 0;

diff --git a/packages/hms-video-store/src/analytics/stats/PublishStatsAnalytics.ts b/packages/hms-video-store/src/analytics/stats/PublishStatsAnalytics.ts
@@ -41,7 +41,6 @@ export class PublishStatsAnalytics extends BaseStatsAnalytics {
 
   protected sendEvent() {
     const track = Object.assign({}, this.trackAnalytics);
-    this.cleanTrackAnalyticsAndCreateSample(true);
     console.log(
       'publishSend',
       `${new Date()}`,

diff --git a/packages/hms-video-store/src/transport/index.ts b/packages/hms-video-store/src/transport/index.ts
@@ -1308,9 +1308,6 @@ export default class HMSTransport {
     if (this.state === TransportState.Disconnected) {
       this.state = TransportState.Connecting;
       this.observer.onStateChange(this.state);
-      if (this.initConfig) {
-        this.initStatsAnalytics();
-      }
     }
   }
 
@@ -1343,10 +1340,6 @@ export default class HMSTransport {
         event = AnalyticsEventFactory.subscribeFail(error);
         break;
     }
-    this.publishStatsAnalytics?.cleanTrackAnalyticsAndCreateSample(true);
-    this.subscribeStatsAnalytics?.cleanTrackAnalyticsAndCreateSample(true);
-    this.publishStatsAnalytics?.stop();
-    this.subscribeStatsAnalytics?.stop();
     this.eventBus.analytics.publish(event!);
   }