@npo/player 1.22.0 → 1.22.2

package/lib/npoplayer.js

@@ -85,7 +85,6 @@ export default class NpoPlayer {
             if (this.player === null)
                 return;
             let prid = (utility.isJWTToken(source) ? this.streamObject?.metadata.prid : source) || 'unknown';
-            this.player.off(PlayerEvent.SourceLoaded, getDurationAndStartPlayerTracker);
             let duration = this.player ? this.player.getDuration() : undefined;
             startPlayerTracker(this, utility.validateStreamLength(duration, true), this.version, prid);
         }.bind(this);
@@ -138,7 +137,6 @@ export default class NpoPlayer {
                 return;
             const drmType = this.streamObject.stream.drmType ?? null;
             this.sourceConfig = await playerAction.processSourceConfig(options.sourceConfig ?? {}, this.streamObject, drmType && drmType.length > 0 ? profile.drm : null, this.streamOptions, this.version, this.npoTag?.npoTagInstance?.getParty());
-            await drm.verifyDRM(this, this.player, payload);
             setupMediaSessionActionHandlers(this.player, this.sourceConfig, _streamObject);
             logEvent(this, 'load');
             let streamDuration = _streamObject.metadata.duration;
@@ -146,18 +144,25 @@ export default class NpoPlayer {
             if (this.isShowingPlayNextScreen) {
                 this.hidePlayNextScreen();
             }
-            function initAndStartTracker() {
+            const initAndStartTracker = () => {
                 if (this.player === null)
                     return;
+                this.player.off(PlayerEvent.SourceLoaded, initAndStartTracker);
+                this.player.off(PlayerEvent.AdBreakFinished, initAndStartTracker);
+                this.player.off(PlayerEvent.AdError, initAndStartTracker);
                 streamDuration = streamDuration == null
-                    ? this.player.on(PlayerEvent.SourceLoaded, getDurationAndStartPlayerTracker)
+                    ? getDurationAndStartPlayerTracker()
                     : startPlayerTracker(this, utility.validateStreamLength(streamDuration, false), this.version, streamPrid);
+            };
+            if (this.variant !== NpoPlayerUIVariants.AUDIO && (this.streamObject.metadata.hasPreroll !== 'false' || this.streamObject.assets.preroll)) {
+                this.player.on(PlayerEvent.AdBreakFinished, initAndStartTracker);
+                this.player.on(PlayerEvent.AdError, initAndStartTracker);
+                await handlePreRolls(this.player, this.streamObject, this);
             }
-            let prerollPromise = Promise.resolve();
-            if (this.variant !== NpoPlayerUIVariants.AUDIO) {
-                prerollPromise = handlePreRolls(this.player, _streamObject, this);
+            else {
+                this.player.on(PlayerEvent.SourceLoaded, initAndStartTracker);
             }
-            prerollPromise.then(() => initAndStartTracker.bind(this)());
+            await drm.verifyDRM(this, this.player, payload);
         }
         else {
             this.doError(`Het is niet gelukt de stream op te halen: \n Input is geen valide token of media object.`, 500);

package/lib/package.json

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

package/package.json

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