mlbserver 2025.3.29 → 2025.4.0-1.2

package/index.js

@@ -44,7 +44,7 @@ const VALID_SCAN_MODES = [ 'off', 'on' ]
 
 const SAMPLE_STREAM_URL = 'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8'
 
-const SECONDS_PER_SEGMENT = 5
+const SECONDS_PER_SEGMENT = 4
 
 // for favorites: text, then background, based on https://teamcolors.jim-nielsen.com/
 const TEAM_COLORS = { 'ATH': ['003831', 'EFB21E'], 'ATL': ['13274F', 'CE1141'], 'AZ': ['E3D4AD', 'A71930'], 'BAL': ['000000', 'DF4601'], 'BOS': ['0D2B56', 'BD3039'], 'CHC': ['CC3433', '0E3386'], 'CWS': ['000000', 'C4CED4'], 'CIN': ['FFFFFF', 'C6011F'], 'CLE': ['002B5C', 'E31937'], 'COL': ['C4CED4', '333366'], 'DET': ['0C2C56', 'FFFFFF'], 'HOU': ['002D62', 'EB6E1F'], 'KC': ['C09A5B', '004687'], 'LAA': ['FFFFFF', 'BA0021'], 'LAD': ['FFFFFF', '005A9C'], 'MIA': ['0077C8', 'FF6600'], 'MIL': ['0A2351', 'B6922E'], 'MIN': ['D31145', '002B5C'], 'NYM': ['002D72', 'FF5910'], 'NYY': ['FFFFFF', '003087'], 'OAK': ['003831', 'EFB21E'], 'PHI': ['284898', 'E81828'], 'PIT': ['000000', 'FDB827'], 'STL': ['FEDB00', 'C41E3A'], 'SD': ['FEC325', '7F411C'], 'SF': ['000000', 'FD5A1E'], 'SEA': ['C4CED4', '005C5C'], 'TB': ['092C5C', '8FBCE6'], 'TEX': ['003278', 'C0111F'], 'TOR': ['FFFFFF', '134A8E'], 'WSH': ['AB0003', '11225B'] }
@@ -863,26 +863,31 @@ app.get('/playlist.m3u8', async function(req, res) {
       })
       .join('\n')+'\n'
 
+      let end_tag = '#EXT-X-ENDLIST'
       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' ) {
+        let segment_index = body_array.length-1
+        if ( body_array[segment_index] == end_tag ) {
           session.debuglog('padding archive stream with extra segments')
-          last_segment_index--
-          while ( !body_array[last_segment_index].startsWith('#EXTINF:') ) {
-            last_segment_index--
+          while ( body_array[segment_index].startsWith('#') ) {
+            segment_index--
           }
-          last_segment_inf = body_array[last_segment_index]
-          last_segment = body_array[last_segment_index+1]
-          let pad_lines = '#EXT-X-DISCONTINUITY' + '\n' + '#EXTINF:' + SECONDS_PER_SEGMENT + '\n' + last_segment + '\n'
-          session.debuglog(pad_lines)
+          let last_segment = body_array[segment_index]
+          body_array.pop()
           for (i=0; i<pad; i++) {
-            body += pad_lines
+            body_array.push('#EXT-X-DISCONTINUITY')
+            body_array.push('#EXTINF:' + SECONDS_PER_SEGMENT)
+            body_array.push(last_segment)
           }
-          body += '#EXT-X-ENDLIST' + '\n'
+          body_array.push(end_tag)
+          body = body_array.join('\n')
+        }
+      } else if ( force_vod != VALID_FORCE_VOD[0] ) {
+        let body_array = body.trim().split('\n')
+        if ( body_array[body_array.length-1] != end_tag ) {
+          body += end_tag + '\n'
         }
       }
-      if ( force_vod != VALID_FORCE_VOD[0] ) body += '#EXT-X-ENDLIST' + '\n'
       session.debuglog(body)
       respond(response, res, Buffer.from(body))
     })
