@vouchfor/embeds 0.0.0-experiment.4ea86a2 → 0.0.0-experiment.4eb5f06

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vouchfor/embeds",
-  "version": "0.0.0-experiment.4ea86a2",
+  "version": "0.0.0-experiment.4eb5f06",
   "license": "MIT",
   "author": "Aaron Williams",
   "main": "dist/es/embeds.js",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@lit/task": "^1.0.0",
-    "@vouchfor/media-player": "0.0.0-experiment.4ea86a2",
+    "@vouchfor/media-player": "0.0.0-experiment.4eb5f06",
     "uuid": "^9.0.1"
   },
   "peerDependencies": {

package/src/components/Embed/controllers/tracking.ts

@@ -7,7 +7,8 @@ import type { ReactiveController, ReactiveControllerHost } from 'lit';
 
 import { getEnvUrls } from '~/utils/env';
 
-const STREAMED_THROTTLE = 10000;
+// In seconds due to checking against node.currentTime
+const STREAMED_THROTTLE = 10;
 
 type EmbedHost = ReactiveControllerHost & Embed;
 
@@ -39,7 +40,6 @@ class TrackingController implements ReactiveController {
   private _answersViewed: BooleanMap = {};
   private _streamedTime: TimeMap = {};
   private _streamLatestTime: TimeMap = {};
-  private _streamedPrevTimestamp: TimeMap = {};
 
   constructor(host: EmbedHost) {
     this.host = host;
@@ -203,28 +203,6 @@ class TrackingController implements ReactiveController {
 
     this._streamedTime[key] = node.currentTime;
     this._streamLatestTime[key] = node.currentTime;
-    this._streamedPrevTimestamp[key] = Date.now();
-  };
-
-  private _handleVideoSeeking = ({ detail: { id, key } }: CustomEvent<VideoEventDetail>) => {
-    const vouchId = this._findVouchId();
-
-    if (!vouchId) {
-      return;
-    }
-
-    if (this._streamLatestTime[key]) {
-      this._sendTrackingEvent('VIDEO_STREAMED', {
-        vouchId,
-        answerId: id,
-        streamStart: this._streamedTime[key],
-        streamEnd: this._streamLatestTime[key]
-      });
-    }
-
-    delete this._streamedTime[key];
-    delete this._streamLatestTime[key];
-    delete this._streamedPrevTimestamp[key];
   };
 
   private _handleVideoTimeUpdate = ({ detail: { id, key, node } }: CustomEvent<VideoEventDetail>) => {
@@ -234,7 +212,6 @@ class TrackingController implements ReactiveController {
       return;
     }
 
-    const currentTimestamp = Date.now();
     if (
       node.currentTime &&
       !node.paused &&
@@ -242,7 +219,7 @@ class TrackingController implements ReactiveController {
       // Only fire the video seeked event when this video is the active one
       id === this.host.scene?.video?.id &&
       // Throttle the frequency that we send streamed events while playing
-      currentTimestamp - this._streamedPrevTimestamp[key] > STREAMED_THROTTLE
+      node.currentTime - this._streamedTime[key] > STREAMED_THROTTLE
     ) {
       this._sendTrackingEvent('VIDEO_STREAMED', {
         vouchId,
@@ -251,13 +228,14 @@ class TrackingController implements ReactiveController {
         streamEnd: node.currentTime
       });
       this._streamedTime[key] = node.currentTime;
-      this._streamedPrevTimestamp[key] = currentTimestamp;
     }
 
-    this._streamLatestTime[key] = node.currentTime;
+    if (!this.host.paused) {
+      this._streamLatestTime[key] = node.currentTime;
+    }
   };
 
-  private _handleVideoPause = ({ detail: { id, key, node } }: CustomEvent<VideoEventDetail>) => {
+  private _handleVideoPause = ({ detail: { id, key } }: CustomEvent<VideoEventDetail>) => {
     const vouchId = this._findVouchId();
 
     if (!vouchId) {
@@ -265,7 +243,7 @@ class TrackingController implements ReactiveController {
     }
 
     // Don't send a tracking event if the video pauses when seeking backwards
-    if (node.currentTime > this._streamedTime[key]) {
+    if (this._streamLatestTime[key] > this._streamedTime[key] + 0.5) {
       // Send a video streamed event any time the video pauses then reset the streamed state
       // We do this to capture the last bit of time that the video was played between the previous
       // stream event and the video being paused manually or stopping because it ended
@@ -273,13 +251,12 @@ class TrackingController implements ReactiveController {
         vouchId,
         answerId: id,
         streamStart: this._streamedTime[key],
-        streamEnd: node.currentTime
+        streamEnd: this._streamLatestTime[key]
       });
     }
 
     delete this._streamedTime[key];
     delete this._streamLatestTime[key];
-    delete this._streamedPrevTimestamp[key];
   };
 
   hostConnected() {
@@ -287,7 +264,6 @@ class TrackingController implements ReactiveController {
       this.host.addEventListener('vouch:loaded', this._handleVouchLoaded);
       this.host.mediaPlayer?.addEventListener('play', this._handlePlay);
       this.host.mediaPlayer?.addEventListener('video:play', this._handleVideoPlay);
-      this.host.mediaPlayer?.addEventListener('video:seeking', this._handleVideoSeeking);
       this.host.mediaPlayer?.addEventListener('video:pause', this._handleVideoPause);
       this.host.mediaPlayer?.addEventListener('video:timeupdate', this._handleVideoTimeUpdate);
     });
@@ -297,7 +273,6 @@ class TrackingController implements ReactiveController {
     this.host.removeEventListener('vouch:loaded', this._handleVouchLoaded);
     this.host.mediaPlayer?.removeEventListener('play', this._handlePlay);
     this.host.mediaPlayer?.removeEventListener('video:play', this._handleVideoPlay);
-    this.host.mediaPlayer?.removeEventListener('video:seeking', this._handleVideoSeeking);
     this.host.mediaPlayer?.removeEventListener('video:pause', this._handleVideoPause);
     this.host.mediaPlayer?.removeEventListener('video:timeupdate', this._handleVideoTimeUpdate);
   }