@vouchfor/embeds 0.0.0-experiment.de04f63 → 0.0.0-experiment.de7febc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vouchfor/embeds",
-  "version": "0.0.0-experiment.de04f63",
+  "version": "0.0.0-experiment.de7febc",
   "license": "MIT",
   "author": "Aaron Williams",
   "main": "dist/es/embeds.js",
@@ -26,7 +26,7 @@
     "lint:staged": "lint-staged",
     "prepublishOnly": "yarn build",
     "size": "size-limit",
-    "storybook": "yarn prebuild && storybook dev -p 6006",
+    "storybook": "yarn prebuild && storybook dev -p 6007",
     "prebuild": "yarn build:deps && yarn generate:manifest",
     "test": "true"
   },
@@ -35,12 +35,12 @@
     "**/*.{md,json,yml}": "prettier --write"
   },
   "dependencies": {
-    "@lit/task": "1.0.0",
-    "@vouchfor/media-player": "0.0.0-experiment.de04f63",
+    "@lit/task": "^1.0.0",
+    "@vouchfor/media-player": "0.0.0-experiment.de7febc",
     "uuid": "^9.0.1"
   },
   "peerDependencies": {
-    "lit": "^3.0.2"
+    "lit": "^3.1.0"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -62,7 +62,7 @@
     "eslint": "^8.50.0",
     "eslint-plugin-import": "^2.28.1",
     "lint-staged": "^14.0.1",
-    "lit": "^2.8.0",
+    "lit": "^3.1.0",
     "prettier": "^3.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

package/src/components/Embed/Embed.stories.ts

@@ -10,32 +10,18 @@ type EmbedArgs = EmbedProps & {
   showVouch?: boolean;
 };
 
-const _Embed = ({
-  vouchHashId,
-  preload,
-  autoplay,
-  env,
-  apiKey,
-  controls,
-  enableTracking,
-  trackingSource,
-
-  resolution,
-  aspectRatio
-}: EmbedArgs) => {
+const _Embed = ({ vouchId, templateId, preload, autoplay, env, apiKey, controls, aspectRatio }: EmbedArgs) => {
   return html`
     <div style="height: 100vh">
       <vouch-embed
         env=${ifDefined(env)}
         apiKey=${ifDefined(apiKey)}
+        vouchId=${ifDefined(vouchId)}
+        templateId=${ifDefined(templateId)}
+        .controls=${controls}
         ?autoplay=${autoplay}
-        ?enableTracking=${enableTracking}
-        vouchHashId=${ifDefined(vouchHashId)}
-        resolution=${ifDefined(resolution)}
-        aspectRatio=${ifDefined(aspectRatio)}
         preload=${ifDefined(preload)}
-        .controls=${controls}
-        trackingSource=${ifDefined(trackingSource)}
+        aspectRatio=${ifDefined(aspectRatio)}
       ></vouch-embed>
     </div>
   `;
@@ -53,20 +39,18 @@ type Story = StoryObj<EmbedArgs>;
 
 const Embed: Story = {
   args: {
-    env: 'dev',
+    env: 'local',
     apiKey: 'TVik9uTMgE-PD25UTHIS6gyl0hMBWC7AT4dkpdlLBT4VIfDWZJrQiCk6Ak7m1',
-    vouchHashId: '6JQEIPeStt',
-    resolution: 1080,
+    vouchId: '6JQEIPeStt',
+    templateId: '357fc118-e179-4171-9446-ff2b8e9d1b29',
     aspectRatio: 0,
     preload: 'none',
-    autoplay: false,
-    enableTracking: true,
-    trackingSource: 'media_player_storybook'
+    autoplay: false
   },
   argTypes: {
     env: {
       control: 'radio',
-      options: ['prod', 'staging', 'dev']
+      options: ['local', 'dev', 'staging', 'prod']
     },
     preload: {
       control: 'radio',

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

@@ -1,41 +1,131 @@
 import { Task } from '@lit/task';
+import { v4 as uuidv4 } from 'uuid';
 
 import type { Embed, EmbedProps } from '..';
 import type { ReactiveControllerHost } from 'lit';
+import type { Environment } from '~/utils/env';
 
 import { getEnvUrls } from '~/utils/env';
 
 type EmbedHost = ReactiveControllerHost & Embed;
 
-type TaskDeps = [EmbedProps['env'], EmbedProps['apiKey'], EmbedProps['vouchHashId']];
+type TaskDeps = [
+  EmbedProps['env'],
+  EmbedProps['apiKey'],
+  EmbedProps['data'],
+  EmbedProps['vouchId'],
+  EmbedProps['templateId']
+];
 
 class FetcherController {
   host: EmbedHost;
 
+  private _fetching = false;
+
+  set fetching(value) {
+    if (this._fetching !== value) {
+      this._fetching = value;
+      this.host.requestUpdate();
+    }
+  }
+  get fetching() {
+    return this._fetching;
+  }
+
+  private getVouch = async (env: Environment, apiKey: string, vouchId: string) => {
+    const { embedApiUrl } = getEnvUrls(env);
+
+    const cacheCheck = uuidv4();
+    const res = await fetch(`${embedApiUrl}/vouches/${vouchId}`, {
+      method: 'GET',
+      headers: [
+        ['X-Api-Key', apiKey],
+        ['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 cacheCheck = uuidv4();
+    const res = await fetch(`${embedApiUrl}/templates/${templateId}`, {
+      method: 'GET',
+      headers: [
+        ['X-Api-Key', apiKey],
+        ['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;
+  };
+
   constructor(host: EmbedHost) {
     this.host = host;
     new Task<TaskDeps, void>(
       this.host,
-      async ([env, apiKey, vouchHashId]: TaskDeps) => {
+      async ([env, apiKey, data, vouchId, templateId]: TaskDeps) => {
         try {
-          if (vouchHashId) {
-            host.fetching = true;
-
-            const { embedApiUrl } = getEnvUrls(env);
+          host.vouch = undefined;
+          host.template = undefined;
 
-            const data = await fetch(`${embedApiUrl}/vouches/${vouchHashId}`, {
-              method: 'GET',
-              headers: [['X-Api-Key', apiKey]]
-            }).then((response) => response.json());
+          if (data) {
+            let template;
+            if (templateId) {
+              this.fetching = true;
+              template = await this.getTemplate(env, apiKey, templateId);
+            }
+            host.vouch = data;
+            host.template = template ?? data?.settings?.template?.instance;
+          } else if (vouchId) {
+            this.fetching = true;
 
-            host.data = data;
-            host.instance = data?.settings?.template?.instance;
+            const [vouch, template] = await Promise.all([
+              this.getVouch(env, apiKey, vouchId),
+              templateId ? this.getTemplate(env, apiKey, templateId) : null
+            ]);
+            host.vouch = vouch;
+            host.template = template ?? vouch?.settings?.template?.instance;
           }
         } finally {
-          host.fetching = false;
+          this.fetching = false;
         }
       },
-      () => [host.env, host.apiKey, host.vouchHashId]
+      () => [host.env, host.apiKey, host.data, host.vouchId, host.templateId]
     );
   }
 }

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

@@ -6,7 +6,7 @@ import type { ReactiveController, ReactiveControllerHost } from 'lit';
 
 import { getEnvUrls } from '~/utils/env';
 
-const STREAMED_THROTTLE = 2000;
+const STREAMED_THROTTLE = 10000;
 
 type EmbedHost = ReactiveControllerHost & Embed;
 
@@ -45,11 +45,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;
     }
   }
 
@@ -116,7 +116,6 @@ class TrackingController implements ReactiveController {
     });
 
     return {
-      // Source might be embeds, could be playlink etc.
       source: this.host.trackingSource,
       time: new Date(),
       region,
@@ -133,8 +132,7 @@ 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.enableTracking && this.host.trackingSource) {
+    if (this.host.enableTracking) {
       navigator.sendBeacon(
         `${publicApiUrl}/api/events`,
         JSON.stringify({
@@ -185,6 +183,7 @@ class TrackingController implements ReactiveController {
 
   private _handleVideoPlay = ({ detail: { id, node } }: CustomEvent<VideoEventDetail>) => {
     const vouchId = this._findVouchId();
+
     if (!vouchId) {
       return;
     }
@@ -202,11 +201,14 @@ class TrackingController implements ReactiveController {
 
   private _handleVideoTimeUpdate = ({ detail: { id, 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 &&
@@ -226,42 +228,43 @@ class TrackingController implements ReactiveController {
 
   private _handleVideoPause = ({ detail: { id, 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
-    });
+
+    // Don't send a tracking event if the video pauses when seeking backwards
+    if (node.currentTime > this._streamedTime[id]) {
+      // 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];
   };
 
   hostConnected() {
-    if (this.host.enableTracking && this.host.trackingSource) {
-      requestAnimationFrame(() => {
-        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:pause', this._handleVideoPause);
-        this.host.mediaPlayer?.addEventListener('video:timeupdate', this._handleVideoTimeUpdate);
-      });
-    }
+    requestAnimationFrame(() => {
+      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:pause', this._handleVideoPause);
+      this.host.mediaPlayer?.addEventListener('video:timeupdate', this._handleVideoTimeUpdate);
+    });
   }
 
   hostDisconnected() {
-    if (this.host.enableTracking && this.host.trackingSource) {
-      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:pause', this._handleVideoPause);
-      this.host.mediaPlayer?.removeEventListener('video:timeupdate', this._handleVideoTimeUpdate);
-    }
+    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:pause', this._handleVideoPause);
+    this.host.mediaPlayer?.removeEventListener('video:timeupdate', this._handleVideoTimeUpdate);
   }
 }
 

package/src/components/Embed/index.ts

@@ -1,9 +1,9 @@
 import { html, LitElement } from 'lit';
-import { customElement, state, property } from 'lit/decorators.js';
+import { customElement, property, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { createRef, ref } from 'lit/directives/ref.js';
 
-import type { Scene } from '@vouchfor/canvas-video';
+import type { Scene, TemplateInstance } from '@vouchfor/canvas-video';
 import type { MediaPlayer, MediaPlayerProps } from '@vouchfor/media-player';
 import type { Ref } from 'lit/directives/ref.js';
 import type { Environment } from '~/utils/env';
@@ -14,39 +14,32 @@ import { TrackingController } from './controllers/tracking';
 
 import '@vouchfor/media-player';
 
-type EmbedProps = Pick<
-  MediaPlayerProps,
-  'data' | 'resolution' | 'aspectRatio' | 'preload' | 'autoplay' | 'controls'
-> & {
+type EmbedProps = Pick<MediaPlayerProps, 'data' | 'aspectRatio' | 'preload' | 'autoplay' | 'controls'> & {
   env: Environment;
   apiKey: string;
-  vouchHashId?: string;
   enableTracking?: boolean;
   trackingSource?: string;
+  vouchId?: string;
+  templateId?: string;
 };
 
 @customElement('vouch-embed')
 class Embed extends LitElement {
   private _mediaPlayerRef: Ref<MediaPlayer> = createRef();
 
-  @property({ type: Object, attribute: 'data' }) propData: EmbedProps['data'];
-  @property({ type: String }) vouchHashId: EmbedProps['vouchHashId'];
+  @property({ type: Object, attribute: 'data' }) data: EmbedProps['data'];
+  @property({ type: String }) vouchId: EmbedProps['vouchId'];
+  @property({ type: String }) templateId: EmbedProps['templateId'];
 
   @property({ type: String }) env: EmbedProps['env'] = 'prod';
   @property({ type: String }) apiKey: EmbedProps['apiKey'] = '';
+  @property({ type: Boolean }) enableTracking: EmbedProps['enableTracking'] = true;
+  @property({ type: String }) trackingSource: EmbedProps['trackingSource'] = 'embed';
 
+  @property({ type: Array }) controls: EmbedProps['controls'];
   @property({ type: String }) preload: EmbedProps['preload'] = 'auto';
   @property({ type: Boolean }) autoplay: EmbedProps['autoplay'] = false;
-  @property({ type: Boolean }) enableTracking: EmbedProps['enableTracking'] = false;
-  @property({ type: String }) trackingSource: EmbedProps['trackingSource'] = 'media_player';
-
-  @property({ type: Number }) resolution: EmbedProps['resolution'] = 1080;
   @property({ type: Number }) aspectRatio: EmbedProps['aspectRatio'] = 0;
-  @property({ type: Array }) controls: EmbedProps['controls'];
-
-  @state() data: MediaPlayerProps['data'];
-  @state() instance: MediaPlayerProps['instance'];
-  @state() fetching = false;
 
   private eventController = new EventForwardController(this, [
     'durationchange',
@@ -75,12 +68,17 @@ class Embed extends LitElement {
     'video:ended',
     'video:error'
   ]);
+  private _fetcherController = new FetcherController(this);
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
-  private trackingController = new TrackingController(this);
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  private fetcherController = new FetcherController(this);
+  private _trackingController = new TrackingController(this);
+
+  @state() vouch: EmbedProps['data'];
+  @state() template: TemplateInstance | undefined;
+
+  get fetching() {
+    return this._fetcherController.fetching;
+  }
 
   get waiting() {
     return this._mediaPlayerRef.value?.waiting;
@@ -172,18 +170,17 @@ class Embed extends LitElement {
 
   render() {
     return html`
-      <vmp-media-player
+      <vmp-new-media-player
         ${ref(this._mediaPlayerRef)}
         ${this.eventController.register()}
         ?autoplay=${this.autoplay}
         ?loading=${this.fetching}
-        .data=${this.data}
-        .instance=${this.instance}
-        resolution=${ifDefined(this.resolution)}
+        .data=${this.vouch}
+        .template=${this.template}
         aspectRatio=${ifDefined(this.aspectRatio)}
         preload=${ifDefined(this.preload)}
         .controls=${this.controls}
-      ></vmp-media-player>
+      ></vmp-new-media-player>
     `;
   }
 }

package/src/utils/env.ts

@@ -1,15 +1,11 @@
-type Environment = 'dev' | 'staging' | 'prod';
+type Environment = 'local' | 'dev' | 'staging' | 'prod';
 
 type GetEnvUrlsReturn = {
-  marketingUrl: string;
   videoUrl: string;
   publicApiUrl: string;
   embedApiUrl: string;
-  publicRecorderUrl: string;
 };
 
-const marketingUrl = 'https://vouchfor.com';
-
 const devVideoUrl = 'https://d2rxhdlm2q91uk.cloudfront.net';
 const stagingVideoUrl = 'https://d1ix11aj5kfygl.cloudfront.net';
 const prodVideoUrl = 'https://d157jlwnudd93d.cloudfront.net';
@@ -18,61 +14,51 @@ const devPublicApiUrl = 'https://bshyfw4h5a.execute-api.ap-southeast-2.amazonaws
 const stagingPublicApiUrl = 'https://gyzw7rpbq3.execute-api.ap-southeast-2.amazonaws.com/staging';
 const prodPublicApiUrl = 'https://vfcjuim1l3.execute-api.ap-southeast-2.amazonaws.com/prod';
 
-const devEmbedApiUrl = 'http://localhost:6060/v1';
-const stagingEmbedApiUrl = 'https://embed-staging.vouchfor.com/v1';
-const prodEmbedApiUrl = 'https://embed.vouchfor.com/v1';
-
-const devPublicRecorderUrl = 'https://dev.vouchfor.com';
-const stagingPublicRecorderUrl = 'https://staging.vouchfor.com';
-const prodPublicRecorderUrl = 'https://app.vouchfor.com';
+const localEmbedApiUrl = 'http://localhost:6060/v2';
+const devEmbedApiUrl = 'https://embed-dev.vouchfor.com/v2';
+const stagingEmbedApiUrl = 'https://embed-staging.vouchfor.com/v2';
+const prodEmbedApiUrl = 'https://embed.vouchfor.com/v2';
 
 // We are handling the case where env is an unknown string so the ts error is a lie
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 function getEnvUrls(env: Environment): GetEnvUrlsReturn {
-  if (!['dev', 'staging', 'prod'].includes(env)) {
+  if (!['local', 'dev', 'staging', 'prod'].includes(env)) {
     throw new Error(`Unknown environment: ${env}`);
   }
 
+  if (env === 'local') {
+    return {
+      videoUrl: devVideoUrl,
+      publicApiUrl: devPublicApiUrl,
+      embedApiUrl: localEmbedApiUrl
+    };
+  }
+
   if (env === 'dev') {
     return {
-      marketingUrl,
       videoUrl: devVideoUrl,
       publicApiUrl: devPublicApiUrl,
-      embedApiUrl: devEmbedApiUrl,
-      publicRecorderUrl: devPublicRecorderUrl
+      embedApiUrl: devEmbedApiUrl
     };
   }
 
   if (env === 'staging') {
     return {
-      marketingUrl,
       videoUrl: stagingVideoUrl,
       publicApiUrl: stagingPublicApiUrl,
-      embedApiUrl: stagingEmbedApiUrl,
-      publicRecorderUrl: stagingPublicRecorderUrl
+      embedApiUrl: stagingEmbedApiUrl
     };
   }
 
   if (env === 'prod') {
     return {
-      marketingUrl,
       videoUrl: prodVideoUrl,
       publicApiUrl: prodPublicApiUrl,
-      embedApiUrl: prodEmbedApiUrl,
-      publicRecorderUrl: prodPublicRecorderUrl
+      embedApiUrl: prodEmbedApiUrl
     };
   }
 }
 
-export {
-  marketingUrl,
-  devEmbedApiUrl,
-  stagingEmbedApiUrl,
-  prodEmbedApiUrl,
-  devPublicRecorderUrl,
-  stagingPublicRecorderUrl,
-  prodPublicRecorderUrl,
-  getEnvUrls
-};
+export { devEmbedApiUrl, stagingEmbedApiUrl, prodEmbedApiUrl, getEnvUrls };
 export type { Environment };

package/dist/es/components/Embed/controllers/event-forwarder.d.ts

@@ -1,14 +0,0 @@
-import type { Embed } from '..';
-import type { ReactiveController, ReactiveControllerHost } from 'lit';
-type EmbedHost = ReactiveControllerHost & Embed;
-declare class EventForwardController implements ReactiveController {
-    host: EmbedHost;
-    private _events;
-    private _cleanup;
-    private _forwardElementRef;
-    constructor(host: EmbedHost, events: string[]);
-    register(): import("lit-html/directive.js").DirectiveResult<typeof import("lit-html/directives/ref.js").RefDirective>;
-    hostConnected(): void;
-    hostDisconnected(): void;
-}
-export { EventForwardController };