@npo/player 1.27.3 → 1.27.5

package/lib/npoplayer.js

@@ -159,25 +159,25 @@ export default class NpoPlayer {
             }
             this.sourceConfig = await playerAction.processSourceConfig(this.npoPlayerServices, source, options.sourceConfig ?? {}, this.streamObject, drmType && drmType.length > 0 ? profile.drm : undefined, this.streamOptions, this.version, this.npoTag?.npoTagInstance);
             await this.npoPlayerServices.verifyDRM(this.playerContext, payload);
-            setupMediaSessionActionHandlers(this.player, this.sourceConfig, _streamObject);
-            this.hidePlayNextScreen();
             const streamDuration = _streamObject.metadata.duration;
             this.npoPlayerServices.startPlayerTracker({
                 playerContext: this.playerContext,
                 source: source,
                 duration: streamDuration ? Number(streamDuration) : undefined
             });
-            if (this.variant === NpoPlayerUIVariants.DEFAULT &&
-                this.streamObject.metadata.hasPreroll === 'true' &&
-                this.streamObject.assets.preroll) {
-                await this.npoPlayerServices.schedulePreRolls(this.playerContext);
-            }
         }
         else {
             await this.npoPlayerServices.handleError(this.playerContext, 500);
         }
         this.npoPlayerServices.handleStreamOptions(this.playerContext);
         this.npoPlayerServices.setupNicamKijkwijzerIcons(this.playerContext);
