hls.js 1.6.0-beta.3.0.canary.10978 → 1.6.0-beta.3.0.canary.10980

package/dist/hls.mjs

@@ -402,7 +402,7 @@ function enableLogs(debugConfig, context, id) {
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.3.0.canary.10978"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.3.0.canary.10980"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -1001,6 +1001,23 @@ function getVideoSelectionOptions(currentVideoRange, videoPreference) {
   };
 }
 
+const omitCircularRefsReplacer = replacer => {
+  const known = new WeakSet();
+  return (_, value) => {
+    if (replacer) {
+      value = replacer(_, value);
+    }
+    if (typeof value === 'object' && value !== null) {
+      if (known.has(value)) {
+        return;
+      }
+      known.add(value);
+    }
+    return value;
+  };
+};
+const stringify = (object, replacer) => JSON.stringify(object, omitCircularRefsReplacer(replacer));
+
 function getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPreference, videoPreference) {
   const codecSets = Object.keys(codecTiers);
   const channelsPreference = audioPreference == null ? void 0 : audioPreference.channels;
@@ -1080,7 +1097,7 @@ function getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPrefer
         return selected;
       }
       if (!videoRanges.some(range => candidateTier.videoRanges[range] > 0)) {
-        logStartCodecCandidateIgnored(candidate, `no variants with VIDEO-RANGE of ${JSON.stringify(videoRanges)} found`);
+        logStartCodecCandidateIgnored(candidate, `no variants with VIDEO-RANGE of ${stringify(videoRanges)} found`);
         return selected;
       }
       if (videoCodecPreference && candidate.indexOf(videoCodecPreference.substring(0, 4)) % 5 !== 0) {
@@ -1873,7 +1890,7 @@ class AbrController extends Logger {
       currentVideoRange = preferHDR ? videoRanges[videoRanges.length - 1] : videoRanges[0];
       currentFrameRate = minFramerate;
       currentBw = Math.max(currentBw, minBitrate);
-      this.log(`picked start tier ${JSON.stringify(startTier)}`);
+      this.log(`picked start tier ${stringify(startTier)}`);
     } else {
       currentCodecSet = level == null ? void 0 : level.codecSet;
       currentVideoRange = level == null ? void 0 : level.videoRange;
@@ -1902,9 +1919,9 @@ class AbrController extends Logger {
             const levels = this.hls.levels;
             const index = levels.indexOf(levelInfo);
             if (decodingInfo.error) {
-              this.warn(`MediaCapabilities decodingInfo error: "${decodingInfo.error}" for level ${index} ${JSON.stringify(decodingInfo)}`);
+              this.warn(`MediaCapabilities decodingInfo error: "${decodingInfo.error}" for level ${index} ${stringify(decodingInfo)}`);
             } else if (!decodingInfo.supported) {
-              this.warn(`Unsupported MediaCapabilities decodingInfo result for level ${index} ${JSON.stringify(decodingInfo)}`);
+              this.warn(`Unsupported MediaCapabilities decodingInfo result for level ${index} ${stringify(decodingInfo)}`);
               if (index > -1 && levels.length > 1) {
                 this.log(`Removing unsupported level ${index}`);
                 this.hls.removeLevel(index);
@@ -1973,16 +1990,19 @@ class AbrController extends Logger {
     return -1;
   }
   set nextAutoLevel(nextLevel) {
-    const {
-      maxAutoLevel,
-      minAutoLevel
-    } = this.hls;
-    const value = Math.min(Math.max(nextLevel, minAutoLevel), maxAutoLevel);
+    const value = this.deriveNextAutoLevel(nextLevel);
     if (this._nextAutoLevel !== value) {
       this.nextAutoLevelKey = '';
       this._nextAutoLevel = value;
     }
   }
+  deriveNextAutoLevel(nextLevel) {
+    const {
+      maxAutoLevel,
+      minAutoLevel
+    } = this.hls;
+    return Math.min(Math.max(nextLevel, minAutoLevel), maxAutoLevel);
+  }
 }
 
 const BinarySearch = {
@@ -7753,7 +7773,7 @@ function mergeDateRanges(oldDateRanges, newDetails) {
           dateRange.tagOrder += mergeCount;
         }
       } else {
-        logger.warn(`Ignoring invalid Playlist Delta Update DATERANGE tag: "${JSON.stringify(deltaDateRanges[id].attr)}"`);
+        logger.warn(`Ignoring invalid Playlist Delta Update DATERANGE tag: "${stringify(deltaDateRanges[id].attr)}"`);
       }
     });
   }
@@ -9887,7 +9907,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.3.0.canary.10978";
+const version = "1.6.0-beta.3.0.canary.10980";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -15936,7 +15956,7 @@ class TransmuxerInterface {
             cmd: 'init',
             typeSupported: m2tsTypeSupported,
             id,
-            config: JSON.stringify(config)
+            config: stringify(config)
           });
         } catch (err) {
           logger.warn(`Error setting up "${id}" Web Worker, fallback to inline`, err);
@@ -15963,7 +15983,7 @@ class TransmuxerInterface {
         resetNo: instanceNo,
         typeSupported: m2tsTypeSupported,
         id: this.id,
-        config: JSON.stringify(config)
+        config: stringify(config)
       });
     }
   }
