hls.js 1.5.5-0.canary.9983 → 1.5.5-0.canary.9985

package/dist/hls.js

@@ -497,76 +497,6 @@
     return ErrorDetails;
   }({});
 
-  var Logger = function Logger(label, logger) {
-    this.trace = void 0;
-    this.debug = void 0;
-    this.log = void 0;
-    this.warn = void 0;
-    this.info = void 0;
-    this.error = void 0;
-    var lb = "[" + label + "]:";
-    this.trace = noop;
-    this.debug = logger.debug.bind(null, lb);
-    this.log = logger.log.bind(null, lb);
-    this.warn = logger.warn.bind(null, lb);
-    this.info = logger.info.bind(null, lb);
-    this.error = logger.error.bind(null, lb);
-  };
-  var noop = function noop() {};
-  var fakeLogger = {
-    trace: noop,
-    debug: noop,
-    log: noop,
-    warn: noop,
-    info: noop,
-    error: noop
-  };
-  function createLogger() {
-    return _extends({}, fakeLogger);
-  }
-
-  // let lastCallTime;
-  // function formatMsgWithTimeInfo(type, msg) {
-  //   const now = Date.now();
-  //   const diff = lastCallTime ? '+' + (now - lastCallTime) : '0';
-  //   lastCallTime = now;
-  //   msg = (new Date(now)).toISOString() + ' | [' +  type + '] > ' + msg + ' ( ' + diff + ' ms )';
-  //   return msg;
-  // }
-
-  function consolePrintFn(type, id) {
-    var func = self.console[type];
-    return func ? func.bind(self.console, (id ? '[' + id + '] ' : '') + "[" + type + "] >") : noop;
-  }
-  function getLoggerFn(key, debugConfig, id) {
-    return debugConfig[key] ? debugConfig[key].bind(debugConfig) : consolePrintFn(key, id);
-  }
-  var exportedLogger = createLogger();
-  function enableLogs(debugConfig, context, id) {
-    // check that console is available
-    var newLogger = createLogger();
-    if (typeof console === 'object' && debugConfig === true || typeof debugConfig === 'object') {
-      var keys = [
-      // Remove out from list here to hard-disable a log-level
-      // 'trace',
-      'debug', 'log', 'info', 'warn', 'error'];
-      keys.forEach(function (key) {
-        newLogger[key] = getLoggerFn(key, debugConfig, 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.5.5-0.canary.9983");
-      } catch (e) {
-        /* log fn threw an exception. All logger methods are no-ops. */
-        return createLogger();
-      }
-    }
-    exportedLogger = newLogger;
-    return newLogger;
-  }
-  var logger = exportedLogger;
-
   var DECIMAL_RESOLUTION_REGEX = /^(\d+)x(\d+)$/;
   var ATTR_LIST_REGEX = /(.+?)=(".*?"|.*?)(?:,|$)/g;
 
@@ -655,6 +585,77 @@
     return AttrList;
   }();
 
+  var Logger = function Logger(label, logger) {
+    this.trace = void 0;
+    this.debug = void 0;
+    this.log = void 0;
+    this.warn = void 0;
+    this.info = void 0;
+    this.error = void 0;
+    var lb = "[" + label + "]:";
+    this.trace = noop;
+    this.debug = logger.debug.bind(null, lb);
+    this.log = logger.log.bind(null, lb);
+    this.warn = logger.warn.bind(null, lb);
+    this.info = logger.info.bind(null, lb);
+    this.error = logger.error.bind(null, lb);
+  };
+  var noop = function noop() {};
+  var fakeLogger = {
+    trace: noop,
+    debug: noop,
+    log: noop,
+    warn: noop,
+    info: noop,
+    error: noop
+  };
+  function createLogger() {
+    return _extends({}, fakeLogger);
+  }
+
+  // let lastCallTime;
+  // function formatMsgWithTimeInfo(type, msg) {
+  //   const now = Date.now();
+  //   const diff = lastCallTime ? '+' + (now - lastCallTime) : '0';
+  //   lastCallTime = now;
+  //   msg = (new Date(now)).toISOString() + ' | [' +  type + '] > ' + msg + ' ( ' + diff + ' ms )';
+  //   return msg;
+  // }
+
+  function consolePrintFn(type, id) {
+    var func = self.console[type];
+    return func ? func.bind(self.console, (id ? '[' + id + '] ' : '') + "[" + type + "] >") : noop;
+  }
+  function getLoggerFn(key, debugConfig, id) {
+    return debugConfig[key] ? debugConfig[key].bind(debugConfig) : consolePrintFn(key, id);
+  }
+  var exportedLogger = createLogger();
+  function enableLogs(debugConfig, context, id) {
+    // check that console is available
+    var newLogger = createLogger();
+    if (typeof console === 'object' && debugConfig === true || typeof debugConfig === 'object') {
+      var keys = [
+      // Remove out from list here to hard-disable a log-level
+      // 'trace',
+      'debug', 'log', 'info', 'warn', 'error'];
+      keys.forEach(function (key) {
+        newLogger[key] = getLoggerFn(key, debugConfig, 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.5.5-0.canary.9985");
+      } catch (e) {
+        /* log fn threw an exception. All logger methods are no-ops. */
+        return createLogger();
+      }
+    }
+    // global exported logger uses the log methods from last call to `enableLogs`
+    _extends(exportedLogger, newLogger);
+    return newLogger;
+  }
+  var logger = exportedLogger;
+
   // Avoid exporting const enum so that these values can be inlined
 
   function isDateRangeCueAttribute(attrName) {
@@ -4186,10 +4187,10 @@
         var loaderContext = loader.context;
         if (loaderContext && loaderContext.url === context.url && loaderContext.level === context.level) {
           // same URL can't overlap
-          logger.trace('[playlist-loader]: playlist request ongoing');
+          this.hls.logger.trace('[playlist-loader]: playlist request ongoing');
           return;
         }
-        logger.log("[playlist-loader]: aborting previous loader for type: " + context.type);
+        this.hls.logger.log("[playlist-loader]: aborting previous loader for type: " + context.type);
         loader.abort();
       }
 
@@ -4299,7 +4300,7 @@
         // alt audio rendition in which quality levels (main)
         // contains both audio+video. but with mixed audio track not signaled
         if (!embeddedAudioFound && levels[0].audioCodec && !levels[0].attrs.AUDIO) {
-          logger.log('[playlist-loader]: audio codec signaled in quality level, but no embedded audio track signaled, create one');
+          this.hls.logger.log('[playlist-loader]: audio codec signaled in quality level, but no embedded audio track signaled, create one');
           audioTracks.unshift({
             type: 'main',
             name: 'main',
@@ -4399,7 +4400,7 @@
         message += " id: " + context.id + " group-id: \"" + context.groupId + "\"";
       }
       var error = new Error(message);
-      logger.warn("[playlist-loader]: " + message);
+      this.hls.logger.warn("[playlist-loader]: " + message);
       var details = ErrorDetails.UNKNOWN;
       var fatal = false;
       var loader = this.getInternalLoader(context);
@@ -6501,7 +6502,12 @@
           var cdnAge = lastAdvanced + details.ageHeader;
           var currentGoal = Math.min(cdnAge - details.partTarget, details.targetduration * 1.5);
           if (currentGoal > 0) {
-            if (previousDetails && currentGoal > previousDetails.tuneInGoal) {
+            if (cdnAge > details.targetduration * 3) {
+              // Omit segment and part directives when the last response was more than 3 target durations ago,
+              this.log("Playlist last advanced " + lastAdvanced.toFixed(2) + "s ago. Omitting segment and part directives.");
+              msn = undefined;
+              part = undefined;
+            } else if (previousDetails != null && previousDetails.tuneInGoal && cdnAge - details.partTarget > previousDetails.tuneInGoal) {
               // If we attempted to get the next or latest playlist update, but currentGoal increased,
               // then we either can't catchup, or the "age" header cannot be trusted.
               this.warn("CDN Tune-in goal increased from: " + previousDetails.tuneInGoal + " to: " + currentGoal + " with playlist age: " + details.age);
@@ -25220,7 +25226,7 @@
             su: !_this.initialized
           });
         } catch (error) {
-          logger.warn('Could not generate manifest CMCD data.', error);
+          _this.hls.logger.warn('Could not generate manifest CMCD data.', error);
         }
       };
       /**
@@ -25248,7 +25254,7 @@
           }
           _this.apply(context, data);
         } catch (error) {
-          logger.warn('Could not generate segment CMCD data.', error);
+          _this.hls.logger.warn('Could not generate segment CMCD data.', error);
         }
       };
       this.hls = hls;
@@ -27202,7 +27208,12 @@
         if (curLevel.fragmentError === 0) {
           curLevel.loadError = 0;
         }
-        this.playlistLoaded(level, data, curLevel.details);
+        // Ignore matching details populated by loading a Media Playlist directly
+        var previousDetails = curLevel.details;
+        if (previousDetails === data.details && previousDetails.advanced) {
+          previousDetails = undefined;
+        }
+        this.playlistLoaded(level, data, previousDetails);
       } else if ((_data$deliveryDirecti2 = data.deliveryDirectives) != null && _data$deliveryDirecti2.skip) {
         // received a delta playlist update that cannot be merged
         details.deltaUpdateFailed = true;
@@ -30023,7 +30034,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.5-0.canary.9983";
+        return "1.5.5-0.canary.9985";
       }
     }, {
       key: "Events",