mlbserver 2025.6.12 → 2025.6.26

package/index.js

@@ -365,10 +365,8 @@ app.get('/stream.m3u8', async function(req, res) {
           let skip_adjust = parseInt(req.query.skip_adjust) || DEFAULT_SKIP_ADJUST
 
           let skip_type = VALID_SKIP.indexOf(options.skip)
-          // for skip other than commercial skip, look up markers
-          if ( skip_type != 4 ) {
-            await session.getSkipMarkers(gamePk, skip_type, options.inning_number, options.inning_half, streamURL, streamURLToken, skip_adjust)
-          }
+          // look up markers
+          await session.getSkipMarkers(gamePk, skip_type, options.inning_number, options.inning_half, streamURL, streamURLToken, skip_adjust)
         }
       }
 
@@ -549,11 +547,6 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
           return
         }
 
-        // Omit subtitles when skipping
-        if ( line.startsWith('#EXT-X-MEDIA:TYPE=SUBTITLES') && (skip != 'none') ) {
-          return
-        }
-
         // Parse audio tracks to only include matching one, if specified
         if ( line.startsWith('#EXT-X-MEDIA:TYPE=AUDIO') ) {
           // if we've already returned our desired audio track, we can skip subsequent ones
@@ -649,11 +642,19 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
         }
 
         // Pass through any remaining caption tracks
-        if ( line.startsWith('#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="English",DEFAULT=YES,AUTOSELECT=YES,FORCED=NO,LANGUAGE="eng",URI="') ) {
+        if ( line.startsWith('#EXT-X-MEDIA:TYPE=SUBTITLES,') ) {
           var parsed = line.match(',URI="([^"]+)"')
           if ( parsed[1] ) {
-            newurl = http_root + '/playlist.m3u8?url='+encodeURIComponent(url.resolve(streamURL, parsed[1].trim())) + content_protect + referer_parameter + token_parameter
-            return '#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="English",DEFAULT=YES,AUTOSELECT=YES,FORCED=NO,LANGUAGE="eng",URI="' + newurl + '"'
+            newurl = http_root + '/playlist.m3u8?url='+encodeURIComponent(url.resolve(streamURL, parsed[1].trim()))
+            if ( force_vod != VALID_FORCE_VOD[0] ) newurl += '&force_vod=on'
+            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 != DEFAULT_SKIP_ADJUST ) newurl += '&skip_adjust=' + skip_adjust
+            if ( pad != VALID_PAD[0] ) newurl += '&pad=' + pad
+            if ( gamePk ) newurl += '&gamePk=' + gamePk
+            newurl += content_protect + referer_parameter + token_parameter
+            return line.replace(parsed[1], newurl)
           }
           return
         }
