hls.js 1.6.0-rc.1.0.canary.11073 → 1.6.0-rc.1.0.canary.11076

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-rc.1.0.canary.11073"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-rc.1.0.canary.11076"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -6915,7 +6915,7 @@ const LEVEL_PLAYLIST_REGEX_FAST = new RegExp([/#EXTINF:\s*(\d*(?:\.\d+)?)(?:,(.*
 // segment URI, group 3 => the URI (note newline is not eaten)
 /#.*/.source // All other non-segment oriented tags will match with all groups empty
 ].join('|'), 'g');
-const LEVEL_PLAYLIST_REGEX_SLOW = new RegExp([/#(EXTM3U)/.source, /#EXT-X-(PROGRAM-DATE-TIME|BYTERANGE|DATERANGE|DEFINE|KEY|MAP|PART|PART-INF|PLAYLIST-TYPE|PRELOAD-HINT|RENDITION-REPORT|SERVER-CONTROL|SKIP|START):(.+)/.source, /#EXT-X-(BITRATE|DISCONTINUITY-SEQUENCE|MEDIA-SEQUENCE|TARGETDURATION|VERSION): *(\d+)/.source, /#EXT-X-(DISCONTINUITY|ENDLIST|GAP|INDEPENDENT-SEGMENTS)/.source, /(#)([^:]*):(.*)/.source, /(#)(.*)(?:.*)\r?\n?/.source].join('|'));
+const LEVEL_PLAYLIST_REGEX_SLOW = new RegExp([/#EXT-X-(PROGRAM-DATE-TIME|BYTERANGE|DATERANGE|DEFINE|KEY|MAP|PART|PART-INF|PLAYLIST-TYPE|PRELOAD-HINT|RENDITION-REPORT|SERVER-CONTROL|SKIP|START):(.+)/.source, /#EXT-X-(BITRATE|DISCONTINUITY-SEQUENCE|MEDIA-SEQUENCE|TARGETDURATION|VERSION): *(\d+)/.source, /#EXT-X-(DISCONTINUITY|ENDLIST|GAP|INDEPENDENT-SEGMENTS)/.source, /(#)([^:]*):(.*)/.source, /(#)(.*)(?:.*)\r?\n?/.source].join('|'));
 class M3U8Parser {
   static findGroup(groups, mediaGroupId) {
     for (let i = 0; i < groups.length; i++) {
@@ -7110,6 +7110,7 @@ class M3U8Parser {
     return results;
   }
   static parseLevelPlaylist(string, baseurl, id, type, levelUrlId, multivariantVariableList) {
+    var _LEVEL_PLAYLIST_REGEX;
     const base = {
       url: baseurl
     };
@@ -7131,9 +7132,14 @@ class M3U8Parser {
     let firstPdtIndex = -1;
     let createNextFrag = false;
     let nextByteRange = null;
+    let serverControlAttrs;
     LEVEL_PLAYLIST_REGEX_FAST.lastIndex = 0;
     level.m3u8 = string;
     level.hasVariableRefs = hasVariableReferences(string) ;
+    if (((_LEVEL_PLAYLIST_REGEX = LEVEL_PLAYLIST_REGEX_FAST.exec(string)) == null ? void 0 : _LEVEL_PLAYLIST_REGEX[0]) !== '#EXTM3U') {
+      level.playlistParsingError = new Error('Missing format identifier #EXTM3U');
+      return level;
+    }
     while ((result = LEVEL_PLAYLIST_REGEX_FAST.exec(string)) !== null) {
       if (createNextFrag) {
         createNextFrag = false;
@@ -7222,15 +7228,23 @@ class M3U8Parser {
             }
             break;
           case 'PLAYLIST-TYPE':
+            if (level.type) {
+              assignMultipleMediaPlaylistTagOccuranceError(level, tag, result);
+            }
             level.type = value1.toUpperCase();
             break;
           case 'MEDIA-SEQUENCE':
+            if (level.startSN !== 0) {
+              assignMultipleMediaPlaylistTagOccuranceError(level, tag, result);
+            } else if (fragments.length > 0) {
+              assignMustAppearBeforeSegmentsError(level, tag, result);
+            }
             currentSN = level.startSN = parseInt(value1);
             break;
           case 'SKIP':
             {
               if (level.skippedSegments) {
-                level.playlistParsingError = new Error(`#EXT-X-SKIP MUST NOT appear more than once in a Playlist`);
+                assignMultipleMediaPlaylistTagOccuranceError(level, tag, result);
               }
               const skipAttrs = new AttrList(value1, level);
               const skippedSegments = skipAttrs.decimalInteger('SKIPPED-SEGMENTS');
@@ -7249,15 +7263,23 @@ class M3U8Parser {
               break;
             }
           case 'TARGETDURATION':
+            if (level.targetduration !== 0) {
+              assignMultipleMediaPlaylistTagOccuranceError(level, tag, result);
+            }
             level.targetduration = Math.max(parseInt(value1), 1);
             break;
           case 'VERSION':
+            if (level.version !== null) {
+              assignMultipleMediaPlaylistTagOccuranceError(level, tag, result);
+            }
             level.version = parseInt(value1);
             break;
           case 'INDEPENDENT-SEGMENTS':
-          case 'EXTM3U':
             break;
           case 'ENDLIST':
+            if (!level.live) {
+              assignMultipleMediaPlaylistTagOccuranceError(level, tag, result);
+            }
             level.live = false;
             break;
           case '#':
@@ -7309,6 +7331,11 @@ class M3U8Parser {
               break;
             }
           case 'DISCONTINUITY-SEQUENCE':
+            if (level.startCC !== 0) {
+              assignMultipleMediaPlaylistTagOccuranceError(level, tag, result);
+            } else if (fragments.length > 0) {
+              assignMustAppearBeforeSegmentsError(level, tag, result);
+            }
             level.startCC = discontinuityCounter = parseInt(value1);
             break;
           case 'KEY':
@@ -7367,7 +7394,10 @@ class M3U8Parser {
             }
           case 'SERVER-CONTROL':
             {
-              const serverControlAttrs = new AttrList(value1);
+              if (serverControlAttrs) {
+                assignMultipleMediaPlaylistTagOccuranceError(level, tag, result);
+              }
+              serverControlAttrs = new AttrList(value1);
               level.canBlockReload = serverControlAttrs.bool('CAN-BLOCK-RELOAD');
               level.canSkipUntil = serverControlAttrs.optionalFloat('CAN-SKIP-UNTIL', 0);
               level.canSkipDateRanges = level.canSkipUntil > 0 && serverControlAttrs.bool('CAN-SKIP-DATERANGES');
@@ -7377,6 +7407,9 @@ class M3U8Parser {
             }
           case 'PART-INF':
             {
+              if (level.partTarget) {
+                assignMultipleMediaPlaylistTagOccuranceError(level, tag, result);
+              }
               const partInfAttrs = new AttrList(value1);
               level.partTarget = partInfAttrs.decimalFloatingPoint('PART-TARGET');
               break;
@@ -7428,6 +7461,9 @@ class M3U8Parser {
         setFragLevelKeys(frag, levelkeys, level);
       }
     }
+    if (!level.targetduration) {
+      level.playlistParsingError = new Error(`#EXT-X-TARGETDURATION is required`);
+    }
     const fragmentLength = fragments.length;
     const firstFragment = fragments[0];
     const lastFragment = fragments[fragmentLength - 1];
@@ -7605,6 +7641,12 @@ function setFragLevelKeys(frag, levelkeys, level) {
     encryptedFragments.push(frag);
   }
 }
+function assignMultipleMediaPlaylistTagOccuranceError(level, tag, result) {
+  level.playlistParsingError = new Error(`#EXT-X-${tag} must not appear more than once (${result[0]})`);
+}
+function assignMustAppearBeforeSegmentsError(level, tag, result) {
+  level.playlistParsingError = new Error(`#EXT-X-${tag} must appear before the first Media Segment (${result[0]})`);
+}
 
 function updateFromToPTS(fragFrom, fragTo) {
   const fragToPTS = fragTo.startPTS;
@@ -7892,9 +7934,24 @@ function mapFragmentIntersection(oldDetails, newDetails, intersectionFn) {
     }
     if (oldFrag && newFrag) {
       intersectionFn(oldFrag, newFrag, i, newFrags);
+      if (oldFrag.url && oldFrag.url !== newFrag.url) {
+        newDetails.playlistParsingError = getSequenceError(`media sequence mismatch ${newFrag.sn}:`, oldDetails, newDetails, oldFrag, newFrag);
+        return;
+      } else if (oldFrag.cc !== newFrag.cc) {
+        newDetails.playlistParsingError = getSequenceError(`discontinuity sequence mismatch (${oldFrag.cc}!=${newFrag.cc})`, oldDetails, newDetails, oldFrag, newFrag);
+        return;
+      }
     }
   }
 }
+function getSequenceError(message, oldDetails, newDetails, oldFrag, newFrag) {
+  return new Error(`${message} ${newFrag.url}
+Playlist starting @${oldDetails.startSN}
+${oldDetails.m3u8}
+
+Playlist starting @${newDetails.startSN}
+${newDetails.m3u8}`);
+}
 function adjustSliding(oldDetails, newDetails, matchingStableVariantOrRendition = true) {
   const delta = newDetails.startSN + newDetails.skippedSegments - oldDetails.startSN;
   const oldFragments = oldDetails.fragments;
@@ -10001,7 +10058,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-rc.1.0.canary.11073";
+const version = "1.6.0-rc.1.0.canary.11076";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -17192,6 +17249,31 @@ class BasePlaylistController extends Logger {
       // Merge live playlists to adjust fragment starts and fill in delta playlist skipped segments
       if (previousDetails && details.fragments.length > 0) {
         mergeDetails(previousDetails, details);
+        const error = details.playlistParsingError;
+        if (error) {
+          this.warn(error);
+          const hls = this.hls;
+          if (!hls.config.ignorePlaylistParsingErrors) {
+            var _details$fragments$;
+            const {
+              networkDetails
+            } = data;
+            hls.trigger(Events.ERROR, {
+              type: ErrorTypes.NETWORK_ERROR,
+              details: ErrorDetails.LEVEL_PARSING_ERROR,
+              fatal: false,
+              url: details.url,
+              error,
+              reason: error.message,
+              level: data.level || undefined,
+              parent: (_details$fragments$ = details.fragments[0]) == null ? void 0 : _details$fragments$.type,
+              networkDetails,
+              stats
+            });
+            return;
+          }
+          details.playlistParsingError = null;
+        }
       }
       if (details.requestScheduled === -1) {
         details.requestScheduled = stats.loading.start;
@@ -29695,6 +29777,7 @@ const hlsDefaultConfig = _objectSpread2(_objectSpread2({
   // used by fps-controller
   appendErrorMaxRetry: 3,
   // used by buffer-controller
+  ignorePlaylistParsingErrors: false,
   loader: XhrLoader,
   // loader: FetchLoader,
   fLoader: undefined,
@@ -33791,21 +33874,25 @@ class PlaylistLoader {
     }
     const error = levelDetails.playlistParsingError;
     if (error) {
-      hls.trigger(Events.ERROR, {
-        type: ErrorTypes.NETWORK_ERROR,
-        details: ErrorDetails.LEVEL_PARSING_ERROR,
-        fatal: false,
-        url,
-        error,
-        reason: error.message,
-        response,
-        context,
-        level: levelIndex,
-        parent,
-        networkDetails,
-        stats
-      });
-      return;
+      this.hls.logger.warn(error);
+      if (!hls.config.ignorePlaylistParsingErrors) {
+        hls.trigger(Events.ERROR, {
+          type: ErrorTypes.NETWORK_ERROR,
+          details: ErrorDetails.LEVEL_PARSING_ERROR,
+          fatal: false,
+          url,
+          error,
+          reason: error.message,
+          response,
+          context,
+          level: levelIndex,
+          parent,
+          networkDetails,
+          stats
+        });
+        return;
+      }
+      levelDetails.playlistParsingError = null;
     }
     if (levelDetails.live && loader) {
       if (loader.getCacheAge) {