more tests

videojs · mister-ben · Apr 28, 2023 · Jun 1, 2023 · Jun 2, 2023 · Jun 2, 2023
commit b67a9ee9873e4ce1e5c3a96a7422875f6ca70d7a
diff --git a/src/js/mediasession.js b/src/js/mediasession.js
@@ -2,10 +2,8 @@ import window from 'global/window';
 import {getMimetype} from './utils/mimetypes';
 
 /**
- *
- * Sets up media session if supported and configured
- *
- * @this { import('./player').default }
+ * @method initMediaSession Sets up media session if supported and configured
+ * @this { import('./player').default } Player
  */
 export const initMediaSession = function() {
   if (!this.options_.mediaSession || !('mediaSession' in window.navigator)) {
@@ -25,6 +23,7 @@ export const initMediaSession = function() {
       this.pause();
       this.currentTime(0);
     }],
+    // videojs-contrib-ads
     ['seekbackward', (details) => {
       if (this.usingPlugin('ads') && this.ads.inAdBreak()) {
         return;
@@ -45,6 +44,9 @@ export const initMediaSession = function() {
     }]
   ];
 
+  // Using Googles' recommendation that expects some handler may not be settable, especially as we
+  // want to support older Chrome
+  // https://web.dev/media-session/#let-users-control-whats-playing
   for (const [action, handler] of actionHandlers) {
     try {
       ms.setActionHandler(action, handler);
@@ -74,23 +76,33 @@ export const initMediaSession = function() {
   }
 
   /**
+   *
+   * Updates the mediaSession metadata. Fires `updatemediasession` as an
+   * opportunity to modify the metadata
+   *
    * @fires Player#updatemediasession
    */
   const updateMediaSession = () => {
-    this.log('updatems');
     const currentMedia = this.getMedia();
     const playlistItem = this.usingPlugin('playlist') ? Object.assign({}, this.playlist()[this.playlist.currentItem()]) : {};
     const mediaSessionData = {
-      artwork: currentMedia.artwork || playlistItem.artwork || this.poster() ? [{
-        src: this.poster(),
-        type: getMimetype(this.poster())
-      }] : [],
       title: currentMedia.title || playlistItem.name || '',
       artist: currentMedia.artist || playlistItem.artist || '',
       album: currentMedia.album || playlistItem.album || ''
     };
 
-    // This allows the metadata to be updated before being set, e.g. if loadmedia() is not used.
+    if (currentMedia.artwork) {
+      mediaSessionData.artwork = currentMedia.artwork;
+    } else if (playlistItem.artwork) {
+      mediaSessionData.artwork = playlistItem.artwork;
+    } else if (this.poster()) {
+      mediaSessionData.artwork = {
+        src: this.poster(),
+        type: getMimetype(this.poster())
+      };
+    }
+
+    // This allows the metadata to be updated before being set, e.g. if loadMedia() is not used.
     this.trigger('updatemediasession', mediaSessionData);
 
     ms.metadata = new window.MediaMetadata(mediaSessionData);
@@ -108,7 +120,15 @@ export const initMediaSession = function() {
     }
   };
 
-  this.on('playing', updateMediaSession);
+  this.on('playing', () => {
+    updateMediaSession();
+    ms.playbackState = 'playing';
+  });
+
+  this.on(['paused', 'paused'], () => {
+    updateMediaSession();
+    ms.playbackState = 'playing';
+  });
 
   if ('setPositionState' in ms) {
     this.on(['playing', 'seeked', 'ratechange'], updatePositionState);

diff --git a/test/unit/player-mediasession.test.js b/test/unit/player-mediasession.test.js
@@ -140,7 +140,7 @@ QUnit.test('mediasession data set', function(assert) {
   this.clock.restore();
 });
 
-QUnit.test('mediasession can be customised befire being set', function(assert) {
+QUnit.test('mediasession can be customised before being set', function(assert) {
   assert.expect(3);
 
   this.clock = sinon.useFakeTimers();
@@ -172,3 +172,34 @@ QUnit.test('mediasession can be customised befire being set', function(assert) {
   this.clock.restore();
 });
 
+QUnit.test('action handlers set up', function(assert) {
+  const spy = sinon.spy(window.navigator.mediaSession, 'setActionHandler');
+
+  this.player = TestHelpers.makePlayer({
+    mediaSession: true
+  });
+
+  assert.true(spy.calledWith('play'), 'play handler set');
+  assert.false(spy.calledWith('previoustrack'), 'playlist handler not set');
+
+  spy.restore();
+});
+
+QUnit.test('playlist action handlers set up', function(assert) {
+  const spy = sinon.spy(window.navigator.mediaSession, 'setActionHandler');
+
+  this.clock = sinon.useFakeTimers();
+  this.player = TestHelpers.makePlayer({
+    mediaSession: true
+  });
+
+  this.player.trigger('pluginsetup:playlist');
+
+  this.clock.tick(10);
+
+  assert.true(spy.calledWith('play'), 'play handler set');
+  assert.true(spy.calledWith('previoustrack'), 'playlist handler set');
+
+  spy.restore();
+  this.clock.restore();
+});