@@ -1041,7 +1046,7 @@ app.get('/gamechanger.m3u8', async function(req, res) {
 
   for ( gamechanger_resolution in GAMECHANGER_RESOLUTIONS ) {
     if ( resolution == gamechanger_resolution ) {
-      body += '#EXT-X-STREAM-INF:BANDWIDTH=' + GAMECHANGER_RESOLUTIONS[gamechanger_resolution].bandwidth + '000,RESOLUTION=' + GAMECHANGER_RESOLUTIONS[gamechanger_resolution].resolution + ',FRAME-RATE=' + GAMECHANGER_RESOLUTIONS[gamechanger_resolution].frame_rate + ',CODECS="mp4a.40.2,avc1.' + GAMECHANGER_RESOLUTIONS[gamechanger_resolution].codec + '",CLOSED-CAPTIONS="cc",AUDIO="aac"' + '\n' + '/gamechangerplaylist?id=' + id + '&resolution=' + gamechanger_resolution + includeTeams + excludeTeams + content_protect + '\n'
+      body += '#EXT-X-STREAM-INF:BANDWIDTH=' + GAMECHANGER_RESOLUTIONS[gamechanger_resolution].bandwidth + '000,RESOLUTION=' + GAMECHANGER_RESOLUTIONS[gamechanger_resolution].resolution + ',FRAME-RATE=' + GAMECHANGER_RESOLUTIONS[gamechanger_resolution].frame_rate + ',CODECS="mp4a.40.2,avc1.' + GAMECHANGER_RESOLUTIONS[gamechanger_resolution].codec + '",CLOSED-CAPTIONS="cc",AUDIO="aac"' + '\n' + '/gamechangerplaylist.m3u8?id=' + id + '&resolution=' + gamechanger_resolution + includeTeams + excludeTeams + content_protect + '\n'
       break
     }
   }
@@ -1055,10 +1060,10 @@ app.get('/gamechanger.m3u8', async function(req, res) {
 
 
 // Listen for gamechanger playlist requests
-app.get('/gamechangerplaylist', async function(req, res) {
+app.get('/gamechangerplaylist.m3u8', async function(req, res) {
   if ( ! (await protect(req, res)) ) return
 
-  session.requestlog('gamechangerplaylist', req, true)
+  session.requestlog('gamechangerplaylist.m3u8', req, true)
 
   let gamechangerAccess = new Date()
 
@@ -1562,11 +1567,11 @@ app.get('/', async function(req, res) {
 
     let currentDate = new Date()
 
+    let entitlements = await session.getEntitlements()
     // MLB Network live stream for eligible USA subscribers
     try {
-        let entitlements = await session.getEntitlements()
         if ( entitlements.includes('MLBN') || entitlements.includes('EXECMLB') || entitlements.includes('MLBTVMLBNADOBEPASS') ) {
-          body += '<tr><td><span class="tooltip">MLB Network<span class="tooltiptext">MLB Network live stream is now available in the USA for paid MLBTV subscribers or as a paid add-on, in addition to authenticated TV subscribers. <a href="https://www.mlb.com/news/mlb-network-launches-direct-to-consumer-streaming-option">See here for more information</a>.</span></span></td><td>'
+          body += '<tr><td><span class="tooltip">MLB Network<span class="tooltiptext">MLB Network live stream is now available in the USA for paid MLBTV subscribers or as a paid add-on, in addition to authenticated TV subscribers. <a href="https://support.mlb.com/s/article/MLB-Network-Streaming-FAQ">See here for more information</a>.</span></span></td><td>'
           let querystring = '?event=MLBN'
           let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION
           if ( linkType == VALID_LINK_TYPES[0] ) {
@@ -1589,6 +1594,58 @@ app.get('/', async function(req, res) {
       session.debuglog('MLB Network detect error : ' + e.message)
     }
 
+    // SNLA live stream for entitled subscribers
+    try {
+        if ( entitlements.includes('SNLA_119') ) {
+          body += '<tr><td><span class="tooltip">SportsNet LA<span class="tooltiptext">SNLA live stream for entitled subscribers. <a href="https://support.mlb.com/s/article/SNLA-Plus-Subscription-Packages">See here for more information</a>.</span></span></td><td>'
+          let querystring = '?event=SNLA'
+          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 + ' SNLA'
+          }
+          querystring += content_protect_b
+          multiviewquerystring += content_protect_b
+          body += '<a href="' + thislink + querystring + '">SNLA</a>'
+          body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
+          body += '</td></tr>' + "\n"
+        } // end entitlements check
+    } catch (e) {
+      session.debuglog('SNLA detect error : ' + e.message)
+    }
+
+    // SNY live stream for entitled subscribers
+    try {
+        if ( entitlements.includes('SNY_121') ) {
+          body += '<tr><td><span class="tooltip">SNY<span class="tooltiptext">SNY live stream for entitled subscribers. <a href="https://support.mlb.com/s/article/SNY-In-Market-Offering">See here for more information</a>.</span></span></td><td>'
+          let querystring = '?event=SNY'
+          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 + ' SNY'
+          }
+          querystring += content_protect_b
+          multiviewquerystring += content_protect_b
+          body += '<a href="' + thislink + querystring + '">SNY</a>'
+          body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
+          body += '</td></tr>' + "\n"
+        } // end entitlements check
+    } catch (e) {
+      session.debuglog('SNY detect error : ' + e.message)
+    }
+
     if ( (mediaType == 'MLBTV') && ((level_ids == levels['MLB']) || level_ids.startsWith(levels['MLB'] + ',')) ) {
       // Recap Rundown beginning in 2023, disabled because it stopped working
       /*if ( (gameDate <= yesterday) && (gameDate >= '2023-03-31') && cache_data.dates && cache_data.dates[0] && cache_data.dates[0].games && (cache_data.dates[0].games.length > 0) ) {
@@ -1618,12 +1675,13 @@ app.get('/', async function(req, res) {
         //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://www.mlb.com/live-stream-games/big-inning">See here for more information</a>.</span></span></td><td>'
+        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) ) {
+          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] ) {
@@ -1659,15 +1717,15 @@ 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 = streamURL + 'resolution=' + DEFAULT_MULTIVIEW_RESOLUTION + content_protect_b
             streamURL += content_protect_a
-            if ( resolution != VALID_RESOLUTIONS[0] ) streamURL += '&resolution=' + resolution
+            if ( resolution != VALID_RESOLUTIONS[0] ) streamURL += 'resolution=' + resolution + '&'
             if ( linkType != VALID_LINK_TYPES[1] ) {
-              streamURL = thislink + '?src=' + encodeURIComponent(streamURL) + '&startFrom=' + VALID_START_FROM[1] + content_protect_b
+              streamURL = thislink + '?src=' + encodeURIComponent(streamURL) + 'startFrom=' + VALID_START_FROM[1] + content_protect_b + '&'
             }
             if ( linkType == VALID_LINK_TYPES[4] ) {
-              streamURL += '&filename=' + gameDate + ' Game Changer'
+              streamURL += 'filename=' + gameDate + ' Game Changer' + '&'
             }
             body += '<a href="' + streamURL + '">Game Changer</a>'
             body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + multiviewquerystring + '" onclick="addmultiview(this, [], excludeTeams)">'
@@ -2196,7 +2254,7 @@ app.get('/', async function(req, res) {
       resolution = 'best'
     }
 
-    body += '<p><span class="tooltip">All<span class="tooltiptext">Will include all live MLB broadcasts (all games plus MLB Network, Big Inning, Game Changer, and Multiview). If favorite team(s) have been provided, it will also include affiliate games for those organizations. Channels/games subject to blackout will be omitted by default. See below for an additional option to override that.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + content_protect_b + '">channels.m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + content_protect_b + '">calendar.ics</a></p>' + "\n"
+    body += '<p><span class="tooltip">All<span class="tooltiptext">Will include all entitled live MLB broadcasts (games plus Big Inning, Game Changer, and Multiview, as well as MLB Network, SNLA, and/or SNY as appropriate). If favorite team(s) have been provided, it will also include affiliate games for those organizations. Channels/games subject to blackout will be omitted by default. See below for an additional option to override that.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + content_protect_b + '">channels.m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + content_protect_b + '">calendar.ics</a></p>' + "\n"
 
     let include_teams = 'ath,national'
     if ( session.credentials.fav_teams.length > 0 ) {
@@ -2211,7 +2269,17 @@ 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="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=lidom' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=lidom' + content_protect_b + '">xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=lidom' + content_protect_b + '">ics</a></p>' + "\n"
 
-    body += '<p><span class="tooltip">Include (or exclude) MLB Network<span class="tooltiptext">MLB Network live stream is now available in the USA for paid MLBTV subscribers or as a paid add-on, in addition to authenticated TV subscribers. <a href="https://www.mlb.com/news/mlb-network-launches-direct-to-consumer-streaming-option">See here for more information</a>.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=mlbn' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=mlbn' + content_protect_b + '">xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=mlb' + content_protect_b + '">ics</a></p>' + "\n"
+    if ( entitlements.includes('MLBN') || entitlements.includes('EXECMLB') || entitlements.includes('MLBTVMLBNADOBEPASS') ) {
+      body += '<p><span class="tooltip">Include (or exclude) MLB Network<span class="tooltiptext">MLB Network live stream is now available in the USA for paid MLBTV subscribers or as a paid add-on, in addition to authenticated TV subscribers. <a href="https://support.mlb.com/s/article/MLB-Network-Streaming-FAQ">See here for more information</a>.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=mlbn' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=mlbn' + content_protect_b + '">xml</a></p>' + "\n"
+    }
+
+    if ( entitlements.includes('SNLA_119') ) {
+      body += '<p><span class="tooltip">Include (or exclude) SportsNet LA<span class="tooltiptext">SNLA live stream for entitled subscribers. <a href="https://support.mlb.com/s/article/SNLA-Plus-Subscription-Packages">See here for more information</a>.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=snla' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=snla' + content_protect_b + '">xml</a></p>' + "\n"
+    }
+
+    if ( entitlements.includes('SNY_121') ) {
+      body += '<p><span class="tooltip">Include (or exclude) SNY<span class="tooltiptext">SNY live stream for entitled subscribers. <a href="https://support.mlb.com/s/article/SNLA-Plus-Subscription-Packages">See here for more information</a>.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=sny' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=sny' + content_protect_b + '">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. <a href="https://www.mlb.com/live-stream-games/big-inning">See here for more information</a>.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=biginning' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=biginning' + content_protect_b + '">xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=biginning' + content_protect_b + '">ics</a></p>' + "\n"
 

package/package.json

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

package/session.js

@@ -38,12 +38,16 @@ const WINTER_LEAGUES = [AFL_ID, LIDOM_ID]
 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', 'Other Advance']
+// These are some idle events to skip
+const IDLE_TYPES = ['Mound Visit', 'Batter Timeout', 'Pitcher Step Off', 'challenge']
 const EVENT_START_PADDING = -3
-const PITCH_END_PADDING = -4
+const PITCH_END_PADDING = 2
 const ACTION_END_PADDING = 7
 const MINIMUM_BREAK_DURATION = 5
 // extra padding for MLB events (2025)
 const MLB_PADDING = 39
+// extra Game Changer padding for MLB (2025)
+const MLB_GAMECHANGER_PADDING = 20
 
 const LI_TABLE = {
     1: {
@@ -1269,7 +1273,7 @@ class sessionClass {
     this.save_cache_data()
   }
 
-  cacheStreamURL(mediaId, streamURL, streamURLToken='', streamURLExpiration='') {
+  cacheStreamURL(mediaId, streamURL, streamURLToken='', streamURLExpiration='', rawStreamURL='') {
     this.createMediaCache(mediaId)
     this.cache.media[mediaId].streamURL = streamURL
     if (streamURLToken != '') {
@@ -1282,6 +1286,7 @@ class sessionClass {
     } else {
       this.cache.media[mediaId].streamURLExpiry = new Date(streamURLExpiration)
     }
+    this.cache.media[mediaId].rawStreamURL = rawStreamURL
     this.save_cache_data()
   }
 
@@ -1572,6 +1577,9 @@ class sessionClass {
     if ( this.cache.media && this.cache.media[mediaId] && this.cache.media[mediaId].streamURL && this.cache.media[mediaId].streamURLToken && this.cache.media[mediaId].streamURLExpiry && (Date.parse(this.cache.media[mediaId].streamURLExpiry) > new Date()) ) {
       this.debuglog('using cached streamURL and token')
       let streamInfo = {streamURL: this.cache.media[mediaId].streamURL, streamURLToken: this.cache.media[mediaId].streamURLToken}
+      if ( this.cache.media[mediaId].rawStreamURL ) {
+        streamInfo['rawStreamURL'] = this.cache.media[mediaId].rawStreamURL
+      }
       return streamInfo
     } else if ( this.cache.media && this.cache.media[mediaId] && this.cache.media[mediaId].blackout && this.cache.media[mediaId].blackoutExpiry && (Date.parse(this.cache.media[mediaId].blackoutExpiry) > new Date()) ) {
       this.log('mediaId recently blacked out, skipping')
@@ -1611,17 +1619,17 @@ class sessionClass {
       var response = await this.httpPost(reqObj)
       if ( response ) {
         this.debuglog('getStreamURL response : ' + JSON.stringify(response))
-        if ( response.data && response.data.initPlaybackSession && response.data.initPlaybackSession.playback && response.data.initPlaybackSession.playback.url && response.data.initPlaybackSession.playback.token && response.data.initPlaybackSession.playback.expiration ) {
+        if ( response.data && response.data.initPlaybackSession && response.data.initPlaybackSession.playback && response.data.initPlaybackSession.playback.url ) {
           let rawStreamURL = response.data.initPlaybackSession.playback.url
           this.debuglog('getStreamURL rawStreamURL : ' + rawStreamURL)
           let streamURL = rawStreamURL.replace(/[\/]([A-Za-z0-9_]+)[\/]/, '/')
-  				let streamURLToken = response.data.initPlaybackSession.playback.token
-  				let streamURLExpiration = response.data.initPlaybackSession.playback.expiration
+  		  let streamURLToken = response.data.initPlaybackSession.playback.token
+  		  let streamURLExpiration = response.data.initPlaybackSession.playback.expiration
           this.debuglog('getStreamURL streamURL : ' + streamURL)
           this.debuglog('getStreamURL token : ' + streamURLToken)
           this.debuglog('getStreamURL expiration : ' + streamURLExpiration)
-          this.cacheStreamURL(mediaId, streamURL, streamURLToken, streamURLExpiration)
-          let streamInfo = {streamURL: streamURL, streamURLToken: streamURLToken}
+          this.cacheStreamURL(mediaId, streamURL, streamURLToken, streamURLExpiration, rawStreamURL)
+          let streamInfo = {streamURL: streamURL, streamURLToken: streamURLToken, rawStreamURL: rawStreamURL}
           return streamInfo
         } else {
           this.log('getStreamURL streamURL not found')
@@ -2588,9 +2596,10 @@ class sessionClass {
           channels = this.sortObj(channels)
           channels = Object.assign(channels, nationalChannels)
 
+          
+          let entitlements = await this.getEntitlements()
           // MLB Network live stream for eligible USA subscribers
           try {
-              let entitlements = await this.getEntitlements()
               if ( (entitlements.includes('MLBN') || entitlements.includes('EXECMLB') || entitlements.includes('MLBTVMLBNADOBEPASS')) ) {
                 if ( (mediaType == 'MLBTV') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
                   if ( (excludeTeams.length > 0) && excludeTeams.includes('MLBN') ) {
@@ -2620,6 +2629,70 @@ class sessionClass {
           } catch (e) {
             this.debuglog('getTVData MLB Network detect error : ' + e.message)
           }
+          
+          // SNLA live stream for entitled subscribers
+          try {
+              if ( (entitlements.includes('SNLA_119')) ) {
+                if ( (mediaType == 'MLBTV') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
+                  if ( (excludeTeams.length > 0) && excludeTeams.includes('SNLA') ) {
+                    // do nothing
+                  } else if ( (includeTeams.length == 0) || includeTeams.includes('SNLA') ) {
+                    this.debuglog('getTVData processing SNLA')
+                    let logo = 'https://img.mlbstatic.com/mlb-images/image/upload/t_w640/mlb/fnwk2k0kgn1j8r8vvx3d.png'
+                    let channelid = mediaType + '.SNLA'
+                    //if ( this.protection.content_protect ) logo += '&content_protect=' + this.protection.content_protect
+                    let stream = server + '/stream.m3u8?event=snla&mediaType=Video&resolution=' + resolution
+                    if ( this.protection.content_protect ) stream += '&content_protect=' + this.protection.content_protect
+                    if ( pipe == 'true' ) stream = await this.convert_stream_to_pipe(stream, channelid)
+                    channels[channelid] = await this.create_channel_object(channelid, logo, stream, mediaType)
+
+                    let title = 'SportsNet LA'
+                    let description = 'Live stream of SNLA'
+
+                    let start = this.convertDateToXMLTV(new Date(cache_data.dates[0].date + ' 00:00:00'))
+                    let stop = this.convertDateToXMLTV(new Date(cache_data.dates[cache_data.dates.length-1].date + ' 00:00:00'))
+
+                    // SNLA guide XML
+                    programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertStringToAirDate(cache_data.dates[0].date))
+                    this.debuglog('getTVData completed SNLA')
+                  } // end includeTeams check
+                } // end mediaType check
+              } // end entitlements check
+          } catch (e) {
+            this.debuglog('getTVData SNLA detect error : ' + e.message)
+          }
+          
+          // SNY live stream for entitled subscribers
+          try {
+              if ( (entitlements.includes('SNY_121')) ) {
+                if ( (mediaType == 'MLBTV') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
+                  if ( (excludeTeams.length > 0) && excludeTeams.includes('SNY') ) {
+                    // do nothing
+                  } else if ( (includeTeams.length == 0) || includeTeams.includes('SNY') ) {
+                    this.debuglog('getTVData processing SNY')
+                    let logo = 'https://img.mlbstatic.com/mlb-images/image/upload/t_w640/mlb/le5jifzo6oylxtnuf0m1.png'
+                    let channelid = mediaType + '.SNY'
+                    //if ( this.protection.content_protect ) logo += '&content_protect=' + this.protection.content_protect
+                    let stream = server + '/stream.m3u8?event=sny&mediaType=Video&resolution=' + resolution
+                    if ( this.protection.content_protect ) stream += '&content_protect=' + this.protection.content_protect
+                    if ( pipe == 'true' ) stream = await this.convert_stream_to_pipe(stream, channelid)
+                    channels[channelid] = await this.create_channel_object(channelid, logo, stream, mediaType)
+
+                    let title = 'SNY'
+                    let description = 'Live stream of SNY'
+
+                    let start = this.convertDateToXMLTV(new Date(cache_data.dates[0].date + ' 00:00:00'))
+                    let stop = this.convertDateToXMLTV(new Date(cache_data.dates[cache_data.dates.length-1].date + ' 00:00:00'))
+
+                    // SNLA guide XML
+                    programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertStringToAirDate(cache_data.dates[0].date))
+                    this.debuglog('getTVData completed SNY')
+                  } // end includeTeams check
+                } // end mediaType check
+              } // end entitlements check
+          } catch (e) {
+            this.debuglog('getTVData SNY detect error : ' + e.message)
+          }
 
           // Big Inning
           if ( (mediaType == 'MLBTV') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
@@ -2638,6 +2711,7 @@ class sessionClass {
               let title = 'MLB Big Inning'
               let description = 'Live look-ins and big moments from around the league'
 
+              // disabled Big Inning schedule scraping March 2025
               for (var i = 0; i < cache_data.dates.length; i++) {
                 // Scraped Big Inning schedule
                 if ( (cache_data.dates[i].date >= 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') ) {
@@ -2655,9 +2729,9 @@ class sessionClass {
                   let stop = this.convertDateToXMLTV(new Date(this.cache.bigInningSchedule[gameDate].end))
 
                   // Generated Big Inning schedule (disabled)
-                  /*let big_inning = await this.generateBigInningSchedule(gameDate)
-                  let start = this.convertDateToXMLTV(new Date(big_inning.start))
-                  let stop = this.convertDateToXMLTV(new Date(big_inning.end))*/
+                  //let big_inning = await this.generateBigInningSchedule(gameDate)
+                  //let start = this.convertDateToXMLTV(new Date(big_inning.start))
+                  //let stop = this.convertDateToXMLTV(new Date(big_inning.end))
 
                   // Big Inning calendar ICS
                   let prefix = 'Watch'
@@ -2670,6 +2744,12 @@ class sessionClass {
                 }
                 this.debuglog('getTVData completed Big Inning for date ' + cache_data.dates[i].date)
               }
+              
+              // generic Big Inning guide XML
+              /*let start = this.convertDateToXMLTV(new Date(cache_data.dates[0].date + ' 00:00:00'))
+              let stop = this.convertDateToXMLTV(new Date(cache_data.dates[cache_data.dates.length-1].date + ' 00:00:00'))
+              programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertStringToAirDate(cache_data.dates[0].date))*/
+              
               this.debuglog('getTVData completed Big Inning')
             }
           }
@@ -3024,8 +3104,11 @@ class sessionClass {
                     event_end_padding = pitch_end_padding
                   }
                   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) {
+                  // skip type 1 (breaks) will look at all plays with an endTime
+                  if ((skip_type == 1) && 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)))) {
                     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)
@@ -3116,17 +3199,15 @@ class sessionClass {
       this.debuglog('getBigInningSchedule')
 
       // temporarily disable Big Inning schedule checking until a new source URL is available
-      this.cache.bigInningSchedule = {}
-      return
+      /*this.cache.bigInningSchedule = {}
+      return*/
 
       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://www.mlb.com/live-stream-games/big-inning',
-          url: 'https://www.mlb.com/live-stream-games/help-center/subscription-access-big-inning',
+          url: 'https://www.fubo.tv/welcome/channel/mlb-big-inning',
           headers: {
-            'authority': 'www.mlb.com',
             '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',
@@ -3149,89 +3230,15 @@ class sessionClass {
         if ( response ) {
           // disabled because it's very big!
           //this.debuglog(response)
-          // break HTML into array based on table rows
-          var rows = response.split('<tr>')
-          // start iterating at 2 (after header row)
-          for (var i=2; i<rows.length; i++) {
-            // split HTML row into array with columns
-            let cols = rows[i].split('<td>')
-
-            // define some variables that persist for each row
-            let parts
-            let year
-            let month
-            let day
-            let this_datestring
-            let add_date = 0
-            let d
-
-            for (var j=1; j<cols.length; j++) {
-              // split on closing bracket to get column text at resulting array index 0
-              let col = cols[j].split('<')
-              switch(j){
-                // first column is date
-                case 1:
-                  // split date into array
-                  // old date format (January 1, 1970) (disabled)
-                  /*parts = col[0].split(' ')
-                  year = parts[2]
-                  // get month index, zero-based
-                  month = new Date(Date.parse(parts[0] +" 1, 2021")).getMonth()
-                  day = parts[1].substring(0,parts[1].length-3)*/
-                  // new date format (01/01/70)
-                  parts = col[0].split('/')
-                  year = parts[2]
-                  if ( year.length == 2 ) {
-                    year = '20' + parts[2]
-                  }
-                  // get month index, zero-based
-                  month = parseInt(parts[0]) - 1
-                  day = parts[1]
-                  this_datestring = new Date(year, month, day).toISOString().substring(0,10)
-                  this.cache.bigInningSchedule[this_datestring] = {}
-                  // increment month index (not zero-based)
-                  month += 1
-                  break
-                // remaining columns are times
-                default:
-                  let hour
-                  let minute = '00'
-                  let ampm
-                  // if time has colon, split into array on that to get hour and minute parts
-                  if ( col[0].indexOf(':') > 0 ) {
-                    parts = col[0].split(':')
-                    hour = parseInt(parts[0])
-                    minute = parts[1].substring(0,2)
-                  } else {
-                    hour = parseInt(col[0].substring(0,col[0].length-2))
-                  }
-                  ampm = col[0].substring(col[0].length-2,col[0].length)
-                  // convert hour to 24-hour format
-                  if ( (ampm == 'PM') || ((hour == 12) && (ampm == 'AM')) ) {
-                    hour += 12
-                  }
-                  // these times are EDT so add 4 for UTC
-                  hour += 4
-                  // if hour is beyond 23, note we will have to add 1 day
-                  if ( hour > 23 ) {
-                    add_date = 1
-                    hour -= 24
-                  }
-
-                  d = new Date(this_datestring + 'T' + hour.toString().padStart(2, '0') + ':' + minute.toString().padStart(2, '0') + ':00.000+00:00')
-                  d.setDate(d.getDate()+add_date)
-                  switch(j){
-                    // 2nd column is start time
-                    case 2:
-                      this.cache.bigInningSchedule[this_datestring].start = d
-                      break
-                    // 3rd column is end time
-                    case 3:
-                      this.cache.bigInningSchedule[this_datestring].end = d
-                      break
-                  }
-                  break
-              }
+          
+          let obj = JSON.parse(response.replace(/\\"/g, '"').match('(?<="channelPrograms":{"live":)(.+?(,"totalPages":1}))')[0])
+          for (var i=0; i < obj.data.length; i++) {
+            let est_date = new Date(obj.data[i].airings[0].start).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: obj.data[i].airings[0].start, 
+              end: obj.data[i].airings[0].end
             }
           }
           this.debuglog(JSON.stringify(this.cache.bigInningSchedule))
@@ -3380,6 +3387,60 @@ class sessionClass {
     }
   }
 
+  // Get linear channel stream URL
+  async getLinearStreamURL(network) {
+    try {
+      this.debuglog('getLinearStreamURL')      
+      
+      let reqObj = {
+        url: GRAPHQL_URL,
+        simple: false,
+        headers: {
+          'accept': 'application/json, text/plain, */*',
+  		  'accept-encoding': 'gzip, deflate, br',
+  		  'accept-language': 'en-US,en;q=0.5',
+  		  'authorization': 'Bearer ' + await this.getLoginToken() || this.halt('missing loginToken'),
+  		  'connection': 'keep-alive',
+  		  'content-type': 'application/json',
+  		  'x-client-name': 'WEB',
+  		  'x-client-version': '7.8.1',
+          'origin': 'https://www.mlb.com',
+          'referer': 'https://www.mlb.com/',
+          'user-agent': USER_AGENT
+        },
+        body: {
+          'operationName': 'contentCollections',
+          'query': 'query contentCollections(\n        $categories: [ContentGroupCategory!]\n        $includeRestricted: Boolean = false\n        $includeSpoilers: Boolean = false\n        $limit: Int = 10,\n        $skip: Int = 0\n    ) {\n        contentCollections(\n            categories: $categories\n            includeRestricted: $includeRestricted\n            includeSpoilers: $includeSpoilers\n            limit: $limit\n            skip: $skip\n        ) {\n            title\n            category\n            contents {\n                assetTrackingKey\n                contentDate\n                contentId\n                contentRestrictions\n                description\n                duration\n                language\n                mediaId\n                officialDate\n                title\n                mediaState {\n                    state\n                    mediaType\n                }\n                thumbnails {\n                    thumbnailType\n                    templateUrl\n                    thumbnailUrl\n                }\n            }\n        }\n    }',
+          'variables': {
+            'categories': network,
+            'limit': '25'
+          }
+        },
+        json: true,
+        gzip: true
+      }
+      var response = await this.httpPost(reqObj)
+      if ( response ) {
+        this.debuglog('getLinearStreamURL response : ' + JSON.stringify(response))
+        if ( response.data && response.data.contentCollections && (response.data.contentCollections.length > 0) && response.data.contentCollections[0].contents ) {
+          for (var i=0; i<response.data.contentCollections[0].contents.length; i++) {
+            try {
+              let streamInfo = await this.getStreamURL(response.data.contentCollections[0].contents[i].mediaId)
+              if ( streamInfo.rawStreamURL ) {
+                return streamInfo.rawStreamURL
+              }
+            } catch(e) {
+              this.debuglog('getLinearStreamURL getStreamURL error : ' + e.message)
+            }
+          }
+          this.log('getLinearStreamURL stream url not found')
+        }
+      }
+    } catch(e) {
+      this.log('getLinearStreamURL error : ' + e.message)
+    }
+  }
+
   // Get Recap Rundown data
   async getRecapRundownData(dateString) {
     try {
@@ -3473,6 +3534,12 @@ class sessionClass {
           playbackURL = await this.getRecapRundownURL(dateString)
         } else if ( eventName.toUpperCase() == 'MLBN' ) {
           playbackURL = 'https://falcon.mlbinfra.com/api/v1/linear/mlbn'
+        } else if ( eventName.toUpperCase() == 'SNLA' ) {
+          playbackURL = await this.getLinearStreamURL('SNLA_LIVE')
+          return playbackURL
+        } else if ( eventName.toUpperCase() == 'SNY' ) {
+          playbackURL = await this.getLinearStreamURL('SNY_LIVE')
+          return playbackURL
         } else {
           playbackURL = await this.getEventURL(eventName)
         }
@@ -4014,7 +4081,7 @@ class sessionClass {
 
           if ( !this.temp_cache.gamechanger[id].games ) this.temp_cache.gamechanger[id].games = []
           this.temp_cache.gamechanger[id].games.push(best_games)
-          let maxlength = (this.gamechanger_delay + 10) / 10
+          let maxlength = (this.gamechanger_delay + 10 + MLB_GAMECHANGER_PADDING) / 10
           while ( this.temp_cache.gamechanger[id].games.length > maxlength ) {
             this.temp_cache.gamechanger[id].games.shift()
           }