+        setupMediaSessionActionHandlers(this.player, this.sourceConfig, this.streamObject);
+        this.hidePlayNextScreen();
+        if (this.variant === NpoPlayerUIVariants.DEFAULT &&
+            this.streamObject.metadata.hasPreroll === 'true' &&
+            this.streamObject.assets.preroll) {
+            await this.npoPlayerServices.schedulePreRolls(this.playerContext);
+        }
         if (this.variant === NpoPlayerUIVariants.VERTICAL) {
             this.npoPlayerServices.handleVerticalVideoControls(this.playerContext);
             this.npoPlayerServices.handleVerticalVideoSettings(this.playerContext);
@@ -329,6 +329,7 @@ export default class NpoPlayer {
                 }
                 this.pause();
                 if (this.playerContext) {
+                    this.npoPlayerServices.removeEventListeners(this.playerContext);
                     this.npoPlayerServices.discardAdBreak(this.playerContext);
                 }
                 this.hidePlayNextScreen();

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npo/player",
-  "version": "1.27.3",
+  "version": "1.27.5",
   "description": "NPO Player",
   "author": "Publieke Omroep <player@npo.nl>",
   "contributors": [

package/lib/services/advertHandlers/discardAdBreak.js

@@ -1,13 +1,9 @@
 import { NpoPlayerUIVariants } from '../../types/interfaces';
 export function discardAdBreak(playerContext) {
     const { npoPlayer, player } = playerContext;
-    const { adBreakActive } = npoPlayer;
-    if (!player || adBreakActive === false)
+    const { adBreakActive, variant } = npoPlayer;
+    if (!player || (!adBreakActive && variant !== NpoPlayerUIVariants.AD))
         return;
     void playerContext.player.createUIManager(playerContext, NpoPlayerUIVariants.DEFAULT);
-    const activeAdBreak = player.getActiveAdBreak();
-    if (activeAdBreak?.id) {
-        player.playerAPI.ads.discardAdBreak(activeAdBreak.id);
-    }
-    npoPlayer.adBreakActive = false;
+    playerContext.npoPlayer.adBreakActive = false;
 }

package/lib/services/advertHandlers/discardAdBreak.test.js

@@ -4,73 +4,36 @@ import { discardAdBreak } from './discardAdBreak';
 describe('discardAdBreak', () => {
     let mockNpoPlayerAPI;
     let npoPlayerMock;
-    const activeAdBreakMock = { id: 'ad-break-id' };
     afterEach(() => {
         jest.resetAllMocks();
     });
     it('should not discard ad break if player is undefined', () => {
-        npoPlayerMock = createMockNpoPlayer({
-            adBreakActive: true
-        });
-        const playerContextMock = createPlayerContextMock({
-            player: undefined,
-            npoPlayer: npoPlayerMock
-        });
+        npoPlayerMock = createMockNpoPlayer({ adBreakActive: true, variant: NpoPlayerUIVariants.AD });
+        const playerContextMock = createPlayerContextMock({ player: undefined, npoPlayer: npoPlayerMock });
         discardAdBreak(playerContextMock);
         expect(npoPlayerMock.adBreakActive).toBe(true);
     });
     it('should not discard ad break if adBreakActive is false', () => {
-        mockNpoPlayerAPI = createMockNpoPlayerAPI({
-            getActiveAdBreak: jest.fn().mockReturnValue(activeAdBreakMock),
-            discardAdBreak: jest.fn()
-        });
-        npoPlayerMock = createMockNpoPlayer({
-            adBreakActive: false
-        });
-        const playerContextMock = createPlayerContextMock({
-            player: mockNpoPlayerAPI,
-            npoPlayer: npoPlayerMock
-        });
+        mockNpoPlayerAPI = createMockNpoPlayerAPI();
+        npoPlayerMock = createMockNpoPlayer({ adBreakActive: false });
+        const playerContextMock = createPlayerContextMock({ player: mockNpoPlayerAPI, npoPlayer: npoPlayerMock });
         discardAdBreak(playerContextMock);
-        expect(mockNpoPlayerAPI.getActiveAdBreak).not.toHaveBeenCalled();
-        expect(mockNpoPlayerAPI.playerAPI.ads.discardAdBreak).not.toHaveBeenCalled();
         expect(npoPlayerMock.adBreakActive).toBe(false);
         expect(playerContextMock.player.createUIManager).not.toHaveBeenCalled();
     });
-    it('should discard active ad break if adBreakActive is true and ad break exists', () => {
-        mockNpoPlayerAPI = createMockNpoPlayerAPI({
-            getActiveAdBreak: jest.fn().mockReturnValue(activeAdBreakMock),
-            discardAdBreak: jest.fn(),
-            variant: NpoPlayerUIVariants.AD
-        });
-        npoPlayerMock = createMockNpoPlayer({
-            adBreakActive: true
-        });
-        const playerContextMock = createPlayerContextMock({
-            player: mockNpoPlayerAPI,
-            npoPlayer: npoPlayerMock
-        });
+    it('should discard ad break if adBreakActive is true', () => {
+        mockNpoPlayerAPI = createMockNpoPlayerAPI();
+        npoPlayerMock = createMockNpoPlayer({ adBreakActive: true, variant: NpoPlayerUIVariants.DEFAULT });
+        const playerContextMock = createPlayerContextMock({ player: mockNpoPlayerAPI, npoPlayer: npoPlayerMock });
         discardAdBreak(playerContextMock);
-        expect(mockNpoPlayerAPI.getActiveAdBreak).toHaveBeenCalled();
-        expect(mockNpoPlayerAPI.playerAPI.ads.discardAdBreak).toHaveBeenCalledWith(activeAdBreakMock.id);
         expect(npoPlayerMock.adBreakActive).toBe(false);
-        expect(playerContextMock.player.createUIManager).toHaveBeenCalledWith(playerContextMock, NpoPlayerUIVariants.DEFAULT);
+        expect(playerContextMock.player.createUIManager).toHaveBeenCalled();
     });
-    it('should not discard ad break if active ad break does not exist', () => {
-        mockNpoPlayerAPI = createMockNpoPlayerAPI({
-            getActiveAdBreak: jest.fn().mockReturnValue(undefined),
-            discardAdBreak: jest.fn()
-        });
-        npoPlayerMock = createMockNpoPlayer({
-            adBreakActive: true
-        });
-        const playerContextMock = createPlayerContextMock({
-            player: mockNpoPlayerAPI,
-            npoPlayer: npoPlayerMock
-        });
+    it('should discard active ad break if conditions are met', () => {
+        mockNpoPlayerAPI = createMockNpoPlayerAPI();
+        npoPlayerMock = createMockNpoPlayer({ adBreakActive: true, variant: NpoPlayerUIVariants.AD });
+        const playerContextMock = createPlayerContextMock({ player: mockNpoPlayerAPI, npoPlayer: npoPlayerMock });
         discardAdBreak(playerContextMock);
-        expect(mockNpoPlayerAPI.getActiveAdBreak).toHaveBeenCalled();
-        expect(mockNpoPlayerAPI.playerAPI.ads.discardAdBreak).not.toHaveBeenCalled();
         expect(npoPlayerMock.adBreakActive).toBe(false);
         expect(playerContextMock.player.createUIManager).toHaveBeenCalledWith(playerContextMock, NpoPlayerUIVariants.DEFAULT);
     });

package/lib/services/advertHandlers/handlePreRolls.js

@@ -124,7 +124,14 @@ export async function handlePreRolls(playerContext) {
             adUiSet = false;
             resolve();
         }
-        playerContext.player.on(NpoPlayerEvent.AdBreakFinished, handleAdBreakFinished);
-        playerContext.player.on(NpoPlayerEvent.AdError, handleAdBreakFinished);
+        const adBreakFinishedCallback = () => handleAdBreakFinished();
+        const adErrorCallback = () => handleAdBreakFinished();
+        playerContext.player.on(NpoPlayerEvent.AdBreakFinished, adBreakFinishedCallback);
+        playerContext.player.on(NpoPlayerEvent.AdError, adErrorCallback);
+        playerContext.npoPlayer.eventListeners = {
+            ...playerContext.npoPlayer.eventListeners,
+            adBreakFinishedCallback,
+            adErrorCallback
+        };
     });
 }

package/lib/services/eventListenerHandlers/removeEventListeners.js

@@ -2,11 +2,13 @@ import { NpoPlayerEvent } from '../../types/events';
 export const removeEventListeners = (playerContext) => {
     const { eventListeners } = playerContext.npoPlayer;
     if (eventListeners) {
-        const { segmentHandleTimeChangedCallback, segmentSeekFunctionCallback, liveStreamHandleTimeChangedCallback } = eventListeners;
+        const { segmentHandleTimeChangedCallback, segmentSeekFunctionCallback, liveStreamHandleTimeChangedCallback, adBreakFinishedCallback, adErrorCallback } = eventListeners;
         const eventMapping = [
             { event: NpoPlayerEvent.TimeChanged, callback: liveStreamHandleTimeChangedCallback },
             { event: NpoPlayerEvent.TimeChanged, callback: segmentHandleTimeChangedCallback },
-            { event: NpoPlayerEvent.Seek, callback: segmentSeekFunctionCallback }
+            { event: NpoPlayerEvent.Seek, callback: segmentSeekFunctionCallback },
+            { event: NpoPlayerEvent.AdBreakFinished, callback: adBreakFinishedCallback },
+            { event: NpoPlayerEvent.AdError, callback: adErrorCallback }
         ];
         for (const { event, callback } of eventMapping) {
             if (callback) {

package/lib/services/liveStreamHandlers/handleLiveStreamControls.js

@@ -4,6 +4,7 @@ export const handleLiveStreamControls = (playerContext) => {
     const { player, npoPlayer } = playerContext;
     player.on(NpoPlayerEvent.TimeChanged, liveStreamHandleTimeChangedCallback);
     npoPlayer.eventListeners = {
+        ...npoPlayer.eventListeners,
         liveStreamHandleTimeChangedCallback
     };
 };

package/lib/services/segmentHandlers/addSegmentEventListeners.js

@@ -8,6 +8,7 @@ export const addSegmentEventListeners = (playerContext, segment) => {
     player.on(NpoPlayerEvent.TimeChanged, segmentHandleTimeChangedCallback);
     player.on(NpoPlayerEvent.Seek, segmentSeekFunctionCallback);
     npoPlayer.eventListeners = {
+        ...npoPlayer.eventListeners,
         segmentHandleTimeChangedCallback,
         segmentSeekFunctionCallback
     };

package/lib/services/services.d.ts

@@ -26,4 +26,5 @@ export declare class NpoPlayerServices {
     startPlayerTracker({ playerContext, source, duration }: PlayerTrackerParams): void;
     initPlayerTracker(playerContext: PlayerContext): void;
     logEvent({ playerContext, event, data }: LogEventParams): void;
+    removeEventListeners(playerContext: PlayerContext): void;
 }

package/lib/services/services.js

@@ -16,6 +16,7 @@ import { handleStreamOptions } from './streamoptionsHandlers/streamOptionsHandle
 import { handlePlayerError } from './errors/errorHandler';
 import { fetchStream } from './streamFetchHandler/fetchStream';
 import { startPlayerTracker, initPlayerTracker, logEvent } from './trackingHandlers';
+import { removeEventListeners } from './eventListenerHandlers/removeEventListeners';
 export class NpoPlayerServices {
     getAVType(avType) {
         return getAVType(avType);
@@ -104,4 +105,7 @@ export class NpoPlayerServices {
     logEvent({ playerContext, event, data }) {
         logEvent({ playerContext, event, data });
     }
+    removeEventListeners(playerContext) {
+        removeEventListeners(playerContext);
+    }
 }

package/lib/services/streamoptionsHandlers/streamOptionsHandler.js

@@ -1,14 +1,12 @@
 import * as playerAction from '../../js/playeractions/playeractions';
 import { initSegment } from '../segmentHandlers/initSegment';
 import { handleLiveStreamControls } from '../liveStreamHandlers/handleLiveStreamControls';
-import { removeEventListeners } from '../eventListenerHandlers/removeEventListeners';
 import { NpoPlayerEvent } from '../../types/events';
 import { updateClassFromElementByQuery } from '../../js/utilities/utilities.element';
 export function handleStreamOptions(playerContext) {
     const { streamObject, uiManager } = playerContext.npoPlayer;
     if (!streamObject || !uiManager)
         return;
-    removeEventListeners(playerContext);
     initializeFragment(playerContext);
     handleStartOffset(playerContext);
     updateStreamClasses(playerContext);

package/lib/src/services/services.d.ts

@@ -26,4 +26,5 @@ export declare class NpoPlayerServices {
     startPlayerTracker({ playerContext, source, duration }: PlayerTrackerParams): void;
     initPlayerTracker(playerContext: PlayerContext): void;
     logEvent({ playerContext, event, data }: LogEventParams): void;
+    removeEventListeners(playerContext: PlayerContext): void;
 }

package/lib/src/types/interfaces.d.ts

@@ -19,6 +19,8 @@ export interface EventListeners {
     liveStreamHandleTimeChangedCallback?: NpoPlayerEventCallback;
     segmentHandleTimeChangedCallback?: NpoPlayerEventCallback;
     segmentSeekFunctionCallback?: NpoPlayerEventCallback;
+    adBreakFinishedCallback?: NpoPlayerEventCallback;
+    adErrorCallback?: NpoPlayerEventCallback;
 }
 export interface StreamObject {
     stream: StreamObject_Stream;

package/lib/types/interfaces.d.ts

@@ -19,6 +19,8 @@ export interface EventListeners {
     liveStreamHandleTimeChangedCallback?: NpoPlayerEventCallback;
     segmentHandleTimeChangedCallback?: NpoPlayerEventCallback;
     segmentSeekFunctionCallback?: NpoPlayerEventCallback;
+    adBreakFinishedCallback?: NpoPlayerEventCallback;
+    adErrorCallback?: NpoPlayerEventCallback;
 }
 export interface StreamObject {
     stream: StreamObject_Stream;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npo/player",
-  "version": "1.27.3",
+  "version": "1.27.5",
   "description": "NPO Player",
   "author": "Publieke Omroep <player@npo.nl>",
   "contributors": [