@vouchfor/embeds 0.0.0-experiment.9821b79 → 0.0.0-experiment.98c50ae

package/src/components/PlayerEmbed/MultiEmbed.stories.ts

@@ -0,0 +1,135 @@
+import { html } from 'lit';
+import { ifDefined } from 'lit/directives/if-defined.js';
+
+import type { PlayerEmbedProps } from '.';
+import type { Meta, StoryObj } from '@storybook/web-components';
+
+import '.';
+
+type MultiEmbedArgs = PlayerEmbedProps & {
+  apiKey1?: string;
+  apiKey2?: string;
+  apiKey3?: string;
+  vouchId1?: string;
+  vouchId2?: string;
+  vouchId3?: string;
+  showVouch?: boolean;
+};
+
+const _MultiEmbed = ({
+  vouchId1,
+  vouchId2,
+  vouchId3,
+  templateId,
+  questions,
+  preload,
+  autoplay,
+  env,
+  apiKey1,
+  apiKey2,
+  apiKey3,
+  controls,
+  aspectRatio
+}: MultiEmbedArgs) => {
+  return html`
+    <div style="height: 33vh">
+      <vouch-embed-player
+        env=${ifDefined(env)}
+        apiKey=${ifDefined(apiKey1)}
+        vouchId=${ifDefined(vouchId1)}
+        templateId=${ifDefined(templateId)}
+        .questions=${questions}
+        .controls=${controls}
+        ?autoplay=${autoplay}
+        preload=${ifDefined(preload)}
+        aspectRatio=${ifDefined(aspectRatio)}
+        @error=${console.log}
+      ></vouch-embed-player>
+    </div>
+    <div style="height: 33vh">
+      <vouch-embed-player
+        env=${ifDefined(env)}
+        apiKey=${ifDefined(apiKey2)}
+        vouchId=${ifDefined(vouchId2)}
+        templateId=${ifDefined(templateId)}
+        .questions=${questions}
+        .controls=${controls}
+        ?autoplay=${autoplay}
+        preload=${ifDefined(preload)}
+        aspectRatio=${ifDefined(aspectRatio)}
+        @error=${console.log}
+      ></vouch-embed-player>
+    </div>
+    <div style="height: 33vh">
+      <vouch-embed-player
+        env=${ifDefined(env)}
+        apiKey=${ifDefined(apiKey3)}
+        vouchId=${ifDefined(vouchId3)}
+        templateId=${ifDefined(templateId)}
+        .questions=${questions}
+        .controls=${controls}
+        ?autoplay=${autoplay}
+        preload=${ifDefined(preload)}
+        aspectRatio=${ifDefined(aspectRatio)}
+        @error=${console.log}
+      ></vouch-embed-player>
+    </div>
+  `;
+};
+
+// More on how to set up stories at: https://storybook.js.org/docs/web-components/writing-stories/introduction
+const meta = {
+  title: 'Embeds',
+  tags: ['autodocs'],
+  render: (args) => _MultiEmbed(args),
+  component: 'vouch-embed-player'
+} satisfies Meta<PlayerEmbedProps>;
+
+type Story = StoryObj<MultiEmbedArgs>;
+
+const MultiPlayer: Story = {
+  args: {
+    env: 'dev',
+    apiKey1: 'TVik9uTMgE-PD25UTHIS6gyl0hMBWC7AT4dkpdlLBT4VIfDWZJrQiCk6Ak7m1',
+    vouchId1: '6JQEIPeStt',
+    apiKey2: 'TVik9uTMgE-PD25UTHIS6gyl0hMBWC7AT4dkpdlLBT4VIfDWZJrQiCk6Ak7m1',
+    vouchId2: '6JQEIPeStt',
+    apiKey3: 'TVik9uTMgE-PD25UTHIS6gyl0hMBWC7AT4dkpdlLBT4VIfDWZJrQiCk6Ak7m1',
+    vouchId3: '6JQEIPeStt',
+    templateId: '357fc118-e179-4171-9446-ff2b8e9d1b29',
+    questions: [],
+    aspectRatio: 0,
+    preload: 'none',
+    autoplay: false,
+    controls: [
+      'progress',
+      'play-large',
+      'navigation',
+      'play',
+      'volume',
+      'current-time',
+      'duration',
+      'speed',
+      'captions',
+      'fullscreen',
+      'preview',
+      'languages'
+    ]
+  },
+  argTypes: {
+    env: {
+      control: 'radio',
+      options: ['local', 'dev', 'staging', 'prod']
+    },
+    preload: {
+      control: 'radio',
+      options: ['auto', 'none']
+    }
+  },
+  parameters: {
+    layout: 'fullscreen'
+  }
+};
+
+export default meta;
+export { MultiPlayer };

