eb-player 2.0.8 → 2.0.10

package/dist/dev/easybroadcast.js

@@ -1,7 +1,7 @@
 var EBPlayerBundle = (function (exports) {
   'use strict';
 
-  var __EB_PLAYER_VERSION__ = "2.0.6";
+  var __EB_PLAYER_VERSION__ = "2.0.9";
 
   function styleInject(css, ref) {
     if ( ref === void 0 ) ref = {};
@@ -4332,6 +4332,15 @@ var EBPlayerBundle = (function (exports) {
           video.addEventListener('ended', () => {
               state.playbackState = 'ended';
           }, { signal });
+          // Safety net: clear stale 'buffering' state when playback is clearly advancing.
+          // In some edge cases (live stream segment boundaries), the browser fires 'waiting'
+          // but never fires 'playing' even though video resumes from buffer. The timeupdate
+          // event fires reliably while time advances, so we use it to recover.
+          video.addEventListener('timeupdate', () => {
+              if (state.playbackState === 'buffering' && !video.paused && video.readyState >= 3) {
+                  state.playbackState = 'playing';
+              }
+          }, { signal });
       }
       /**
        * Seek to a specific time. Default implementation sets video.currentTime.
@@ -4526,6 +4535,7 @@ var EBPlayerBundle = (function (exports) {
           this.expirationMarginInSeconds = expirationMarginInSeconds;
           this.lastTokenResponse = null;
           this.resetAttemptCounterTimeout = null;
+          this.inFlightFetch = null;
       }
       resetAttemptCounter() {
           if (this.resetAttemptCounterTimeout) {
@@ -4769,21 +4779,35 @@ var EBPlayerBundle = (function (exports) {
               console.warn('CDNToken: Missing src to tokenize');
               return null;
           }
-          switch (this.tokenType) {
-              case TOKEN_TYPES.BUNNY:
-                  this.lastTokenResponse = await this._fetchBunnyToken(src);
-                  break;
-              case TOKEN_TYPES.AKAMAI:
-                  this.lastTokenResponse = await this._fetchAkamaiToken(src);
-                  break;
-              case TOKEN_TYPES.VENOM:
-              case TOKEN_TYPES.EASY_B:
-                  this.lastTokenResponse = await this._fetchEasyBToken(src);
-                  break;
-              default:
-                  this.lastTokenResponse = await this._fetchDefaultToken(src);
+          // Deduplicate concurrent fetches: if a fetch is already in flight,
+          // return the same promise instead of firing a second network request.
+          // This prevents the main player and snapshot handler from both triggering
+          // separate generate calls when their manifest refreshes overlap.
+          if (this.inFlightFetch) {
+              return this.inFlightFetch;
           }
-          return this.lastTokenResponse;
+          const doFetch = async () => {
+              switch (this.tokenType) {
+                  case TOKEN_TYPES.BUNNY:
+                      return this._fetchBunnyToken(src);
+                  case TOKEN_TYPES.AKAMAI:
+                      return this._fetchAkamaiToken(src);
+                  case TOKEN_TYPES.VENOM:
+                  case TOKEN_TYPES.EASY_B:
+                      return this._fetchEasyBToken(src);
+                  default:
+                      return this._fetchDefaultToken(src);
+              }
+          };
+          this.inFlightFetch = doFetch().then((response) => {
+              this.lastTokenResponse = response;
+              this.inFlightFetch = null;
+              return response;
+          }).catch((error) => {
+              this.inFlightFetch = null;
+              throw error;
+          });
+          return this.inFlightFetch;
       }
       // -------------------------------------------------------------------------
       // Public: updateUrlWithTokenParams
@@ -4886,6 +4910,7 @@ var EBPlayerBundle = (function (exports) {
           }
           this.attempt = 0;
           this.lastTokenResponse = null;
+          this.inFlightFetch = null;
           console.log('CDNTokenManager: destroyed');
       }
       // -------------------------------------------------------------------------
@@ -5160,6 +5185,14 @@ var EBPlayerBundle = (function (exports) {
       getDriver() {
           return this.driver;
       }
+      /**
+       * Returns the CDN token manager used by this engine.
+       * Allows the snapshot handler to share the same manager (avoids duplicate token requests).
+       * Returns null when no token URL is configured or before init().
+       */
+      getTokenManager() {
+          return this.tokenManager;
+      }
       // -------------------------------------------------------------------------
       // BaseEngine hooks
       // -------------------------------------------------------------------------
@@ -5275,7 +5308,9 @@ var EBPlayerBundle = (function (exports) {
           if (!hlsjsUrl) {
               throw new Error('HlsEngine: config.hlsjs URL is required');
           }
-          // Create token manager if a token URL is configured
+          // Create token manager if a token URL is configured.
+          // No initial fetchToken() here — updateUrlWithTokenParams() below handles it
+          // and populates lastTokenResponse (used lazily by DRM licenseXhrSetup).
           if (config.token) {
               this.tokenManager = new CDNTokenManager({
                   token: config.token,
@@ -5284,13 +5319,6 @@ var EBPlayerBundle = (function (exports) {
                   extraParamsCallback: (config.engineSettings.extraParamsCallback ?? config.extraParamsCallback),
                   onCDNTokenError: config.engineSettings.onCDNTokenError
               });
-              // Fetch initial token
-              if (config.src) {
-                  await this.tokenManager.fetchToken({ src: config.src });
-              }
-              // Guard: abort if detached during token fetch
-              if (this.detached)
-                  return;
           }
           // console.info('HlsEngine: loading hls.js from', hlsjsUrl)
           const Hls = await loadScript(hlsjsUrl, 'Hls');
@@ -5373,7 +5401,6 @@ var EBPlayerBundle = (function (exports) {
           // Create the driver (NEVER stored in state)
           const driver = new Hls(driverConfig);
           this.driver = driver;
-          this.resolveDriverReady();
           // Pitfall 4: apply discontinuity workaround BEFORE attachMedia/loadSource
           applyDiscontinuityWorkaround(driver, Hls.Events);
           // Wire retry handler
@@ -5396,8 +5423,27 @@ var EBPlayerBundle = (function (exports) {
               }
           }
           driver.loadSource(src);
+          // Resolve driverReady AFTER loadSource so consumers (P2P, snapshot handler)
+          // don't start making token requests before the main engine's initial token
+          // fetch completes and populates the cache.
+          this.resolveDriverReady();
           // Register driver event handlers
           this.registerDriverEvents(Hls, state);
+          // Pause/resume loading on video pause/play to stop manifest refreshes
+          // (and thus CDN token requests) while the player is paused.
+          // Only applies to live streams where hls.js continuously refreshes the manifest.
+          const driverRef = driver;
+          video.addEventListener('pause', () => {
+              if (this.state?.isLive) {
+                  driverRef.stopLoad();
+              }
+          }, { signal });
+          video.addEventListener('play', () => {
+              if (this.state?.isLive) {
+                  // Defer startLoad to avoid re-entrancy (Pitfall 3)
+                  setTimeout(() => driverRef.startLoad(-1), 0);
+              }
+          }, { signal });
           // Start stall watchdog
           this.startWatchdog();
       }
@@ -6131,6 +6177,24 @@ var EBPlayerBundle = (function (exports) {
       getVideo() {
           return this.offscreenVideo;
       }
+      /**
+       * Stop manifest refreshes (and thus CDN token requests) while the main player is paused.
+       * For live streams, the snapshot hls.js instance continuously refreshes the manifest
+       * on the playlist interval — this prevents unnecessary generate calls during pause.
+       */
+      stopLoad() {
+          if (this.driver && typeof this.driver['stopLoad'] === 'function') {
+              this.driver['stopLoad']();
+          }
+      }
+      /**
+       * Resume manifest refreshes when the main player resumes playback.
+       */
+      startLoad() {
+          if (this.driver && typeof this.driver['startLoad'] === 'function') {
+              this.driver['startLoad'](-1);
+          }
+      }
       /**
        * Destroy the snapshot Hls instance and clean up resources.
        */
@@ -6414,36 +6478,35 @@ var EBPlayerBundle = (function (exports) {
                       else {
                           const win = window;
                           if (win.Hls) {
-                              // Create a dedicated token manager for the snapshot handler (DRM license + manifest tokens)
-                              let snapshotTokenManager = null;
-                              if (mergedConfig.token) {
-                                  snapshotTokenManager = new CDNTokenManager({
-                                      token: mergedConfig.token,
-                                      tokenType: mergedConfig.tokenType,
-                                      srcInTokenRequest: mergedConfig.srcInTokenRequest,
-                                      extraParamsCallback: (mergedConfig.engineSettings.extraParamsCallback ?? mergedConfig.extraParamsCallback),
-                                      onCDNTokenError: mergedConfig.engineSettings.onCDNTokenError
-                                  });
-                              }
+                              // Share the main engine's token manager with the snapshot handler
+                              // to avoid duplicate token requests (one CDNTokenManager per player instance)
+                              const sharedTokenManager = engine.getTokenManager();
                               // Build DRM config (emeEnabled, drmSystems, licenseXhrSetup) for the snapshot hls.js instance
-                              const snapshotDrmConfigurator = new DrmConfigurator(snapshotTokenManager);
+                              const snapshotDrmConfigurator = new DrmConfigurator(sharedTokenManager);
                               const snapshotDrmConfig = snapshotDrmConfigurator.buildHlsConfig(mergedConfig.engineSettings);
-                              const handler = new HlsSnapshotHandler({ src, engineSettings: { ...mergedConfig.engineSettings, ...snapshotDrmConfig } }, snapshotTokenManager);
-                              // Fetch initial token before init (needed for manifest request)
-                              const tokenReady = snapshotTokenManager && src
-                                  ? snapshotTokenManager.fetchToken({ src }).catch((error) => {
-                                      console.warn('EBPlayer: Snapshot token fetch failed:', error);
-                                  })
-                                  : Promise.resolve();
-                              tokenReady.then(() => {
-                                  return handler.init(win.Hls);
-                              })
+                              const handler = new HlsSnapshotHandler({ src, engineSettings: { ...mergedConfig.engineSettings, ...snapshotDrmConfig } }, sharedTokenManager);
+                              handler.init(win.Hls)
                                   .then(() => {
                                   activeSnapshotDestroy = () => handler.destroy();
                                   const snapshotVideo = handler.getVideo();
                                   if (snapshotVideo !== null) {
                                       controller.bus.emit('snapshot-handler-ready', { take: (time) => handler.take(time), video: snapshotVideo });
                                   }
+                                  // Stop/start snapshot manifest refreshes on pause/play to prevent
+                                  // CDN token generate calls while the player is paused (live streams only).
+                                  // Mirrors the same logic in hls.ts for the main engine.
+                                  if (video) {
+                                      video.addEventListener('pause', () => {
+                                          if (controller.state?.isLive) {
+                                              handler.stopLoad();
+                                          }
+                                      }, { signal: controller.signal });
+                                      video.addEventListener('play', () => {
+                                          if (controller.state?.isLive) {
+                                              setTimeout(() => handler.startLoad(), 0);
+                                          }
+                                      }, { signal: controller.signal });
+                                  }
                               })
                                   .catch((error) => {
                                   console.warn('EBPlayer: HlsSnapshotHandler init failed:', error);
@@ -6494,9 +6557,22 @@ var EBPlayerBundle = (function (exports) {
           }, 100);
       });
       // Auto-open the stream if src is provided in config (matches legacy player behaviour
-      // where consumers call start({ src: '...' }) and expect playback to begin immediately)
+      // where consumers call start({ src: '...' }) and expect playback to begin immediately).
+      // When autoplay is false, defer open() until the user requests play — this avoids
+      // fetching CDN tokens and loading manifests before playback is actually needed.
       if (mergedConfig.src) {
-          reference.open(mergedConfig.src);
+          if (mergedConfig.autoplay) {
+              reference.open(mergedConfig.src);
+          }
+          else {
+              let deferredOpen = true;
+              controller.bus.on('play', () => {
+                  if (deferredOpen) {
+                      deferredOpen = false;
+                      reference.open(mergedConfig.src);
+                  }
+              }, { signal: controller.signal });
+          }
       }
       return reference;
   }
@@ -6538,7 +6614,7 @@ var EBPlayerBundle = (function (exports) {
       window.EBPlayer = { start: start$1, stop, destroy, AVAILABLE_THEMES, THEME_LAYOUTS, version: VERSION };
   }
 
-  var brandConfig = {"loading":false,"start":true,"autoplay":true,"muted":true,"image":"https://www.easybroadcast.fr/img/logo_blue.svg","statsOrigin":"easybroadcast.fr","ad":"https://pubads.g.doubleclick.net/gampad/live/ads?iu=/21671680130/FORJA/PLAYER_VIDEO&description_url=[placeholder]&tfcd=0&npa=0&sz=640x480%7C1280x720%7C1920x1080&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=[timestamp]&cust_params=","socialMediaList":{"facebook":"https://www.facebook.com/sharer/sharer.php?u=https://www.easybroadcast.fr","twitter":"https://twitter.com/Easy_Broadcast","pinterest":"http://pinterest.com/pin/create/link/?url=https://www.easybroadcast.fr","blogger":"https://www.blogger.com/blog_this.pyra?t&u=https://www.easybroadcast.fr","tumblr":"http://www.tumblr.com/share/link?url=https://www.easybroadcast.fr","reddit":"http://reddit.com/submit?url=https://www.easybroadcast.fr"},"socials":{"facebook":"https://www.facebook.com/sharer/sharer.php?u=https://www.easybroadcast.fr","twitter":"https://twitter.com/Easy_Broadcast","pinterest":"http://pinterest.com/pin/create/link/?url=https://www.easybroadcast.fr","reddit":"http://reddit.com/submit?url=https://www.easybroadcast.fr"},"liveButton":true,"src":"https://live.easybroadcast.fr/hls/live/playlist.m3u8","disableCustomAbr":false,"aboutText":"\n\n    <img src=\"https://www.easybroadcast.fr/img/logo_blue.svg\" width=\"40px\"/>\n    <p> Copyright 2019 EasyBroadcast </p>\n    \n\n    <a style=\"color:white\" href=\"http://www.easybroadcast.fr\" target=\"_blank\">\n      easybroadcast.fr\n    </a>\n  ","template":"/Volumes/Dev-ext/dev/players/web/player-master/configs/videos/easybroadcast/demo/index.ejs","content":"_99999","lang":"FR","epgContentId":"Alaoula","epgPolling":20,"showProgressThumb":true,"engineSettings":{"liveSyncDurationCount":2,"lowLatencyMode":false,"maxLiveSyncPlaybackRate":1}};
+  var brandConfig = {"start":true,"autoplay":true,"muted":true,"statsOrigin":"easybroadcast.fr","prerollLink":false,"socialMediaList":{"facebook":"https://www.facebook.com/sharer/sharer.php?u=https://www.easybroadcast.fr","twitter":"https://twitter.com/Easy_Broadcast","pinterest":"http://pinterest.com/pin/create/link/?url=https://www.easybroadcast.fr","blogger":"https://www.blogger.com/blog_this.pyra?t&u=https://www.easybroadcast.fr","tumblr":"http://www.tumblr.com/share/link?url=https://www.easybroadcast.fr","reddit":"http://reddit.com/submit?url=https://www.easybroadcast.fr"},"srcInTokenRequest":true,"manager":"wss://manager.kube.easybroadcast.fr/easybroadcast/Lyf4JVGAmWJpTyN","src":"https://cdn.live.easybroadcast.io/abr_corp/73_aloula_w1dqfwm/playlist_dvr.m3u8","token":"https://token.easybroadcast.io/all","tokenType":"easy_b","lib":"https://libs.easybroadcast.io/assets/js/eblib/hls1/latest/eblib.bundle.js","aboutText":"\n\n    <img src=\"https://www.easybroadcast.fr/img/logo_blue.svg\" width=\"40px\"/>\n    <p> Copyright 2019 EasyBroadcast </p>\n    \n\n    <a style=\"color:white\" href=\"http://www.easybroadcast.fr\" target=\"_blank\">\n      easybroadcast.fr\n    </a>\n  ","template":"/Volumes/Dev-ext/dev/players/web/player-master/configs/videos/easybroadcast/demo-token/index.ejs","content":"_99999"};
 
   /**
    * Standalone entry point — used for the generated player bundle (not the npm UMD build).