@@ -18000,8 +18020,8 @@ class BufferController extends Logger {
         return;
       }
       this.log(`attachTransferred: (bufferCodecEventsTotal ${this.bufferCodecEventsTotal})
-required tracks: ${JSON.stringify(requiredTracks, (key, value) => key === 'initSegment' ? undefined : value)};
-transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'initSegment' ? undefined : value)}}`);
+required tracks: ${stringify(requiredTracks, (key, value) => key === 'initSegment' ? undefined : value)};
+transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSegment' ? undefined : value)}}`);
       if (!isCompatibleTrackChange(transferredTracks, requiredTracks)) {
         // destroy attaching media source
         data.mediaSource = null;
@@ -18813,7 +18833,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'in
       pendingTrackCount,
       tracks
     } = this;
-    this.log(`checkPendingTracks (pending: ${pendingTrackCount} codec events expected: ${bufferCodecEventsTotal}) ${JSON.stringify(tracks)}`);
+    this.log(`checkPendingTracks (pending: ${pendingTrackCount} codec events expected: ${bufferCodecEventsTotal}) ${stringify(tracks)}`);
     // Check if we've received all of the expected bufferCodec events. When none remain, create all the sourceBuffers at once.
     // This is important because the MSE spec allows implementations to throw QuotaExceededErrors if creating new sourceBuffers after
     // data has been appended to existing ones.
@@ -18880,7 +18900,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'in
         const codec = this.getTrackCodec(track, type);
         const mimeType = `${track.container};codecs=${codec}`;
         track.codec = codec;
-        this.log(`creating sourceBuffer(${mimeType})${this.currentOp(type) ? ' Queued' : ''} ${JSON.stringify(track)}`);
+        this.log(`creating sourceBuffer(${mimeType})${this.currentOp(type) ? ' Queued' : ''} ${stringify(track)}`);
         try {
           const sb = mediaSource.addSourceBuffer(mimeType);
           const sbIndex = sourceBufferNameToIndex(type);
@@ -20815,7 +20835,7 @@ class ContentSteeringController extends Logger {
         errorAction.resolved = this.pathwayId !== errorPathway;
       }
       if (!errorAction.resolved) {
-        this.warn(`Could not resolve ${data.details} ("${data.error.message}") with content-steering for Pathway: ${errorPathway} levels: ${levels ? levels.length : levels} priorities: ${JSON.stringify(pathwayPriority)} penalized: ${JSON.stringify(this.penalizedPathways)}`);
+        this.warn(`Could not resolve ${data.details} ("${data.error.message}") with content-steering for Pathway: ${errorPathway} levels: ${levels ? levels.length : levels} priorities: ${stringify(pathwayPriority)} penalized: ${stringify(this.penalizedPathways)}`);
       }
     }
   }
