@vouchfor/embeds 0.0.0-experiment.1cdaf7d → 0.0.0-experiment.1f98c5e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vouchfor/embeds",
-  "version": "0.0.0-experiment.1cdaf7d",
+  "version": "0.0.0-experiment.1f98c5e",
   "license": "MIT",
   "author": "Aaron Williams",
   "main": "dist/es/embeds.js",
@@ -28,7 +28,8 @@
     "size": "size-limit",
     "storybook": "yarn prebuild && storybook dev -p 6007",
     "prebuild": "yarn build:deps && yarn generate:manifest",
-    "test": "true"
+    "test": "rm -rf test/lib && yarn prebuild && vite build --mode test && web-test-runner",
+    "test:ci": "yarn test"
   },
   "lint-staged": {
     "**/*.{ts,tsx,js}": "eslint --fix --quiet",
@@ -36,7 +37,7 @@
   },
   "dependencies": {
     "@lit/task": "^1.0.0",
-    "@vouchfor/media-player": "0.0.0-experiment.1cdaf7d",
+    "@vouchfor/media-player": "0.0.0-experiment.1f98c5e",
     "uuid": "^9.0.1"
   },
   "peerDependencies": {
@@ -69,6 +70,7 @@
     "storybook": "^7.4.5",
     "typescript": "^5.1.3",
     "vite": "^4.4.9",
+    "vite-plugin-commonjs": "^0.10.0",
     "vite-plugin-dts": "^3.6.0",
     "web-component-analyzer": "^1.1.7"
   }

package/src/components/Embed/Embed.spec.ts

@@ -0,0 +1,17 @@
+import { expect } from '@esm-bundle/chai';
+// import { fixture } from '@open-wc/testing';
+// import { html } from 'lit';
+
+// import type { Embed } from './index.js';
+
+// Can't use typescript aliases with esbuild file transforms apparently
+// No idea what a good way to actually build before testing is, the examples give nothing
+// https://modern-web.dev/guides/test-runner/typescript/
+import '../../test/lib/embeds.js';
+
+describe('Embeds', () => {
+  it('passes', async () => {
+    expect(true).to.be.true;
+    // const player = await fixture<Embed>(html`<vouch-embed aspectratio=${1}></vouch-embed>`);
+  });
+});

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

@@ -10,7 +10,17 @@ type EmbedArgs = EmbedProps & {
   showVouch?: boolean;
 };
 