package/src/components/{Embed/Embed.stories.ts → PlayerEmbed/PlayerEmbed.stories.ts}

@@ -1,16 +1,16 @@
 import { html } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
 
-import type { EmbedProps } from './';
+import type { PlayerEmbedProps } from '.';
 import type { Meta, StoryObj } from '@storybook/web-components';
 
-import './';
+import '.';
 
-type EmbedArgs = EmbedProps & {
+type PlayerEmbedArgs = PlayerEmbedProps & {
   showVouch?: boolean;
 };
 
-const _Embed = ({
+const _PlayerEmbed = ({
   vouchId,
   templateId,
   questions,
@@ -20,10 +20,10 @@ const _Embed = ({
   apiKey,
   controls,
   aspectRatio
-}: EmbedArgs) => {
+}: PlayerEmbedArgs) => {
   return html`
     <div style="height: 100vh">
-      <vouch-embed
+      <vouch-embed-player
         env=${ifDefined(env)}
         apiKey=${ifDefined(apiKey)}
         vouchId=${ifDefined(vouchId)}
@@ -34,22 +34,22 @@ const _Embed = ({
         preload=${ifDefined(preload)}
         aspectRatio=${ifDefined(aspectRatio)}
         @error=${console.log}
-      ></vouch-embed>
+      ></vouch-embed-player>
     </div>
   `;
 };
 
 // More on how to set up stories at: https://storybook.js.org/docs/web-components/writing-stories/introduction
 const meta = {
-  title: 'Embed',
+  title: 'Embeds',
   tags: ['autodocs'],
-  render: (args) => _Embed(args),
-  component: 'vouch-embed'
-} satisfies Meta<EmbedProps>;
+  render: (args) => _PlayerEmbed(args),
+  component: 'vouch-embed-player'
+} satisfies Meta<PlayerEmbedProps>;
 
-type Story = StoryObj<EmbedArgs>;
+type Story = StoryObj<PlayerEmbedArgs>;
 
-const Embed: Story = {
+const Player: Story = {
   args: {
     env: 'dev',
     apiKey: 'TVik9uTMgE-PD25UTHIS6gyl0hMBWC7AT4dkpdlLBT4VIfDWZJrQiCk6Ak7m1',
@@ -58,7 +58,21 @@ const Embed: Story = {
     questions: [],
     aspectRatio: 0,
     preload: 'none',
-    autoplay: false
+    autoplay: false,
+    controls: [
+      'progress',
+      'play-large',
+      'navigation',
+      'play',
+      'volume',
+      'current-time',
+      'duration',
+      'speed',
+      'captions',
+      'fullscreen',
+      'preview',
+      'languages'
+    ]
   },
   argTypes: {
     env: {
@@ -76,4 +90,4 @@ const Embed: Story = {
 };
 
 export default meta;
-export { Embed };
+export { Player };

package/src/components/{Embed → PlayerEmbed}/controllers/event-forwarder.ts

@@ -1,27 +1,28 @@
 import { createRef, ref } from 'lit/directives/ref.js';
 
-import type { Embed } from '..';
+import type { PlayerEmbed } from '..';
 import type { ReactiveController, ReactiveControllerHost } from 'lit';
+import type { DirectiveResult } from 'lit/directive.js';
 import type { Ref } from 'lit/directives/ref.js';
 
 import { forwardEvent } from '~/utils/events';
 
-type EmbedHost = ReactiveControllerHost & Embed;
+type PlayerEmbedHost = ReactiveControllerHost & PlayerEmbed;
 
 class EventForwardController implements ReactiveController {
-  host: EmbedHost;
+  host: PlayerEmbedHost;
 
   private _events: string[] = [];
   private _cleanup: (() => void)[] = [];
   private _forwardElementRef: Ref<HTMLElement> = createRef();
 
-  constructor(host: EmbedHost, events: string[]) {
+  constructor(host: PlayerEmbedHost, events: string[]) {
     this.host = host;
     this._events = events;
     host.addController(this);
   }
 
-  register() {
+  register(): DirectiveResult {
     return ref(this._forwardElementRef);
   }
 

package/src/components/{Embed → PlayerEmbed}/controllers/fetcher.ts

@@ -1,29 +1,29 @@
 import { Task } from '@lit/task';
 import { v4 as uuidv4 } from 'uuid';
 
-import type { Embed, EmbedProps } from '..';
+import type { PlayerEmbed, PlayerEmbedProps } from '..';
 import type { ReactiveControllerHost } from 'lit';
 import type { Environment } from '~/utils/env';
 
 import { getEnvUrls } from '~/utils/env';
 
-type EmbedHost = ReactiveControllerHost & Embed;
+type PlayerEmbedHost = ReactiveControllerHost & PlayerEmbed;
 
 type FetchTaskDeps = [
-  EmbedProps['env'],
-  EmbedProps['apiKey'],
-  EmbedProps['data'],
-  EmbedProps['vouchId'],
-  EmbedProps['templateId']
+  PlayerEmbedProps['env'],
+  PlayerEmbedProps['apiKey'],
+  PlayerEmbedProps['data'],
+  PlayerEmbedProps['vouchId'],
+  PlayerEmbedProps['templateId']
 ];
 
-type FilterTaskDeps = [EmbedProps['data'], EmbedProps['questions']];
+type FilterTaskDeps = [PlayerEmbedProps['data'], PlayerEmbedProps['questions']];
 
 class FetcherController {
-  host: EmbedHost;
+  host: PlayerEmbedHost;
 
   private _fetching = false;
-  private _vouch: EmbedProps['data'];
+  private _vouch: PlayerEmbedProps['data'];
 
   set fetching(value) {
     if (this._fetching !== value) {
@@ -97,7 +97,7 @@ class FetcherController {
     return template;
   };
 
-  constructor(host: EmbedHost) {
+  constructor(host: PlayerEmbedHost) {
     this.host = host;
     new Task<FetchTaskDeps, void>(
       this.host,

package/src/components/{Embed → PlayerEmbed}/controllers/tracking/index.ts

@@ -1,4 +1,4 @@
-import type { Embed } from '../..';
+import type { PlayerEmbed } from '../..';
 import type { VideoEventDetail } from '@vouchfor/media-player';
 import type { ReactiveController, ReactiveControllerHost } from 'lit';
 
@@ -7,7 +7,7 @@ import { getEnvUrls } from '~/utils/env';
 
 const MINIMUM_SEND_THRESHOLD = 1;
 
-type EmbedHost = ReactiveControllerHost & Embed;
+type PlayerEmbedHost = ReactiveControllerHost & PlayerEmbed;
 
 type TrackingEvent = 'VOUCH_LOADED' | 'VOUCH_RESPONSE_VIEWED' | 'VIDEO_PLAYED' | 'VIDEO_STREAMED';
 type TrackingPayload = {
@@ -33,7 +33,7 @@ type BooleanMap = {
 };
 
 class TrackingController implements ReactiveController {
-  host: EmbedHost;
+  host: PlayerEmbedHost;
 
   private _batchedEvents: BatchEvent[] = [];
   private _hasPlayed = false;
@@ -43,7 +43,7 @@ class TrackingController implements ReactiveController {
   private _streamLatestTime: TimeMap = {};
   private _currentlyPlayingVideo: VideoEventDetail | null = null;
 
-  constructor(host: EmbedHost) {
+  constructor(host: PlayerEmbedHost) {
     this.host = host;
     host.addController(this);
   }

package/src/components/{Embed → PlayerEmbed}/controllers/tracking/utils.ts

@@ -2,10 +2,10 @@ import { TEMPLATE_VERSION } from '@vouchfor/canvas-video';
 import { v4 as uuidv4 } from 'uuid';
 
 import type { TrackingPayload } from '.';
-import type { Vouch } from '@vouchfor/media-player';
+import type { Vouch } from '@vouchfor/video-utils';
 import type { Environment } from '~/utils/env';
 
-import packageJson from '../../../../../package.json';
+import packageJson from '~/../package.json';
 import { getEnvUrls } from '~/utils/env';
 
 function createVisitor(env: Environment) {

package/src/components/{Embed → PlayerEmbed}/index.ts

@@ -5,7 +5,7 @@ import { createRef, ref } from 'lit/directives/ref.js';
 
 import type { Scene, Scenes, TemplateInstance } from '@vouchfor/canvas-video';
 import type { MediaPlayer, MediaPlayerProps } from '@vouchfor/media-player';
-import type { Ref } from 'lit/directives/ref.js';
+import type { PropertyValueMap } from 'lit';
 import type { Environment } from '~/utils/env';
 
 import { EventForwardController } from './controllers/event-forwarder';
@@ -14,7 +14,10 @@ import { TrackingController } from './controllers/tracking';
 
 import '@vouchfor/media-player';
 
-type EmbedProps = Pick<MediaPlayerProps, 'data' | 'aspectRatio' | 'preload' | 'autoplay' | 'controls'> & {
+type PlayerEmbedProps = Pick<
+  MediaPlayerProps,
+  'data' | 'aspectRatio' | 'language' | 'preload' | 'autoplay' | 'controls'
+> & {
   env: Environment;
   apiKey: string;
   disableTracking?: boolean;
@@ -25,8 +28,8 @@ type EmbedProps = Pick<MediaPlayerProps, 'data' | 'aspectRatio' | 'preload' | 'a
   questions?: number[];
 };
 
-@customElement('vouch-embed')
-class Embed extends LitElement {
+@customElement('vouch-embed-player')
+class PlayerEmbed extends LitElement {
   static styles = [
     css`
       :host {
@@ -35,22 +38,21 @@ class Embed extends LitElement {
     `
   ];
 
-  private _mediaPlayerRef: Ref<MediaPlayer> = createRef();
+  @property({ type: Object }) data: PlayerEmbedProps['data'];
+  @property({ type: String }) vouchId: PlayerEmbedProps['vouchId'];
+  @property({ type: String }) templateId: PlayerEmbedProps['templateId'];
+  @property({ type: Array }) questions: PlayerEmbedProps['questions'];
 
-  @property({ type: Object }) data: EmbedProps['data'];
-  @property({ type: String }) vouchId: EmbedProps['vouchId'];
-  @property({ type: String }) templateId: EmbedProps['templateId'];
-  @property({ type: Array }) questions: EmbedProps['questions'];
+  @property({ type: String }) env: PlayerEmbedProps['env'] = 'prod';
+  @property({ type: String }) apiKey: PlayerEmbedProps['apiKey'] = '';
+  @property({ type: Boolean }) disableTracking: PlayerEmbedProps['disableTracking'] = false;
+  @property({ type: String }) trackingSource: PlayerEmbedProps['trackingSource'] = 'embedded_player';
 
-  @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'] = 'embedded_player';
-
-  @property({ type: Array }) controls: EmbedProps['controls'];
-  @property({ type: String }) preload: EmbedProps['preload'] = 'auto';
-  @property({ type: Boolean }) autoplay: EmbedProps['autoplay'] = false;
-  @property({ type: Number }) aspectRatio: EmbedProps['aspectRatio'] = 0;
+  @property({ type: Array }) controls: PlayerEmbedProps['controls'];
+  @property({ type: String }) preload: PlayerEmbedProps['preload'] = 'auto';
+  @property({ type: Boolean }) autoplay: PlayerEmbedProps['autoplay'] = false;
+  @property({ type: Number }) aspectRatio: PlayerEmbedProps['aspectRatio'] = 0;
+  @property({ type: String }) language?: MediaPlayerProps['language'];
 
   private eventController = new EventForwardController(this, [
     'durationchange',
@@ -63,10 +65,12 @@ class Embed extends LitElement {
     'playing',
     'ratechange',
     'scenechange',
+    'scenesupdate',
     'seeking',
     'seeked',
     'timeupdate',
     'volumechange',
+    'processing',
     'waiting',
 
     'video:loadeddata',
@@ -85,17 +89,23 @@ class Embed extends LitElement {
   // @ts-ignore
   private _trackingController = new TrackingController(this);
 
-  @state() vouch: EmbedProps['data'];
+  @state() vouch: PlayerEmbedProps['data'];
   @state() template: TemplateInstance | undefined;
 
   get fetching() {
     return this._fetcherController.fetching;
   }
 
+  private _mediaPlayerRef = createRef<MediaPlayer>();
+
   get waiting() {
     return this._mediaPlayerRef.value?.waiting;
   }
 
+  get initialised() {
+    return this._mediaPlayerRef.value?.initialised;
+  }
+
   get seeking() {
     return this._mediaPlayerRef.value?.seeking;
   }
@@ -180,6 +190,10 @@ class Embed extends LitElement {
     this._mediaPlayerRef.value?.pause();
   }
 
+  reset(time = 0, play = false) {
+    this._mediaPlayerRef.value?.reset(time, play);
+  }
+
   setScene(index: number) {
     this._mediaPlayerRef.value?.setScene(index);
   }
@@ -209,6 +223,13 @@ class Embed extends LitElement {
     return null;
   }
 
+  protected willUpdate(changedProperties: PropertyValueMap<PlayerEmbedProps>) {
+    // If the vouch this embed is pointing to changes then reset the player
+    if (changedProperties.has('vouchId') && this.vouchId !== changedProperties.get('vouchId')) {
+      this.reset(0, false);
+    }
+  }
+
   render() {
     return html`
       ${this._renderStyles()}
@@ -221,6 +242,7 @@ class Embed extends LitElement {
         .template=${this.template}
         aspectRatio=${ifDefined(this.aspectRatio)}
         preload=${ifDefined(this.preload)}
+        language=${ifDefined(this.language)}
         .controls=${this.controls}
       ></vmp-media-player>
     `;
@@ -229,15 +251,15 @@ class Embed extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    'vouch-embed': Embed;
+    'vouch-embed-player': PlayerEmbed;
   }
 
   namespace JSX {
     interface IntrinsicElements {
-      'vouch-embed': Embed;
+      'vouch-embed-player': PlayerEmbed;
     }
   }
 }
 
-export { Embed };
-export type { EmbedProps };
+export { PlayerEmbed };
+export type { PlayerEmbedProps };

package/src/components/{Embed/tests/Embed.spec.ts → PlayerEmbed/tests/PlayerEmbed.spec.ts}

@@ -3,7 +3,7 @@ import { expect, fixture, waitUntil } from '@open-wc/testing';
 import { html } from 'lit';
 import sinon from 'sinon';
 
-import type { Embed } from '../index.js';
+import type { PlayerEmbed } from '../index.js';
 import type { VideoMap } from '@vouchfor/media-player';
 
 import { data } from './data.js';
@@ -17,7 +17,7 @@ function getVideo(videos: VideoMap) {
   return Object.values(videos)[0];
 }
 
-function playerLoaded(player: Embed) {
+function playerLoaded(player: PlayerEmbed) {
   return waitUntil(
     () => {
       return player.mediaPlayer?.initialised;
@@ -28,8 +28,10 @@ function playerLoaded(player: Embed) {
 }
 
 describe('Embeds', () => {
-  it('passes', async () => {
-    const player = await fixture<Embed>(html`<vouch-embed env="dev" .data=${data} aspectratio=${1}></vouch-embed>`);
+  it('Sends correct tracking events', async () => {
+    const player = await fixture<PlayerEmbed>(
+      html`<vouch-embed-player env="dev" .data=${data} aspectratio=${1}></vouch-embed-player>`
+    );
     // @ts-ignore - accessing private property
     const sendTrackingSpy = sinon.spy(player._trackingController, '_sendTrackingEvent');
     // @ts-ignore - accessing private property
@@ -54,6 +56,13 @@ describe('Embeds', () => {
     expect(sendTrackingSpy.callCount).to.be.eq(0);
     // Destroy node because events are sent when node is removed from the document
     player.remove();
+    await waitUntil(
+      () => {
+        return createTrackingSpy.args[2];
+      },
+      'Cleanup event has not fired',
+      { timeout: 5000 }
+    );
     expect(sendTrackingSpy.callCount).to.be.eq(1);
     expect(createTrackingSpy.args[0]).to.eql([
       'VIDEO_PLAYED',