@@ -21376,7 +21396,7 @@ class EMEController extends Logger {
     const keySystemAccessPromises = this.keySystemAccessPromises[keySystem];
     let keySystemAccess = keySystemAccessPromises == null ? void 0 : keySystemAccessPromises.keySystemAccess;
     if (!keySystemAccess) {
-      this.log(`Requesting encrypted media "${keySystem}" key-system access with config: ${JSON.stringify(mediaKeySystemConfigs)}`);
+      this.log(`Requesting encrypted media "${keySystem}" key-system access with config: ${stringify(mediaKeySystemConfigs)}`);
       keySystemAccess = this.requestMediaKeySystemAccess(keySystem, mediaKeySystemConfigs);
       const _keySystemAccessPromises = this.keySystemAccessPromises[keySystem] = {
         keySystemAccess
@@ -21545,7 +21565,7 @@ class EMEController extends Logger {
         type: ErrorTypes.KEY_SYSTEM_ERROR,
         details: ErrorDetails.KEY_SYSTEM_NO_CONFIGURED_LICENSE,
         fatal: true
-      }, `Missing key-system license configuration options ${JSON.stringify({
+      }, `Missing key-system license configuration options ${stringify({
         drmSystems: this.config.drmSystems
       })}`);
     }
@@ -23685,20 +23705,6 @@ function removeEventListener(el, type, listener) {
   el.removeEventListener(type, listener);
 }
 
-const replacer = () => {
-  const known = new WeakSet();
-  return (_, value) => {
-    if (typeof value === 'object' && value !== null) {
-      if (known.has(value)) {
-        return;
-      }
-      known.add(value);
-    }
-    return value;
-  };
-};
-const stringify = object => JSON.stringify(object, replacer());
-
 function playWithCatch(media) {
   media == null ? void 0 : media.play().catch(() => {
     /* no-op */
@@ -26445,7 +26451,7 @@ class CaptionScreen {
     row.setCursor(absPos);
   }
   setPAC(pacData) {
-    this.logger.log(2, () => 'pacData = ' + JSON.stringify(pacData));
+    this.logger.log(2, () => 'pacData = ' + stringify(pacData));
     let newRow = pacData.row - 1;
     if (this.nrRollUpRows && newRow < this.nrRollUpRows - 1) {
       newRow = this.nrRollUpRows - 1;
@@ -26496,7 +26502,7 @@ class CaptionScreen {
    * Set background/extra foreground, but first do back_space, and then insert space (backwards compatibility).
    */
   setBkgData(bkgData) {
-    this.logger.log(2, () => 'bkgData = ' + JSON.stringify(bkgData));
+    this.logger.log(2, () => 'bkgData = ' + stringify(bkgData));
     this.backSpace();
     this.setPen(bkgData);
     this.insertChar(0x20); // Space
@@ -26736,7 +26742,7 @@ class Cea608Channel {
     } else {
       styles.foreground = 'white';
     }
-    this.logger.log(2, 'MIDROW: ' + JSON.stringify(styles));
+    this.logger.log(2, 'MIDROW: ' + stringify(styles));
     this.writeScreen.setPen(styles);
   }
   outputDataUpdate(dispatch = false) {
@@ -29736,7 +29742,7 @@ function mergeConfig(defaultConfig, userConfig, logger) {
       }
     });
     if (report.length) {
-      logger.warn(`hls.js config: "${report.join('", "')}" setting(s) are deprecated, use "${policyName}": ${JSON.stringify(userConfig[policyName])}`);
+      logger.warn(`hls.js config: "${report.join('", "')}" setting(s) are deprecated, use "${policyName}": ${stringify(userConfig[policyName])}`);
     }
   });
   return _objectSpread2(_objectSpread2({}, defaultsCopy), userConfig);
@@ -30152,7 +30158,7 @@ class GapController extends TaskLoop {
     if (!stallReported && stalled !== null && media && hls) {
       // Report stalled error once
       this.stallReported = true;
-      const error = new Error(`Playback stalling at @${media.currentTime} due to low buffer (${JSON.stringify(bufferInfo)})`);
+      const error = new Error(`Playback stalling at @${media.currentTime} due to low buffer (${stringify(bufferInfo)})`);
       this.warn(error.message);
       hls.trigger(Events.ERROR, {
         type: ErrorTypes.MEDIA_ERROR,
@@ -30338,7 +30344,7 @@ function createCueWithDataFields(Cue, startTime, endTime, data, type) {
       cue.type = type;
     }
   } catch (e) {
-    cue = new Cue(startTime, endTime, JSON.stringify(type ? _objectSpread2({
+    cue = new Cue(startTime, endTime, stringify(type ? _objectSpread2({
       type
     }, data) : data));
   }
@@ -31089,7 +31095,7 @@ class LevelController extends BasePlaylistController {
       Promise.resolve().then(() => {
         if (this.hls) {
           if (data.levels.length) {
-            this.warn(`One or more CODECS in variant not supported: ${JSON.stringify(data.levels[0].attrs)}`);
+            this.warn(`One or more CODECS in variant not supported: ${stringify(data.levels[0].attrs)}`);
           }
           const error = new Error('no level with compatible codecs found in manifest');
           this.hls.trigger(Events.ERROR, {