@gcorevideo/player 2.24.2 → 2.24.5

package/src/plugins/source-controller/SourceController.ts

@@ -1,5 +1,5 @@
 import {
-  Events as ClapprEvents,
+  Events as Events,
   CorePlugin,
   type Core as ClapprCore,
 } from '@clappr/core'
@@ -127,6 +127,8 @@ export class SourceController extends CorePlugin {
 
   private active = false
 
+  private autoPlay = false
+
   private switching = false
 
   private sync: SyncFn = noSync
@@ -165,10 +167,10 @@ export class SourceController extends CorePlugin {
   override bindEvents() {
     super.bindEvents()
 
-    this.listenTo(this.core, ClapprEvents.CORE_READY, this.onCoreReady)
+    this.listenTo(this.core, Events.CORE_READY, this.onCoreReady)
     this.listenTo(
       this.core,
-      ClapprEvents.CORE_ACTIVE_CONTAINER_CHANGED,
+      Events.CORE_ACTIVE_CONTAINER_CHANGED,
       this.onActiveContainerChanged,
     )
   }
@@ -200,7 +202,7 @@ export class SourceController extends CorePlugin {
 
   private bindContainerEventListeners() {
     this.core.activePlayback.on(
-      ClapprEvents.PLAYBACK_ERROR,
+      Events.PLAYBACK_ERROR,
       (error: PlaybackError) => {
         trace(`${T} on PLAYBACK_ERROR`, {
           error: {
@@ -215,6 +217,9 @@ export class SourceController extends CorePlugin {
         if (this.switching) {
           return
         }
+        // The autoPlay metadata flag is set between a call to play and the actual playback start event, after which the flag is cleared.
+        this.autoPlay =
+          !!this.core.activeContainer.actionsMetadata.playEvent?.autoPlay
         switch (error.code) {
           case PlaybackErrorCode.MediaSourceUnavailable:
             this.core.activeContainer?.getPlugin('poster')?.disable()
@@ -225,7 +230,7 @@ export class SourceController extends CorePlugin {
         }
       },
     )
-    this.core.activePlayback.on(ClapprEvents.PLAYBACK_PLAY, () => {
+    this.core.activePlayback.on(Events.PLAYBACK_PLAY, () => {
       trace(`${T} on PLAYBACK_PLAY`, {
         currentSource: this.sourcesList[this.currentSourceIndex],
         retrying: this.active,
@@ -236,6 +241,16 @@ export class SourceController extends CorePlugin {
         this.core.activeContainer?.getPlugin('spinner')?.hide()
       }
     })
+    this.listenTo(
+      this.core.activeContainer,
+      Events.CONTAINER_PLAY,
+      (_: string, { autoPlay }: { autoPlay?: boolean }) => {
+        trace(`${T} onContainerPlay`, {
+          autoPlay,
+        })
+        this.autoPlay = !!autoPlay
+      },
+    )
   }
 
   private reset() {
@@ -255,17 +270,20 @@ export class SourceController extends CorePlugin {
       trace(`${T} retryPlayback syncing...`, {
         nextSource,
       })
-      const rnd = RETRY_DELAY_BLUR * Math.random()
+      const rnd = Math.round(RETRY_DELAY_BLUR * Math.random())
       this.sync(() => {
-        trace(`${T} retryPlayback loading...`)
         this.switching = false
         this.core.load(nextSource.source, nextSource.mimeType)
         trace(`${T} retryPlayback loaded`, {
           nextSource,
         })
         setTimeout(() => {
-          this.core.activePlayback.play()
-          trace(`${T} retryPlayback playing`)
+          trace(`${T} retryPlayback playing`, {
+            autoPlay: this.autoPlay,
+          })
+          this.core.activeContainer.play({
+            autoPlay: this.autoPlay,
+          })
         }, rnd)
       })
     })

package/src/plugins/source-controller/__tests__/SourceController.test.ts

@@ -1,5 +1,4 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
-
 import FakeTimers from '@sinonjs/fake-timers'
 
 import { SourceController } from '../SourceController'
@@ -11,6 +10,11 @@ import {
   createSpinnerPlugin,
 } from '../../../testUtils.js'
 
+// import { LogTracer, Logger, setTracer } from '@gcorevideo/utils'
+
+// setTracer(new LogTracer('SourceController.test'))
+// Logger.enable('*')
+
 const MOCK_SOURCES = [
   {
     source: 'http://0eab.cdn.globo.com/1932-1447.mpd',
@@ -85,8 +89,6 @@ describe('SourceController', () => {
           code: PlaybackErrorCode.MediaSourceUnavailable,
         })
         nextPlayback = createMockPlayback()
-        vi.spyOn(nextPlayback, 'consent')
-        vi.spyOn(nextPlayback, 'play')
         core.activePlayback = nextPlayback
       })
       it('should load the next source after a delay', async () => {
@@ -101,7 +103,7 @@ describe('SourceController', () => {
         await clock.tickAsync(1000)
         expect(nextPlayback.play).not.toHaveBeenCalled()
         await clock.tickAsync(500) // TODO check randomness
-        expect(nextPlayback.play).toHaveBeenCalled()
+        expect(core.activeContainer.play).toHaveBeenCalled()
       })
       it('should not call consent', async () => {
         await clock.tickAsync(1500)
@@ -151,8 +153,6 @@ describe('SourceController', () => {
           code: PlaybackErrorCode.MediaSourceUnavailable,
         })
         nextPlayback = createMockPlayback()
-        vi.spyOn(nextPlayback, 'consent')
-        vi.spyOn(nextPlayback, 'play')
         core.activePlayback = nextPlayback
       })
       it('should sync with the spinner before reloading the source', async () => {
@@ -234,8 +234,6 @@ describe('SourceController', () => {
         })
         await clock.tickAsync(1)
         nextPlayback = createMockPlayback()
-        vi.spyOn(nextPlayback, 'consent')
-        vi.spyOn(nextPlayback, 'play')
         core.activePlayback = nextPlayback
       })
       it('should run handler only once', async () => {
@@ -248,5 +246,27 @@ describe('SourceController', () => {
         )
       })
     })
+    describe('when playback was started with autoPlay', () => {
+      beforeEach(async () => {
+        core = createMockCore({
+          sources: MOCK_SOURCES,
+        })
+        const _ = new SourceController(core)
+        core.emit('core:ready')
+        core.emit('core:active:container:changed')
+        core.activeContainer.actionsMetadata.playEvent = {
+          autoPlay: true,
+        }
+        core.activePlayback.emit('playback:error', {
+          code: PlaybackErrorCode.MediaSourceUnavailable,
+        })
+        await clock.tickAsync(1500)
+      })
+      it('should call play with autoPlay metadata', () => {
+        expect(core.activeContainer.play).toHaveBeenCalledWith({
+          autoPlay: true,
+        })
+      })
+    })
   })
 })

package/src/testUtils.ts

@@ -42,7 +42,10 @@ export function createSpinnerPlugin() {
   })
 }
 
-export function createMockPlayback(name = 'mock', options: Record<string, unknown> = {}) {
+export function createMockPlayback(
+  name = 'mock',
+  options: Record<string, unknown> = {},
+) {
   const emitter = new Events()
   return Object.assign(emitter, {
     name,
@@ -87,6 +90,7 @@ export function createMockContainer(
   const el = playback.el
   const emitter = new Events()
   return Object.assign(emitter, {
+    actionsMetadata: {},
     el,
     playback,
     options: {