@npo/player 1.22.4 → 1.23.0

package/lib/js/playeractions/handlers/handleoffsets.js

@@ -1,6 +1,6 @@
 import { PlayerEvent } from 'bitmovin-player';
 export function handleStartOffset(player, offset) {
-    if (offset == null || player.isLive()) {
+    if (offset == undefined || player.isLive()) {
         if (player.isLive()) {
             console.warn('handleStartOffset was called but the player is playing live content.');
         }
@@ -17,9 +17,9 @@ export function handleStartOffset(player, offset) {
     player.on(PlayerEvent.AdError, seek);
 }
 export function shiftToProgramStart(player, timestamp) {
-    if (player == null)
+    if (player == undefined)
         return;
-    if (timestamp == null || !player.isLive()) {
+    if (timestamp == undefined || !player.isLive()) {
         if (!player.isLive()) {
             console.warn('shiftToProgramStart was called but the player is playing VOD content.');
         }
@@ -28,11 +28,11 @@ export function shiftToProgramStart(player, timestamp) {
     player.timeShift(timestamp);
 }
 export function handleLiveOffsetLogic(npoplayer, player, options) {
-    if (player == null)
+    if (player == undefined)
         return;
-    if (npoplayer.uiComponents.watchFromStartButton == null)
+    if (npoplayer.uiComponents.watchFromStartButton == undefined)
         return;
-    if (options?.liveProgramTime == null) {
+    if (options?.liveProgramTime == undefined) {
         npoplayer.uiComponents.watchFromStartButton.hide();
         return;
     }

package/lib/js/playeractions/handlers/handleoffsets.test.js

@@ -1,4 +1,4 @@
-import { handleStartOffset, shiftToProgramStart } from "./handleoffsets";
+import { handleStartOffset, shiftToProgramStart } from './handleoffsets';
 const isLive = () => true;
 const onReady = jest.fn();
 const timeShift = jest.fn();
@@ -7,42 +7,42 @@ const timestamp = 10;
 const player = {
     isLive,
     on: onReady,
-    timeShift,
+    timeShift
 };
-describe("Test offset handling", () => {
+describe('Test offset handling', () => {
     afterEach(() => {
         jest.resetAllMocks();
     });
-    it("should not seek when player is live", () => {
+    it('should not seek when player is live', () => {
         handleStartOffset(player, offset);
         expect(onReady).not.toHaveBeenCalled();
     });
-    it("should not seek when offset is undefined", () => {
+    it('should not seek when offset is undefined', () => {
         handleStartOffset({ ...player, isLive: () => false });
         expect(onReady).not.toHaveBeenCalled();
     });
-    it("should seek when player is not live and offset is defined", () => {
+    it('should seek when player is not live and offset is defined', () => {
         handleStartOffset({ ...player, isLive: () => false }, offset);
         expect(onReady).toHaveBeenCalled();
     });
 });
-describe("Test programStart shift", () => {
+describe('Test programStart shift', () => {
     afterEach(() => {
         jest.resetAllMocks();
     });
-    it("should not call timeshift when player is null", () => {
-        shiftToProgramStart(null, timestamp);
+    it('should not call timeshift when player is null', () => {
+        shiftToProgramStart(undefined, timestamp);
         expect(timeShift).not.toHaveBeenCalled();
     });
-    it("should not call timeshift when timestamp is undefined", () => {
+    it('should not call timeshift when timestamp is undefined', () => {
         shiftToProgramStart(player);
         expect(timeShift).not.toHaveBeenCalled();
     });
-    it("should not call timeshift when player is not live", () => {
+    it('should not call timeshift when player is not live', () => {
         shiftToProgramStart({ ...player, isLive: () => false }, timestamp);
         expect(timeShift).not.toHaveBeenCalled();
     });
-    it("should not call timeshift when player is live and timestamp is set", () => {
+    it('should not call timeshift when player is live and timestamp is set', () => {
         shiftToProgramStart(player, timestamp);
         expect(timeShift).toHaveBeenCalled();
     });

package/lib/js/playeractions/handlers/mediasessionactions.d.ts

@@ -1,2 +1,2 @@
-import { PlayerAPI, SourceConfig } from "bitmovin-player";
+import { PlayerAPI, SourceConfig } from 'bitmovin-player';
 export declare function setupMediaSessionActionHandlers(player: PlayerAPI, sourceConfig: SourceConfig, _streamObject: any): void;

package/lib/js/playeractions/handlers/mediasessionactions.js

@@ -1,4 +1,4 @@
-import { PlayerEvent } from "bitmovin-player";
+import { PlayerEvent } from 'bitmovin-player';
 export function setupMediaSessionActionHandlers(player, sourceConfig, _streamObject) {
     player.on(PlayerEvent.Playing, () => {
         if (!('mediaSession' in navigator)) {
@@ -38,13 +38,13 @@ export function setupMediaSessionActionHandlers(player, sourceConfig, _streamObj
     function setMediaSessionMetadata() {
         const metadata = {
             title: sourceConfig.title,
-            artist: _streamObject.metadata.broadcaster || '',
+            artist: _streamObject.metadata.broadcaster || ''
         };
         if (sourceConfig.poster || _streamObject.metadata.poster) {
             metadata.artwork = [
                 {
-                    src: sourceConfig.poster || _streamObject.metadata.poster,
-                },
+                    src: sourceConfig.poster || _streamObject.metadata.poster
+                }
             ];
         }
         navigator.mediaSession.metadata = new MediaMetadata(metadata);
@@ -58,29 +58,34 @@ export function setupMediaSessionActionHandlers(player, sourceConfig, _streamObj
                     const skipTime = details.seekOffset || defaultSkipTime;
                     player.seek(Math.max(player.getCurrentTime() - skipTime, 0));
                     updatePositionState();
-                },
-            }, {
+                }
+            },
+            {
                 action: 'seekforward',
                 handler: (details) => {
                     const skipTime = details.seekOffset || defaultSkipTime;
                     player.seek(Math.min(player.getCurrentTime() + skipTime, player.getDuration()));
                     updatePositionState();
-                },
-            }, {
+                }
+            },
+            {
                 action: 'seekto',
                 handler: (details) => {
                     if (details.seekTime) {
                         player.seek(details.seekTime);
                     }
                     updatePositionState();
-                },
-            }, {
+                }
+            },
+            {
                 action: 'play',
-                handler: () => player.play(),
-            }, {
+                handler: () => player.play()
+            },
+            {
                 action: 'pause',
-                handler: () => player.pause(),
-            }, {
+                handler: () => player.pause()
+            },
+            {
                 action: 'stop',
                 handler: () => player.unload()
             }
@@ -99,7 +104,7 @@ export function setupMediaSessionActionHandlers(player, sourceConfig, _streamObj
             navigator.mediaSession.setPositionState({
                 duration: player.getDuration(),
                 playbackRate: player.getPlaybackSpeed(),
-                position: player.getCurrentTime(),
+                position: player.getCurrentTime()
             });
         }
     }

package/lib/js/playeractions/handlers/processplayerconfig.d.ts

@@ -1,3 +1,3 @@
-import { type PlayerConfig } from "bitmovin-player";
-import NpoPlayer from "npoplayer";
+import { type PlayerConfig } from 'bitmovin-player';
+import NpoPlayer from 'npoplayer';
 export declare function processPlayerConfig(npoplayer: NpoPlayer, playerConfig: PlayerConfig): PlayerConfig;

package/lib/js/playeractions/handlers/processplayerconfig.js

@@ -1,8 +1,8 @@
-import { LogLevel } from "bitmovin-player";
-import { isFairPlayDrmSupported, isSafari } from '../../checks/apple';
+import { LogLevel } from 'bitmovin-player';
+import { isSafari } from '../../utilities/utilities.user-agent';
 export function processPlayerConfig(npoplayer, playerConfig) {
-    let processedConfig = playerConfig;
-    if (isSafari(isFairPlayDrmSupported())) {
+    const processedConfig = playerConfig;
+    if (isSafari()) {
         processedConfig.playback = {
             autoplay: false
         };

package/lib/js/playeractions/handlers/processsourceconfig.d.ts

@@ -1,3 +1,4 @@
 import { StreamObject, StreamOptions } from 'types/interfaces';
 import { SourceConfig } from 'bitmovin-player';
-export declare function processSourceConfig(_sourceConfig: SourceConfig | undefined, _streamObject: StreamObject, drm: string | null | undefined, streamOptions: StreamOptions, version: string, npoTagPartyId: string | undefined): Promise<SourceConfig>;
+import { NpoPlayerServices } from '../../../services/services';
+export declare function processSourceConfig(NpoPlayerServices: NpoPlayerServices, _sourceConfig: SourceConfig | undefined, _streamObject: StreamObject, drm: string | undefined, streamOptions: StreamOptions, version: string, npoTagPartyId: string | undefined, npoPlayerServices: NpoPlayerServices): Promise<SourceConfig>;

package/lib/js/playeractions/handlers/processsourceconfig.js

@@ -1,32 +1,29 @@
 import { HttpResponseType } from 'bitmovin-player';
 import { npoCdnProviders } from '../../cdnproviders';
-import { replaceSpecialChars } from '../../utilities/utilities';
+import { replaceSpecialCharacters } from '../../utilities/utilities.text';
 async function setDrm(sourceConfig, drm, _streamObject, useWidevineServerCertificate) {
     const npoDrmGateway = 'https://npo-drm-gateway.samgcloud.nepworldwide.nl/authentication?custom_data=';
     switch (drm) {
-        case 'fairplay':
+        case 'fairplay': {
             sourceConfig.drm = {
                 fairplay: {
                     certificateURL: 'https://fairplay.npo.nl/certificate/fairplay.cer',
                     LA_URL: npoDrmGateway + _streamObject.stream.drmToken,
-                    prepareMessage: event => {
+                    prepareMessage: (event) => {
                         return new Uint8Array(event.message);
                     },
-                    prepareContentId: url => {
+                    prepareContentId: (url) => {
                         const link = document.createElement('a');
-                        const trimmedUrl = url
-                            .split('')
-                            .filter(char => !(char.codePointAt(0) == null))
-                            .join('');
+                        const trimmedUrl = [...url].filter((char) => !(char.codePointAt(0) == undefined)).join('');
                         link.href = trimmedUrl.replace('T', '');
                         return link.hostname;
                     },
-                    prepareLicense: license => {
+                    prepareLicense: (license) => {
                         let binary = '';
                         const bytes = new Uint8Array(license);
                         const len = bytes.byteLength;
                         for (let i = 0; i < len; i++) {
-                            binary += String.fromCharCode(bytes[i]);
+                            binary += String.fromCodePoint(bytes[i]);
                         }
                         return window.btoa(binary);
                     },
@@ -35,7 +32,8 @@ async function setDrm(sourceConfig, drm, _streamObject, useWidevineServerCertifi
                 }
             };
             break;
-        case 'widevine':
+        }
+        case 'widevine': {
             try {
                 sourceConfig.drm = {
                     widevine: {
@@ -43,7 +41,7 @@ async function setDrm(sourceConfig, drm, _streamObject, useWidevineServerCertifi
                         audioRobustness: 'SW_SECURE_CRYPTO',
                         videoRobustness: 'SW_SECURE_CRYPTO',
                         serverCertificate: useWidevineServerCertificate
-                            ? await (await fetch('https://widevine.npoplayer.nl/widevine_player_cert.bin')).arrayBuffer()
+                            ? await getServerCertificate('https://widevine.npoplayer.nl/widevine_player_cert.bin')
                             : undefined
                     }
                 };
@@ -52,25 +50,40 @@ async function setDrm(sourceConfig, drm, _streamObject, useWidevineServerCertifi
                 console.error('Error:', error);
             }
             break;
-        case 'playready':
+        }
+        case 'playready': {
             sourceConfig.drm = {
                 playready: {
                     LA_URL: npoDrmGateway + _streamObject.stream.drmToken
                 }
             };
             break;
+        }
     }
     return sourceConfig;
 }
+async function getServerCertificate(url) {
+    const response = await fetch(url);
+    return response.arrayBuffer();
+}
+const getSubtitleLabels = function (data) {
+    if (data.label === 'nl') {
+        return 'Nederlands';
+    }
+    return data.label;
+};
+const getQualityLabels = function (data) {
+    return data.height + 'p';
+};
 function setStreamProfile(sourceConfig, _sourceConfig, _streamObject) {
     const streamProfile = _streamObject.stream.streamProfile;
     const streamURL = _streamObject.stream.streamURL;
     const configMapping = {
-        'hls': _sourceConfig.hls,
-        'dash': _sourceConfig.dash,
-        'progressive': _sourceConfig.progressive
+        hls: _sourceConfig.hls,
+        dash: _sourceConfig.dash,
+        progressive: _sourceConfig.progressive
     };
-    if (configMapping.hasOwnProperty(streamProfile)) {
+    if (Object.prototype.hasOwnProperty.call(configMapping, streamProfile)) {
         const value = configMapping[streamProfile];
         if (typeof value === 'string' || value === undefined) {
             sourceConfig[streamProfile] = value === '' ? undefined : value ?? streamURL ?? '';
@@ -78,33 +91,36 @@ function setStreamProfile(sourceConfig, _sourceConfig, _streamObject) {
         else if (Array.isArray(value) && streamProfile === 'progressive') {
             sourceConfig.progressive = value;
         }
-        Object.keys(configMapping)
-            .filter(profile => profile !== streamProfile)
-            .forEach(profile => {
+        for (const profile of Object.keys(configMapping).filter((profile) => profile !== streamProfile)) {
             if (profile === 'progressive') {
                 sourceConfig[profile] = undefined;
             }
             else {
                 sourceConfig[profile] = '';
             }
-        });
+        }
     }
     return sourceConfig;
 }
-export async function processSourceConfig(_sourceConfig = {}, _streamObject, drm = null, streamOptions, version, npoTagPartyId) {
+export async function processSourceConfig(NpoPlayerServices, _sourceConfig = {}, _streamObject, drm = undefined, streamOptions, version, npoTagPartyId, npoPlayerServices) {
     let sourceConfig = {};
-    sourceConfig.title =
-        _sourceConfig.title ?? _streamObject.metadata.title ?? '';
-    sourceConfig.description =
-        _sourceConfig.description ??
-            _streamObject.metadata.description ??
-            '';
+    sourceConfig.title = _sourceConfig.title ?? _streamObject.metadata.title ?? '';
+    sourceConfig.description = _sourceConfig.description ?? _streamObject.metadata.description ?? '';
     sourceConfig.poster = decidePoster(_streamObject, _sourceConfig, streamOptions);
     sourceConfig.metadata = {
         title: sourceConfig.title,
         description: sourceConfig.description,
         poster: sourceConfig.poster
     };
+    if (streamOptions.fragments || _streamObject.segment) {
+        const segment = streamOptions.fragments
+            ? NpoPlayerServices.convertFragmentToSegment(streamOptions.fragments)
+            : _streamObject.segment;
+        if (segment) {
+            ;
+            sourceConfig.markers = NpoPlayerServices.segmentMarkersHandler(segment, sourceConfig.metadata.title);
+        }
+    }
     sourceConfig.subtitleTracks =
         _sourceConfig.subtitleTracks ??
             (_streamObject.assets.subtitles
@@ -117,8 +133,7 @@ export async function processSourceConfig(_sourceConfig = {}, _streamObject, drm
                 }))
                 : undefined);
     sourceConfig.thumbnailTrack =
-        _sourceConfig.thumbnailTrack ??
-            _streamObject.assets.scrubbingThumbnail
+        _sourceConfig.thumbnailTrack ?? _streamObject.assets.scrubbingThumbnail
             ? { url: _streamObject.assets.scrubbingThumbnail }
             : undefined;
     sourceConfig.options = _sourceConfig.options;
@@ -130,33 +145,24 @@ export async function processSourceConfig(_sourceConfig = {}, _streamObject, drm
         cdnString = 'OFFLINE';
     }
     else {
-        npoCdnProviders.forEach(function (value, key) {
+        for (const [key, value] of npoCdnProviders.entries()) {
             if (streamSource.includes(key)) {
                 cdnString = value;
             }
-        });
+        }
     }
-    if (sourceConfig.analytics == null)
+    if (sourceConfig.analytics == undefined)
         sourceConfig.analytics = {};
     sourceConfig.analytics.cdnProvider = cdnString;
     sourceConfig.analytics.videoId = _streamObject.metadata.prid;
     sourceConfig.analytics.title = _streamObject.metadata.title;
     sourceConfig.analytics.customData2 = _streamObject.user.type;
-    sourceConfig.analytics.customData3 = _streamObject.stream.avType;
+    sourceConfig.analytics.customData3 = npoPlayerServices.getAVType(_streamObject.stream.avType);
     sourceConfig.analytics.customData4 = npoTagPartyId;
     sourceConfig.analytics.customData5 = version;
     sourceConfig.analytics = {
         ...sourceConfig.analytics,
-        ..._sourceConfig.analytics,
-    };
-    const getSubtitleLabels = function (data) {
-        if (data.label === 'nl') {
-            return 'Nederlands';
-        }
-        return data.label;
-    };
-    const getQualityLabels = function (data) {
-        return data.height + 'p';
+        ..._sourceConfig.analytics
     };
     if (sourceConfig.progressive !== '') {
         sourceConfig.labeling = {
@@ -174,13 +180,13 @@ export async function processSourceConfig(_sourceConfig = {}, _streamObject, drm
 }
 function decidePoster(streamObject, sourceConfig, streamOptions) {
     if (sourceConfig.poster) {
-        return replaceSpecialChars(sourceConfig.poster);
+        return replaceSpecialCharacters(sourceConfig.poster);
     }
     if (streamObject.metadata.poster && !streamObject.metadata.posterIsDefault) {
         return streamObject.metadata.poster;
     }
     if (streamObject.metadata.posterIsDefault && streamOptions.customFallbackPoster) {
-        return replaceSpecialChars(streamOptions.customFallbackPoster);
+        return replaceSpecialCharacters(streamOptions.customFallbackPoster);
     }
     return streamObject.metadata.poster ?? '';
 }

package/lib/js/playeractions/handlers/removereplayclass.d.ts

@@ -1,2 +1,2 @@
 import { PlayerAPI } from 'bitmovin-player';
-export declare function removeReplayClass(player: PlayerAPI | null): void;
+export declare function removeReplayClass(player: PlayerAPI | undefined): void;

package/lib/js/playeractions/handlers/removereplayclass.test.d.ts

@@ -1 +1 @@
-export {};
+import '@testing-library/jest-dom';

package/lib/js/playeractions/handlers/removereplayclass.test.js

@@ -1,3 +1,4 @@
+import '@testing-library/jest-dom';
 import { removeReplayClass } from './removereplayclass';
 import { PlayerEvent } from 'bitmovin-player';
 describe('removeReplayClass', () => {
@@ -12,21 +13,21 @@ describe('removeReplayClass', () => {
         mockPlayerContainer.appendChild(mockPlayerWrapper);
         mockPlayer = {
             off: jest.fn(),
-            getContainer: jest.fn().mockReturnValue(mockPlayerContainer),
+            getContainer: jest.fn().mockReturnValue(mockPlayerContainer)
         };
     });
     it('should remove "bmpui-player-state-finished" and "bmpui-player-state-replay" classes from the player container', () => {
         removeReplayClass(mockPlayer);
-        expect(mockPlayerWrapper.classList.contains('bmpui-player-state-finished')).toBe(false);
-        expect(mockPlayerWrapper.classList.contains('bmpui-player-state-replay')).toBe(false);
-        expect(mockPlayerWrapper.classList.contains('bmpui-player-state-paused')).toBe(true);
+        expect(mockPlayerWrapper).not.toHaveClass('bmpui-player-state-finished');
+        expect(mockPlayerWrapper).not.toHaveClass('bmpui-player-state-replay');
+        expect(mockPlayerWrapper).toHaveClass('bmpui-player-state-paused');
     });
     it('should unregister the Seek event listener', () => {
         removeReplayClass(mockPlayer);
         expect(mockPlayer.off).toHaveBeenCalledWith(PlayerEvent.Seek, expect.any(Function));
     });
-    it('should not unregister the Seek event listener if the player is null', () => {
-        removeReplayClass(null);
+    it('should not unregister the Seek event listener if the player is undefined', () => {
+        removeReplayClass(undefined);
         expect(mockPlayer.off).not.toHaveBeenCalled();
     });
 });

package/lib/js/playeractions/playeractions.d.ts

@@ -1,5 +1,4 @@
-export { resolveKeyPress } from "./handlers/resolvekeypress";
-export { handleStartOffset, handleLiveOffsetLogic, shiftToProgramStart } from "./handlers/handleoffsets";
-export { handlePlayerError } from "./handlers/error";
-export { processPlayerConfig } from "./handlers/processplayerconfig";
-export { processSourceConfig } from "./handlers/processsourceconfig";
+export { handleStartOffset, handleLiveOffsetLogic, shiftToProgramStart } from './handlers/handleoffsets';
+export { handlePlayerError } from './handlers/error';
+export { processPlayerConfig } from './handlers/processplayerconfig';
+export { processSourceConfig } from './handlers/processsourceconfig';

package/lib/js/playeractions/playeractions.js

@@ -1,5 +1,4 @@
-export { resolveKeyPress } from "./handlers/resolvekeypress";
-export { handleStartOffset, handleLiveOffsetLogic, shiftToProgramStart } from "./handlers/handleoffsets";
-export { handlePlayerError } from "./handlers/error";
-export { processPlayerConfig } from "./handlers/processplayerconfig";
-export { processSourceConfig } from "./handlers/processsourceconfig";
+export { handleStartOffset, handleLiveOffsetLogic, shiftToProgramStart } from './handlers/handleoffsets';
+export { handlePlayerError } from './handlers/error';
+export { processPlayerConfig } from './handlers/processplayerconfig';
+export { processSourceConfig } from './handlers/processsourceconfig';

package/lib/js/settings/settings.user-agent.d.ts

@@ -0,0 +1 @@
+export declare const supportedKeySystems: string[];

package/lib/js/settings/settings.user-agent.js

@@ -0,0 +1 @@
+export const supportedKeySystems = ['com.apple.fps.1_0', 'com.apple.fps.2_0'];

package/lib/js/tracking/handlers/eventbinding.js

@@ -2,10 +2,10 @@ import { PlayerEvent, ViewMode } from 'bitmovin-player';
 import { logEvent } from './eventlogging';
 const logEventHandlers = new Map();
 export function bindPlayerEvents(npoplayer, player) {
-    if (player == null)
+    if (player == undefined)
         return;
     let isSeeking = false;
-    let isLiveStream = npoplayer.streamObject.stream.isLiveStream;
+    const isLiveStream = npoplayer.streamObject.stream.isLiveStream;
     let currentTime = 0;
     let isNewSource = true;
     const timeDifference = (time) => {
@@ -16,7 +16,7 @@ export function bindPlayerEvents(npoplayer, player) {
     };
     const logEventHandler = (eventName) => {
         return (e) => {
-            const eventTime = e.time !== undefined ? timeDifference(e.time) : undefined;
+            const eventTime = e.time === undefined ? undefined : timeDifference(e.time);
             logEvent(npoplayer, eventName, eventTime);
         };
     };
@@ -27,14 +27,14 @@ export function bindPlayerEvents(npoplayer, player) {
             const timeDifferencePosition = -1 * (Date.now() / 1000 - e.position);
             const timeDifferenceTarget = -1 * (Date.now() / 1000 - e.target);
             data = {
-                seek_from: parseFloat(timeDifferencePosition.toFixed(3)),
-                stream_position: parseFloat(timeDifferenceTarget.toFixed(3)),
+                seek_from: Number.parseFloat(timeDifferencePosition.toFixed(3)),
+                stream_position: Number.parseFloat(timeDifferenceTarget.toFixed(3))
             };
         }
         else if (e.type === 'seek') {
             data = {
                 seek_from: e.position,
-                stream_position: e.seekTarget,
+                stream_position: e.seekTarget
             };
         }
         logEvent(npoplayer, e.type, data);
@@ -93,14 +93,14 @@ export function bindPlayerEvents(npoplayer, player) {
         { event: PlayerEvent.Seek, handler: seekHandler },
         { event: PlayerEvent.TimeShift, handler: seekHandler },
         { event: PlayerEvent.TimeChanged, handler: handleTime },
-        { event: PlayerEvent.ViewModeChanged, handler: handleViewModeChange },
+        { event: PlayerEvent.ViewModeChanged, handler: handleViewModeChange }
     ];
-    playerEvents.forEach(({ event, name, handler }) => {
+    for (const { event, name, handler } of playerEvents) {
         const effectiveName = name || 'unnamed_event';
         const eventHandler = handler || logEventHandler(effectiveName);
         logEventHandlers.set(event, eventHandler);
         player.on(event, eventHandler);
-    });
+    }
     if (npoplayer.streamObject.assets.preroll === null) {
         logEventHandlers.set(PlayerEvent.Playing, handlePlaying);
         player.on(PlayerEvent.Playing, handlePlaying);

package/lib/js/tracking/handlers/eventlogging.js

@@ -4,8 +4,8 @@ export function logEvent(npoplayer, event, data) {
     try {
         npoplayer.player.getCurrentTime();
     }
-    catch (e) {
-        console.warn('Er gaat iets mis met de player API', e);
+    catch (error) {
+        console.warn('Er gaat iets mis met de player API', error);
     }
     const streamOptions = { stream_position: npoplayer.player.getCurrentTime() };
     const eventHandlers = {

package/lib/js/tracking/handlers/eventlogging.test.js

@@ -6,7 +6,7 @@ describe('logEvent', () => {
         npoplayer = mockNpoPlayer;
     });
     it('should not log event if player is not available', () => {
-        npoplayer.player = null;
+        npoplayer.player = undefined;
         if (npoplayer.streamTracker && npoplayer.player) {
             logEvent(npoplayer, 'start');
             expect(npoplayer.streamTracker.start).not.toHaveBeenCalled();
@@ -14,7 +14,7 @@ describe('logEvent', () => {
         }
     });
     it('should not log event if streamTracker is not available', () => {
-        npoplayer.streamTracker = null;
+        npoplayer.streamTracker = undefined;
         if (npoplayer.streamTracker) {
             logEvent(npoplayer, 'start');
             expect(npoplayer.logEmitter.emit).not.toHaveBeenCalled();

package/lib/js/tracking/handlers/playertrackerinit.d.ts

@@ -1,4 +1,4 @@
 import { type NPOTag } from '@npotag/tag';
 import { type InitialisationProps } from '@npotag/tag/dist/types/src/npoTag';
 import type NpoPlayer from '../../../npoplayer';
-export declare function initPlayerTracker(npoplayer: NpoPlayer, _npotag?: InitialisationProps | null, _npotaginstance?: NPOTag): void;
+export declare function initPlayerTracker(npoplayer: NpoPlayer, _npotag?: InitialisationProps | undefined, _npotaginstance?: NPOTag): void;

package/lib/js/tracking/handlers/playertrackerinit.js

@@ -1,21 +1,15 @@
 import { newATInternetPlugin, newGovoltePlugin, newPageTracker, newTag } from '@npotag/tag';
-const npoTagPlugins = [
-    newGovoltePlugin({ maxRetryCount: 5, delayBetweenRetriesInMs: 3000 }),
-    newATInternetPlugin()
-];
+const npoTagPlugins = [newGovoltePlugin({ maxRetryCount: 5, delayBetweenRetriesInMs: 3000 }), newATInternetPlugin()];
 export function initPlayerTracker(npoplayer, _npotag, _npotaginstance) {
-    if (!npoplayer.npoTag) {
+    if (npoplayer.npoTag == undefined) {
         npoplayer.npoTag = {
             npoTagInstance: undefined,
-            pageTracker: null,
+            pageTracker: undefined,
             heartbeatInterval: undefined
         };
     }
-    npoplayer.npoTag.npoTagInstance =
-        _npotag != null
-            ? newTag(_npotag, npoTagPlugins)
-            : _npotaginstance;
-    if (npoplayer.npoTag.npoTagInstance != null) {
+    npoplayer.npoTag.npoTagInstance = _npotag == undefined ? _npotaginstance : newTag(_npotag, npoTagPlugins);
+    if (npoplayer.npoTag.npoTagInstance != undefined) {
         npoplayer.npoTag.pageTracker = newPageTracker(npoplayer.npoTag.npoTagInstance);
     }
 }

package/lib/js/tracking/handlers/playertrackerstart.d.ts

@@ -1 +1 @@
-export declare function startPlayerTracker(playerInstance: any, duration: number, version: string, source: string | null): void;
+export declare function startPlayerTracker(playerInstance: any, duration: number, version: string, source: string | undefined): void;