@npo/player 1.22.3 → 1.22.5

package/lib/js/ads/ster.js

@@ -11,8 +11,8 @@ export async function handlePreRolls(playerapi, streamObject, npoplayer) {
         let totalAds = 0;
         let currentClickListener = null;
         let adUiSet = false;
-        async function handleSourceLoaded() {
-            playerapi.off(PlayerEvent.SourceLoaded, handleSourceLoaded);
+        async function handleReady() {
+            playerapi.off(PlayerEvent.Ready, handleReady);
             const advertConfig = {
                 tag: {
                     url: String(prerollUrl),
@@ -23,7 +23,7 @@ export async function handlePreRolls(playerapi, streamObject, npoplayer) {
             };
             await playerapi.ads.schedule(advertConfig);
         }
-        playerapi.on(PlayerEvent.SourceLoaded, handleSourceLoaded);
+        playerapi.on(PlayerEvent.Ready, handleReady);
         async function handlePlay() {
             playerapi.off(PlayerEvent.Play, handlePlay);
             attemptSetAdUi();

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,31 +137,31 @@ 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;
+            let streamPrid = this.streamObject.metadata.prid || _streamObject.metadata.prid;
+            if (this.isShowingPlayNextScreen) {
+                this.hidePlayNextScreen();
+            }
             const initAndStartTracker = () => {
                 if (this.player === null)
                     return;
-                this.player.off(PlayerEvent.SourceLoaded, initAndStartTracker);
+                this.player.off(PlayerEvent.Ready, initAndStartTracker);
                 this.player.off(PlayerEvent.AdBreakFinished, initAndStartTracker);
                 this.player.off(PlayerEvent.AdError, initAndStartTracker);
                 streamDuration = streamDuration == null
                     ? getDurationAndStartPlayerTracker()
                     : startPlayerTracker(this, utility.validateStreamLength(streamDuration, false), this.version, streamPrid);
             };
-            if (this.variant !== NpoPlayerUIVariants.AUDIO && (this.streamObject.metadata.hasPreroll !== 'false' || this.streamObject.assets.preroll)) {
+            if (this.variant !== NpoPlayerUIVariants.AUDIO && this.streamObject.metadata.hasPreroll === 'true' && this.streamObject.assets.preroll) {
                 this.player.on(PlayerEvent.AdBreakFinished, initAndStartTracker);
                 this.player.on(PlayerEvent.AdError, initAndStartTracker);
                 await handlePreRolls(this.player, this.streamObject, this);
             }
             else {
-                this.player.on(PlayerEvent.SourceLoaded, initAndStartTracker);
-            }
-            await drm.verifyDRM(this, this.player, payload);
-            setupMediaSessionActionHandlers(this.player, this.sourceConfig, _streamObject);
-            logEvent(this, 'load');
-            let streamDuration = _streamObject.metadata.duration;
-            let streamPrid = this.streamObject.metadata.prid || _streamObject.metadata.prid;
-            if (this.isShowingPlayNextScreen) {
-                this.hidePlayNextScreen();
+                this.player.on(PlayerEvent.Ready, initAndStartTracker);
             }
         }
         else {

package/lib/package.json

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

package/package.json

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