@vouchfor/embeds 0.0.0-experiment.401abc6 → 0.0.0-experiment.40b39e3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vouchfor/embeds",
-  "version": "0.0.0-experiment.401abc6",
+  "version": "0.0.0-experiment.40b39e3",
   "license": "MIT",
   "author": "Aaron Williams",
   "main": "dist/es/embeds.js",
@@ -31,10 +31,11 @@
     "prepublishOnly": "yarn build",
     "size": "size-limit",
     "storybook": "yarn prebuild && storybook dev -p 6007",
-    "prebuild": "yarn build:deps && yarn generate:manifest",
+    "prebuild": "yarn generate:manifest",
     "test": "rm -rf test/lib && yarn prebuild && vite build --mode test && web-test-runner",
     "test:ci": "yarn test --config web-test-runner.ci.config.js",
-    "test:watch": "yarn test --watch"
+    "test:watch": "yarn test --watch",
+    "typecheck": "tsc --noEmit"
   },
   "lint-staged": {
     "**/*.{ts,tsx,js}": "eslint --fix --quiet",
@@ -42,47 +43,47 @@
   },
   "dependencies": {
     "@a11y/focus-trap": "^1.0.5",
-    "@lit/task": "^1.0.0",
-    "@vouchfor/canvas-video": "0.0.0-experiment.401abc6",
-    "@vouchfor/media-player": "0.0.0-experiment.401abc6",
+    "@lit/task": "^1.0.2",
+    "@vouchfor/canvas-video": "0.0.0-experiment.40b39e3",
+    "@vouchfor/media-player": "0.0.0-experiment.40b39e3",
     "uuid": "^9.0.1"
   },
   "peerDependencies": {
     "lit": "^3.1.2"
   },
   "devDependencies": {
-    "@esm-bundle/chai": "^4.3.4-fix.0",
+    "@esm-bundle/chai": "^4.3.4",
     "@open-wc/testing": "^4.0.0",
-    "@storybook/addon-essentials": "^8.0.4",
-    "@storybook/addon-links": "^8.0.4",
-    "@storybook/blocks": "^8.0.4",
-    "@storybook/web-components": "^8.0.4",
-    "@storybook/web-components-vite": "^8.0.4",
+    "@storybook/addon-essentials": "^8.6.12",
+    "@storybook/addon-links": "^8.6.12",
+    "@storybook/blocks": "^8.6.12",
+    "@storybook/web-components": "^8.6.12",
+    "@storybook/web-components-vite": "^8.6.12",
     "@svgr/core": "^8.1.0",
     "@types/flat": "^5.0.5",
-    "@types/mocha": "^10.0.6",
-    "@vouchfor/eslint-config": "^1.0.1",
+    "@types/mocha": "^10.0.10",
+    "@vouchfor/eslint-config": "^1.0.5",
     "@vouchfor/prettier-config": "^1.0.1",
-    "@vouchfor/video-utils": "0.0.0-experiment.401abc6",
-    "@web/dev-server-esbuild": "^1.0.2",
-    "@web/test-runner": "^0.18.1",
-    "@web/test-runner-browserstack": "^0.7.1",
+    "@vouchfor/video-utils": "0.0.0-experiment.40b39e3",
+    "@web/dev-server-esbuild": "^1.0.4",
+    "@web/test-runner": "^0.20.1",
+    "@web/test-runner-browserstack": "^0.8.0",
     "@web/test-runner-mocha": "^0.9.0",
     "@web/test-runner-playwright": "^0.11.0",
-    "glob": "^10.3.10",
-    "lint-staged": "^15.2.2",
-    "lit": "^3.1.2",
+    "glob": "^10.4.5",
+    "lint-staged": "^15.5.1",
+    "lit": "^3.3.0",
     "lodash": "^4.17.21",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "rollup-plugin-tla": "^0.0.2",
     "sinon": "^17.0.1",
-    "storybook": "^8.0.4",
+    "storybook": "^8.6.12",
     "svgson": "^5.3.1",
-    "typescript": "^5.4.3",
-    "vite": "^5.2.2",
-    "vite-plugin-commonjs": "^0.10.1",
-    "vite-plugin-dts": "^3.7.3",
+    "typescript": "^5.8.3",
+    "vite": "^5.4.18",
+    "vite-plugin-commonjs": "^0.10.4",
+    "vite-plugin-dts": "^3.9.1",
     "web-component-analyzer": "^2.0.0"
   }
 }

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