@@ -768,23 +769,7 @@ app.get('/playlist.m3u8', async function(req, res) {
         content_protect = '&content_protect=' + session.protection.content_protect
       }
 
-      // if skipping commercials, filter the playlist to remove ad insertion domains
-      if ( skip == 'commercials' ) {
-        session.debuglog('filtering commercial breaks')
-        let new_body = []
-        let break_active = false
-        for (var i=0; i<body.length; i++) {
-          if ( (break_active == false) && body[i].startsWith('#EXT-OATCLS-SCTE35:') ) {
-            break_active = true
-            new_body.push('#EXT-X-DISCONTINUITY')
-          } else if ( (break_active == true) && body[i].startsWith('#EXT-X-CUE-IN') ) {
-            break_active = false
-          } else if ( break_active == false ) {
-            new_body.push(body[i])
-          }
-        }
-        body = new_body
-      } else if ( (gamePk) && ((inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0]) || (skip != VALID_SKIP[0])) && (typeof session.temp_cache[gamePk] !== 'undefined') && (typeof session.temp_cache[gamePk].skip_markers !== 'undefined') ) {
+      if ( (gamePk) && ((inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0]) || (skip != VALID_SKIP[0])) && (typeof session.temp_cache[gamePk] !== 'undefined') && (typeof session.temp_cache[gamePk].skip_markers !== 'undefined') ) {
         session.debuglog('pulling skip markers from temporary cache')
         skip_markers = session.temp_cache[gamePk].skip_markers
       } else {
@@ -978,19 +963,22 @@ app.get('/subtitles.vtt', async function(req, res) {
   var u = req.query.url
   session.debuglog('subtitles.vtt url : ' + u)
 
+  var headers = {}
+
   var referer = false
   if ( req.query.referer ) {
+    session.debuglog('found subtitles.vtt referer : ' + req.query.referer)
     referer = decodeURIComponent(req.query.referer)
-    session.debuglog('found subtitles.vtt referer : ' + referer)
+    headers.referer = referer
+    headers.origin = getOriginFromURL(referer)
   }
 
-  var req = function () {
-    var headers = {}
-    if ( referer ) {
-      headers.referer = referer
-      headers.origin = getOriginFromURL(referer)
-    }
+  if ( req.query.streamURLToken ) {
+    token = decodeURIComponent(req.query.streamURLToken)
+    headers['x-cdn-token'] = token
+  }
 
+  var req = function () {
     requestRetry(u, headers, function(err, response) {
       if (err) return res.error(err)
 
@@ -1689,7 +1677,6 @@ app.get('/', async function(req, res) {
         let compareEnd = new Date(big_inning.end)
         compareEnd.setHours(compareEnd.getHours()+1)
         if ( (currentDate >= compareStart) && (currentDate < compareEnd) ) {
-          body += '<tr><td><span class="tooltip">Big Inning<span class="tooltiptext">Big Inning is the live look-in and highlights show. <a href="https://support.mlb.com/s/article/What-Is-MLB-Big-Inning">See here for more information</a>.</span></span></td><td>'
           let querystring = '?event=biginning'
           let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION
           if ( linkType == VALID_LINK_TYPES[0] ) {
@@ -1725,8 +1712,8 @@ app.get('/', async function(req, res) {
           compareEnd.setHours(compareEnd.getHours()+4)
           body += '<tr><td><span class="tooltip">' + compareStart.toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + ' - ' + compareEnd.toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + '<span class="tooltiptext">The game changer stream will automatically switch between the highest leverage active live non-blackout games, and should be available whenever there are such games available. Does not support adaptive bitrate switching, will default to 720p60 resolution if not specified.</span></span></td><td>'
           if ( (currentDate >= compareStart) && (currentDate < compareEnd) ) {
-            let streamURL = server + '/gamechanger.m3u8?'
-            let multiviewquerystring = streamURL + 'resolution=' + DEFAULT_MULTIVIEW_RESOLUTION + content_protect_b
+            let streamURL = server + '/gamechanger.m3u8'
+            let multiviewquerystring = '/gamechanger.m3u8?resolution=' + DEFAULT_MULTIVIEW_RESOLUTION + content_protect_b
             streamURL += content_protect_a
             if ( resolution != VALID_RESOLUTIONS[0] ) streamURL += 'resolution=' + resolution + '&'
             if ( linkType != VALID_LINK_TYPES[1] ) {
@@ -2214,7 +2201,7 @@ app.get('/', async function(req, res) {
         }
         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 all breaks, idle time, non-action pitches, or only commercial breaks 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. Also, commercial break skipping will ignore inning start options (it will always start from the beginning).</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 all breaks, idle time, non-action pitches, or only commercial breaks 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" '

package/package.json

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

package/session.js

@@ -3036,10 +3036,10 @@ class sessionClass {
     }
   }
 
-  // Get broadcast start timestamp
-  async getBroadcastStart(streamURL, streamURLToken) {
+  // Get variant playlist
+  async getVariantPlaylist(streamURL, streamURLToken) {
     try {
-      this.debuglog('getBroadcastStart')
+      this.debuglog('getVariantPlaylist')
       
       // MLB version
       let variant = '_5600K'
@@ -3059,6 +3059,19 @@ class sessionClass {
       }
       var response = await this.httpGet(reqObj, false)
       var body = response.replace(/^\s+|\s+$/g, '').split('\n')
+      
+      return body
+    } catch(e) {
+      this.log('getVariantPlaylist error : ' + e.message)
+    }
+  }
+
+  // Get broadcast start timestamp
+  async getBroadcastStart(variantPlaylist) {
+    try {
+      this.debuglog('getBroadcastStart')
+      
+      var body = variantPlaylist
 
       // check if HLS
       if ( body[0] != '#EXTM3U' ) {
@@ -3103,7 +3116,8 @@ class sessionClass {
       let break_start = 0
 
       // Get the broadcast start time first -- event times will be relative to this
-      let broadcast_start_timestamp = await this.getBroadcastStart(streamURL, streamURLToken)
+      let variantPlaylist = await this.getVariantPlaylist(streamURL, streamURLToken)
+      let broadcast_start_timestamp = await this.getBroadcastStart(variantPlaylist)
 
       if ( broadcast_start_timestamp ) {
         this.debuglog('getSkipMarkers broadcast start detected as ' + broadcast_start_timestamp)
@@ -3145,8 +3159,8 @@ class sessionClass {
           // Loop through all plays
           for (var i=0; i < cache_data.liveData.plays.allPlays.length; i++) {
 
-            // exit loop after found inning, if not skipping any breaks
-            if ((skip_type == 0) && (skip_markers.length == 1)) {
+            // exit loop after found inning, if not skipping any play-defined breaks
+            if ( ((skip_type == 0) || (skip_type == 4)) && (skip_markers.length == 1) ) {
               break
             }
 
@@ -3170,8 +3184,8 @@ class sessionClass {
                     event_end_padding = pitch_end_padding
                   }
                   let action_index
-                  // skip type 0 (none, inning start) and 1 (breaks) will look at all plays with an endTime
-                  if ((skip_type <= 1) && cache_data.liveData.plays.allPlays[i].playEvents[j].endTime) {
+                  // skip type 0 (none, inning start), 1 (breaks), and 4 (commercials) will look at all plays with an endTime
+                  if ( ((skip_type <= 1) || (skip_type == 4)) && cache_data.liveData.plays.allPlays[i].playEvents[j].endTime ) {
                     action_index = j
                   // skip type 2 (idle time) will look at all non-idle plays with an endTime
                   } else if ((skip_type == 2) && cache_data.liveData.plays.allPlays[i].playEvents[j].endTime && (!cache_data.liveData.plays.allPlays[i].playEvents[j].details || !cache_data.liveData.plays.allPlays[i].playEvents[j].details.description || !IDLE_TYPES.some(v => cache_data.liveData.plays.allPlays[i].playEvents[j].details.description.includes(v)))) {
@@ -3217,8 +3231,8 @@ class sessionClass {
                       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) {
+                      // exit loop after found inning, if not skipping play-defined breaks
+                      if ( (skip_type == 0) || (skip_type == 4)) {
                         break
                       }
                     }
@@ -3243,6 +3257,32 @@ class sessionClass {
               }
             }
           }
+          
+          // if skipping commercials, look at the variant playlist to detect insertions
+          if ( skip_type == 4 ) {
+            this.debuglog('detecting commercial breaks')
+            let body = variantPlaylist
+            let break_active = false
+            let break_end = 0
+            let time_counter = 0
+            if ( skip_markers.length > 0 ) {
+              break_end = skip_markers[skip_markers.length-1].break_end
+            }
+            for (var i=0; i<body.length; i++) {
+              if ( body[i].startsWith('#EXTINF:') ) {
+                time_counter += parseFloat(body[i].substring(8, body[i].length-1))
+              }
+              if ( (time_counter > break_end) && (break_active == false) && body[i].startsWith('#EXT-OATCLS-SCTE35:') ) {
+                break_active = true
+                break_start = time_counter
+              } else if ( (break_active == true) && body[i].startsWith('#EXT-X-CUE-IN') ) {
+                break_end = time_counter
+                break_active = false
+                skip_markers.push({'break_start': break_start, 'break_end': break_end})
+                total_skip_time += break_end - break_start
+              }
+            }
+          }
 
           this.debuglog('getSkipMarkers found ' + new Date(total_skip_time * 1000).toISOString().substr(11, 8) + ' total skip time')
         }
@@ -3299,13 +3339,13 @@ class sessionClass {
           
           if ( response.data ) {
             for (var i=0; i < response.data.length; i++) {
-              if ( response.data[i].airings && (response.data[i].airings.length > 0) && response.data[i].airings[0] && response.data[i].airings[0].accessRights && response.data[i].airings[0].accessRights.live ) {
-                let est_date = new Date(response.data[i].airings[0].accessRights.live.startTime).toLocaleString("en-US", {timeZone: 'America/New_York'})
+              if ( response.data[i].airings && (response.data[i].airings.length > 0) && response.data[i].airings[0] && response.data[i].airings[0].accessRightsV2 && response.data[i].airings[0].accessRightsV2.live ) {
+                let est_date = new Date(response.data[i].airings[0].accessRightsV2.live.startTime).toLocaleString("en-US", {timeZone: 'America/New_York'})
                 let date_array = est_date.split(',')[0].split('/')
                 let this_datestring = date_array[2] + '-' + date_array[0].padStart(2, '0') + '-' + date_array[1].padStart(2, '0')
                 this.cache.bigInningSchedule[this_datestring] = {
-                  start: response.data[i].airings[0].accessRights.live.startTime, 
-                  end: response.data[i].airings[0].accessRights.live.endTime
+                  start: response.data[i].airings[0].accessRightsV2.live.startTime, 
+                  end: response.data[i].airings[0].accessRightsV2.live.endTime
                 }
               }
             }