@vouchfor/embeds 0.0.0-experiment.b40b077 → 0.0.0-experiment.b77073f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vouchfor/embeds",
-  "version": "0.0.0-experiment.b40b077",
+  "version": "0.0.0-experiment.b77073f",
   "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,8 +35,8 @@
     "**/*.{md,json,yml}": "prettier --write"
   },
   "dependencies": {
-    "@lit/task": "1.0.0",
-    "@vouchfor/media-player": "0.0.0-experiment.b40b077",
+    "@lit/task": "^1.0.0",
+    "@vouchfor/media-player": "0.0.0-experiment.b77073f",
     "uuid": "^9.0.1"
   },
   "peerDependencies": {

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>
   `;
@@ -55,13 +41,11 @@ const Embed: Story = {
   args: {
     env: 'dev',
     apiKey: 'TVik9uTMgE-PD25UTHIS6gyl0hMBWC7AT4dkpdlLBT4VIfDWZJrQiCk6Ak7m1',
-    vouchHashId: '6JQEIPeStt',
-    resolution: 1080,
+    vouchId: '6JQEIPeStt',
+    templateId: '7d0113f7-3f9a-4bdd-97e3-07ee6eec5730',
     aspectRatio: 0,
     preload: 'none',
-    autoplay: false,
-    enableTracking: true,
-    trackingSource: 'media_player_storybook'
+    autoplay: false
   },
   argTypes: {
     env: {

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

@@ -2,40 +2,88 @@ import { Task } from '@lit/task';
 
 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 = (env: Environment, apiKey: string, vouchId: string) => {
+    const { embedApiUrl } = getEnvUrls(env);
+
+    return 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();
+    });
+  };
+
+  private async getTemplate(env: Environment, apiKey: string, templateId: string) {
+    const { embedApiUrl } = getEnvUrls(env);
+
+    return fetch(`${embedApiUrl}/templates/${templateId}`, {
+      method: 'GET',
+      headers: [['X-Api-Key', apiKey]]
+    }).then((response) => response.json());
+  }
+
   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}/v1/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

@@ -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,
@@ -134,22 +133,20 @@ class TrackingController implements ReactiveController {
     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) {
-      navigator.sendBeacon(
-        `${publicApiUrl}/api/events`,
-        JSON.stringify({
-          event,
-          payload,
-          context: {
-            'x-uid-client': client,
-            'x-uid-tab': tab,
-            'x-uid-request': request,
-            'x-uid-visitor': visitor,
-            'x-reporting-metadata': this._getReportingMetadata()
-          }
-        })
-      );
-    }
+    navigator.sendBeacon(
+      `${publicApiUrl}/api/events`,
+      JSON.stringify({
+        event,
+        payload,
+        context: {
+          'x-uid-client': client,
+          'x-uid-tab': tab,
+          'x-uid-request': request,
+          'x-uid-visitor': visitor,
+          'x-reporting-metadata': this._getReportingMetadata()
+        }
+      })
+    );
   };
 
   private _handleVouchLoaded = ({ detail: vouchId }: CustomEvent<string>) => {
@@ -243,25 +240,21 @@ class TrackingController implements ReactiveController {
   };
 
   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,30 @@ 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: 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 +66,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 +168,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

@@ -18,9 +18,9 @@ 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 devEmbedApiUrl = 'https://embed-dev.vouchfor.com/v2';
+const stagingEmbedApiUrl = 'https://embed-staging.vouchfor.com/v2';
+const prodEmbedApiUrl = 'https://embed.vouchfor.com/v2';
 
 const devPublicRecorderUrl = 'https://dev.vouchfor.com';
 const stagingPublicRecorderUrl = 'https://staging.vouchfor.com';