@npo/player 1.24.0 → 1.24.1

package/lib/npoplayer.js

@@ -20,6 +20,7 @@ import { removeReplayClass } from './js/playeractions/handlers/removereplayclass
 import { showNicamAfterUiDelay } from './ui/handlers/nicamhandler';
 import { updateLiveMarkers } from './js/markers/updateLiveMarkers';
 import { NpoPlayerAPI } from './services/npoPlayerAPI/npoPlayerAPI';
+import { discardAdBreak } from './services/advertHandlers/discardAdBreak';
 export { NpoPlayerUIVariants };
 export default class NpoPlayer {
     constructor(_container, _playerConfig, _npotag, _npotaginstance, _variant) {
@@ -83,9 +84,8 @@ export default class NpoPlayer {
             console.error('Er is nog geen player geladen.');
             return;
         }
-        if (this.adBreakActive) {
-            const currentAd = this.player.ads.getActiveAdBreak().id;
-            this.player.ads.discardAdBreak(currentAd);
+        if (this.playerContext) {
+            discardAdBreak(this.playerContext);
         }
         let _streamObject;
         const sourceIsUrl = isUrl(source);
@@ -297,6 +297,7 @@ export default class NpoPlayer {
             this.hidePlayNextScreen();
         });
         this.isShowingPlayNextScreen = false;
+        this.canceledPlayNextScreen = false;
         hidePlayNextScreen(this.container);
     }
     doPlayNext() {
@@ -332,6 +333,9 @@ export default class NpoPlayer {
                 if (this.npoTag != undefined) {
                     clearInterval(this.npoTag.heartbeatInterval);
                 }
+                if (this.playerContext) {
+                    discardAdBreak(this.playerContext);
+                }
                 this.hidePlayNextScreen();
                 await this.player?.unload();
                 return true;

package/lib/package.json

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

package/lib/services/advertHandlers/discardAdBreak.d.ts

@@ -0,0 +1,2 @@
+import { PlayerContext } from '../../types/interfaces';
+export declare function discardAdBreak(playerContext: PlayerContext): void;

package/lib/services/advertHandlers/discardAdBreak.js

@@ -0,0 +1,11 @@
+export function discardAdBreak(playerContext) {
+    const { npoplayer, player } = playerContext;
+    const { adBreakActive } = npoplayer;
+    if (!player || adBreakActive === false)
+        return;
+    const activeAdBreak = player.getActiveAdBreak();
+    if (activeAdBreak?.id) {
+        player.discardAdBreak(activeAdBreak.id);
+    }
+    npoplayer.adBreakActive = false;
+}

package/lib/services/advertHandlers/discardAdBreak.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,60 @@
+import createPlayerContextMock, { createMockNpoPlayer, createMockNpoPlayerAPI } from '../../../tests/mocks/playerContextMock';
+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 adBreakActive is false', () => {
+        mockNpoPlayerAPI = createMockNpoPlayerAPI({
+            getActiveAdBreak: jest.fn().mockReturnValue(undefined),
+            discardAdBreak: jest.fn()
+        });
+        npoplayerMock = createMockNpoPlayer({
+            adBreakActive: false
+        });
+        const playerContextMock = createPlayerContextMock({
+            player: mockNpoPlayerAPI,
+            npoplayer: npoplayerMock
+        });
+        discardAdBreak(playerContextMock);
+        expect(mockNpoPlayerAPI.getActiveAdBreak).not.toHaveBeenCalled();
+        expect(mockNpoPlayerAPI.discardAdBreak).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()
+        });
+        npoplayerMock = createMockNpoPlayer({
+            adBreakActive: true
+        });
+        const playerContextMock = createPlayerContextMock({
+            player: mockNpoPlayerAPI,
+            npoplayer: npoplayerMock
+        });
+        discardAdBreak(playerContextMock);
+        expect(mockNpoPlayerAPI.getActiveAdBreak).toHaveBeenCalled();
+        expect(mockNpoPlayerAPI.discardAdBreak).toHaveBeenCalledWith(activeAdBreakMock.id);
+        expect(npoplayerMock.adBreakActive).toBe(false);
+    });
+    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
+        });
+        discardAdBreak(playerContextMock);
+        expect(mockNpoPlayerAPI.getActiveAdBreak).toHaveBeenCalled();
+        expect(mockNpoPlayerAPI.discardAdBreak).not.toHaveBeenCalled();
+        expect(npoplayerMock.adBreakActive).toBe(false);
+    });
+});

package/lib/services/npoPlayerAPI/npoPlayerAPI.d.ts

@@ -37,6 +37,7 @@ export declare class NpoPlayerAPI {
     getTimeShift(): number;
     scheduleAds(adConfig: AdConfig): Promise<AdBreak[]>;
     getActiveAdBreak(): AdBreak | null;
+    discardAdBreak(adBreakId: string): void;
     getConfig(mergedConfig?: boolean): PlayerConfig;
     createUIManager(playerContext: PlayerContext, variant: NpoPlayerUIVariants): Promise<void | UIManager>;
 }

package/lib/services/npoPlayerAPI/npoPlayerAPI.js

@@ -135,6 +135,9 @@ export class NpoPlayerAPI {
     getActiveAdBreak() {
         return this.playerAPI.ads.getActiveAdBreak();
     }
+    discardAdBreak(adBreakId) {
+        return this.playerAPI.ads.discardAdBreak(adBreakId);
+    }
     getConfig(mergedConfig) {
         return this.playerAPI.getConfig(mergedConfig);
     }

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

@@ -0,0 +1,2 @@
+import { PlayerContext } from '../../types/interfaces';
+export declare function discardAdBreak(playerContext: PlayerContext): void;

package/lib/src/services/advertHandlers/discardAdBreak.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -37,6 +37,7 @@ export declare class NpoPlayerAPI {
     getTimeShift(): number;
     scheduleAds(adConfig: AdConfig): Promise<AdBreak[]>;
     getActiveAdBreak(): AdBreak | null;
+    discardAdBreak(adBreakId: string): void;
     getConfig(mergedConfig?: boolean): PlayerConfig;
     createUIManager(playerContext: PlayerContext, variant: NpoPlayerUIVariants): Promise<void | UIManager>;
 }

package/lib/tests/mocks/playerContextMock.js

@@ -44,6 +44,7 @@ export const createMockNpoPlayerAPI = (overrides = {}) => ({
     getTimeShift: jest.fn().mockReturnValue(0),
     scheduleAds: jest.fn().mockResolvedValue([]),
     getActiveAdBreak: jest.fn().mockReturnValue(undefined),
+    discardAdBreak: jest.fn(),
     getConfig: jest.fn().mockReturnValue({}),
     createUIManager: jest.fn(),
     ...overrides

package/package.json

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