@@ -19,7 +19,8 @@ const _PlayerEmbed = ({
   env,
   apiKey,
   controls,
-  aspectRatio
+  aspectRatio,
+  senderId
 }: PlayerEmbedArgs) => {
   return html`
     <div style="height: 100vh">
@@ -33,6 +34,7 @@ const _PlayerEmbed = ({
         ?autoplay=${autoplay}
         preload=${ifDefined(preload)}
         aspectRatio=${ifDefined(aspectRatio)}
+        senderId=${ifDefined(senderId)}
         @error=${console.log}
       ></vouch-embed-player>
     </div>

package/src/components/PlayerEmbed/controllers/tracking/index.ts

@@ -1,5 +1,5 @@
 import type { PlayerEmbed } from '../..';
-import type { VideoEventDetail } from '@vouchfor/media-player';
+import type { MediaEventDetail } from '@vouchfor/media-player';
 import type { ReactiveController, ReactiveControllerHost } from 'lit';
 
 import { findVouchId, getReportingMetadata, getUids } from './utils';
@@ -15,6 +15,7 @@ type TrackingPayload = {
   answerId?: string;
   streamStart?: number;
   streamEnd?: number;
+  senderId?: string;
 };
 
 type BatchEvent = {
@@ -41,7 +42,7 @@ class TrackingController implements ReactiveController {
   private _answersViewed: BooleanMap = {};
   private _streamStartTime: TimeMap = {};
   private _streamLatestTime: TimeMap = {};
-  private _currentlyPlayingVideo: VideoEventDetail | null = null;
+  private _currentlyPlayingVideo: MediaEventDetail | null = null;
 
   constructor(host: PlayerEmbedHost) {
     this.host = host;
@@ -59,6 +60,7 @@ class TrackingController implements ReactiveController {
       event,
       payload: {
         ...payload,
+        senderId: this.host.senderId,
         vouchId,
         time: new Date().toISOString()
       }
@@ -127,14 +129,12 @@ class TrackingController implements ReactiveController {
   private _handlePlay = () => {
     // Only send the video played event once per session
     if (!this._hasPlayed) {
-      this._createTrackingEvent('VIDEO_PLAYED', {
-        streamStart: this.host.currentTime
-      });
+      this._createTrackingEvent('VIDEO_PLAYED', { streamStart: this.host.currentTime });
       this._hasPlayed = true;
     }
   };
 
-  private _handleVideoPlay = ({ detail: { id, key } }: CustomEvent<VideoEventDetail>) => {
+  private _handleVideoPlay = ({ detail: { id, key } }: CustomEvent<MediaEventDetail>) => {
     // Only increment play count once per session
     if (!this._answersViewed[key]) {
       this._createTrackingEvent('VOUCH_RESPONSE_VIEWED', {
@@ -144,7 +144,7 @@ class TrackingController implements ReactiveController {
     }
   };
 
-  private _handleVideoTimeUpdate = ({ detail: { id, key, node } }: CustomEvent<VideoEventDetail>) => {
+  private _handleVideoTimeUpdate = ({ detail: { id, key, node } }: CustomEvent<MediaEventDetail>) => {
     if (
       // We only want to count any time that the video is actually playing
       !this.host.paused
@@ -161,7 +161,7 @@ class TrackingController implements ReactiveController {
     }
   };
 
-  private _handleVideoPause = ({ detail: { id, key } }: CustomEvent<VideoEventDetail>) => {
+  private _handleVideoPause = ({ detail: { id, key } }: CustomEvent<MediaEventDetail>) => {
     if (this._streamLatestTime[key] > this._streamStartTime[key] + MINIMUM_SEND_THRESHOLD) {
       this._createTrackingEvent('VIDEO_STREAMED', {
         answerId: id,

package/src/components/PlayerEmbed/index.ts

@@ -25,6 +25,7 @@ type PlayerEmbedProps = Pick<MediaPlayerProps, 'aspectRatio' | 'language' | 'pre
   templateId?: string;
   // Index of the questions to include starting from 1
   questions?: number[];
+  senderId?: string;
 };
 
 @customElement('vouch-embed-player')
@@ -52,6 +53,7 @@ class PlayerEmbed extends LitElement {
   @property({ type: Boolean }) autoplay: PlayerEmbedProps['autoplay'] = false;
   @property({ type: Number }) aspectRatio: PlayerEmbedProps['aspectRatio'] = 0;
   @property({ type: String }) language?: MediaPlayerProps['language'];
+  @property({ type: String }) senderId?: PlayerEmbedProps['senderId'];
 
   private eventController = new EventForwardController(this, [
     'durationchange',
@@ -78,6 +80,7 @@ class PlayerEmbed extends LitElement {
     'video:play',
     'video:playing',
     'video:pause',
+    'video:waiting',
     'video:stalled',
     'video:timeupdate',
     'video:ended',
@@ -173,8 +176,8 @@ class PlayerEmbed extends LitElement {
   //   return this._mediaPlayerRef.value?.sceneConfig ?? null;
   // }
 
-  get videoState() {
-    return this._mediaPlayerRef.value?.videoState;
+  get mediaState() {
+    return this._mediaPlayerRef.value?.mediaState;
   }
 
   get mediaPlayer() {

package/src/components/PlayerEmbed/tests/PlayerEmbed.spec.ts

@@ -4,7 +4,7 @@ import { html } from 'lit';
 import sinon from 'sinon';
 
 import type { PlayerEmbed } from '../index.js';
-import type { VideoMap } from '@vouchfor/media-player';
+import type { MediaMap } from '@vouchfor/media-player';
 
 import { data } from './data.js';
 
@@ -13,7 +13,7 @@ import { data } from './data.js';
 // https://modern-web.dev/guides/test-runner/typescript/
 import '../../../test/lib/embeds.js';
 
-function getVideo(videos: VideoMap) {
+function getVideo(videos: MediaMap) {
   return Object.values(videos)[0];
 }
 
@@ -45,14 +45,14 @@ describe.skip('Embeds', () => {
     await waitUntil(
       () => {
         // Video plays for 3 seconds
-        return (getVideo(player.mediaPlayer!.videos)?.node?.currentTime ?? 0) > 3;
+        return (getVideo(player.mediaPlayer!.media)?.node?.currentTime ?? 0) > 3;
       },
       'Video did not play for 3 seconds',
       { timeout: 20000 }
     );
-    expect(getVideo(player.mediaPlayer!.videos)?.node?.paused).eq(false);
+    expect(getVideo(player.mediaPlayer!.media)?.node?.paused).eq(false);
     player.pause();
-    expect(getVideo(player.mediaPlayer!.videos)?.node?.paused).eq(true);
+    expect(getVideo(player.mediaPlayer!.media)?.node?.paused).eq(true);
     expect(sendTrackingSpy.callCount).to.be.eq(0);
     // Destroy node because events are sent when node is removed from the document
     player.remove();