hls.js 1.6.0-rc.1.0.canary.11071 → 1.6.0-rc.1.0.canary.11074

package/dist/hls.d.mts

@@ -1972,6 +1972,7 @@ export declare type HlsConfig = {
     maxDevicePixelRatio: number;
     preferManagedMediaSource: boolean;
     timelineOffset?: number;
+    ignorePlaylistParsingErrors: boolean;
     loader: {
         new (confg: HlsConfig): Loader<LoaderContext>;
     };

package/dist/hls.d.ts

@@ -1972,6 +1972,7 @@ export declare type HlsConfig = {
     maxDevicePixelRatio: number;
     preferManagedMediaSource: boolean;
     timelineOffset?: number;
+    ignorePlaylistParsingErrors: boolean;
     loader: {
         new (confg: HlsConfig): Loader<LoaderContext>;
     };

package/dist/hls.js

@@ -1073,7 +1073,7 @@
       // 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.11071");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-rc.1.0.canary.11074");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -7656,7 +7656,7 @@
   // 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');
-  var 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('|'));
+  var 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('|'));
   var M3U8Parser = /*#__PURE__*/function () {
     function M3U8Parser() {}
     M3U8Parser.findGroup = function findGroup(groups, mediaGroupId) {
@@ -7856,6 +7856,7 @@
       return results;
     };
     M3U8Parser.parseLevelPlaylist = function parseLevelPlaylist(string, baseurl, id, type, levelUrlId, multivariantVariableList) {
+      var _LEVEL_PLAYLIST_REGEX;
       var base = {
         url: baseurl
       };
@@ -7877,9 +7878,14 @@
       var firstPdtIndex = -1;
       var createNextFrag = false;
       var nextByteRange = null;
+      var 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;
@@ -7968,15 +7974,23 @@
               }
               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);
                 }
                 var skipAttrs = new AttrList(value1, level);
                 var skippedSegments = skipAttrs.decimalInteger('SKIPPED-SEGMENTS');
@@ -7995,15 +8009,23 @@
                 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 '#':
@@ -8055,6 +8077,11 @@
                 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':
@@ -8113,7 +8140,10 @@
               }
             case 'SERVER-CONTROL':
               {
-                var 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');
@@ -8123,6 +8153,9 @@
               }
             case 'PART-INF':
               {
+                if (level.partTarget) {
+                  assignMultipleMediaPlaylistTagOccuranceError(level, tag, result);
+                }
                 var partInfAttrs = new AttrList(value1);
                 level.partTarget = partInfAttrs.decimalFloatingPoint('PART-TARGET');
                 break;
@@ -8174,6 +8207,9 @@
           setFragLevelKeys(frag, levelkeys, level);
         }
       }
+      if (!level.targetduration) {
+        level.playlistParsingError = new Error("#EXT-X-TARGETDURATION is required");
+      }
       var fragmentLength = fragments.length;
       var firstFragment = fragments[0];
       var lastFragment = fragments[fragmentLength - 1];
@@ -8360,6 +8396,12 @@
       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) {
     var fragToPTS = fragTo.startPTS;
@@ -8649,9 +8691,19 @@
       }
       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 + "\nPlaylist starting @" + oldDetails.startSN + "\n" + oldDetails.m3u8 + "\n\nPlaylist starting @" + newDetails.startSN + "\n" + newDetails.m3u8);
+  }
   function adjustSliding(oldDetails, newDetails, matchingStableVariantOrRendition) {
     if (matchingStableVariantOrRendition === void 0) {
       matchingStableVariantOrRendition = true;
@@ -16479,7 +16531,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-rc.1.0.canary.11071";
+  var version = "1.6.0-rc.1.0.canary.11074";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -17754,6 +17806,29 @@
         // Merge live playlists to adjust fragment starts and fill in delta playlist skipped segments
         if (previousDetails && details.fragments.length > 0) {
           mergeDetails(previousDetails, details);
+          var error = details.playlistParsingError;
+          if (error) {
+            this.warn(error);
+            var hls = this.hls;
+            if (!hls.config.ignorePlaylistParsingErrors) {
+              var _details$fragments$;
+              var networkDetails = data.networkDetails;
+              hls.trigger(Events.ERROR, {
+                type: ErrorTypes.NETWORK_ERROR,
+                details: ErrorDetails.LEVEL_PARSING_ERROR,
+                fatal: false,
+                url: details.url,
+                error: error,
+                reason: error.message,
+                level: data.level || undefined,
+                parent: (_details$fragments$ = details.fragments[0]) == null ? void 0 : _details$fragments$.type,
+                networkDetails: networkDetails,
+                stats: stats
+              });
+              return;
+            }
+            details.playlistParsingError = null;
+          }
         }
         if (details.requestScheduled === -1) {
           details.requestScheduled = stats.loading.start;
@@ -30619,6 +30694,7 @@
     // used by fps-controller
     appendErrorMaxRetry: 3,
     // used by buffer-controller
+    ignorePlaylistParsingErrors: false,
     loader: XhrLoader,
     // loader: FetchLoader,
     fLoader: undefined,
@@ -34695,21 +34771,25 @@
       }
       var error = levelDetails.playlistParsingError;
       if (error) {
-        hls.trigger(Events.ERROR, {
-          type: ErrorTypes.NETWORK_ERROR,
-          details: ErrorDetails.LEVEL_PARSING_ERROR,
-          fatal: false,
-          url: url,
-          error: error,
-          reason: error.message,
-          response: response,
-          context: context,
-          level: levelIndex,
-          parent: parent,
-          networkDetails: networkDetails,
-          stats: 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: url,
+            error: error,
+            reason: error.message,
+            response: response,
+            context: context,
+            level: levelIndex,
+            parent: parent,
+            networkDetails: networkDetails,
+            stats: stats
+          });
+          return;
+        }
+        levelDetails.playlistParsingError = null;
       }
       if (levelDetails.live && loader) {
         if (loader.getCacheAge) {

package/dist/hls.js.d.ts

@@ -1972,6 +1972,7 @@ export declare type HlsConfig = {
     maxDevicePixelRatio: number;
     preferManagedMediaSource: boolean;
     timelineOffset?: number;
+    ignorePlaylistParsingErrors: boolean;
     loader: {
         new (confg: HlsConfig): Loader<LoaderContext>;
     };