mlbserver 2026.3.15 → 2026.4.1-2

package/index.js

@@ -262,6 +262,7 @@ app.get('/clearcache', async function(req, res) {
     session.log('Clearing session...')
     session.clear_session_data()
     session = new sessionClass(argv)
+    session.setPorts(port, multiview_port)
 
     let server = (req.headers['x-forwarded-proto'] ? req.headers['x-forwarded-proto'] : 'http') + '://' + req.headers.host + http_root
     res.redirect(server)
@@ -431,7 +432,7 @@ var getKey = function(url, headers, cb) {
   requestRetry(url, headers, function(err, response) {
     if (err) return cb(err)
     let key = response.body
-    session.debuglog('key returned ' + key)
+    session.debuglog('key returned ' + Buffer.from(key, 'binary').toString('base64'))
     session.temp_cache.prevKeys[url] = key
     cb(null, key)
   })
@@ -1262,15 +1263,28 @@ app.get('/gamechangerplaylist.m3u8', async function(req, res) {
               let new_segments_complete = false
               let segment_count = 0
               for (var i=(body.length-1); i>=0; i--) {
-                if ( body[i].startsWith('#EXTINF:') ) {
-                  let line = url.resolve(u, body[i+1])
-                  if ( !new_segments_complete ) {
-                    session.debuglog(game_changer_title + 'found segment ' + line)
+                if ( body[i].startsWith('#EXT-X-KEY') ) {
+                  let key = url.resolve(u, body[i].match('URI="([^"]+)"')[1])
+                  let iv = body[i].match('IV=0x(.*)$')[1]
+                  let ts
+                  let extinf
+                  for (var j=1; j<=4; j++) {
+                    if ( body[i+j] ) {
+                      if ( !extinf && body[i+j].startsWith('#EXTINF') ) {
+                        extinf = body[i+j]
+                      } else if ( !ts && !body[i+j].startsWith('#') ) {
+                        ts = url.resolve(u, body[i+j])
+                      }
+                      if ( extinf && ts ) break;
+                    }
+                  }
+                  if ( key && iv && extinf && ts && !new_segments_complete ) {
+                    session.debuglog(game_changer_title + 'found segment ' + ts)
                     if ( discontinuity ) {
                       session.debuglog(game_changer_title + 'only getting newest segment after stream change')
-                      new_segments.unshift({'extinf':body[i], 'ts':line, 'streamURLToken':streamURLToken})
+                      new_segments.unshift({'key':key, 'iv':iv, 'extinf':extinf, 'ts':ts, 'streamURLToken':streamURLToken})
                       new_segments_complete = true
-                    } else if ( !discontinuity && (session.temp_cache.gamechanger[id].segments.length > 0) && (line == session.temp_cache.gamechanger[id].segments[session.temp_cache.gamechanger[id].segments.length-1].ts) ) {
+                    } else if ( !discontinuity && (session.temp_cache.gamechanger[id].segments.length > 0) && (ts == session.temp_cache.gamechanger[id].segments[session.temp_cache.gamechanger[id].segments.length-1].ts) ) {
                       session.debuglog(game_changer_title + 'found previous last segment')
                       new_segments_complete = true
                     } else if ( segment_count == GAMECHANGER_LIST_SIZE ) {
@@ -1281,7 +1295,7 @@ app.get('/gamechangerplaylist.m3u8', async function(req, res) {
                       }
                       new_segments_complete = true
                     } else {
-                      new_segments.unshift({'extinf':body[i], 'ts':line, 'streamURLToken':streamURLToken})
+                      new_segments.unshift({'key':key, 'iv':iv, 'extinf':extinf, 'ts':ts, 'streamURLToken':streamURLToken})
                     }
                   }
                   segment_count++
@@ -1314,7 +1328,7 @@ app.get('/gamechangerplaylist.m3u8', async function(req, res) {
                 if ( session.temp_cache.gamechanger[id].segments[i].discontinuity ) {
                   session.temp_cache.gamechanger[id].playlist[resolution] += '#EXT-X-DISCONTINUITY' + '\n'
                 }
-                session.temp_cache.gamechanger[id].playlist[resolution] += session.temp_cache.gamechanger[id].segments[i].extinf + '\n' + http_root + '/segment.ts?url=' + encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].ts) + '&streamURLToken='+encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].streamURLToken) + content_protect + '\n'
+                session.temp_cache.gamechanger[id].playlist[resolution] += session.temp_cache.gamechanger[id].segments[i].extinf + '\n' + http_root + '/segment.ts?url=' + encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].ts) + '&streamURLToken='+encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].streamURLToken) + '&key='+encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].key) + '&iv='+encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].iv) + content_protect + '\n'
               }
 
               session.debuglog(game_changer_title + 'playlist ' + session.temp_cache.gamechanger[id].playlist[resolution])