-const _Embed = ({ vouchId, templateId, preload, autoplay, env, apiKey, controls, aspectRatio }: EmbedArgs) => {
+const _Embed = ({
+  vouchId,
+  templateId,
+  questions,
+  preload,
+  autoplay,
+  env,
+  apiKey,
+  controls,
+  aspectRatio
+}: EmbedArgs) => {
   return html`
     <div style="height: 100vh">
       <vouch-embed
@@ -18,10 +28,12 @@ const _Embed = ({ vouchId, templateId, preload, autoplay, env, apiKey, controls,
         apiKey=${ifDefined(apiKey)}
         vouchId=${ifDefined(vouchId)}
         templateId=${ifDefined(templateId)}
+        .questions=${questions}
         .controls=${controls}
         ?autoplay=${autoplay}
         preload=${ifDefined(preload)}
         aspectRatio=${ifDefined(aspectRatio)}
+        @error=${console.log}
       ></vouch-embed>
     </div>
   `;
@@ -43,6 +55,7 @@ const Embed: Story = {
     apiKey: 'TVik9uTMgE-PD25UTHIS6gyl0hMBWC7AT4dkpdlLBT4VIfDWZJrQiCk6Ak7m1',
     vouchId: '6JQEIPeStt',
     templateId: '357fc118-e179-4171-9446-ff2b8e9d1b29',
+    questions: [],
     aspectRatio: 0,
     preload: 'none',
     autoplay: false

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

@@ -9,7 +9,7 @@ import { getEnvUrls } from '~/utils/env';
 
 type EmbedHost = ReactiveControllerHost & Embed;
 
-type TaskDeps = [
+type FetchTaskDeps = [
   EmbedProps['env'],
   EmbedProps['apiKey'],
   EmbedProps['data'],
@@ -17,10 +17,13 @@ type TaskDeps = [
   EmbedProps['templateId']
 ];
 
+type FilterTaskDeps = [EmbedProps['data'], EmbedProps['questions']];
+
 class FetcherController {
   host: EmbedHost;
 
   private _fetching = false;
+  private _vouch: EmbedProps['data'];
 
   set fetching(value) {
     if (this._fetching !== value) {
@@ -96,9 +99,9 @@ class FetcherController {
 
   constructor(host: EmbedHost) {
     this.host = host;
-    new Task<TaskDeps, void>(
+    new Task<FetchTaskDeps, void>(
       this.host,
-      async ([env, apiKey, data, vouchId, templateId]: TaskDeps) => {
+      async ([env, apiKey, data, vouchId, templateId]: FetchTaskDeps) => {
         try {
           host.vouch = undefined;
           host.template = undefined;
@@ -109,7 +112,7 @@ class FetcherController {
               this.fetching = true;
               template = await this.getTemplate(env, apiKey, templateId);
             }
-            host.vouch = data;
+            this._vouch = data;
             host.template = template ?? data?.settings?.template?.instance;
           } else if (vouchId) {
             this.fetching = true;
@@ -118,7 +121,7 @@ class FetcherController {
               this.getVouch(env, apiKey, vouchId),
               templateId ? this.getTemplate(env, apiKey, templateId) : null
             ]);
-            host.vouch = vouch;
+            this._vouch = vouch;
             host.template = template ?? vouch?.settings?.template?.instance;
           }
         } finally {
@@ -127,6 +130,22 @@ class FetcherController {
       },
       () => [host.env, host.apiKey, host.data, host.vouchId, host.templateId]
     );
+
+    // This second task is to be able to filter the vouch without fetching it again if only the questions changed
+    new Task<FilterTaskDeps, void>(
+      this.host,
+      ([vouch, questions]: FilterTaskDeps) => {
+        host.vouch = vouch
+          ? {
+              ...vouch,
+              questions: {
+                items: vouch?.questions.items.filter((_, index) => !questions?.length || questions?.includes(index + 1))
+              }
+            }
+          : undefined;
+      },
+      () => [this._vouch, host.questions]
+    );
   }
 }
 

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

@@ -1,3 +1,4 @@
+import { TEMPLATE_VERSION } from '@vouchfor/canvas-video';
 import { v4 as uuidv4 } from 'uuid';
 
 import type { Embed } from '..';
@@ -127,6 +128,9 @@ class TrackingController implements ReactiveController {
       screenWidth: window.screen.width,
       referrer: document.referrer,
       currentUrl: location.href,
+      embedType: 'media-player-embed',
+      embedVersion: packageJson.version,
+      templateVersion: TEMPLATE_VERSION,
       ...utmParams
     };
   };
@@ -154,8 +158,7 @@ class TrackingController implements ReactiveController {
           'x-uid-tab': tab,
           'x-uid-request': request,
           'x-uid-visitor': visitor,
-          'x-reporting-metadata': this._getReportingMetadata(),
-          'x-embeds-version': packageJson.version
+          'x-reporting-metadata': this._getReportingMetadata()
         }
       })
     );

package/src/components/Embed/index.ts

@@ -1,4 +1,4 @@
-import { html, LitElement } from 'lit';
+import { css, html, LitElement } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { createRef, ref } from 'lit/directives/ref.js';
@@ -21,20 +21,31 @@ type EmbedProps = Pick<MediaPlayerProps, 'data' | 'aspectRatio' | 'preload' | 'a
   trackingSource?: string;
   vouchId?: string;
   templateId?: string;
+  // Index of the questions to include starting from 1
+  questions?: number[];
 };
 
 @customElement('vouch-embed')
 class Embed extends LitElement {
+  static styles = [
+    css`
+      :host {
+        display: flex;
+      }
+    `
+  ];
+
   private _mediaPlayerRef: Ref<MediaPlayer> = createRef();
 
-  @property({ type: Object, attribute: 'data' }) data: EmbedProps['data'];
+  @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: 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: String }) trackingSource: EmbedProps['trackingSource'] = 'embedded_player';
 
   @property({ type: Array }) controls: EmbedProps['controls'];
   @property({ type: String }) preload: EmbedProps['preload'] = 'auto';
@@ -175,7 +186,7 @@ class Embed extends LitElement {
 
   render() {
     return html`
-      <vmp-new-media-player
+      <vmp-media-player
         ${ref(this._mediaPlayerRef)}
         ${this.eventController.register()}
         ?autoplay=${this.autoplay}
@@ -185,7 +196,7 @@ class Embed extends LitElement {
         aspectRatio=${ifDefined(this.aspectRatio)}
         preload=${ifDefined(this.preload)}
         .controls=${this.controls}
-      ></vmp-new-media-player>
+      ></vmp-media-player>
     `;
   }
 }