mlbserver 2025.8.16 → 2025.8.17

package/index.js

@@ -295,7 +295,7 @@ app.get('/stream.m3u8', async function(req, res) {
       options.resolution = req.query.resolution
       options.audio_track = VALID_AUDIO_TRACKS[0]
       if ( req.query.audio_track ) {
-        options.audio_track = session.returnValidItem(req.query.audio_track.split(' ')[0], VALID_AUDIO_TRACKS)
+        options.audio_track = req.query.audio_track.split(' ')[0]
       }
       options.captions = req.query.captions || VALID_CAPTIONS[0]
       options.force_vod = req.query.force_vod || VALID_FORCE_VOD[0]
@@ -339,6 +339,17 @@ app.get('/stream.m3u8', async function(req, res) {
               } else {
                 mediaId = mediaInfo.mediaId
                 gamePk = mediaInfo.gamePk
+                if ( mediaInfo.teamType ) {
+                  if ( options.audio_track.toLowerCase() == 'radio' ) {
+                    options.audio_track = mediaInfo.teamType
+                  } else if ( options.audio_track.toLowerCase() == 'spanish' ) {
+                    if ( mediaInfo.teamType == 'Away' ) {
+                      options.audio_track = VALID_AUDIO_TRACKS[5]
+                    } else {
+                      options.audio_track = VALID_AUDIO_TRACKS[3]
+                    }
+                  }
+                }
               }
             } else {
               session.log('no matching game found ' + req.url)
@@ -520,6 +531,34 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
 
       let resolution = options.resolution || VALID_RESOLUTIONS[0]
       let audio_track = options.audio_track || VALID_AUDIO_TRACKS[0]
+      // if specific audio track is requested, check if master playlist contains it
+      if ( audio_track != VALID_AUDIO_TRACKS[0] ) {
+        if ( !response.body.includes(',NAME="' + audio_track) ) {
+          session.debuglog('requested ' + audio_track + ' audio track not available')
+          // fallback check other team's radio feed
+          if ( VALID_AUDIO_TRACKS.slice(2, 6).includes(audio_track) ) {
+            if ( audio_track == VALID_AUDIO_TRACKS[5] ) {
+              audio_track = VALID_AUDIO_TRACKS[3]
+            } else if ( audio_track == VALID_AUDIO_TRACKS[3] ) {
+              audio_track = VALID_AUDIO_TRACKS[5]
+            } else if ( audio_track == VALID_AUDIO_TRACKS[4] ) {
+              audio_track = VALID_AUDIO_TRACKS[2]
+            } else if ( audio_track == VALID_AUDIO_TRACKS[2] ) {
+              audio_track = VALID_AUDIO_TRACKS[4]
+            }
+            if ( !response.body.includes(',NAME="' + audio_track) ) {
+              // if fallback feed is also not available, fall back to default
+              session.debuglog('fallback ' + audio_track + ' audio track also not available')
+              audio_track = VALID_AUDIO_TRACKS[0]
+            } else {
+              session.debuglog('falling back to ' + audio_track + ' audio track')
+            }
+          } else {
+            // fall back to default
+            audio_track = VALID_AUDIO_TRACKS[0]
+          }
+        }
+      }
       let captions = options.captions || VALID_CAPTIONS[0]
       let force_vod = options.force_vod || VALID_FORCE_VOD[0]
 
@@ -2388,6 +2427,10 @@ app.get('/', async function(req, res) {
       include_teams = session.credentials.fav_teams.toString()
     }
     body += '<p><span class="tooltip">By team<span class="tooltiptext">Including a team (MLB only, by abbreviation, in a comma-separated list if more than 1) will include all of its broadcasts, or if that team is not broadcasting the game, it will include the national broadcast or opponent\'s broadcast if available. 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 + '&includeTeams=' + include_teams + content_protect_b + '">channels.m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=' + include_teams + content_protect_b + '">calendar.ics</a></p>' + "\n"
+    
+    body += '<p><span class="tooltip">By team w/ radio<span class="tooltiptext">Same as above, but defaults to that team\'s radio track, if available.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=' + include_teams + '&audio_track=radio' + content_protect_b + '">channels.m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&audio_track=radio' + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&audio_track=radio' + content_protect_b + '">calendar.ics</a></p>' + "\n"
+    
+    body += '<p><span class="tooltip">By team w/ Spanish<span class="tooltiptext">Same as above, but defaults to that team\'s Spanish radio track, if available.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=' + include_teams + '&audio_track=spanish' + content_protect_b + '">channels.m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&audio_track=spanish' + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&audio_track=spanish' + content_protect_b + '">calendar.ics</a></p>' + "\n"
 
     body += '<p><span class="tooltip">Include blackouts<span class="tooltiptext">An optional parameter added to the URL will include channels/games subject to blackout (although you may not be able to play those games).</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=' + include_teams + '&includeBlackouts=true' + content_protect_b + '">channels.m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&includeBlackouts=true' + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&includeBlackouts=true' + content_protect_b + '">calendar.ics</a></p>' + "\n"
 
@@ -2820,6 +2863,11 @@ app.get('/channels.m3u', async function(req, res) {
     startingChannelNumber = req.query.startingChannelNumber
   }
 
+  let audio_track = false
+  if ( req.query.audio_track ) {
+    audio_track = req.query.audio_track
+  }
+
   let includeBlackouts = 'false'
   if ( req.query.includeBlackouts ) {
     includeBlackouts = req.query.includeBlackouts
@@ -2835,7 +2883,7 @@ app.get('/channels.m3u', async function(req, res) {
     includeOrgs = req.query.includeOrgs.toUpperCase().split(',')
   }
 
-  var body = await session.getTVData('channels', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, 'false', 'false', resolution, pipe, startingChannelNumber)
+  var body = await session.getTVData('channels', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, 'false', audio_track, 'false', resolution, pipe, startingChannelNumber)
 
   res.writeHead(200, {'Content-Type': 'audio/x-mpegurl'})
   res.end(body)
@@ -2861,6 +2909,11 @@ app.get('/calendar.ics', async function(req, res) {
     if ( req.query.excludeTeams ) {
       excludeTeams = req.query.excludeTeams.toUpperCase().split(',')
     }
+    
+    let audio_track = false
+    if ( req.query.audio_track ) {
+      audio_track = req.query.audio_track
+    }
 
     let includeBlackouts = 'false'
     if ( req.query.includeBlackouts ) {
@@ -2884,7 +2937,7 @@ app.get('/calendar.ics', async function(req, res) {
 
     let server = (req.headers['x-forwarded-proto'] ? req.headers['x-forwarded-proto'] : 'http') + '://' + req.headers.host + http_root
 
-    var body = await session.getTVData('calendar', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, includeTeamsInTitles)
+    var body = await session.getTVData('calendar', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, includeTeamsInTitles, audio_track)
 
     res.writeHead(200, {'Content-Type': 'text/calendar'})
     res.end(body)
@@ -2915,6 +2968,11 @@ app.get('/guide.xml', async function(req, res) {
     excludeTeams = req.query.excludeTeams.toUpperCase().split(',')
   }
 
+  let audio_track = false
+  if ( req.query.audio_track ) {
+    audio_track = req.query.audio_track
+  }
+
   let includeBlackouts = 'false'
   if ( req.query.includeBlackouts ) {
     includeBlackouts = req.query.includeBlackouts
@@ -2942,7 +3000,7 @@ app.get('/guide.xml', async function(req, res) {
 
   let server = (req.headers['x-forwarded-proto'] ? req.headers['x-forwarded-proto'] : 'http') + '://' + req.headers.host + http_root
 
-  var body = await session.getTVData('guide', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, includeTeamsInTitles, offAir)
+  var body = await session.getTVData('guide', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, includeTeamsInTitles, audio_track, offAir)
 
   res.end(body)
 })

package/package.json

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

package/session.js

@@ -1886,6 +1886,7 @@ class sessionClass {
                         if ( (nationalArray.length == 2) && (nationalArray[1] == nationalCount) ) {
                           this.debuglog('matched national event')
                           mediaInfo = await this.check_media_state(broadcast, cache_data.dates[0].games[j].status.abstractGameState, mediaDate, cache_data.dates[0].games[j].gamePk)
+                          mediaInfo.teamType = 'Home'
                           break
                         }
 
@@ -1897,6 +1898,7 @@ class sessionClass {
                           if ( (freeArray.length == 2) && (freeArray[1] == freeCount) ) {
                             this.debuglog('matched free event')
                             mediaInfo = await this.check_media_state(broadcast, cache_data.dates[0].games[j].status.abstractGameState, mediaDate, cache_data.dates[0].games[j].gamePk)
+                            mediaInfo.teamType = 'Home'
                             break
                           }
 
@@ -1910,6 +1912,11 @@ class sessionClass {
                           } else {
                             this.debuglog('matched team for event')
                             mediaInfo = await this.check_media_state(broadcast, cache_data.dates[0].games[j].status.abstractGameState, mediaDate, cache_data.dates[0].games[j].gamePk)
+                            if ( team.toUpperCase() == away_team ) {
+                              mediaInfo.teamType = 'Away'
+                            } else {
+                              mediaInfo.teamType = 'Home'
+                            }
                             break
                           }
                         }
@@ -2193,7 +2200,7 @@ class sessionClass {
   }
 
   // get TV data (channels or guide)
-  async getTVData(dataType, mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, includeTeamsInTitles='false', offAir='false', resolution='best', pipe='false', startingChannelNumber=1) {
+  async getTVData(dataType, mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, includeTeamsInTitles='false', audio_track=false, offAir='false', resolution='best', pipe='false', startingChannelNumber=1) {
     try {
       this.debuglog('getTVData for ' + dataType)
 
@@ -2531,6 +2538,9 @@ class sessionClass {
                             if ( streamMediaType == 'Video' ) {
                               stream += '&resolution=' + resolution
                             }
+                            if ( audio_track ) {
+                              stream += '&audio_track=' + audio_track
+                            }
                             if ( includeBlackouts == 'true' ) stream += '&includeBlackouts=' + includeBlackouts
                             if ( this.protection.content_protect ) stream += '&content_protect=' + this.protection.content_protect
                             if ( pipe == 'true' ) stream = await this.convert_stream_to_pipe(stream, channelid)
@@ -2550,6 +2560,13 @@ class sessionClass {
                                 title = this.channelsFormattedTitle(subtitle, cache_data.dates[i].games[j].gameDate)
                               } else {
                                 title = 'MLB: ' + subtitle + ' (' + station
+                                if ( audio_track ) {
+                                  title += ' with'
+                                  if ( audio_track.toLowerCase() == 'spanish' ) {
+                                    title += ' Spanish'
+                                  }
+                                  title += ' Radio'
+                                }
                                 if ( language == 'es' ) {
                                   title += ' Spanish'
                                 }
@@ -2566,6 +2583,14 @@ class sessionClass {
                                 description += ' Spanish'
                               }
                               description += ' Radio'
+                            } else {
+                              if ( audio_track ) {
+                                description += ' with'
+                                if ( audio_track.toLowerCase() == 'spanish' ) {
+                                  description += ' Spanish'
+                                }
+                                description += ' Radio, if available'
+                              }                                
                             }
                             description += '. '
                             if ( cache_data.dates[i].games[j].seriesDescription != 'Regular Season' ) {
@@ -2628,6 +2653,9 @@ class sessionClass {
                             if ( streamMediaType == 'Video' ) {
                               location += '&resolution=' + resolution
                             }
+                            if ( audio_track ) {
+                              location += '&audio_track=' + audio_track
+                            }
                             if ( includeBlackouts == 'true' ) location += '&includeBlackouts=' + includeBlackouts
                             if ( this.protection.content_protect ) location += '&content_protect=' + this.protection.content_protect
                             calendar += await this.generate_ics_event(prefix, calendar_start, calendar_stop, subtitle, description, location)