@npo/player 1.27.5 → 1.27.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/lib/js/playeractions/handlers/handleoffsets.js +15 -8
  2. package/lib/package.json +1 -1
  3. package/lib/services/eventListenerHandlers/removeEventListeners.js +6 -2
  4. package/lib/services/eventListenerHandlers/removeEventListeners.test.js +20 -26
  5. package/lib/src/types/interfaces.d.ts +4 -0
  6. package/lib/types/interfaces.d.ts +4 -0
  7. package/package.json +1 -1
package/lib/js/playeractions/handlers/handleoffsets.js CHANGED
@@ -8,16 +8,23 @@ export function handleStartOffset(playerContext, offset) {
8
8
  return;
9
9
  }
10
10
  const seek = () => {
11
- player.off(NpoPlayerEvent.Ready, seek);
12
- player.off(NpoPlayerEvent.SourceLoaded, seek);
13
- player.off(NpoPlayerEvent.AdBreakFinished, seek);
14
- player.off(NpoPlayerEvent.AdError, seek);
15
11
  player.seek(offset);
16
12
  };
17
- player.on(NpoPlayerEvent.Ready, seek);
18
- player.on(NpoPlayerEvent.SourceLoaded, seek);
19
- player.on(NpoPlayerEvent.AdBreakFinished, seek);
20
- player.on(NpoPlayerEvent.AdError, seek);
13
+ const handleStartOffsetCallbackOnReady = () => seek();
14
+ const handleStartOffsetCallbackOnSourceLoaded = () => seek();
15
+ const handleStartOffsetCallbackOnAdBreakFinished = () => seek();
16
+ const handleStartOffsetCallbackOnAdError = () => seek();
17
+ playerContext.player.on(NpoPlayerEvent.Ready, handleStartOffsetCallbackOnReady);
18
+ playerContext.player.on(NpoPlayerEvent.SourceLoaded, handleStartOffsetCallbackOnSourceLoaded);
19
+ playerContext.player.on(NpoPlayerEvent.AdBreakFinished, handleStartOffsetCallbackOnAdBreakFinished);
20
+ playerContext.player.on(NpoPlayerEvent.AdError, handleStartOffsetCallbackOnAdError);
21
+ playerContext.npoPlayer.eventListeners = {
22
+ ...playerContext.npoPlayer.eventListeners,
23
+ handleStartOffsetCallbackOnReady,
24
+ handleStartOffsetCallbackOnSourceLoaded,
25
+ handleStartOffsetCallbackOnAdBreakFinished,
26
+ handleStartOffsetCallbackOnAdError
27
+ };
21
28
  }