@@ -1529,8 +1543,7 @@ app.get('/', async function(req, res) {
     var body = '<!DOCTYPE html><html><head><meta charset="UTF-8"><meta http-equiv="Content-type" content="text/html;charset=UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><title>' + appname + '</title><link rel="icon" href="favicon.svg' + content_protect_a + '"><style type="text/css">input[type=text],input[type=button]{-webkit-appearance:none;-webkit-border-radius:0}body{width:480px;color:lightgray;background-color:black;font-family:Arial,Helvetica,sans-serif;-webkit-text-size-adjust:none}a{color:darkgray}button{color:lightgray;background-color:black}button.default{color:black;background-color:lightgray}table{width:100%;pad}table,th,td{border:1px solid darkgray;border-collapse:collapse}th,td{padding:5px}.tinytext,textarea,input[type="number"]{font-size:.8em}textarea{width:380px}.freegame,.freegame a{color:green}.blackout,.blackout a{text-decoration:line-through}'
 
     // Highlights CSS
-    //max-height:calc(100vh-110px);
-    body += '.modal{display:none;position:fixed;z-index:1;padding-top:100px;left:0;top:0;width:100%;height:100%;overflow:auto;-webkit-overflow-scrolling:touch;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}.modal-content{background-color:#fefefe;margin:auto;padding:10px;border:1px solid #888;width:360px;color:black}#highlights a{color:black}.close{color:black;float:right;font-size:28px;font-weight:bold;}#highlights a:hover,#highlights a:focus,.close:hover,.close:focus{color:gray;text-decoration:none;cursor:pointer;}'
+    body += '.modal{display:none;position:fixed;z-index:1;left:0;top:0;width:100%;height:100%;overflow:hidden;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}.modal-content{position:absolute;top:100px;bottom:20px;left:50%;transform:translateX(-50%);background-color:#fefefe;padding:10px;border:1px solid #888;width:360px;overflow-y:auto;color:black}#highlights{overflow-y:auto;}#highlights a{color:black}.close{color:black;float:right;font-size:28px;font-weight:bold;}#highlights a:hover,#highlights a:focus,.close:hover,.close:focus{color:gray;text-decoration:none;cursor:pointer;}'
 
     // Tooltip CSS
     body += '.tooltip{position:relative;display:inline-block;border-bottom: 1px dotted gray;}.tooltip .tooltiptext{font-size:.8em;visibility:hidden;width:360px;background-color:gray;color:white;text-align:left;padding:5px;border-radius:6px;position:absolute;z-index:1;top:100%;left:75%;margin-left:-30px;}.tooltip:hover .tooltiptext{visibility:visible;}'
@@ -1816,37 +1829,38 @@ app.get('/', async function(req, res) {
       if ( (entitlements.length > 0) && cache_data.dates && cache_data.dates[0] && (cache_data.dates[0].date >= today) && cache_data.dates[0].games && (cache_data.dates[0].games.length > 1) && cache_data.dates[0].games[0] && (cache_data.dates[0].games[0].seriesDescription == 'Regular Season') ) {
         // Scraped Big Inning schedule
         big_inning = await session.getBigInningSchedule(gameDate)
-
-        // Generated Big Inning schedule (disabled)
-        //big_inning = await session.generateBigInningSchedule(gameDate)
-      }
-      if ( big_inning && big_inning.start ) {
-        body += '<tr><td><span class="tooltip">' + new Date(big_inning.start).toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + ' - ' + new Date(big_inning.end).toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + '<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 compareStart = new Date(big_inning.start)
-        compareStart.setMinutes(compareStart.getMinutes()-10)
-        let compareEnd = new Date(big_inning.end)
-        compareEnd.setHours(compareEnd.getHours()+1)
-        if ( (currentDate >= compareStart) && (currentDate < compareEnd) ) {
-          let querystring = '?event=biginning'
-          let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION
-          if ( linkType == VALID_LINK_TYPES[0] ) {
-            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 == VALID_LINK_TYPES[1] ) {
-            if ( force_vod != VALID_FORCE_VOD[0] ) querystring += '&force_vod=' + force_vod
-          } else if ( linkType == VALID_LINK_TYPES[4] ) {
-            querystring += '&filename=' + gameDate + ' Big Inning'
+      }
+      if ( big_inning ) {
+        for (var i = 0; i < big_inning.length; i++) {
+          if ( big_inning[i].start ) {
+            body += '<tr><td><span class="tooltip">' + new Date(big_inning[i].start).toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + ' - ' + new Date(big_inning[i].end).toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + '<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 compareStart = new Date(big_inning[i].start)
+            compareStart.setMinutes(compareStart.getMinutes()-10)
+            let compareEnd = new Date(big_inning[i].end)
+            compareEnd.setHours(compareEnd.getHours()+1)
+            if ( (currentDate >= compareStart) && (currentDate < compareEnd) ) {
+              let querystring = '?event=biginning'
+              let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION
+              if ( linkType == VALID_LINK_TYPES[0] ) {
+                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 == VALID_LINK_TYPES[1] ) {
+                if ( force_vod != VALID_FORCE_VOD[0] ) querystring += '&force_vod=' + force_vod
+              } else if ( linkType == VALID_LINK_TYPES[4] ) {
+                querystring += '&filename=' + gameDate + ' Big Inning'
+              }
+              querystring += content_protect_b
+              multiviewquerystring += content_protect_b
+              body += '<a href="' + thislink + querystring + '">Big Inning</a>'
+              body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
+            } else {
+              body += 'Big Inning'
+            }
+            body += '</td></tr>' + "\n"
           }
-          querystring += content_protect_b
-          multiviewquerystring += content_protect_b
-          body += '<a href="' + thislink + querystring + '">Big Inning</a>'
-          body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
-        } else {
-          body += 'Big Inning'
         }
-        body += '</td></tr>' + "\n"
       }
 
       // Game Changer and Stream Finder
@@ -3307,11 +3321,13 @@ function start_multiview_stream(streams, sync, dvr, faster, reencode, park_audio
       //let audio_input = audio_present[i] + ':a:m:language:en?'
       let audio_input = audio_present[i] + ':a:'
       let video_url = streams[audio_present[i]]
-      if ( !video_url || video_url.includes('audio_track=English') || !video_url.includes('audio_track=') ) {
+      // disabled code below because we can now assume 
+      // the first audio track is the one we want
+      //if ( !video_url || video_url.includes('audio_track=English') || !video_url.includes('audio_track=') ) {
         audio_input += '0'
-      } else {
+      /*} else {
         audio_input += '1'
-      }
+      }*/
       let filter = ''
       // Optionally apply sync adjustments
       if ( sync[audio_present[i]] ) {
@@ -3518,11 +3534,13 @@ app.get('/download.ts', async function(req, res) {
   if ( ! (await protect(req, res)) ) return
 
   try {
+    let ffmpeg_timeout = 432000
     // we'll know it's an actual download request if it include a filename parameter
     if ( req.query.filename ) {
       session.requestlog('download.ts', req)
     } else {
       session.debuglog('force alternate audio', req)
+      ffmpeg_timeout = 20
     }
 
     let server = 'http://127.0.0.1:' + session.data.port + http_root
@@ -3548,7 +3566,7 @@ app.get('/download.ts', async function(req, res) {
       }
     }
 
-    ffmpeg_command = ffmpeg({ timeout: 432000 })
+    ffmpeg_command = ffmpeg({ timeout: ffmpeg_timeout })
 
     // Set input stream and minimize ffmpeg startup latency
     ffmpeg_command.input(video_url)
@@ -3606,15 +3624,21 @@ app.get('/download.ts', async function(req, res) {
     ffmpeg_command.addOutputOption('-f', 'mpegts')
     .output(res)
     .on('start', function(commandLine) {
-      session.debuglog('download.ts command started')
+      session.debuglog('download.ts command started for ' + video_url)
       if ( argv.debug || argv.ffmpeg_logging ) {
-        session.debuglog('download.ts command: ' + commandLine)
+        session.log('download.ts command: ' + commandLine)
       }
     })
     .on('error', function(err, stdout, stderr) {
-      session.debuglog('download.ts command stopped: ' + err.message)
-      if ( stdout ) session.log(stdout)
-      if ( stderr ) session.log(stderr)
+      if (err.message.includes('timeout')) {
+        session.debuglog('download.ts command timeout: ' + err.message)
+      } else {
+        session.debuglog('download.ts command error: ' + err.message)
+      }
+      if ( stdout ) session.debuglog(stdout)
+      if ( stderr ) session.debuglog(stderr)
+      ffmpeg_command.kill('SIGKILL')
+      session.debuglog('killed ffmpeg process due to error processing ' + video_url)
     })
     .on('end', function() {
       session.debuglog('download.ts command ended')
@@ -3782,3 +3806,142 @@ app.get('/comskip.txt', async function(req, res) {
     res.end('comskip.txt request error, check log')
   }
 })
+
+// Listen for embedded MPEGTS stream requests
+// embedded player not fully tested
+app.get('/mpegts.html', async function(req, res) {
+  if ( ! (await protect(req, res)) ) return
+
+  try {
+    let server = 'http://127.0.0.1:' + session.data.port + http_root
+
+    let video_url = '/stream.ts'
+    if ( req.query.src ) {
+      video_url = req.query.src
+    } else {
+      let urlArray = req.url.split('?')
+      if ( (urlArray.length == 2) ) {
+        video_url += '?' + urlArray[1]
+      }
+      video_url = server + video_url
+    }
+    session.debuglog('mpegts.html src : ' + video_url)
+    
+    var body = '<html><script src="https://xqq.im/mpegts.js/dist/mpegts.js"></script><style type"text/css">body{background-color:black}video{width:100% !important;height:auto !important;max-width:1280px}</style><body><video id="videoElement" controls autoplay playsinline></video><script>if (mpegts.getFeatureList().mseLivePlayback) { var videoElement = document.getElementById("videoElement"); var player = mpegts.createPlayer({ type: "mpegts", isLive: true, url: "' + video_url + '" }); player.attachMediaElement(videoElement); player.load(); player.play(); }</script></body></html>'
+
+    res.end(body)
+  } catch (e) {
+    session.log('mpegts.html request error : ' + e.message)
+    res.end('')
+  }
+})
+
+
+// Listen for MPEGTS stream requests
+app.get('/stream.ts', async function(req, res) {
+  if ( ! (await protect(req, res)) ) return
+
+  try {
+    let server = 'http://127.0.0.1:' + session.data.port + http_root
+
+    let video_url = '/stream.m3u8'
+    if ( req.query.src ) {
+      video_url = req.query.src
+    } else {
+      let urlArray = req.url.split('?')
+      if ( (urlArray.length == 2) ) {
+        video_url += '?' + urlArray[1]
+      }
+      video_url = server + video_url
+    }
+    session.debuglog('stream.ts src : ' + video_url)
+
+    // force adaptive streams to just use a single video resolution/track
+    if ( !video_url.includes('resolution=') ) {
+      video_url += '&resolution=best'
+    } else if ( video_url.includes('resolution=adaptive') ) {
+      video_url = video_url.replace('resolution=adaptive', 'resolution=best')
+    }
+
+    // force streams to just use a single audio track, if they aren't already
+    if ( !video_url.includes('audio_track=') ) {
+      video_url += '&audio_track=English'
+    } else if ( video_url.includes('audio_track=all') ) {
+      video_url = video_url.replace('audio_track=all', 'audio_track=English')
+    }
+
+    ffmpeg_command = ffmpeg({ timeout: 432000 })
+
+    // Set input live stream and minimize ffmpeg startup latency
+    ffmpeg_command.input(video_url)
+    .addInputOption('-thread_queue_size', '4096')
+    .addInputOption('-fflags', 'nobuffer')
+    .addInputOption('-probesize', '1000000')
+    .addInputOption('-analyzeduration', '0')
+    
+    // We'll limit our processing to real-time
+    ffmpeg_command.native()
+
+    let video_input = 0
+    let audio_input = 0
+    
+    // Adjust audio sync, if specified
+    if ( req.query.sync ) {
+      if ( req.query.sync > 0 ) {
+        session.log('stream.ts delaying video by ' + req.query.sync + ' seconds')
+        video_input = 1
+        ffmpeg_command.addInputOption('-itsoffset', req.query.sync)
+      } else {
+        session.log('stream.ts delaying audio by ' + (req.query.sync * -1) + ' seconds')
+        audio_input = 1
+        ffmpeg_command.addInputOption('-itsoffset', (req.query.sync * -1))
+      }
+      ffmpeg_command.input(video_url)
+      .addInputOption('-thread_queue_size', '4096')
+      
+      // We'll limit our processing to real-time
+      ffmpeg_command.native()
+    }
+
+    // video
+    ffmpeg_command.addOutputOption('-map', video_input + ':v:0')
+    .addOutputOption('-c:v', 'copy')
+
+    // audio
+    ffmpeg_command.addOutputOption('-map', audio_input + ':a')
+    .addOutputOption('-c:a', 'copy')
+
+    // output mpegts to response stream
+    ffmpeg_command.addOutputOption('-f', 'mpegts')
+    .output(res)
+    .on('start', function(commandLine) {
+      session.debuglog('stream.ts command started')
+      if ( argv.debug || argv.ffmpeg_logging ) {
+        session.log('stream.ts command: ' + commandLine)
+      }
+    })
+    .on('error', function(err, stdout, stderr) {
+      session.debuglog('stream.ts command stopped: ' + err.message)
+      if ( stdout ) session.debuglog(stdout)
+      if ( stderr ) session.debuglog(stderr)
+    })
+    .on('end', function() {
+      session.debuglog('stream.ts command ended')
+    })
+
+    if ( argv.ffmpeg_logging ) {
+      session.log('ffmpeg output logging enabled')
+      ffmpeg_command.on('stderr', function(stderrLine) {
+        session.log(stderrLine);
+      })
+    }
+
+    var headers = {'Content-Type': 'video/mp2t',"access-control-allow-origin":"*"}
+    res.writeHead(200, headers)
+
+    ffmpeg_command.run()
+  } catch (e) {
+    session.log('stream.ts request error : ' + e.message)
+    res.end('')
+  }
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlbserver",
-  "version": "2026.3.15",
+  "version": "2026.4.1-2",
   "description": "",
   "repository": {
     "type": "git",

package/session.js

@@ -28,7 +28,7 @@ const LIDOM_TEAM_IDS = { 'AGU': '667', 'TOR': '668', 'EST': '669', 'GIG': '670',
 
 const LMP_TEAM_IDS = { 'MXC': '673', 'JAL': '674', 'MOC': '675', 'HER': '677', 'CUL': '678', 'MAZ': '679', 'OBR': '680', 'GSV': '5482', 'NAY': '6483', 'TBC': '6484' }
 
-const AFFILIATE_TEAM_IDS = { 'ATH': '237,400,499,524', 'ATL': '431,432,478,6325', 'AZ': '419,516,2310,5368', 'BAL': '418,488,548,568', 'BOS': '414,428,533,546', 'CHC': '451,521,550,553', 'CIN': '416,450,459,498', 'CLE': '402,437,445,481', 'COL': '259,342,486,538', 'CWS': '247,487,494,580', 'DET': '106,512,570,582', 'HOU': '482,573,3712,5434', 'KC': '541,565,1350,3705', 'LAA': '401,460,559,561', 'LAD': '238,260,456,526', 'MIA': '479,554,564,4124', 'MIL': '249,556,572,5015', 'MIN': '492,509,1960,3898', 'NYM': '453,505,507,552', 'NYY': '531,537,587,1956', 'PHI': '427,522,566,1410', 'PIT': '452,477,484,3390', 'SD': '103,510,584,4904', 'SEA': '403,515,529,574', 'SF': '105,461,476,3410', 'STL': '235,279,440,443', 'TB': '233,234,421,2498', 'TEX': '102,448,540,6324', 'TOR': '422,424,435,463', 'WSH': '426,436,534,547' }
+const AFFILIATE_TEAM_IDS = {"ATH":"237,400,499,524","ATL":"431,432,478,6325","AZ":"419,516,2310,5368","BAL":"418,493,548,568","BOS":"414,428,533,546","CHC":"451,521,550,553","CIN":"416,450,459,498","CLE":"402,437,445,481","COL":"259,342,486,538","CWS":"247,487,494,580","DET":"106,512,570,582","HOU":"482,573,3712,5434","KC":"541,565,1350,3705","LAA":"460,526,559,561","LAD":"238,260,456,6482","MIA":"479,554,564,4124","MIL":"249,556,572,5015","MIN":"492,509,1960,3898","NYM":"453,505,507,552","NYY":"531,537,587,1956","PHI":"427,522,566,1410","PIT":"452,477,484,3390","SD":"103,510,584,4904","SEA":"401,403,529,574","SF":"105,461,476,3410","STL":"235,279,440,443","TB":"233,234,421,2498","TEX":"102,448,540,6324","TOR":"422,424,435,463","WSH":"426,436,534,547"}
 
 // First is default level, last should be All (also used as default org)
 const LEVELS = { 'MLB': '1', 'AAA': '11', 'AA': '12', 'A+': '13', 'A': '14', 'WINTER': '17', 'All': '1,11,12,13,14,17' }
@@ -2368,8 +2368,8 @@ class sessionClass {
                           stream = server + '/stream.m3u8?event=' + encodeURIComponent(cache_data.dates[i].games[j].teams['home'].team.shortName.toUpperCase())
                         }
                         stream += '&league_id=' + league_id
+                        stream += '&mediaType=' + streamMediaType
                       }
-                      stream += '&mediaType=' + streamMediaType
                       stream += '&level=' + encodeURIComponent(this.getLevelNameFromSportId(sportId))
                       stream += '&resolution=' + resolution
                       if ( this.protection.content_protect ) stream += '&content_protect=' + this.protection.content_protect
@@ -2919,25 +2919,28 @@ class sessionClass {
                 let gameDate = cache_data.dates[i].date
                 if ( (gameDate >= today) && cache_data.dates[i].games && (cache_data.dates[i].games.length > 1) && cache_data.dates[i].games[0] && (cache_data.dates[i].games[0].seriesDescription == 'Regular Season') && this.cache.bigInningSchedule[gameDate] ) {
                   this.debuglog('getTVData Big Inning active for date ' + cache_data.dates[i].date)
-                  // Scraped Big Inning schedule
-                  let start = this.convertDateToXMLTV(new Date(this.cache.bigInningSchedule[gameDate].start))
-                  let stop = this.convertDateToXMLTV(new Date(this.cache.bigInningSchedule[gameDate].end))
-
-                  // Big Inning calendar ICS
-                  let prefix = 'Watch'
-                  let location = server + '/embed.html?event=biginning&mediaType=Video&resolution=' + resolution
-                  if ( this.protection.content_protect ) location += '&content_protect=' + this.protection.content_protect
-                  calendar += await this.generate_ics_event(prefix, new Date(this.cache.bigInningSchedule[gameDate].start), new Date(this.cache.bigInningSchedule[gameDate].end), title, description, location)
                   
-                  // Off Air if necessary
-                  let off_air_event = await this.generate_off_air_event(offAir, channelid, gameDate, channels[channelid].stop, this.cache.bigInningSchedule[gameDate].start, title)
-                  if ( off_air_event ) {
-                    programs += off_air_event
-                    channels[channelid].stop = stop
-                  }
+                  for (var j = 0; j < this.cache.bigInningSchedule[gameDate].length; j++) {
+                    // Scraped Big Inning schedule
+                    let start = this.convertDateToXMLTV(new Date(this.cache.bigInningSchedule[gameDate][j].start))
+                    let stop = this.convertDateToXMLTV(new Date(this.cache.bigInningSchedule[gameDate][j].end))
+
+                    // Big Inning calendar ICS
+                    let prefix = 'Watch'
+                    let location = server + '/embed.html?event=biginning&mediaType=Video&resolution=' + resolution
+                    if ( this.protection.content_protect ) location += '&content_protect=' + this.protection.content_protect
+                    calendar += await this.generate_ics_event(prefix, new Date(this.cache.bigInningSchedule[gameDate][j].start), new Date(this.cache.bigInningSchedule[gameDate][j].end), title, description, location)
+                  
+                    // Off Air if necessary
+                    let off_air_event = await this.generate_off_air_event(offAir, channelid, gameDate, channels[channelid].stop, this.cache.bigInningSchedule[gameDate][j].start, title)
+                    if ( off_air_event ) {
+                      programs += off_air_event
+                      channels[channelid].stop = stop
+                    }
 
-                  // Big Inning guide XML
-                  programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertDateToAirDate(new Date(this.cache.bigInningSchedule[gameDate].start)))
+                    // Big Inning guide XML
+                    programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertDateToAirDate(new Date(this.cache.bigInningSchedule[gameDate][j].start)))
+                  }
                 }
                 this.debuglog('getTVData completed Big Inning for date ' + cache_data.dates[i].date)
               }
@@ -3319,6 +3322,7 @@ class sessionClass {
   async getSkipMarkers(gamePk, skip_type, start_inning, start_inning_half, streamURL, streamURLToken, skip_adjust, broadcast_start_timestamp=false) {
     try {
       this.debuglog('getSkipMarkers')
+      let variantPlaylist;
 
       if ( skip_adjust != 0 ) this.log('manual adjustment of ' + skip_adjust + ' seconds being applied')
       
@@ -3342,7 +3346,7 @@ class sessionClass {
 
       // Get the broadcast start time first, if necessary -- event times will be relative to this
       if ( !broadcast_start_timestamp ) {
-        let variantPlaylist = await this.getVariantPlaylist(streamURL, streamURLToken)
+        variantPlaylist = await this.getVariantPlaylist(streamURL, streamURLToken)
         broadcast_start_timestamp = await this.getBroadcastStart(variantPlaylist)
       }
 
@@ -3488,6 +3492,10 @@ class sessionClass {
           // if skipping commercials, look at the variant playlist to detect insertions
           if ( skip_type == 4 ) {
             this.debuglog('detecting commercial breaks')
+            if (!variantPlaylist) {
+              this.debuglog('variantPlaylist missing, fetching...')
+              variantPlaylist = await this.getVariantPlaylist(streamURL, streamURLToken)
+            }
             let body = variantPlaylist
             let break_active = false
             let break_end = 0
@@ -3534,54 +3542,54 @@ class sessionClass {
       // temporarily disable Big Inning schedule checking until a new source URL is available
       /*this.cache.bigInningSchedule = {}
       return*/
-
+      
+      // reset for new format as of 2026-04-01
+      try {
+        if ( !this.cache.bigInningSchedule[Object.keys(this.cache.bigInningSchedule)[0]].length ) {
+          this.log('getBigInningSchedule cache reset')
+          delete this.cache.bigInningScheduleCacheExpiry
+          delete this.cache.bigInningSchedule
+        }
+      } catch (e) {
+        //this.debuglog('getBigInningSchedule cache reset error : ' + e.message)
+      }
+      
       let currentDate = new Date()
       if ( !this.cache || !this.cache.bigInningScheduleCacheExpiry || (currentDate > new Date(this.cache.bigInningScheduleCacheExpiry)) ) {
         if ( !this.cache.bigInningSchedule ) this.cache.bigInningSchedule = {}
         let reqObj = {
-          url: 'https://api.fubo.tv/gg/series/123881219/live-programs?limit=14&languages=en&countrySlugs=USA',
+          url: 'https://www.fubo.tv/welcome/channel/mlb-big-inning',
           headers: {
-            'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
-            'accept-language': 'en-US,en;q=0.9',
-            'cache-control': 'no-cache',
-            'dnt': '1',
-            'pragma': 'no-cache',
-            'sec-ch-ua': '"Not(A:Brand";v="99", "Google Chrome";v="133", "Chromium";v="133"',
-            'sec-ch-ua-mobile': '?0',
-            'sec-ch-ua-platform': '"macOS"',
-            'sec-fetch-dest': 'document',
-            'sec-fetch-mode': 'navigate',
-            'sec-fetch-site': 'none',
-            'sec-fetch-user': '?1',
-            'sec-gpc': '1',
-            'upgrade-insecure-requests': '1',
+            'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+            'accept-encoding': 'gzip, deflate, br, zstd',
+            'referer': 'https://www.fubo.tv',
             'user-agent': USER_AGENT
           },
-          json: true,
           gzip: true
         }
         var response = await this.httpGet(reqObj, false)
         if ( response ) {
-          this.debuglog(JSON.stringify(response))
+          // disabled because it's big
+          //this.debuglog(response)
           
-          if ( response.data ) {
-            for (var i=0; i < response.data.length; i++) {
-              if ( response.data[i].airings && (response.data[i].airings.length > 0) ) {
-                for (var j=0; j < response.data[i].airings.length; j++) {
-                  if ( response.data[i].airings[j].station && response.data[i].airings[j].station.name && (response.data[i].airings[j].station.name == 'MLB Big Inning') && response.data[i].airings[j].accessRightsV2 && response.data[i].airings[j].accessRightsV2.live ) {
-                    let est_date = new Date(response.data[i].airings[j].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[j].accessRightsV2.live.startTime, 
-                      end: response.data[i].airings[j].accessRightsV2.live.endTime
-                    }
-                    break
-                  }
-                }
+          let nextdatastring = response.match(/<script id=\"__NEXT_DATA__\" type=\"application\/json\">(.*?)<\/script>/)
+          let nextdata = JSON.parse(nextdatastring[1])
+          let initialState = JSON.parse(nextdata.props.pageProps.initialState.replace(/\\"/g, '"'))
+
+          initialState.channel.channelPrograms.live.data.forEach((program) => {
+            program.airings.forEach((airing) => {
+              let est_date = new Date(airing.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')
+              if ( !this.cache.bigInningSchedule[this_datestring] || !this.cache.bigInningSchedule[this_datestring].length ) {
+                this.cache.bigInningSchedule[this_datestring] = []
               }
-            }
-          }
+              this.cache.bigInningSchedule[this_datestring].push({
+                start: airing.accessRightsV2.live.startTime, 
+                end: airing.accessRightsV2.live.endTime
+              })
+            });
+          });
           this.debuglog(JSON.stringify(this.cache.bigInningSchedule))
 
           // Default cache period is 1 day from now
@@ -3608,35 +3616,6 @@ class sessionClass {
     }
   }
 
-  // Generate generic Big Inning schedule for specified date
-  // times in UTC (and DST) according to https://www.mlb.com/live-stream-games/help-center/subscription-access-big-inning
-  async generateBigInningSchedule(dateString) {
-    try {
-      this.debuglog('generateBigInningSchedule')
-
-      let utc_start_string = '01:00'
-      let utc_end_string = '03:30'
-      let add_date = 1
-      // Different Sunday schedule
-      let weekday_index = new Date(dateString + ' 00:00:00').getDay()
-      if ( weekday_index == 0 ) {
-        utc_start_string = '19:00'
-        utc_end_string = '21:30'
-        add_date = 0
-      }
-      let d = new Date(dateString + 'T' + utc_start_string + ':00.000+00:00')
-      d.setDate(d.getDate()+add_date)
-      let start = d
-      d = new Date(dateString + 'T' + utc_end_string + ':00.000+00:00')
-      d.setDate(d.getDate()+add_date)
-      let end = d
-
-      return {start: start, end: end}
-    } catch(e) {
-      this.log('generateBigInningSchedule error : ' + e.message)
-    }
-  }
-
   // Get event data
   async getEventData(url) {
     try {
@@ -4349,6 +4328,7 @@ class sessionClass {
       if ( cache_data ) {
         if ( cache_data.dates && cache_data.dates[0] && cache_data.dates[0].games && (cache_data.dates[0].games.length > 0) ) {
           let team_data = this.temp_cache.gamechanger[id].streamFinderData.team_data
+          let games_CLI = this.temp_cache.gamechanger[id].streamFinderData.games_CLI
         
           var games = []
           
@@ -5615,6 +5595,56 @@ class sessionClass {
       this.log('getComskipMarkers error : ' + e.message)
     }
   }
+
+  // generates AFFILIATE_TEAM_IDS, should be done each season
+  async getAffiliates() {
+    try {
+      this.debuglog('getAffiliates')
+
+      let affiliates_data = {}
+      let reqObj = {
+        url: 'https://statsapi.mlb.com/api/v1/teams?sportIds=1,11,12,13,14&activeStatus=true&season=2026',
+        headers: {
+          'User-agent': USER_AGENT,
+          'Origin': 'https://www.mlb.com',
+          'Accept-Encoding': 'gzip, deflate, br',
+          'Content-type': 'application/json'
+        },
+        gzip: true
+      }
+      var response = await this.httpGet(reqObj, false)
+      if ( response && this.isValidJson(response) ) {
+        //this.debuglog(response)
+        let teams_data = JSON.parse(response)
+        
+        let parent_orgs = {}
+        if ( teams_data && teams_data.teams ) {
+          for (var i=0; i<teams_data.teams.length; i++) {
+            if (teams_data.teams[i].sport.id == 1) {
+              parent_orgs[teams_data.teams[i].id] = teams_data.teams[i].abbreviation
+              affiliates_data[teams_data.teams[i].abbreviation] = []
+            }
+          }
+          for (var i=0; i<teams_data.teams.length; i++) {
+            if (teams_data.teams[i].sport.id != 1) {
+              teams_data.teams[i].abbreviation
+              affiliates_data[parent_orgs[teams_data.teams[i].parentOrgId]].push(teams_data.teams[i].id)
+              affiliates_data[parent_orgs[teams_data.teams[i].parentOrgId]].sort((a, b) => a - b)
+            }
+          }
+          for (const [key, value] of Object.entries(affiliates_data)) {
+            affiliates_data[key] = value.join(',')
+          }
+          
+          console.log(JSON.stringify(this.sortObj(affiliates_data)))
+        }
+      } else {
+        this.log('error : invalid json from url ' + reqObj.url)
+      }
+    } catch(e) {
+      this.log('getAffiliates error : ' + e.message)
+    }
+  }
 }
 
 module.exports = sessionClass