mlbserver 2022.3.27 → 2022.5.9

package/README.md

@@ -1,6 +1,6 @@
 # mlbserver
 
-Current version 2022.03.27
+Current version 2022.05.09
 
 Credit to https://github.com/tonycpsu/streamglob and https://github.com/mafintosh/hls-decryptor
 

package/index.js

@@ -25,6 +25,7 @@ const YESTERDAY_UTC_HOURS = 14 // UTC hours (EST + 4) to change home page defaul
 const VALID_MEDIA_TYPES = [ 'Video', 'Audio', 'Spanish' ]
 const VALID_LINK_TYPES = [ 'Embed', 'Stream', 'Chromecast', 'Advanced' ]
 const VALID_START_FROM = [ 'Beginning', 'Live' ]
+const VALID_CONTROLS = [ 'Show', 'Hide' ]
 const VALID_INNING_HALF = [ '', 'top', 'bottom' ]
 const VALID_INNING_NUMBER = [ '', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12' ]
 const VALID_SCORES = [ 'Hide', 'Show' ]
@@ -34,7 +35,8 @@ const DEFAULT_MULTIVIEW_RESOLUTION = '540p'
 const VALID_BANDWIDTHS = [ '', '6600k', '4160k', '2950k', '2120k', '1400k', '' ]
 const VALID_AUDIO_TRACKS = [ 'all', 'English', 'English Radio', 'Radio Española', 'none' ]
 const DEFAULT_MULTIVIEW_AUDIO_TRACK = 'English'
-const VALID_SKIP = [ 'off', 'breaks', 'pitches' ]
+const VALID_SKIP = [ 'off', 'breaks', 'idle time', 'pitches' ]
+const VALID_PAD = [ 'off', 'on' ]
 const VALID_FORCE_VOD = [ 'off', 'on' ]
 
 const SAMPLE_STREAM_URL = 'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8'
@@ -133,7 +135,7 @@ session.setPorts(port, multiview_port)
 app.listen(port, function(addr) {
   session.log(appname + ' started at http://' + addr)
   session.debuglog('multiview port ' + multiview_port)
-  session.log('multiview server started at http://' + addr.replace(':' + port, ':' + multiview_port) + multiview_url_path)
+  session.debuglog('multiview server started at http://' + addr.replace(':' + port, ':' + multiview_port) + multiview_url_path)
   session.clear_multiview_files()
 })
 var multiview_app = http.createServer()
@@ -179,6 +181,11 @@ app.get('/stream.m3u8', async function(req, res) {
       options.inning_half = req.query.inning_half || VALID_INNING_HALF[0]
       options.inning_number = req.query.inning_number || VALID_INNING_NUMBER[0]
       options.skip = req.query.skip || VALID_SKIP[0]
+      options.pad = req.query.pad || VALID_PAD[0]
+      if ( options.pad != VALID_PAD[0] ) {
+        // if pad is selected, pick a random number of times to repeat the last segment
+        options.pad = Math.floor(Math.random() * 1440) + 720
+      }
 
       if ( req.query.src ) {
         streamURL = req.query.src
@@ -231,15 +238,8 @@ app.get('/stream.m3u8', async function(req, res) {
         if ( contentId ) {
           options.contentId = contentId
 
-          let skip_adjust = req.query.skip_adjust || 0
-          let skip_types = []
-          if ( (options.inning_half != VALID_INNING_HALF[0]) || (options.inning_number != VALID_INNING_NUMBER[0]) ) {
-            skip_types.push('innings')
-          }
-          if ( options.skip != VALID_SKIP[0] ) {
-            skip_types.push(options.skip)
-          }
-          await session.getEventOffsets(contentId, skip_types, skip_adjust)
+          let skip_type = VALID_SKIP.indexOf(options.skip)
+          await session.getSkipMarkers(contentId, skip_type, options.inning_number, options.inning_half)
         }
       }
 
@@ -364,6 +364,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
       let inning_half = options.inning_half || VALID_INNING_HALF[0]
       let inning_number = options.inning_number || VALID_INNING_NUMBER[0]
       let skip = options.skip || VALID_SKIP[0]
+      let pad = options.pad || VALID_PAD[0]
       let contentId = options.contentId || false
 
       if ( (inning_number > 0) && (inning_half == VALID_INNING_HALF[0]) ) {
@@ -444,6 +445,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
                 if ( inning_half != VALID_INNING_HALF[0] ) newurl += '&inning_half=' + inning_half
                 if ( inning_number != VALID_INNING_NUMBER[0] ) newurl += '&inning_number=' + inning_number
                 if ( skip != VALID_SKIP[0] ) newurl += '&skip=' + skip
+                if ( pad != VALID_PAD[0] ) newurl += '&pad=' + pad
                 if ( contentId ) newurl += '&contentId=' + contentId
                 newurl += content_protect + referer_parameter
                 if ( resolution == 'none' ) {
@@ -490,6 +492,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
           if ( inning_half != VALID_INNING_HALF[0] ) newurl += '&inning_half=' + inning_half
           if ( inning_number != VALID_INNING_NUMBER[0] ) newurl += '&inning_number=' + inning_number
           if ( skip != VALID_SKIP[0] ) newurl += '&skip=' + skip
+          if ( pad != VALID_PAD[0] ) newurl += '&pad=' + pad
           if ( contentId ) newurl += '&contentId=' + contentId
           newurl += content_protect + referer_parameter
           return 'playlist?url='+newurl
@@ -537,6 +540,7 @@ app.get('/playlist', async function(req, res) {
   var inning_half = req.query.inning_half || VALID_INNING_HALF[0]
   var inning_number = req.query.inning_number || VALID_INNING_NUMBER[0]
   var skip = req.query.skip || VALID_SKIP[0]
+  var pad = req.query.pad || VALID_PAD[0]
   var contentId = req.query.contentId || false
 
   var req = function () {
@@ -574,26 +578,22 @@ app.get('/playlist', async function(req, res) {
 
       var key
       var iv
+      var skip_markers
+      var skip_marker_index = 0
+      var time_counter = 0.0
+      var skip_next = false
+      var discontinuity = false
 
       var content_protect = ''
       if ( session.protection.content_protect ) {
         content_protect = '&content_protect=' + session.protection.content_protect
       }
 
-      if ( (contentId) && ((inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0]) || (skip != VALID_SKIP[0]))) {
-        // If inning offsets don't exist, we'll force those options off
-        if ( (typeof session.temp_cache[contentId] === 'undefined') || (typeof session.temp_cache[contentId].inning_offsets === 'undefined') ) {
-          inning_half = VALID_INNING_HALF[0]
-          inning_number = VALID_INNING_NUMBER[0]
-          skip = 'off'
-        } else {
-          var time_counter = 0.0
-          var skip_index = 1
-          var skip_next = false
-          var discontinuity = false
-
-          var offsets = session.temp_cache[contentId].event_offsets
-        }
+      if ( (contentId) && ((inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0]) || (skip != VALID_SKIP[0])) && (typeof session.temp_cache[contentId] !== 'undefined') && (typeof session.temp_cache[contentId].skip_markers !== 'undefined') ) {
+        session.debuglog('pulling skip markers from temporary cache')
+        skip_markers = session.temp_cache[contentId].skip_markers
+      } else {
+        session.debuglog('not using skip markers from temporary cache')
       }
 
       body = body
@@ -601,7 +601,7 @@ app.get('/playlist', async function(req, res) {
         // Skip blank lines
         if (line.trim() == '') return null
 
-        if ( ((skip != 'off') || (inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0])) && (typeof session.temp_cache[contentId] !== 'undefined') && (typeof session.temp_cache[contentId].inning_offsets !== 'undefined') ) {
+        if ( skip_markers && skip_markers[skip_marker_index] ) {
           if ( skip_next ) {
             skip_next = false
             return null
@@ -609,55 +609,23 @@ app.get('/playlist', async function(req, res) {
 
           if (line.indexOf('#EXTINF:') == 0) {
             time_counter += parseFloat(line.substring(8, line.length-1))
+            session.debuglog('checking skip marker at ' + time_counter)
 
-            if ( (inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0]) ) {
-              let inning_index = 0
-              if ( inning_number > 0 ) {
-                inning_index = (inning_number * 2)
-                if ( inning_half == 'top' ) inning_index = inning_index - 1
-              }
-              if ( (typeof session.temp_cache[contentId].inning_offsets[inning_index] !== 'undefined') && (typeof session.temp_cache[contentId].inning_offsets[inning_index].start !== 'undefined') && (time_counter < session.temp_cache[contentId].inning_offsets[inning_index].start) ) {
-                session.debuglog('skipping ' + time_counter + ' before ' + session.temp_cache[contentId].inning_offsets[inning_index].start)
-                // Increment skip index if our offset is less than the inning start
-                if ( offsets && (offsets[skip_index]) && (offsets[skip_index].end) && (offsets[skip_index].end < session.temp_cache[contentId].inning_offsets[inning_index].start) ) {
-                  skip_index++
-                }
-                skip_next = true
-                if ( discontinuity ) {
-                  return null
-                } else {
-                  discontinuity = true
-                  return '#EXT-X-DISCONTINUITY'
-                }
-              } else {
-                session.debuglog('inning start time not found or duplicate request made, ignoring: ' + u)
-                inning_half = VALID_INNING_HALF[0]
-                inning_number = VALID_INNING_NUMBER[0]
-              }
+            while (skip_markers[skip_marker_index] && (skip_markers[skip_marker_index].break_end < time_counter)) {
+              skip_marker_index++
             }
-
-            if ( (skip != VALID_SKIP[0]) && (inning_half == VALID_INNING_HALF[0]) && (inning_number == VALID_INNING_NUMBER[0]) ) {
-              let skip_this = true
-              if ( (typeof offsets[skip_index] !== 'undefined') && (typeof offsets[skip_index].start !== 'undefined') && (typeof offsets[skip_index].end !== 'undefined') && (time_counter > offsets[skip_index].start) && (time_counter > offsets[skip_index].end) ) {
-                skip_index++
-              }
-              if ( (typeof offsets[skip_index] === 'undefined') || (typeof offsets[skip_index].start === 'undefined') || (typeof offsets[skip_index].end === 'undefined') || ((time_counter > offsets[skip_index].start) && (time_counter < offsets[skip_index].end)) ) {
-                session.debuglog('keeping ' + time_counter)
-                skip_this = false
-              } else {
-                session.debuglog('skipping ' + time_counter)
-              }
-              if ( skip_this ) {
-                skip_next = true
-                if ( discontinuity ) {
-                  return null
-                } else {
-                  discontinuity = true
-                  return '#EXT-X-DISCONTINUITY'
-                }
+            if (skip_markers[skip_marker_index] && (time_counter >= skip_markers[skip_marker_index].break_start) && (time_counter < skip_markers[skip_marker_index].break_end)) {
+              session.debuglog('skipping ' + time_counter)
+              skip_next = true
+              if ( discontinuity ) {
+                return null
               } else {
-                discontinuity = false
+                discontinuity = true
+                return '#EXT-X-DISCONTINUITY'
               }
+            } else {
+              session.debuglog('keeping ' + time_counter)
+              discontinuity = false
             }
           }
         }
@@ -689,6 +657,19 @@ app.get('/playlist', async function(req, res) {
       })
       .join('\n')+'\n'
 
+      if ( pad != VALID_PAD[0] ) {
+        let body_array = body.trim().split('\n')
+        let last_segment_index = body_array.length-1
+        if ( body_array[last_segment_index] == '#EXT-X-ENDLIST' ) {
+          session.debuglog('padding archive stream with extra segments')
+          last_segment_index--
+          let pad_lines = '#EXT-X-DISCONTINUITY' + '\n' + body_array[last_segment_index-1] + '\n' + body_array[last_segment_index] + '\n'
+          session.debuglog(pad_lines)
+          for (i=0; i<pad; i++) {
+            body += pad_lines
+          }
+        }
+      }
       if ( force_vod != VALID_FORCE_VOD[0] ) body += '#EXT-X-ENDLIST' + '\n'
       session.debuglog(body)
       respond(response, res, Buffer.from(body))
@@ -795,6 +776,7 @@ app.get('/', async function(req, res) {
 
     let gameDate = session.liveDate()
     let todayUTCHours = session.getTodayUTCHours()
+    let curDate = new Date()
     if ( req.query.date ) {
       if ( req.query.date == VALID_DATES[1] ) {
         gameDate = session.yesterdayDate()
@@ -802,7 +784,6 @@ app.get('/', async function(req, res) {
         gameDate = req.query.date
       }
     } else {
-      let curDate = new Date()
       let utcHours = curDate.getUTCHours()
       if ( (utcHours >= todayUTCHours) && (utcHours < YESTERDAY_UTC_HOURS) ) {
         gameDate = session.yesterdayDate()
@@ -823,6 +804,10 @@ app.get('/', async function(req, res) {
     if ( req.query.startFrom ) {
       startFrom = req.query.startFrom
     }
+    var controls = VALID_CONTROLS[0]
+    if ( req.query.controls ) {
+      controls = req.query.controls
+    }
     var scores = VALID_SCORES[0]
     if ( req.query.scores ) {
       scores = req.query.scores
@@ -855,9 +840,9 @@ app.get('/', async function(req, res) {
     if ( req.query.skip ) {
       skip = req.query.skip
     }
-    var skip_adjust = 0
-    if ( req.query.skip_adjust ) {
-      skip_adjust = req.query.skip_adjust
+    var pad = VALID_PAD[0]
+    if ( req.query.pad ) {
+      pad = req.query.pad
     }
     // audio_url is disabled here, now used in multiview instead
     /*var audio_url = ''
@@ -890,13 +875,13 @@ app.get('/', async function(req, res) {
     body += '</style><script type="text/javascript">' + "\n";
 
     // Define option variables in page
-    body += 'var date="' + gameDate + '";var mediaType="' + mediaType + '";var resolution="' + resolution + '";var audio_track="' + audio_track + '";var force_vod="' + force_vod + '";var inning_half="' + inning_half + '";var inning_number="' + inning_number + '";var skip="' + skip + '";var skip_adjust="' + skip_adjust + '";var linkType="' + linkType + '";var startFrom="' + startFrom + '";var scores="' + scores + '";var scan_mode="' + scan_mode + '";' + "\n"
+    body += 'var date="' + gameDate + '";var mediaType="' + mediaType + '";var resolution="' + resolution + '";var audio_track="' + audio_track + '";var force_vod="' + force_vod + '";var inning_half="' + inning_half + '";var inning_number="' + inning_number + '";var skip="' + skip + '";var pad="' + pad + '";var linkType="' + linkType + '";var startFrom="' + startFrom + '";var scores="' + scores + '";var controls="' + controls + '";var scan_mode="' + scan_mode + '";' + "\n"
     // audio_url is disabled here, now used in multiview instead
     //body += 'var audio_url="' + audio_url + '";' + "\n"
 
     // Reload function, called after options change
     // audio_url is disabled here, now used in multiview instead
-    body += 'var defaultDate="' + session.liveDate() + '";var curDate=new Date();var utcHours=curDate.getUTCHours();if ((utcHours >= ' + todayUTCHours + ') && (utcHours < ' + YESTERDAY_UTC_HOURS + ')){defaultDate="' + session.yesterdayDate() + '"}function reload(){var newurl="/?";if (date != defaultDate){var urldate=date;if (date == "' + session.liveDate() + '"){urldate="today"}else if (date == "' + session.yesterdayDate() + '"){urldate="yesterday"}newurl+="date="+urldate+"&"}if (mediaType != "' + VALID_MEDIA_TYPES[0] + '"){newurl+="mediaType="+mediaType+"&"}if (mediaType=="Video"){if (resolution != "' + VALID_RESOLUTIONS[0] + '"){newurl+="resolution="+resolution+"&"}if (audio_track != "' + VALID_AUDIO_TRACKS[0] + '"){newurl+="audio_track="+encodeURIComponent(audio_track)+"&"}else if (resolution == "none"){newurl+="audio_track="+encodeURIComponent("' + VALID_AUDIO_TRACKS[2] + '")+"&"}/*if (audio_url != ""){newurl+="audio_url="+encodeURIComponent(audio_url)+"&"}*/if (inning_half != "' + VALID_INNING_HALF[0] + '"){newurl+="inning_half="+inning_half+"&"}if (inning_number != "' + VALID_INNING_NUMBER[0] + '"){newurl+="inning_number="+inning_number+"&"}if (skip != "' + VALID_SKIP[0] + '"){newurl+="skip="+skip+"&";if (skip_adjust != "0"){newurl+="skip_adjust="+skip_adjust+"&"}}}if (linkType != "' + VALID_LINK_TYPES[0] + '"){newurl+="linkType="+linkType+"&"}if (linkType=="Embed"){if (startFrom != "' + VALID_START_FROM[0] + '"){newurl+="startFrom="+startFrom+"&"}}if (linkType=="Stream"){if (force_vod != "' + VALID_FORCE_VOD[0] + '"){newurl+="force_vod="+force_vod+"&"}}if (scores != "' + VALID_SCORES[0] + '"){newurl+="scores="+scores+"&"}if (scan_mode != "' + session.data.scan_mode + '"){newurl+="scan_mode="+scan_mode+"&"}window.location=newurl.substring(0,newurl.length-1)}' + "\n"
+    body += 'var defaultDate="' + session.liveDate() + '";var curDate=new Date();var utcHours=curDate.getUTCHours();if ((utcHours >= ' + todayUTCHours + ') && (utcHours < ' + YESTERDAY_UTC_HOURS + ')){defaultDate="' + session.yesterdayDate() + '"}function reload(){var newurl="/?";if (date != defaultDate){var urldate=date;if (date == "' + session.liveDate() + '"){urldate="today"}else if (date == "' + session.yesterdayDate() + '"){urldate="yesterday"}newurl+="date="+urldate+"&"}if (mediaType != "' + VALID_MEDIA_TYPES[0] + '"){newurl+="mediaType="+mediaType+"&"}if (mediaType=="Video"){if (resolution != "' + VALID_RESOLUTIONS[0] + '"){newurl+="resolution="+resolution+"&"}if (audio_track != "' + VALID_AUDIO_TRACKS[0] + '"){newurl+="audio_track="+encodeURIComponent(audio_track)+"&"}else if (resolution == "none"){newurl+="audio_track="+encodeURIComponent("' + VALID_AUDIO_TRACKS[2] + '")+"&"}/*if (audio_url != ""){newurl+="audio_url="+encodeURIComponent(audio_url)+"&"}*/if (inning_half != "' + VALID_INNING_HALF[0] + '"){newurl+="inning_half="+inning_half+"&"}if (inning_number != "' + VALID_INNING_NUMBER[0] + '"){newurl+="inning_number="+inning_number+"&"}if (skip != "' + VALID_SKIP[0] + '"){newurl+="skip="+skip+"&";}}if (pad != "' + VALID_PAD[0] + '"){newurl+="pad="+pad+"&";}if (linkType != "' + VALID_LINK_TYPES[0] + '"){newurl+="linkType="+linkType+"&"}if (linkType=="Embed"){if (startFrom != "' + VALID_START_FROM[0] + '"){newurl+="startFrom="+startFrom+"&"}if (controls != "' + VALID_CONTROLS[0] + '"){newurl+="controls="+controls+"&"}}if (linkType=="Stream"){if (force_vod != "' + VALID_FORCE_VOD[0] + '"){newurl+="force_vod="+force_vod+"&"}}if (scores != "' + VALID_SCORES[0] + '"){newurl+="scores="+scores+"&"}if (scan_mode != "' + session.data.scan_mode + '"){newurl+="scan_mode="+scan_mode+"&"}window.location=newurl.substring(0,newurl.length-1)}' + "\n"
 
     // Ajax function for multiview and highlights
     body += 'function makeGETRequest(url, callback){var request=new XMLHttpRequest();request.onreadystatechange=function(){if (request.readyState==4 && request.status==200){callback(request.responseText)}};request.open("GET", url);request.send();}' + "\n"
@@ -941,7 +926,15 @@ app.get('/', async function(req, res) {
 
     body += '<p>'
     if ( linkType == 'Embed' ) {
-      body += '<span class="tooltip">Start From<span class="tooltiptext">For the embedded player only: Beginning will start playback at the beginning of the stream (may be 1 hour before game time for live games), and Live will start at the live point (if the event is live -- archive games should always start at the beginning). You can still seek anywhere.</span></span>: '
+      body += '<p><span class="tooltip">Video Controls<span class="tooltiptext">Choose whether to show or hide controls on the embedded video page. Helpful to avoid timeline spoilers.</span></span>: '
+      for (var i = 0; i < VALID_CONTROLS.length; i++) {
+        body += '<button '
+        if ( controls == VALID_CONTROLS[i] ) body += 'class="default" '
+        body += 'onclick="controls=\'' + VALID_CONTROLS[i] + '\';reload()">' + VALID_CONTROLS[i] + '</button> '
+      }
+      body += '</p>' + "\n"
+
+      body += '<p><span class="tooltip">Start From<span class="tooltiptext">For the embedded player only: Beginning will start playback at the beginning of the stream (may be 1 hour before game time for live games), and Live will start at the live point (if the event is live -- archive games should always start at the beginning). You can still seek anywhere.</span></span>: '
       for (var i = 0; i < VALID_START_FROM.length; i++) {
         body += '<button '
         if ( startFrom == VALID_START_FROM[i] ) body += 'class="default" '
@@ -1017,7 +1010,14 @@ app.get('/', async function(req, res) {
       if ( (currentDate >= compareStart) && (currentDate < compareEnd) ) {
         let querystring = '?event=biginning'
         let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION
+        if ( linkType == 'embed' ) {
+          if ( startFrom != VALID_START_FROM[0] ) querystring += '&startFrom=' + startFrom
+          if ( controls != VALID_CONTROLS[0] ) querystring += '&controls=' + controls
+        }
         if ( resolution != VALID_RESOLUTIONS[0] ) querystring += '&resolution=' + resolution
+        if ( linkType == 'stream' ) {
+          if ( force_vod != VALID_FORCE_VOD[0] ) querystring += '&force_vod=' + force_vod
+        }
         querystring += content_protect_b
         multiviewquerystring += content_protect_b
         body += '<a href="' + thislink + querystring + '">Big Inning</a>'
@@ -1229,7 +1229,11 @@ app.get('/', async function(req, res) {
                       station += '*'
                     }
                     if ( (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ON') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ARCHIVE') || cache_data.dates[0].games[j].gameUtils.isFinal ) {
-                      game_started = true
+                      let gameTime = new Date(cache_data.dates[0].games[j].gameDate)
+                      gameTime.setMinutes(gameTime.getMinutes()-10)
+                      if ( curDate >= gameTime ) {
+                        game_started = true
+                      }
                       let mediaId = cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaId
                       if ( (mediaType == 'MLBTV') && session.cache.media && session.cache.media[mediaId] && session.cache.media[mediaId].blackout && session.cache.media[mediaId].blackoutExpiry && (new Date(session.cache.media[mediaId].blackoutExpiry) > new Date()) ) {
                         body += teamabbr + ': <s>' + station + '</s>'
@@ -1238,13 +1242,13 @@ app.get('/', async function(req, res) {
                         querystring = '?mediaId=' + mediaId
                         let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION + '&audio_track=' + DEFAULT_MULTIVIEW_AUDIO_TRACK
                         if ( linkType == 'embed' ) {
-                          if ( startFrom != 'Beginning' ) querystring += '&startFrom=' + startFrom
+                          if ( startFrom != VALID_START_FROM[0] ) querystring += '&startFrom=' + startFrom
+                          if ( controls != VALID_CONTROLS[0] ) querystring += '&controls=' + controls
                         }
                         if ( mediaType == 'MLBTV' ) {
                           if ( inning_half != VALID_INNING_HALF[0] ) querystring += '&inning_half=' + inning_half
-                          if ( inning_number != '' ) querystring += '&inning_number=' + relative_inning
-                          if ( skip != 'off' ) querystring += '&skip=' + skip
-                          if ( skip_adjust != '0' ) querystring += '&skip_adjust=' + skip_adjust
+                          if ( inning_number != VALID_INNING_NUMBER[0] ) querystring += '&inning_number=' + relative_inning
+                          if ( skip != VALID_SKIP[0] ) querystring += '&skip=' + skip
                           if ( (inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0]) || (skip != VALID_SKIP[0]) ) {
                             let contentId = cache_data.dates[0].games[j].content.media.epg[k].items[x].contentId
                             querystring += '&contentId=' + contentId
@@ -1254,6 +1258,7 @@ app.get('/', async function(req, res) {
                           // audio_url is disabled here, now used in multiview instead
                           //if ( audio_url != '' ) querystring += '&audio_url=' + encodeURIComponent(audio_url)
                         }
+                        if ( pad != VALID_PAD[0] ) querystring += '&pad=' + pad
                         if ( linkType == 'stream' ) {
                           if ( cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ON' ) {
                             if ( force_vod != VALID_FORCE_VOD[0] ) querystring += '&force_vod=' + force_vod
@@ -1295,7 +1300,7 @@ app.get('/', async function(req, res) {
           if ( body.substr(-2) == ', ' ) {
             body = body.slice(0, -2)
           }
-          if ( (mediaType == 'MLBTV') && (game_started) ) {
+          if ( (mediaType == 'MLBTV') && (game_started) && cache_data.dates[0].games[j].content && cache_data.dates[0].games[j].content.summary && cache_data.dates[0].games[j].content.summary.hasHighlightsVideo ) {
             body += '<br/><a href="javascript:showhighlights(\'' + cache_data.dates[0].games[j].gamePk + '\',\'' + gameDate + '\')">Highlights</a>'
           }
           if ( body.substr(-2) == ', ' ) {
@@ -1336,15 +1341,24 @@ app.get('/', async function(req, res) {
         //body += '<br/><span class="tooltip">or enter a separate audio stream URL<span class="tooltiptext">EXPERIMENTAL! May not actually work. For video streams only: you can also include a separate audio stream URL as an alternate audio track. This is useful if you want to pair the road radio feed with a national TV broadcast (which only includes home radio feeds by default).<br/><br/>After entering the audio stream URL, click the Update button to include it in the video links above; click the Reset button when done with this option.<br/><br/>Warning: does not support inning start or skip options.</span></span>: <span class="tinytext">(copy one from the <button onclick="mediaType=\'Audio\';reload()">Audio</button> page</a>)</span><br/><textarea id="audio_url" rows=2 cols=60 oninput="this.value=stream_substitution(this.value)">' + audio_url + '</textarea><br/><button onclick="audio_url=document.getElementById(\'audio_url\').value;reload()">Update Audio URL</button> <button onclick="audio_url=\'\';reload()">Reset Audio URL</button><br/>'
         body += '</p>' + "\n"
 
-        body += '<p><span class="tooltip">Skip<span class="tooltiptext">For video streams only (use the video "none" option above to apply it to audio streams): you can remove breaks or non-decision pitches from the stream (the latter is useful to make your own "condensed games").<br/><br/>NOTE: skip timings are only generated when the stream is loaded -- so for live games, it will only skip up to the time you loaded the stream.</span></span>: '
+        body += '<p><span class="tooltip">Skip<span class="tooltiptext">For video streams only (use the video "none" option above to apply it to audio streams): you can remove breaks, idle time, or non-action pitches from the stream (useful to make your own "condensed games").<br/><br/>NOTE: skip timings are only generated when the stream is loaded -- so for live games, it will only skip up to the time you loaded the stream.</span></span>: '
         for (var i = 0; i < VALID_SKIP.length; i++) {
           body += '<button '
           if ( skip == VALID_SKIP[i] ) body += 'class="default" '
           body += 'onclick="skip=\'' + VALID_SKIP[i] + '\';reload()">' + VALID_SKIP[i] + '</button> '
         }
-        body += ' <span class="tooltip">Skip Adjust<span class="tooltiptext">Seconds to adjust the skip time video segments, if necessary. Try a negative number if the plays are ending before the video segments begin; use a positive number if the video segments are ending before the play happens.</span></span>: <input type="number" id="skip_adjust" value="' + skip_adjust + '" step="5" onchange="setTimeout(function(){skip_adjust=document.getElementById(\'skip_adjust\').value;reload()},750)" onblur="skip_adjust=this.value;reload()" style="vertical-align:top;font-size:.8em;width:3em"/>'
         body += '</p>' + "\n"
+      }
+
+      body += '<p><span class="tooltip">Pad<span class="tooltiptext">You can pad archive streams with random extra time at the end, to help conceal timeline spoilers.</span></span>: '
+      for (var i = 0; i < VALID_PAD.length; i++) {
+        body += '<button '
+        if ( pad == VALID_PAD[i] ) body += 'class="default" '
+        body += 'onclick="pad=\'' + VALID_PAD[i] + '\';reload()">' + VALID_PAD[i] + '</button> '
+      }
+      body += '</p>' + "\n"
 
+      if ( mediaType == 'Video' ) {
         body += '<table><tr><td><table><tr><td>1</td><td>2</tr><tr><td>3</td><td>4</td></tr></table><td><span class="tooltip">Multiview / Alternate Audio / Sync<span class="tooltiptext">For video streams only: create a new live stream combining 1-4 separate video streams, using the layout shown at left (if more than 1 video stream is selected). Check the boxes next to feeds above to add/remove them, then click "Start" when ready, "Stop" when done watching, or "Restart" to stop and start with the currently selected streams. May take up to 15 seconds after starting before it is ready to play.<br/><br/>No video scaling is performed: defaults to 540p video for each stream, which can combine to make one 1080p stream. Audio defaults to English (TV) audio. If you specify a different audio track instead, you can use the box after each URL below to adjust the sync in seconds (use positive values if audio is early and the audio stream needs to be padded with silence at the beginning to line up with the video; negative values if audio is late, and audio needs to be trimmed from the beginning.)<br/><br/>TIP #1: You can enter just 1 video stream here, at any resolution, to take advantage of the audio sync or alternate audio features without using multiview -- a single video stream will not be re-encoded and will be presented at its full resolution.<br/><br/>TIP #2: You can also manually enter streams from other sources like <a href="https://www.npmjs.com/package/milbserver" target="_blank">milbserver</a> in the boxes below.<br/><br/>WARNING #1: if the mlbserver process dies or restarts while multiview is active, the ffmpeg encoding process will be orphaned and must be killed manually.<br/><br/>WARNING #2: If you did not specify a hardware encoder for ffmpeg on the command line, this will use your server CPU for encoding. Either way, your system may not be able to keep up with processing 4 video streams at once. Try fewer streams if you have perisistent trouble.</span></span>: <a id="startmultiview" href="" onclick="startmultiview(this);return false">Start'
         if ( ffmpeg_status ) body += 'ed'
         body += '</a> | <a id="stopmultiview" href="" onclick="stopmultiview(this);return false">Stop'
@@ -1394,7 +1408,7 @@ app.get('/', async function(req, res) {
 
     body += '<p><span class="tooltip">Include (or exclude) LIDOM<span class="tooltiptext">Dominican Winter League, aka Liga de Beisbol Dominicano. Live stream only, does not support starting from the beginning or certain innings, skip options, etc.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=lidom' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=lidom' + content_protect_b + '">guide.xml</a></p>' + "\n"
 
-    body += '<p><span class="tooltip">Include (or exclude) Big Inning<span class="tooltiptext">Big Inning is the live look-in and highlights show. Live stream only, does not support starting from the beginning.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=biginning' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=biginning' + content_protect_b + '">guide.xml</a></p>' + "\n"
+    body += '<p><span class="tooltip">Include (or exclude) Big Inning<span class="tooltiptext">Big Inning is the live look-in and highlights show.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=biginning' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=biginning' + content_protect_b + '">guide.xml</a></p>' + "\n"
 
     body += '<p><span class="tooltip">Include (or exclude) Multiview<span class="tooltiptext">Requires starting and stopping the multiview stream from the web interface.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=multiview' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=multiview' + content_protect_b + '">guide.xml</a></p>' + "\n"
 
@@ -1529,10 +1543,14 @@ app.get('/embed.html', async function(req, res) {
 
   delete req.headers.host
 
-  let startFrom = 'Beginning'
+  let startFrom = VALID_START_FROM[0]
   if ( req.query.startFrom ) {
     startFrom = req.query.startFrom
   }
+  let controls = VALID_CONTROLS[0]
+  if ( req.query.controls ) {
+    controls = req.query.controls
+  }
 
   let video_url = '/stream.m3u8'
   if ( req.query.src ) {
@@ -1546,9 +1564,13 @@ app.get('/embed.html', async function(req, res) {
   session.debuglog('embed src : ' + video_url)
 
   // Adapted from https://hls-js.netlify.app/demo/basic-usage.html
-  var body = '<html><head><meta charset="UTF-8"><meta http-equiv="Content-type" content="text/html;charset=UTF-8"><title>' + appname + ' player</title><link rel="icon" href="favicon.svg"><style type="text/css">input[type=text],input[type=button]{-webkit-appearance:none;-webkit-border-radius:0}body{background-color:black;color:lightgrey;font-family:Arial,Helvetica,sans-serif}video{width:100% !important;height:auto !important;max-width:1280px}input[type=number]::-webkit-inner-spin-button{opacity:1}button{color:lightgray;background-color:black}button.default{color:black;background-color:lightgray}</style><script>function goBack(){var prevPage=window.location.href;window.history.go(-1);setTimeout(function(){if(window.location.href==prevPage){window.location.href="/"}}, 500)}function toggleAudio(x){var elements=document.getElementsByClassName("audioButton");for(var i=0;i<elements.length;i++){elements[i].className="audioButton"}document.getElementById("audioButton"+x).className+=" default";hls.audioTrack=x}function changeTime(x){video.currentTime+=x}function changeRate(x){let newRate=Math.round((Number(document.getElementById("playback_rate").value)+x)*10)/10;if((newRate<=document.getElementById("playback_rate").max) && (newRate>=document.getElementById("playback_rate").min)){document.getElementById("playback_rate").value=newRate.toFixed(1);video.defaultPlaybackRate=video.playbackRate=document.getElementById("playback_rate").value}}function myKeyPress(e){if(e.key=="ArrowRight"){changeTime(10)}else if(e.key=="ArrowLeft"){changeTime(-10)}else if(e.key=="ArrowUp"){changeRate(0.1)}else if(e.key=="ArrowDown"){changeRate(-0.1)}}</script></head><body onkeydown="myKeyPress(event)"><script src="https://hls-js.netlify.app/dist/hls.js"></script><video id="video" controls></video><script>var video=document.getElementById("video");if(Hls.isSupported()){var hls=new Hls('
+  var body = '<html><head><meta charset="UTF-8"><meta http-equiv="Content-type" content="text/html;charset=UTF-8"><title>' + appname + ' player</title><link rel="icon" href="favicon.svg"><style type="text/css">input[type=text],input[type=button]{-webkit-appearance:none;-webkit-border-radius:0}body{background-color:black;color:lightgrey;font-family:Arial,Helvetica,sans-serif}video{width:100% !important;height:auto !important;max-width:1280px}input[type=number]::-webkit-inner-spin-button{opacity:1}button{color:lightgray;background-color:black}button.default{color:black;background-color:lightgray}</style><script>function goBack(){var prevPage=window.location.href;window.history.go(-1);setTimeout(function(){if(window.location.href==prevPage){window.location.href="/"}}, 500)}function toggleAudio(x){var elements=document.getElementsByClassName("audioButton");for(var i=0;i<elements.length;i++){elements[i].className="audioButton"}document.getElementById("audioButton"+x).className+=" default";hls.audioTrack=x}function changeTime(x){video.currentTime+=x}function changeRate(x){let newRate=Math.round((Number(document.getElementById("playback_rate").value)+x)*10)/10;if((newRate<=document.getElementById("playback_rate").max) && (newRate>=document.getElementById("playback_rate").min)){document.getElementById("playback_rate").value=newRate.toFixed(1);video.defaultPlaybackRate=video.playbackRate=document.getElementById("playback_rate").value}}function myKeyPress(e){if(e.key=="ArrowRight"){changeTime(10)}else if(e.key=="ArrowLeft"){changeTime(-10)}else if(e.key=="ArrowUp"){changeRate(0.1)}else if(e.key=="ArrowDown"){changeRate(-0.1)}}</script></head><body onkeydown="myKeyPress(event)"><script src="https://hls-js.netlify.app/dist/hls.js"></script><video id="video"'
+  if ( controls == VALID_CONTROLS[0] ) {
+    body += ' controls'
+  }
+  body += '></video><script>var video=document.getElementById("video");if(Hls.isSupported()){var hls=new Hls('
 
-  if ( startFrom != 'Live' ) {
+  if ( startFrom != VALID_START_FROM[1] ) {
     body += '{startPosition:0,liveSyncDuration:32400,liveMaxLatencyDuration:32410}'
   }
 
@@ -1556,7 +1578,7 @@ app.get('/embed.html', async function(req, res) {
 
   body += '<button onclick="changeTime(video.duration-10)">Latest</button> '
 
-  body += '<button id="airplay">AirPlay</button></p><p>Playback rate: <input type="number" value=1.0 min=0.1 max=16.0 step=0.1 id="playback_rate" size="8" style="width: 4em" onchange="video.defaultPlaybackRate=video.playbackRate=this.value"></p><p>Audio: <button onclick="video.muted=!video.muted">Toggle Mute</button> <span id="audioSpan"></span></p><p><button onclick="goBack()">Back</button></p><script>var airPlay=document.getElementById("airplay");if(window.WebKitPlaybackTargetAvailabilityEvent){video.addEventListener("webkitplaybacktargetavailabilitychanged",function(event){switch(event.availability){case "available":airPlay.style.display="inline";break;default:airPlay.style.display="none"}airPlay.addEventListener("click",function(){video.webkitShowPlaybackTargetPicker()})})}else{airPlay.style.display="none"}</script></body></html>'
+  body += '<button id="airplay">AirPlay</button></p><p>Playback rate: <input type="number" value=1.0 min=0.1 max=16.0 step=0.1 id="playback_rate" size="8" style="width: 4em" onchange="video.defaultPlaybackRate=video.playbackRate=this.value"></p><p>Audio: <button onclick="video.muted=!video.muted">Toggle Mute</button> <span id="audioSpan"></span></p><p>Controls: <button onclick="video.controls=!video.controls">Toggle Controls</button></p><p><button onclick="goBack()">Back</button></p><script>var airPlay=document.getElementById("airplay");if(window.WebKitPlaybackTargetAvailabilityEvent){video.addEventListener("webkitplaybacktargetavailabilitychanged",function(event){switch(event.availability){case "available":airPlay.style.display="inline";break;default:airPlay.style.display="none"}airPlay.addEventListener("click",function(){video.webkitShowPlaybackTargetPicker()})})}else{airPlay.style.display="none"}</script></body></html>'
   res.end(body)
 })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlbserver",
-  "version": "2022.03.27",
+  "version": "2022.05.09",
   "description": "",
   "repository": {
     "type": "git",

package/session.js

@@ -33,6 +33,14 @@ const TODAY_UTC_HOURS = 8 // UTC hours (EST + 4) into tomorrow to still use toda
 
 const TEAM_IDS = {'ARI':'109','ATL':'144','BAL':'110','BOS':'111','CHC':'112','CWS':'145','CIN':'113','CLE':'114','COL':'115','DET':'116','HOU':'117','KC':'118','LAA':'108','LAD':'119','MIA':'146','MIL':'158','MIN':'142','NYM':'121','NYY':'147','OAK':'133','PHI':'143','PIT':'134','STL':'138','SD':'135','SF':'137','SEA':'136','TB':'139','TEX':'140','TOR':'141','WSH':'120'}
 
+// These are the events to ignore, if we're skipping breaks
+const BREAK_TYPES = ['Game Advisory', 'Pitching Substitution', 'Offensive Substitution', 'Defensive Sub', 'Defensive Switch', 'Runner Placed On Base']
+// These are the events to keep, in addition to the last event of each at-bat, if we're skipping pitches
+const ACTION_TYPES = ['Wild Pitch', 'Passed Ball', 'Stolen Base', 'Caught Stealing', 'Pickoff', 'Error', 'Out', 'Balk', 'Defensive Indiff']
+const EVENT_START_PADDING = -5
+const EVENT_END_PADDING = 8
+const MINIMUM_BREAK_DURATION = 10
+
 class sessionClass {
   // Initialize the class
   constructor(argv = {}) {
@@ -1571,14 +1579,15 @@ class sessionClass {
                         if ( (excludeTeams.length > 0) && (excludeTeams.includes(team) || excludeTeams.includes(opponent_team) || excludeTeams.includes(teamType)) ) {
                           continue
                         } else if ( (includeTeams.length == 0) || includeTeams.includes(team) || includeTeams.includes(teamType) ) {
-                          let icon = server
+                          /*let icon = server
                           if ( (teamType == 'NATIONAL') && ((includeTeams.length == 0) || ((includeTeams.length > 0) && includeTeams.includes(teamType))) ) {
                             team = teamType + '.' + nationalCounter[mediaTitle]
                             icon += '/image.svg?teamId=MLB'
                           } else {
                             icon += '/image.svg?teamId=' + cache_data.dates[i].games[j].content.media.epg[k].items[x].mediaFeedSubType
                           }
-                          if ( this.protection.content_protect ) icon += '&content_protect=' + this.protection.content_protect
+                          if ( this.protection.content_protect ) icon += '&content_protect=' + this.protection.content_protect*/
+                          let icon = 'https://img.mlbstatic.com/mlb-photos/image/upload/ar_167:215,c_crop/fl_relative,l_team:' + cache_data.dates[i].games[j].teams['home'].team.id + ':fill:spot.png,w_1.0,h_1,x_0.5,y_0,fl_no_overflow,e_distort:100p:0:200p:0:200p:100p:0:100p/fl_relative,l_team:' + cache_data.dates[i].games[j].teams['away'].team.id + ':logo:spot:current,w_0.38,x_-0.25,y_-0.16/fl_relative,l_team:' + cache_data.dates[i].games[j].teams['home'].team.id + ':logo:spot:current,w_0.38,x_0.25,y_0.16/w_750/team/' + cache_data.dates[i].games[j].teams['away'].team.id + '/fill/spot.png'
                           let channelid = mediaType + '.' + team
                           channels[channelid] = {}
                           channels[channelid].name = channelid
@@ -1661,8 +1670,9 @@ class sessionClass {
           if ( (excludeTeams.length > 0) && excludeTeams.includes('BIGINNING') ) {
             // do nothing
           } else if ( (includeTeams.length == 0) || includeTeams.includes('BIGINNING') ) {
-            let icon = server + '/image.svg?teamId=MLB'
-            if ( this.protection.content_protect ) icon += '&content_protect=' + this.protection.content_protect
+            /*let icon = server + '/image.svg?teamId=MLB'
+            if ( this.protection.content_protect ) icon += '&content_protect=' + this.protection.content_protect*/
+            let icon = 'https://img.mlbstatic.com/mlb-images/image/private/ar_16:9,g_auto,q_auto:good,w_372,c_fill,f_jpg/mlb/uwr8vepua4t1fe8uwyki'
             let channelid = mediaType + '.BIGINNING'
             channels[channelid] = {}
             channels[channelid].name = channelid
@@ -1998,164 +2008,140 @@ class sessionClass {
     }
   }
 
-  // Get event offsets into temporary cache
-  async getEventOffsets(contentId, skip_types, skip_adjust = 0) {
+  // Get skip markers into temporary cache
+  async getSkipMarkers(contentId, skip_type, start_inning, start_inning_half) {
     try {
-      this.debuglog('getEventOffsets')
+      this.debuglog('getSkipMarkers')
+
+      let skip_markers = []
 
-      if ( skip_adjust != 0 ) session.log('manual adjustment of ' + skip_adjust + ' seconds being applied')
+      // assume the game starts in a break
+      let break_start = 0
 
       // Get the broadcast start time first -- event times will be relative to this
       let broadcast_start = await this.getBroadcastStart(contentId)
       let broadcast_start_offset = broadcast_start.broadcast_start_offset
       let broadcast_start_timestamp = broadcast_start.broadcast_start_timestamp
-      this.debuglog('broadcast start detected as ' + broadcast_start_timestamp + ', offset ' + broadcast_start_offset)
-
-      let cache_data = await this.getGamedayData(contentId)
+      this.debuglog('getSkipMarkers broadcast start detected as ' + broadcast_start_timestamp + ', offset ' + broadcast_start_offset)
 
-      // There are the events to ignore, if we're skipping breaks
-      let break_types = ['Game Advisory', 'Pitching Substitution', 'Offensive Substitution', 'Defensive Sub', 'Defensive Switch', 'Runner Placed On Base']
+      // start inning 0 is simply the broadcast start offset
+      if ((skip_type == 0) && (start_inning == 0)) {
+        let break_end = broadcast_start_offset
+        skip_markers.push({'break_start': break_start, 'break_end': break_end})
+      } else {
+        if (start_inning == '') {
+          start_inning = 0
+        }
+        if (start_inning_half == '') {
+          start_inning_half = 'top'
+        }
 
-      // There are the events to keep, in addition to the last event of each at-bat, if we're skipping pitches
-      let action_types = ['Wild Pitch', 'Passed Ball', 'Stolen Base', 'Caught Stealing', 'Pickoff', 'Out', 'Balk', 'Defensive Indiff']
+        let cache_data = await this.getGamedayData(contentId)
 
-      let inning_offsets = [{start:broadcast_start_offset}]
-      let event_offsets = [{start:0}]
-      let last_event = 0
-      let default_event_duration = 15
+        // make sure we have play data
+        if (cache_data && cache_data.liveData && cache_data.liveData.plays && cache_data.liveData.plays.allPlays) {
 
-      // Pad times by these amounts
-      let pad_start = 0
-      let pad_end = 15
-      let pad_adjust = 20
+          // keep track of inning, if skipping inning breaks only
+          let previous_inning = 0
+          let previous_inning_half = ''
 
-      // Inning counters
-      let last_inning = 0
-      let last_inning_half = ''
+          // calculate total skip time (for fun)
+          let total_skip_time = 0
 
-      // Loop through all plays
-      for (var i=0; i < cache_data.liveData.plays.allPlays.length; i++) {
+          // Loop through all plays
+          for (var i=0; i < cache_data.liveData.plays.allPlays.length; i++) {
 
-        // If requested, calculate inning offsets
-        if ( skip_types.includes('innings') ) {
-          // Look for a change from our inning counters
-          if ( cache_data.liveData.plays.allPlays[i].about && cache_data.liveData.plays.allPlays[i].about.inning && ((cache_data.liveData.plays.allPlays[i].about.inning != last_inning) || (cache_data.liveData.plays.allPlays[i].about.halfInning != last_inning_half)) ) {
-            let inning_index = cache_data.liveData.plays.allPlays[i].about.inning * 2
-            // top
-            if ( cache_data.liveData.plays.allPlays[i].about.halfInning == 'top' ) {
-              inning_index = inning_index - 1
-            }
-            if ( typeof inning_offsets[inning_index] === 'undefined' ) inning_offsets.push({})
-            for (var j=0; j < cache_data.liveData.plays.allPlays[i].playEvents.length; j++) {
-              if ( cache_data.liveData.plays.allPlays[i].playEvents[j].details && cache_data.liveData.plays.allPlays[i].playEvents[j].details.event && (break_types.some(v => cache_data.liveData.plays.allPlays[i].playEvents[j].details.event.includes(v))) ) {
-                // ignore break events
-              } else {
-                inning_offsets[inning_index].start = ((new Date(cache_data.liveData.plays.allPlays[i].playEvents[j].startTime) - broadcast_start_timestamp) / 1000) - pad_start + skip_adjust
-                break
+            // make sure start inning is valid
+            if (start_inning > 0) {
+              let last_play_index = cache_data.liveData.plays.allPlays.length - 1
+              let final_inning = cache_data.liveData.plays.allPlays[last_play_index].about.inning
+              if (start_inning >= final_inning) {
+                if (start_inning > final_inning) {
+                  start_inning = final_inning
+                  let final_inning_half = json_source['liveData']['plays']['allPlays'][last_play_index]['about']['halfInning']
+                  if ((start_inning_half == 'bottom') && (final_inning_half == 'top')) {
+                    start_inning_half = final_inning_half
+                  }
+                }
               }
             }
-            // Update inning counters
-            last_inning = cache_data.liveData.plays.allPlays[i].about.inning
-            last_inning_half = cache_data.liveData.plays.allPlays[i].about.halfInning
-          }
-        }
 
-        // Get event offsets, if necessary
-        if ( skip_types.includes('breaks') || skip_types.includes('pitches') ) {
-
-          // Loop through play events, looking for actions
-          let actions = []
-          for (var j=0; j < cache_data.liveData.plays.allPlays[i].playEvents.length; j++) {
-            // If skipping breaks, everything is an action except break types
-            // otherwise, only action types are included (skipping pitches)
-            if ( skip_types.includes('breaks') ) {
-              if ( cache_data.liveData.plays.allPlays[i].playEvents[j].details && cache_data.liveData.plays.allPlays[i].playEvents[j].details.event && (break_types.some(v => cache_data.liveData.plays.allPlays[i].playEvents[j].details.event.includes(v))) ) {
-                // ignore break events
-              } else {
-                actions.push(j)
-              }
-            } else if ( cache_data.liveData.plays.allPlays[i].playEvents[j].details && cache_data.liveData.plays.allPlays[i].playEvents[j].details.event && (action_types.some(v => cache_data.liveData.plays.allPlays[i].playEvents[j].details.event.includes(v))) ) {
-              actions.push(j)
+            // exit loop after found inning, if not skipping any breaks
+            if ((skip_type == 0) && (skip_markers.length == 1)) {
+              break
             }
-          }
 
-          // Process breaks
-          if ( skip_types.includes('breaks') ) {
-            let this_event = {}
-            let event_in_atbat = false
-            for (var x=0; x < actions.length; x++) {
-              let this_pad_start = 0
-              let this_pad_end = 0
-              // Once we define each event's start time, we won't change it
-              if ( typeof this_event.start === 'undefined' ) {
-                this_event.start = ((new Date(cache_data.liveData.plays.allPlays[i].playEvents[actions[x]].startTime) - broadcast_start_timestamp) / 1000) - pad_start + skip_adjust
-                // For events within at-bats, adjust the padding
-                if ( event_in_atbat ) {
-                  this_event.start -= pad_adjust
+            let current_inning = cache_data.liveData.plays.allPlays[i].about.inning
+            let current_inning_half = cache_data.liveData.plays.allPlays[i].about.halfInning
+            // make sure we're past our start inning
+            if ((current_inning > start_inning) || ((current_inning == start_inning) && ((current_inning_half == start_inning_half) || (current_inning_half == 'bottom')))) {
+              // loop through events within each play
+              for (var j=0; j < cache_data.liveData.plays.allPlays[i].playEvents.length; j++) {
+                // always exclude break types
+                if (cache_data.liveData.plays.allPlays[i].playEvents[j].details && cache_data.liveData.plays.allPlays[i].playEvents[j].details.event && BREAK_TYPES.includes(cache_data.liveData.plays.allPlays[i].playEvents[j].details.event)) {
+                  // if we're in the process of skipping inning breaks, treat the first break type we find as another inning break
+                  if ((skip_type == 1) && (previous_inning > 0)) {
+                    break_start = ((new Date(cache_data.liveData.plays.allPlays[i].playEvents[j].startTime) - broadcast_start_timestamp) / 1000) + EVENT_END_PADDING
+                    previous_inning = 0
+                  }
+                  continue
+                } else {
+                  let action_index
+                  // skip type 1 (breaks) && 2 (idle time) will look at all plays with an endTime
+                  if ((skip_type <= 2) && cache_data.liveData.plays.allPlays[i].playEvents[j].endTime) {
+                    action_index = j
+                  } else if (skip_type == 3) {
+                    // skip type 3 excludes non-action pitches (events that aren't last in the at-bat and don't fall under action types)
+                    if ( (j < (cache_data.liveData.plays.allPlays[i].playEvents.length - 1)) && (!cache_data.liveData.plays.allPlays[i].playEvents[j].details || !cache_data.liveData.plays.allPlays[i].playEvents[j].details.event || !ACTION_TYPES.some(v => cache_data.liveData.plays.allPlays[i].playEvents[j].details.event.includes(v))) ) {
+                      continue
+                    } else {
+                      // if the action is associated with another play or the event doesn't have an end time, use the previous event instead
+                      if (cache_data.liveData.plays.allPlays[i].playEvents[j].actionPlayId || ((cache_data.liveData.plays.allPlays[i].playEvents[j].endTime === 'undefined') && (j > 0))) {
+                        action_index = j - 1
+                      } else {
+                        action_index = j
+                      }
+                    }
+                  }
+                  if (typeof action_index === 'undefined') {
+                    continue
+                  } else {
+                    let break_end = ((new Date(cache_data.liveData.plays.allPlays[i].playEvents[action_index].startTime) - broadcast_start_timestamp) / 1000) + EVENT_START_PADDING
+                    // if the break duration should be greater than than our specified minimum
+                    // and if skip type is not 1 (inning breaks) or the inning has changed
+                    // then we'll add the skip marker
+                    // otherwise we'll ignore it and move on to the next one
+                    if ( ((break_end - break_start) >= MINIMUM_BREAK_DURATION) && ((skip_type != 1) || (current_inning != previous_inning) || (current_inning_half != previous_inning_half)) ) {
+                      skip_markers.push({'break_start': break_start, 'break_end': break_end})
+                      total_skip_time += break_end - break_start
+                      previous_inning = current_inning
+                      previous_inning_half = current_inning_half
+                      // exit loop after found inning, if not skipping breaks
+                      if (skip_type == 0) {
+                        break
+                      }
+                    }
+                    break_start = ((new Date(cache_data.liveData.plays.allPlays[i].playEvents[action_index].endTime) - broadcast_start_timestamp) / 1000) + EVENT_END_PADDING
+                    // add extra padding for overturned review plays
+                    if (cache_data.liveData.plays.allPlays[i].reviewDetails && (cache_data.liveData.plays.allPlays[i].reviewDetails.isOverturned == true)) {
+                      break_start += 40
+                    }
+                  }
                 }
               }
-              // Update the end time, if available
-              if ( cache_data.liveData.plays.allPlays[i].playEvents[actions[x]].endTime ) {
-                this_event.end = ((new Date(cache_data.liveData.plays.allPlays[i].playEvents[actions[x]].endTime) - broadcast_start_timestamp) / 1000) + pad_end + skip_adjust
-              // Otherwise use the start time to estimate the end time
-              } else {
-                this_event.end = ((new Date(cache_data.liveData.plays.allPlays[i].playEvents[actions[x]].startTime) - broadcast_start_timestamp) / 1000) + this_pad_end + skip_adjust + default_event_duration
-              }
-              // Check if we have skipped a play event (indicating a break inside an at-bat), in which case push this event and start another one
-              if ( (x > 0) && (actions[x] > (actions[x-1]+1)) && (typeof this_event.end !== 'undefined') ) {
-                  // For events within at-bats, adjust the padding
-                  event_in_atbat = true
-                  this_event.end += pad_adjust
-                  event_offsets.push(this_event)
-                  this_event = {}
-              }
-            }
-            // Once we've finished our loop through a play's events, push the event as long as we got an end time
-            if ( typeof this_event.end !== 'undefined' ) {
-              event_offsets.push(this_event)
-            }
-          } else if ( skip_types.includes('pitches') ) {
-            // If we're skipping pitches, but we didn't detect any action events, use the last play event
-            if ( (cache_data.liveData.plays.allPlays[i].playEvents.length > 0) && ((actions.length == 0) || (actions[(actions.length-1)] < (cache_data.liveData.plays.allPlays[i].playEvents.length-1))) ) {
-              actions.push(cache_data.liveData.plays.allPlays[i].playEvents.length-1)
-            }
-            // Loop through the actions
-            for (var x=0; x < actions.length; x++) {
-              let this_event = {}
-              let this_pad_start = pad_start
-              let this_pad_end = pad_end
-              // For events within at-bats, adjust the padding
-              if ( x < (actions.length-1) ) {
-                this_pad_start += pad_adjust
-                this_pad_end -= pad_adjust
-              }
-              this_event.start = ((new Date(cache_data.liveData.plays.allPlays[i].playEvents[actions[x]].startTime) - broadcast_start_timestamp) / 1000) - this_pad_start + skip_adjust
-              // If play event end time is available, set it and push this event
-              if ( cache_data.liveData.plays.allPlays[i].playEvents[actions[x]].endTime ) {
-                this_event.end = ((new Date(cache_data.liveData.plays.allPlays[i].playEvents[actions[x]].endTime) - broadcast_start_timestamp) / 1000) + this_pad_end + skip_adjust
-              // Otherwise use the start time to estimate the end time
-              } else {
-                this_event.end = ((new Date(cache_data.liveData.plays.allPlays[i].playEvents[actions[x]].startTime) - broadcast_start_timestamp) / 1000) + this_pad_end + skip_adjust + default_event_duration
-              }
-              event_offsets.push(this_event)
             }
           }
-        }
-      }
 
-      if ( skip_types.includes('innings') ) {
-        this.debuglog('inning offsets: ' + JSON.stringify(inning_offsets))
+          this.debuglog('getSkipMarkers found ' + new Date(total_skip_time * 1000).toISOString().substr(11, 8) + ' total skip time')
+        }
       }
-      this.temp_cache[contentId].inning_offsets = inning_offsets
 
-      if ( skip_types.includes('breaks') || skip_types.includes('pitches') ) {
-        this.debuglog('event offsets: ' + JSON.stringify(event_offsets))
-      }
-      this.temp_cache[contentId].event_offsets = event_offsets
+      this.debuglog('getSkipMarkers skip markers: ' + JSON.stringify(skip_markers))
+      this.temp_cache[contentId].skip_markers = skip_markers
 
       return true
     } catch(e) {
-      this.log('getEventOffsets error : ' + e.message)
+      this.log('getSkipMarkers error : ' + e.message)
     }
   }
 
@@ -2347,7 +2333,7 @@ class sessionClass {
               break
             } else {
               if ( cache_data.items[i].title ) {
-                if ( (eventName == 'BIGINNING') && (cache_data.items[i].title == 'LIVE NOW: MLB Big Inning') ) {
+                if ( (eventName == 'BIGINNING') && cache_data.items[i].title.startsWith('LIVE') && cache_data.items[i].title.includes('Big Inning') ) {
                   this.debuglog('active big inning url')
                   return cache_data.items[i].fields.url
                 } else if ( cache_data.items[i].title.toUpperCase().endsWith(' VS. ' + eventName) ) {