22
29
  export function shiftToProgramStart(playerContext, timestamp) {
23
30
  const { player } = playerContext;
package/lib/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@npo/player",
3
- "version": "1.27.5",
3
+ "version": "1.27.6",
4
4
  "description": "NPO Player",
5
5
  "author": "Publieke Omroep <player@npo.nl>",
6
6
  "contributors": [
package/lib/services/eventListenerHandlers/removeEventListeners.js CHANGED
@@ -2,13 +2,17 @@ import { NpoPlayerEvent } from '../../types/events';
2
2
  export const removeEventListeners = (playerContext) => {
3
3
  const { eventListeners } = playerContext.npoPlayer;
4
4
  if (eventListeners) {
5
- const { segmentHandleTimeChangedCallback, segmentSeekFunctionCallback, liveStreamHandleTimeChangedCallback, adBreakFinishedCallback, adErrorCallback } = eventListeners;
5
+ const { segmentHandleTimeChangedCallback, segmentSeekFunctionCallback, liveStreamHandleTimeChangedCallback, adBreakFinishedCallback, adErrorCallback, handleStartOffsetCallbackOnReady, handleStartOffsetCallbackOnSourceLoaded, handleStartOffsetCallbackOnAdBreakFinished, handleStartOffsetCallbackOnAdError } = eventListeners;
6
6
  const eventMapping = [
7
7
  { event: NpoPlayerEvent.TimeChanged, callback: liveStreamHandleTimeChangedCallback },
8
8
  { event: NpoPlayerEvent.TimeChanged, callback: segmentHandleTimeChangedCallback },
9
9
  { event: NpoPlayerEvent.Seek, callback: segmentSeekFunctionCallback },
10
10
  { event: NpoPlayerEvent.AdBreakFinished, callback: adBreakFinishedCallback },
11
- { event: NpoPlayerEvent.AdError, callback: adErrorCallback }
11
+ { event: NpoPlayerEvent.AdError, callback: adErrorCallback },
12
+ { event: NpoPlayerEvent.Ready, callback: handleStartOffsetCallbackOnReady },
13
+ { event: NpoPlayerEvent.SourceLoaded, callback: handleStartOffsetCallbackOnSourceLoaded },
14
+ { event: NpoPlayerEvent.AdBreakFinished, callback: handleStartOffsetCallbackOnAdBreakFinished },
15
+ { event: NpoPlayerEvent.AdError, callback: handleStartOffsetCallbackOnAdError }
12
16
  ];
13
17
  for (const { event, callback } of eventMapping) {
14
18
  if (callback) {
package/lib/services/eventListenerHandlers/removeEventListeners.test.js CHANGED
@@ -7,36 +7,30 @@ describe('removeEventListeners', () => {
7
7
  jest.clearAllMocks();
8
8
  mockPlayerContext = createPlayerContextMock();
9
9
  });
10
- it('should remove TimeChanged event listener if exists', () => {
11
- mockPlayerContext.npoPlayer.eventListeners = {
10
+ it('should remove all event listeners if they exist', () => {
11
+ const eventListeners = {
12
12
  segmentHandleTimeChangedCallback: jest.fn(),
13
13
  liveStreamHandleTimeChangedCallback: jest.fn(),
14
- segmentSeekFunctionCallback: jest.fn()
15
- };
16
- removeEventListeners(mockPlayerContext);
17
- if (mockPlayerContext.npoPlayer.eventListeners) {
18
- expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.TimeChanged, mockPlayerContext.npoPlayer.eventListeners.segmentHandleTimeChangedCallback);
19
- expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.TimeChanged, mockPlayerContext.npoPlayer.eventListeners.liveStreamHandleTimeChangedCallback);
20
- }
21
- });
22
- it('should remove Seek event listener if exists', () => {
23
- mockPlayerContext.npoPlayer.eventListeners = {
24
- segmentHandleTimeChangedCallback: jest.fn(),
25
- liveStreamHandleTimeChangedCallback: jest.fn(),
26
- segmentSeekFunctionCallback: jest.fn()
27
- };
28
- removeEventListeners(mockPlayerContext);
29
- if (mockPlayerContext.npoPlayer.eventListeners) {
30
- expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.Seek, mockPlayerContext.npoPlayer.eventListeners.segmentSeekFunctionCallback);
31
- }
32
- });
33
- it('should reset EventListeners in playerContext', () => {
34
- mockPlayerContext.npoPlayer.eventListeners = {
35
- segmentHandleTimeChangedCallback: jest.fn(),
36
- liveStreamHandleTimeChangedCallback: jest.fn(),
37
- segmentSeekFunctionCallback: jest.fn()
14
+ segmentSeekFunctionCallback: jest.fn(),
15
+ adBreakFinishedCallback: jest.fn(),
16
+ adErrorCallback: jest.fn(),
17
+ handleStartOffsetCallbackOnReady: jest.fn(),
18
+ handleStartOffsetCallbackOnSourceLoaded: jest.fn(),
19
+ handleStartOffsetCallbackOnAdBreakFinished: jest.fn(),
20
+ handleStartOffsetCallbackOnAdError: jest.fn()
38
21
  };
22
+ mockPlayerContext.npoPlayer.eventListeners = { ...eventListeners };
39
23
  removeEventListeners(mockPlayerContext);
24
+ expect(mockPlayerContext.player.off).toHaveBeenCalledTimes(9);
25
+ expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.TimeChanged, eventListeners.liveStreamHandleTimeChangedCallback);
26
+ expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.TimeChanged, eventListeners.segmentHandleTimeChangedCallback);
27
+ expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.Seek, eventListeners.segmentSeekFunctionCallback);
28
+ expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.AdBreakFinished, eventListeners.adBreakFinishedCallback);
29
+ expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.AdError, eventListeners.adErrorCallback);
30
+ expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.Ready, eventListeners.handleStartOffsetCallbackOnReady);
31
+ expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.SourceLoaded, eventListeners.handleStartOffsetCallbackOnSourceLoaded);
32
+ expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.AdBreakFinished, eventListeners.handleStartOffsetCallbackOnAdBreakFinished);
33
+ expect(mockPlayerContext.player.off).toHaveBeenCalledWith(NpoPlayerEvent.AdError, eventListeners.handleStartOffsetCallbackOnAdError);
40
34
  expect(mockPlayerContext.npoPlayer.eventListeners).toBeUndefined();
41
35
  });
42
36
  });
package/lib/src/types/interfaces.d.ts CHANGED
@@ -21,6 +21,10 @@ export interface EventListeners {
21
21
  segmentSeekFunctionCallback?: NpoPlayerEventCallback;
22
22
  adBreakFinishedCallback?: NpoPlayerEventCallback;
23
23
  adErrorCallback?: NpoPlayerEventCallback;
24
+ handleStartOffsetCallbackOnReady?: NpoPlayerEventCallback;
25
+ handleStartOffsetCallbackOnSourceLoaded?: NpoPlayerEventCallback;
26
+ handleStartOffsetCallbackOnAdBreakFinished?: NpoPlayerEventCallback;
27
+ handleStartOffsetCallbackOnAdError?: NpoPlayerEventCallback;
24
28
  }
25
29
  export interface StreamObject {
26
30
  stream: StreamObject_Stream;
package/lib/types/interfaces.d.ts CHANGED
@@ -21,6 +21,10 @@ export interface EventListeners {
21
21
  segmentSeekFunctionCallback?: NpoPlayerEventCallback;
22
22
  adBreakFinishedCallback?: NpoPlayerEventCallback;
23
23
  adErrorCallback?: NpoPlayerEventCallback;
24
+ handleStartOffsetCallbackOnReady?: NpoPlayerEventCallback;
25
+ handleStartOffsetCallbackOnSourceLoaded?: NpoPlayerEventCallback;
26
+ handleStartOffsetCallbackOnAdBreakFinished?: NpoPlayerEventCallback;
27
+ handleStartOffsetCallbackOnAdError?: NpoPlayerEventCallback;
24
28
  }
25
29
  export interface StreamObject {
26
30
  stream: StreamObject_Stream;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@npo/player",
3
- "version": "1.27.5",
3
+ "version": "1.27.6",
4
4
  "description": "NPO Player",
5
5
  "author": "Publieke Omroep <player@npo.nl>",
6
6
  "contributors": [