mlbserver 2024.10.7 → 2024.10.10

package/index.js

@@ -29,12 +29,12 @@ const VALID_CONTROLS = [ 'Show', 'Hide' ]
 const VALID_INNING_HALF = [ '', 'top', 'bottom' ]
 const VALID_INNING_NUMBER = [ '', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12' ]
 const VALID_SCORES = [ 'Hide', 'Show' ]
-const VALID_RESOLUTIONS = [ 'adaptive', '720p60', '720p', '540p', '504p', '360p', 'none'  ]
+const VALID_RESOLUTIONS = [ 'adaptive', '720p60', '720p', '540p', '504p', '360p', 'none' ]
 const DEFAULT_MULTIVIEW_RESOLUTION = '504p'
 // Corresponding andwidths to display for above resolutions
 const DISPLAY_BANDWIDTHS = [ '', '6600k', '4160k', '2950k', '2120k', '1400k', '' ]
-const VALID_AUDIO_TRACKS = [ 'all', 'English', 'Home Radio', 'Casa Radio', 'Away Radio', 'Visita Radio', 'none' ]
-const DISPLAY_AUDIO_TRACKS = [ 'all', 'TV', 'Radio', 'Spanish', 'Away Radio', 'Away Sp.', 'none' ]
+const VALID_AUDIO_TRACKS = [ 'all', 'English', 'Home Radio', 'Casa Radio', 'Away Radio', 'Visita Radio', 'Park', 'none' ]
+const DISPLAY_AUDIO_TRACKS = [ 'all', 'TV', 'Radio', 'Spa.', 'Away Rad.', 'Away Sp.', 'Park', 'none' ]
 const DEFAULT_MULTIVIEW_AUDIO_TRACK = 'English'
 const VALID_SKIP = [ 'off', 'breaks', 'idle time', 'pitches', 'commercials' ]
 const DEFAULT_SKIP_ADJUST = 0
@@ -528,23 +528,28 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
           if ( audio_track_matched ) return
 
           // user specified no audio tracks
-          if ( audio_track == VALID_AUDIO_TRACKS[VALID_AUDIO_TRACKS.length-1] ) {
+          /*if ( audio_track == VALID_AUDIO_TRACKS[VALID_AUDIO_TRACKS.length-1] ) {
             audio_track_matched = true
             return
-          }
+          }*/
 
           // we'll append to this and output track(s) at the end of this code block
           let audio_output = ''
 
-          // default TV audio
+          // default TV audio, or park sounds
           if ( !line.includes(',URI=') ) {
-            if ( audio_track == VALID_AUDIO_TRACKS[1] ) {
+            // only include default embedded audio track if requested or if filtering for park audio
+            if ( (audio_track == VALID_AUDIO_TRACKS[1]) || (audio_track == VALID_AUDIO_TRACKS[6]) ) {
+              audio_track_matched = true
+              if ( audio_track == VALID_AUDIO_TRACKS[6] ) {
+                line = line.replace('English','Park Sounds')
+              }
               return line
             } else if ( audio_track == VALID_AUDIO_TRACKS[0] ) {
               audio_output += line
             }
           } else {
-            if ( (audio_track == VALID_AUDIO_TRACKS[0]) || (audio_track == VALID_AUDIO_TRACKS[2]) || (audio_track == VALID_AUDIO_TRACKS[3]) || (audio_track == VALID_AUDIO_TRACKS[4]) || (audio_track == VALID_AUDIO_TRACKS[5]) ) {
+            if ( (audio_track != VALID_AUDIO_TRACKS[1]) && (audio_track != VALID_AUDIO_TRACKS[6]) && (audio_track != VALID_AUDIO_TRACKS[7]) ) {
               // if user specified home/away radio or home/away Spanish audio track, check if this one matches
               if ( (audio_track == VALID_AUDIO_TRACKS[2]) || (audio_track == VALID_AUDIO_TRACKS[3]) || (audio_track == VALID_AUDIO_TRACKS[4]) || (audio_track == VALID_AUDIO_TRACKS[5]) ) {
                 if ( line.includes('NAME="'+audio_track+'"') || line.includes('NAME="'+audio_track.substring(0,audio_track.length-1)+'"') ) {
@@ -637,6 +642,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
           if ( skip_adjust != DEFAULT_SKIP_ADJUST ) newurl += '&skip_adjust=' + skip_adjust
           if ( pad != VALID_PAD[0] ) newurl += '&pad=' + pad
           if ( gamePk ) newurl += '&gamePk=' + gamePk
+          if ( audio_track != VALID_AUDIO_TRACKS[0] ) newurl += '&audio_track=' + encodeURIComponent(audio_track)
           newurl += content_protect + referer_parameter + token_parameter
           return '/playlist?url='+newurl
         }
@@ -693,6 +699,7 @@ app.get('/playlist', async function(req, res) {
   var skip_adjust = req.query.skip_adjust || DEFAULT_SKIP_ADJUST
   var pad = req.query.pad || VALID_PAD[0]
   var gamePk = req.query.gamePk || false
+  var audio_track = req.query.audio_track || VALID_AUDIO_TRACKS[0]
 
   var req = function () {
     var headers = {}
@@ -817,6 +824,11 @@ app.get('/playlist', async function(req, res) {
         newline += '?url='+encodeURIComponent(url.resolve(u, line.trim())) + content_protect + referer_parameter + token_parameter
         if ( key ) newline += '&key='+encodeURIComponent(key) + '&iv='+encodeURIComponent(iv)
 
+        // if an alternate audio track is specified, force removal of embedded audio
+        if ( (audio_track != VALID_AUDIO_TRACKS[0]) && (audio_track != VALID_AUDIO_TRACKS[1]) ) {
+          newline = 'download.html?audio_track=' + encodeURIComponent(audio_track) + '&src=' + encodeURIComponent('http://127.0.0.1:' + session.data.port + newline) + content_protect
+        }
+
         return newline
       })
       .filter(function(line) {
@@ -1532,13 +1544,13 @@ app.get('/', async function(req, res) {
           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[VALID_LINK_TYPES.length-1] ) {
+          } else if ( linkType == VALID_LINK_TYPES[4] ) {
             querystring += '&filename=' + gameDate + ' MLB Network'
           }
           querystring += content_protect_b
           multiviewquerystring += content_protect_b
           body += '<a href="' + thislink + querystring + '">MLB Network</a>'
-          body += '<input type="checkbox" value="' + server + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
+          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
       } // end country check
@@ -1590,13 +1602,13 @@ app.get('/', async function(req, res) {
           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[VALID_LINK_TYPES.length-1] ) {
+          } 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="' + server + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
+          body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
         } else {
           body += 'Big Inning'
         }
@@ -1623,11 +1635,11 @@ app.get('/', async function(req, res) {
             if ( linkType != VALID_LINK_TYPES[1] ) {
               streamURL = thislink + '?src=' + encodeURIComponent(streamURL) + '&startFrom=' + VALID_START_FROM[1] + content_protect_b
             }
-            if ( linkType == VALID_LINK_TYPES[VALID_LINK_TYPES.length-1] ) {
+            if ( linkType == VALID_LINK_TYPES[4] ) {
               streamURL += '&filename=' + gameDate + ' Game Changer'
             }
             body += '<a href="' + streamURL + '">Game Changer</a>'
-            body += '<input type="checkbox" value="' + multiviewquerystring + '" onclick="addmultiview(this, [], excludeTeams)">'
+            body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + multiviewquerystring + '" onclick="addmultiview(this, [], excludeTeams)">'
           } else {
             body += 'Game Changer'
           }
@@ -1876,13 +1888,13 @@ app.get('/', async function(req, res) {
                     if ( currentTime < endTime ) {
                       if ( force_vod != VALID_FORCE_VOD[0] ) querystring += '&force_vod=' + force_vod
                     }
-                  } else if ( linkType == VALID_LINK_TYPES[VALID_LINK_TYPES.length-1] ) {
+                  } else if ( linkType == VALID_LINK_TYPES[4] ) {
                     querystring += '&filename=' + filename + broadcastName
                   }
                   querystring += content_protect_b
                   multiviewquerystring += content_protect_b
                   body += '<a href="' + thislink + querystring + '">' + broadcastName + '</a>'
-                  body += '<input type="checkbox" value="' + server + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
+                  body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
                 } else {
                   body += broadcastName
                 }
@@ -1971,7 +1983,7 @@ app.get('/', async function(req, res) {
                           if ( broadcast.mediaState.mediaStateCode == 'MEDIA_ON' ) {
                             if ( force_vod != VALID_FORCE_VOD[0] ) querystring += '&force_vod=' + force_vod
                           }
-                        } else if ( linkType == VALID_LINK_TYPES[VALID_LINK_TYPES.length-1] ) {
+                        } else if ( linkType == VALID_LINK_TYPES[4] ) {
                           querystring += '&filename=' + filename + station
                         }
                         querystring += content_protect_b
@@ -1984,7 +1996,7 @@ app.get('/', async function(req, res) {
                           body += stationlink
                         }
                         if ( mediaType == 'MLBTV' ) {
-                          body += '<input type="checkbox" value="' + server + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this, [\'' + awayteam + '\', \'' + hometeam + '\'])">'
+                          body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this, [\'' + awayteam + '\', \'' + hometeam + '\'])">'
                         }
                         if ( resumeStatus ) {
                           body += '('
@@ -2949,12 +2961,17 @@ app.get('/kodi.strm', async function(req, res) {
   }
 })
 
-// Listen for download requests
+// Listen for download requests (either for actual downloads or just proxying stream through ffmpeg)
 app.get('/download.html', async function(req, res) {
   if ( ! (await protect(req, res)) ) return
 
   try {
-    session.requestlog('download', req)
+    // we'll know it's an actual download request if it include a filename parameter
+    if ( req.query.filename ) {
+      session.requestlog('download', req)
+    } else {
+      session.debuglog('force alternate audio', req)
+    }
 
     let server = 'http://' + req.headers.host
 
@@ -2970,26 +2987,85 @@ app.get('/download.html', async function(req, res) {
     }
     session.debuglog('download src : ' + video_url)
 
+    // force adaptive streams to just use a single video resolution/track
+    if ( req.query.filename ) {
+      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')
+      }
+    }
+
     ffmpeg_command = ffmpeg({ timeout: 432000 })
 
-    // Set input stream and its thread queue size
+    // Set input stream and minimize ffmpeg startup latency
     ffmpeg_command.input(video_url)
-    .addOutputOption('-c', 'copy')
-    .addOutputOption('-f', 'mpegts')
+    .addInputOption('-fflags', 'nobuffer')
+    .addInputOption('-probesize', '32')
+    .addInputOption('-analyzeduration', '0')
+
+    // video
+    if ( !req.query.resolution || (req.query.resolution != VALID_RESOLUTIONS[VALID_RESOLUTIONS.length-1]) ) {
+      // copy first video track if available
+      ffmpeg_command.addOutputOption('-map', '0:v:0?')
+      .addOutputOption('-c:v', 'copy')
+    } else {
+      // suppress video is "none" resolution was specified
+      ffmpeg_command.addOutputOption('-vn')
+    }
+
+    // audio
+    if ( !req.query.audio_track || (req.query.audio_track == VALID_AUDIO_TRACKS[0]) ) {
+      // if no specific audio track was requested, include and copy them all
+      ffmpeg_command.addOutputOption('-map', '0:a')
+      .addOutputOption('-c:a', 'copy')
+    } else {
+      // park sounds audio track
+      if ( req.query.audio_track == VALID_AUDIO_TRACKS[6] ) {
+        // filter for park audio track
+        ffmpeg_command.complexFilter([{
+          filter: 'pan=stereo|c0=c0|c1=-1*c1',
+          inputs: '0:a:0',
+          outputs: 'out0'
+        }])
+        // map filtered audio and re-encode to mono
+        ffmpeg_command.addOutputOption('-map', '[out0]')
+        .addOutputOption('-c:a', 'aac')
+        .addOutputOption('-ac:a:0', '1')
+
+        // if not downloading to a file, also copy source PTS values for continuous playback
+        if ( !req.query.filename ) {
+          ffmpeg_command.addOutputOption('-copyts')
+          .addOutputOption('-muxpreload', '0')
+          .addOutputOption('-muxdelay', '0')
+        }
+      } else if ( (!req.query.filename && (req.query.audio_track != VALID_AUDIO_TRACKS[1])) || (req.query.audio_track == VALID_AUDIO_TRACKS[7]) ) {
+        // if we're not downloading a file, and we requested an alternate audio track, then we want to suppress the embedded TV audio
+        // or if the user requested no audio tracks in their download, we will suppress all
+        ffmpeg_command.addOutputOption('-an')
+      } else {
+        // fallback to only including and copying first audio track
+        ffmpeg_command.addOutputOption('-map', '0:a:0')
+        .addOutputOption('-c:a', 'copy')
+      }
+    }
+
+    // output mpegts to response stream
+    ffmpeg_command.addOutputOption('-f', 'mpegts')
     .output(res)
     .on('start', function(commandLine) {
-      session.log('download command started')
+      session.debuglog('download command started')
       if ( argv.debug || argv.ffmpeg_logging ) {
-        session.log('download command: ' + commandLine)
+        session.debuglog('download command: ' + commandLine)
       }
     })
     .on('error', function(err, stdout, stderr) {
-      session.log('download command stopped: ' + err.message)
+      session.debuglog('download command stopped: ' + err.message)
       if ( stdout ) session.log(stdout)
       if ( stderr ) session.log(stderr)
     })
     .on('end', function() {
-      session.log('download command ended')
+      session.debuglog('download command ended')
     })
 
     if ( argv.ffmpeg_logging ) {
@@ -2999,12 +3075,9 @@ app.get('/download.html', async function(req, res) {
       })
     }
 
-    var filename = 'mlbserver'
+    var download_headers = {}
     if ( req.query.filename ) {
-      filename = req.query.filename
-    }
-    var download_headers = {
-      'Content-Disposition': 'attachment; filename="' + filename + '.ts"'
+      download_headers['Content-Disposition'] = 'attachment; filename="' + req.query.filename + '.ts"'
     }
     res.writeHead(200, download_headers)
 

package/package.json

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

package/session.js

@@ -26,6 +26,8 @@ const TODAY_UTC_HOURS = 8 // UTC hours (EST + 4) into tomorrow to still use toda
 
 const TEAM_IDS = { 'ATL': '144', 'AZ': '109', 'BAL': '110', 'BOS': '111', 'CHC': '112', 'CWS': '145', 'CIN': '113', 'CLE': '114', 'COL': '115', 'DET': '116', 'HOU': '117', 'KC': '118', 'LAA': '108', 'LAD': '119', 'MIA': '146', 'MIL': '158', 'MIN': '142', 'NYM': '121', 'NYY': '147', 'OAK': '133', 'PHI': '143', 'PIT': '134', 'STL': '138', 'SD': '135', 'SF': '137', 'SEA': '136', 'TB': '139', 'TEX': '140', 'TOR': '141', 'WSH': '120' }
 
+const LIDOM_TEAM_IDS = { 'AGU': '667', 'TOR': '668', 'EST': '669', 'GIG': '670', 'ESC': '671', 'LIC': '672' }
+
 const AFFILIATE_TEAM_IDS = { 'ATL': '430,431,432,478', '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', 'OAK': '237,400,499,524', '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,485,540', 'TOR': '422,424,435,463', 'WSH': '426,436,534,547' }
 
 // Other country options would be USA, Canada, or other
@@ -1136,6 +1138,14 @@ class sessionClass {
     }
   }
 
+  getLidomTeamIds(team_abbr = false) {
+    if ( team_abbr ) {
+      return LIDOM_TEAM_IDS[team_abbr]
+    } else {
+      return Object.values(LIDOM_TEAM_IDS).toString()
+    }
+  }
+
   getAffiliateTeamIds(team_abbr = false) {
     if ( team_abbr ) {
       return AFFILIATE_TEAM_IDS[team_abbr]
@@ -1797,10 +1807,10 @@ class sessionClass {
               this.debuglog('checking game ' + cache_data.dates[0].games[j].teams['home'].team.abbreviation + '@' + cache_data.dates[0].games[j].teams['away'].team.abbreviation)
 
               // check that that game involves the requested team, or if we've requested a national or free game
-              if ( ((team.toUpperCase() == home_team) && (LEVELS[level.toUpperCase()] == home_level)) || ((team.toUpperCase() == away_team) && (LEVELS[level.toUpperCase()] == away_level)) || (team.toUpperCase().indexOf('NATIONAL.') == 0) || ((team.toUpperCase().startsWith('FREE.') && cache_data.dates[0].games[j].broadcasts && cache_data.dates[0].games[j].broadcasts[0] && (cache_data.dates[0].games[j].broadcasts[0].freeGame == true))) ) {
+              if ( ((team.toUpperCase() == home_team) && (LEVELS[level.toUpperCase()] == home_level)) || ((team.toUpperCase() == away_team) && (LEVELS[level.toUpperCase()] == away_level)) || ((team.toUpperCase().indexOf('NATIONAL.') == 0) && (home_level == LEVELS['MLB'])) || ((team.toUpperCase().startsWith('FREE.') && cache_data.dates[0].games[j].broadcasts && cache_data.dates[0].games[j].broadcasts[0] && (cache_data.dates[0].games[j].broadcasts[0].freeGame == true))) ) {
 
                 // Check if Winter League / MiLB game first
-                if ( (cache_data.dates[0].games[j].teams['home'].team.sport.id != LEVELS['MLB']) && (mediaType == 'MLBTV') ) {
+                if ( (home_level != LEVELS['MLB']) && (mediaType == 'MLBTV') ) {
                   this.debuglog('matched non-MLB team for ' + cache_data.dates[0].games[j].teams['home'].team.abbreviation + '@' + cache_data.dates[0].games[j].teams['away'].team.abbreviation)
                   if ( cache_data.dates[0].games[j].broadcasts ) {
                     let broadcastName = 'N/A'
@@ -2231,6 +2241,9 @@ class sessionClass {
                 team_ids += ',' + AFFILIATE_TEAM_IDS[includeTeams[i]]
               }
             }
+            if ( includeTeams.includes('LIDOM') ) {
+              team_ids += this.getLidomTeamIds()
+            }
           } else {
             team_ids = this.getTeamIds()
             for (let i=0; i<this.credentials.fav_teams.length; i++) {
@@ -2238,6 +2251,9 @@ class sessionClass {
                 team_ids += ',' + AFFILIATE_TEAM_IDS[this.credentials.fav_teams[i]]
               }
             }
+            if ( (excludeTeams.length == 0) || !excludeTeams.includes('LIDOM') ) {
+              team_ids += this.getLidomTeamIds()
+            }
           }
         }
 
@@ -2265,19 +2281,21 @@ class sessionClass {
               this.debuglog('getTVData processing game ' + j + ' for date ' + cache_data.dates[i].date)
               // Check if non-MLB (Winter League / MiLB) game first
               if ( (cache_data.dates[i].games[j].teams['home'].team.sport.id != LEVELS['MLB']) && (cache_data.dates[i].games[j].teams['away'].team.sport.id != LEVELS['MLB']) && (mediaType == 'MLBTV') ) {
+                let league_id = cache_data.dates[i].games[j].teams['home'].team.league.id
+                let broadcastName = 'N/A'
                 if ( cache_data.dates[i].games[j].broadcasts ) {
-                  let broadcastName = 'N/A'
                   for (var k = 0; k < cache_data.dates[i].games[j].broadcasts.length; k++) {
                     if ( cache_data.dates[i].games[j].broadcasts[k].name != 'Audio' ) {
                       broadcastName = mediaType
                       break
                     }
                   }
-                  if ( broadcastName == 'N/A' ) {
+                }
+                  if ( (broadcastName == 'N/A') && (league_id != LIDOM_ID) ) {
                     continue
                   } else {
-                    for (var k = 0; k < cache_data.dates[i].games[j].broadcasts.length; k++) {
-                      let league_id = cache_data.dates[i].games[j].teams['home'].team.league.id
+                    //for (var k = 0; k < cache_data.dates[i].games[j].broadcasts.length; k++) {
+                      if (broadcastName == 'N/A') broadcastName = 'MLBTV'
                       let team = cache_data.dates[i].games[j].teams['home'].team.abbreviation
                       let team_id = cache_data.dates[i].games[j].teams['home'].team.id.toString()
                       let opponent_team_id = cache_data.dates[i].games[j].teams['away'].team.id.toString()
@@ -2386,10 +2404,9 @@ class sessionClass {
                       // MILB guide XML
                       programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertDateToAirDate(gameDate), subtitle, team_id, cache_data.dates[i].games[j].gamePk, away_team, home_team)
 
-                      break
-                    }
+                      //break
+                    //}
                   }
-                }
               } else {
                 // Begin MLB games
                 // check blackout status, if necessary