@vouchfor/embeds 0.0.0-experiment.90d5928 → 0.0.0-experiment.93ea548

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vouchfor/embeds",
-  "version": "0.0.0-experiment.90d5928",
+  "version": "0.0.0-experiment.93ea548",
   "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.90d5928",
+    "@vouchfor/media-player": "0.0.0-experiment.93ea548",
     "uuid": "^9.0.1"
   },
   "peerDependencies": {

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

@@ -1,4 +1,5 @@
 import { Task } from '@lit/task';
+import { v4 as uuidv4 } from 'uuid';
 
 import type { Embed, EmbedProps } from '..';
 import type { ReactiveControllerHost } from 'lit';
@@ -34,42 +35,61 @@ class FetcherController {
   private getVouch = async (env: Environment, apiKey: string, vouchId: string) => {
     const { embedApiUrl } = getEnvUrls(env);
 
-    const vouch = await fetch(`${embedApiUrl}/vouches/${vouchId}`, {
-      method: 'GET',
-      headers: [['X-Api-Key', apiKey]]
-    }).then((response) => {
-      this.host.dispatchEvent(new CustomEvent('vouch:loaded', { detail: vouchId }));
-      return response.json();
-    });
-
-    // HACK: trigger another fetch after we received the data to update the cache in the background
-    fetch(`${embedApiUrl}/vouches/${vouchId}`, {
+    const cacheCheck = uuidv4();
+    const res = await fetch(`${embedApiUrl}/vouches/${vouchId}`, {
       method: 'GET',
       headers: [
         ['X-Api-Key', apiKey],
-        ['Cache-Control', 'max-age=0']
+        ['X-Cache-Check', cacheCheck]
       ]
     });
 
+    const vouch = await res.json();
+    this.host.dispatchEvent(new CustomEvent('vouch:loaded', { detail: vouchId }));
+
+    // HACK: we're currently using API Gateway caching on the embed API without any invalidation logic,
+    // so to ensure that the cache stays up to date, whenever we detect a cache hit we trigger another
+    // API call with the `Cache-Control` header which will re-fill the cache
+    const resCacheCheck = res?.headers?.get('X-Cache-Check');
+    if (resCacheCheck && resCacheCheck !== cacheCheck) {
+      fetch(`${embedApiUrl}/vouches/${vouchId}`, {
+        method: 'GET',
+        headers: [
+          ['X-Api-Key', apiKey],
+          ['Cache-Control', 'max-age=0']
+        ]
+      });
+    }
+
     return vouch;
   };
 
   private getTemplate = async (env: Environment, apiKey: string, templateId: string) => {
     const { embedApiUrl } = getEnvUrls(env);
 
-    const template = await fetch(`${embedApiUrl}/templates/${templateId}`, {
-      method: 'GET',
-      headers: [['X-Api-Key', apiKey]]
-    }).then((response) => response.json());
-
-    // HACK: trigger another fetch after we received the data to update the cache in the background
-    fetch(`${embedApiUrl}/templates/${templateId}`, {
+    const cacheCheck = uuidv4();
+    const res = await fetch(`${embedApiUrl}/templates/${templateId}`, {
       method: 'GET',
       headers: [
         ['X-Api-Key', apiKey],
-        ['Cache-Control', 'max-age=0']
+        ['X-Cache-Check', cacheCheck]
       ]
     });
+    const template = await res.json();
+
+    // HACK: we're currently using API Gateway caching on the embed API without any invalidation logic,
+    // so to ensure that the cache stays up to date, whenever we detect a cache hit we trigger another
+    // API call with the `Cache-Control` header which will re-fill the cache
+    const resCacheCheck = res?.headers?.get('X-Cache-Check');
+    if (resCacheCheck && resCacheCheck !== cacheCheck) {
+      fetch(`${embedApiUrl}/templates/${templateId}`, {
+        method: 'GET',
+        headers: [
+          ['X-Api-Key', apiKey],
+          ['Cache-Control', 'max-age=0']
+        ]
+      });
+    }
 
     return template;
   };

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

@@ -1,3 +1,4 @@
+/* eslint-disable max-lines */
 import { v4 as uuidv4 } from 'uuid';
 
 import type { Embed } from '..';
@@ -6,7 +7,7 @@ import type { ReactiveController, ReactiveControllerHost } from 'lit';
 
 import { getEnvUrls } from '~/utils/env';
 
-const STREAMED_THROTTLE = 2000;
+const STREAMED_THROTTLE = 10000;
 
 type EmbedHost = ReactiveControllerHost & Embed;
 
@@ -37,6 +38,7 @@ class TrackingController implements ReactiveController {
   private _hasLoaded: BooleanMap = {};
   private _answersViewed: BooleanMap = {};
   private _streamedTime: TimeMap = {};
+  private _streamLatestTime: TimeMap = {};
   private _streamedPrevTimestamp: TimeMap = {};
 
   constructor(host: EmbedHost) {
@@ -45,11 +47,11 @@ class TrackingController implements ReactiveController {
   }
 
   private _findVouchId() {
-    if (this.host.data) {
-      if ('uuid' in this.host.data) {
-        return this.host.data.uuid;
+    if (this.host.vouch) {
+      if ('uuid' in this.host.vouch) {
+        return this.host.vouch.uuid;
       }
-      return this.host.data.id;
+      return this.host.vouch.id;
     }
   }
 
@@ -132,7 +134,10 @@ class TrackingController implements ReactiveController {
     const { publicApiUrl } = getEnvUrls(this.host.env);
     const { client, tab, request, visitor } = this._getUids();
 
-    // Don't send tracking if we don't have a source
+    if (this.host.disableTracking) {
+      return;
+    }
+
     navigator.sendBeacon(
       `${publicApiUrl}/api/events`,
       JSON.stringify({
@@ -180,63 +185,101 @@ class TrackingController implements ReactiveController {
     }
   };
 
-  private _handleVideoPlay = ({ detail: { id, node } }: CustomEvent<VideoEventDetail>) => {
+  private _handleVideoPlay = ({ detail: { id, key, node } }: CustomEvent<VideoEventDetail>) => {
     const vouchId = this._findVouchId();
+
     if (!vouchId) {
       return;
     }
+
     // Only increment play count once per session
-    if (!this._answersViewed[id]) {
+    if (!this._answersViewed[key]) {
       this._sendTrackingEvent('VOUCH_RESPONSE_VIEWED', {
         vouchId,
         answerId: id
       });
-      this._answersViewed[id] = true;
+      this._answersViewed[key] = true;
     }
-    this._streamedTime[id] = node.currentTime;
-    this._streamedPrevTimestamp[id] = Date.now();
+
+    this._streamedTime[key] = node.currentTime;
+    this._streamLatestTime[key] = node.currentTime;
+    this._streamedPrevTimestamp[key] = Date.now();
   };
 
-  private _handleVideoTimeUpdate = ({ detail: { id, node } }: CustomEvent<VideoEventDetail>) => {
+  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>) => {
+    const vouchId = this._findVouchId();
+
+    if (!vouchId) {
+      return;
+    }
+
     const currentTimestamp = Date.now();
     if (
+      node.currentTime &&
+      !node.paused &&
       !this.host.paused &&
       // 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[id] > STREAMED_THROTTLE
+      currentTimestamp - this._streamedPrevTimestamp[key] > STREAMED_THROTTLE
     ) {
       this._sendTrackingEvent('VIDEO_STREAMED', {
         vouchId,
         answerId: id,
-        streamStart: this._streamedTime[id],
+        streamStart: this._streamedTime[key],
         streamEnd: node.currentTime
       });
-      this._streamedTime[id] = node.currentTime;
-      this._streamedPrevTimestamp[id] = currentTimestamp;
+      this._streamedTime[key] = node.currentTime;
+      this._streamedPrevTimestamp[key] = currentTimestamp;
     }
+
+    this._streamLatestTime[key] = node.currentTime;
   };
 
-  private _handleVideoPause = ({ detail: { id, node } }: CustomEvent<VideoEventDetail>) => {
+  private _handleVideoPause = ({ detail: { id, key, node } }: CustomEvent<VideoEventDetail>) => {
     const vouchId = this._findVouchId();
+
     if (!vouchId) {
       return;
     }
-    // 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
-    this._sendTrackingEvent('VIDEO_STREAMED', {
-      vouchId,
-      answerId: id,
-      streamStart: this._streamedTime[id],
-      streamEnd: node.currentTime
-    });
-    delete this._streamedTime[id];
-    delete this._streamedPrevTimestamp[id];
+
+    // Don't send a tracking event if the video pauses when seeking backwards
+    if (node.currentTime > this._streamedTime[key]) {
+      // 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
+      this._sendTrackingEvent('VIDEO_STREAMED', {
+        vouchId,
+        answerId: id,
+        streamStart: this._streamedTime[key],
+        streamEnd: node.currentTime
+      });
+    }
+
+    delete this._streamedTime[key];
+    delete this._streamLatestTime[key];
+    delete this._streamedPrevTimestamp[key];
   };
 
   hostConnected() {
@@ -244,6 +287,7 @@ 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);
     });
@@ -253,6 +297,7 @@ 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);
   }

package/src/components/Embed/index.ts

@@ -17,6 +17,7 @@ import '@vouchfor/media-player';
 type EmbedProps = Pick<MediaPlayerProps, 'data' | 'aspectRatio' | 'preload' | 'autoplay' | 'controls'> & {
   env: Environment;
   apiKey: string;
+  disableTracking?: boolean;
   trackingSource?: string;
   vouchId?: string;
   templateId?: string;
@@ -32,6 +33,7 @@ class Embed extends LitElement {
 
   @property({ type: String }) env: EmbedProps['env'] = 'prod';
   @property({ type: String }) apiKey: EmbedProps['apiKey'] = '';
+  @property({ type: Boolean }) disableTracking: EmbedProps['disableTracking'] = false;
   @property({ type: String }) trackingSource: EmbedProps['trackingSource'] = 'embed';
 
   @property({ type: Array }) controls: EmbedProps['controls'];
@@ -57,6 +59,7 @@ class Embed extends LitElement {
     'waiting',
 
     'video:loadeddata',
+    'video:seeking',
     'video:seeked',
     'video:play',
     'video:playing',