mlbserver 2021.10.11 → 2022.3.22

package/README.md

@@ -1,6 +1,6 @@
 # mlbserver
 
-Current version 2021.10.11
+Current version 2022.03.22
 
 Credit to https://github.com/tonycpsu/streamglob and https://github.com/mafintosh/hls-decryptor
 

package/index.js

@@ -37,7 +37,7 @@ const DEFAULT_MULTIVIEW_AUDIO_TRACK = 'English'
 const VALID_SKIP = [ 'off', 'breaks', 'pitches' ]
 const VALID_FORCE_VOD = [ 'off', 'on' ]
 
-const SAMPLE_STREAM_URL = 'https://www.radiantmediaplayer.com/media/rmp-segment/bbb-abr-aes/playlist.m3u8'
+const SAMPLE_STREAM_URL = 'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8'
 
 // Basic command line arguments, if specified:
 // --port or -p (primary port to run on; defaults to 9999 if not specified)
@@ -72,7 +72,9 @@ var argv = minimist(process.argv, {
 })
 
 // Version
-if (argv.version) return console.log(require('./package').version)
+var version = require('./package').version
+console.log('Version ' + version)
+if (argv.version) return
 
 // Declare a session, pass arguments to it
 var session = new sessionClass(argv)
@@ -117,8 +119,8 @@ var appname = path.basename(__dirname)
 // Multiview server variables
 var hls_base = 'multiview'
 var multiview_stream_name = 'master.m3u8'
-if ( session.protection.content_protect ) multiview_stream_name += '?content_protect=' + session.protection.content_protect
 var multiview_url_path = '/' + hls_base + '/' + multiview_stream_name
+if ( session.protection.content_protect ) multiview_url_path += '?content_protect=' + session.protection.content_protect
 session.setMultiviewStreamURLPath(multiview_url_path)
 var ffmpeg_command
 var ffmpeg_status = false
@@ -158,11 +160,12 @@ app.get('/stream.m3u8', async function(req, res) {
     let streamURL
     let options = {}
     let urlArray = req.url.split('?')
-    if ( (urlArray.length == 1) || ((session.data.scan_mode == 'on') && req.query.team) || (!req.query.team && !req.query.src && !req.query.highlight_src && !req.query.type && !req.query.id && !req.query.mediaId && !req.query.contentId) ) {
+    if ( (urlArray.length == 1) || ((session.data.scan_mode == 'on') && req.query.team) || (!req.query.team && !req.query.src && !req.query.highlight_src && !req.query.event && !req.query.id && !req.query.mediaId && !req.query.contentId) ) {
       // load a sample encrypted HLS stream
       session.log('loading sample stream')
       options.resolution = 'adaptive'
       streamURL = SAMPLE_STREAM_URL
+      options.referer = 'https://hls-js.netlify.app/'
     } else {
       if ( req.query.resolution && (options.resolution == 'best') ) {
         options.resolution = VALID_RESOLUTIONS[1]
@@ -181,8 +184,8 @@ app.get('/stream.m3u8', async function(req, res) {
         streamURL = req.query.src
       } else if ( req.query.highlight_src ) {
         streamURL = req.query.highlight_src
-      } else if ( req.query.type && (req.query.type.toUpperCase() == 'BIGINNING') ) {
-        streamURL = await session.getBigInningStreamURL()
+      } else if ( req.query.event ) {
+        streamURL = await session.getEventStreamURL(req.query.event.toUpperCase())
       } else {
         if ( req.query.contentId ) {
           contentId = req.query.contentId
@@ -240,6 +243,11 @@ app.get('/stream.m3u8', async function(req, res) {
         }
       }
 
+      if ( req.query.referer ) {
+        options.referer = req.query.referer
+        session.debuglog('sending referer : ' + options.referer)
+      }
+
       getMasterPlaylist(streamURL, req, res, options)
     } else {
       session.log('failed to get streamURL : ' + req.url)
@@ -269,6 +277,11 @@ var getKey = function(url, headers, cb) {
   })
 }
 
+function getOriginFromURL(url) {
+  let pathArray = url.split('/')
+  return pathArray[0] + '//' + pathArray[2]
+}
+
 // Default respond function, for adjusting content-length and updating CORS headers
 var respond = function(proxy, res, body) {
   delete proxy.headers['content-length']
@@ -307,6 +320,15 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
   session.debuglog('getMasterPlaylist of streamURL : ' + streamURL)
   var req = function () {
     var headers = {}
+    var referer = false
+    var referer_parameter = ''
+    if ( options.referer ) {
+      referer = decodeURIComponent(options.referer)
+      headers.referer = referer
+      headers.origin = getOriginFromURL(referer)
+      session.debuglog('found stream referer  : ' + referer)
+      referer_parameter = '&referer=' + encodeURIComponent(options.referer)
+    }
     requestRetry(streamURL, headers, function(err, response) {
       if (err) return res.error(err)
 
@@ -314,6 +336,26 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
 
       var body = response.body.trim().split('\n')
 
+      // check if HLS
+      let hls_detected = false
+      for (var i=0; i<body.length; i++) {
+        if ( body[i] == '#EXTM3U' ) {
+          session.debuglog('hls detected')
+          hls_detected = true
+          break
+        } else if ( body[i] == '' ) {
+          session.debuglog('skipping blank lines at beginning of file')
+          continue
+        } else {
+          session.debuglog(body[i])
+          break
+        }
+      }
+      if ( !hls_detected ) {
+        session.log('not a valid hls stream')
+        return
+      }
+
       let resolution = options.resolution || VALID_RESOLUTIONS[0]
       let audio_track = options.audio_track || VALID_AUDIO_TRACKS[0]
       let audio_url = options.audio_url || ''
@@ -338,12 +380,13 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
       var audio_track_matched = false
       var frame_rate = '29.97'
       if ( (resolution != 'adaptive') && (resolution != 'none') ) {
-        if ( resolution.slice(4) === '60' ) {
+        if ( resolution.endsWith('p60') ) {
           frame_rate = '59.94'
+          resolution = resolution.slice(0, -3)
         }
-        resolution = resolution.slice(0, 3)
       }
 
+      var segment_playlist = false
       var segment_found = false
 
       body = body
@@ -352,12 +395,15 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
 
         // Check if segment playlist instead of master
         if ( line.startsWith('#EXTINF:') ) {
-          session.debuglog('segment playlist instead of master')
+          if ( !segment_playlist ) {
+            session.debuglog('segment playlist instead of master')
+            segment_playlist = true
+          }
           segment_found = true
           return line
         } else if ( segment_found ) {
           segment_found = false
-          return 'ts?url='+encodeURIComponent(url.resolve(streamURL, line.trim())) + content_protect
+          return 'ts?url='+encodeURIComponent(url.resolve(streamURL, line.trim())) + content_protect + referer_parameter
         }
 
         // Omit keyframe tracks
@@ -375,7 +421,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
           if ( audio_track_matched ) return
           if ( audio_url != '' ) {
             audio_track_matched = true
-            return '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="Alternate Audio",AUTOSELECT=YES,DEFAULT=YES,URI="' + audio_url + content_protect + '"'
+            return '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="Alternate Audio",AUTOSELECT=YES,DEFAULT=YES,URI="' + audio_url + content_protect + referer_parameter + '"'
           }
           if ( audio_track == 'none') return
           if ( (resolution == 'none') && (line.indexOf(',URI=') < 0) ) return
@@ -397,7 +443,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
                 if ( inning_number != VALID_INNING_NUMBER[0] ) newurl += '&inning_number=' + inning_number
                 if ( skip != VALID_SKIP[0] ) newurl += '&skip=' + skip
                 if ( contentId ) newurl += '&contentId=' + contentId
-                newurl += content_protect
+                newurl += content_protect + referer_parameter
                 if ( resolution == 'none' ) {
                   audio_track_matched = true
                   return line.replace(parsed[0],'') + "\n" + '#EXT-X-STREAM-INF:BANDWIDTH=50000,CODECS="mp4a.40.2",AUDIO="aac"' + "\n" + newurl
@@ -443,7 +489,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
           if ( inning_number != VALID_INNING_NUMBER[0] ) newurl += '&inning_number=' + inning_number
           if ( skip != VALID_SKIP[0] ) newurl += '&skip=' + skip
           if ( contentId ) newurl += '&contentId=' + contentId
-          newurl += content_protect
+          newurl += content_protect + referer_parameter
           return 'playlist?url='+newurl
         }
       })
@@ -477,6 +523,14 @@ app.get('/playlist', async function(req, res) {
   var u = req.query.url
   session.debuglog('playlist url : ' + u)
 
+  var referer = false
+  var referer_parameter = ''
+  if ( req.query.referer ) {
+    referer = decodeURIComponent(req.query.referer)
+    session.debuglog('found playlist referer : ' + referer)
+    referer_parameter = '&referer=' + encodeURIComponent(req.query.referer)
+  }
+
   var force_vod = req.query.force_vod || VALID_FORCE_VOD[0]
   var inning_half = req.query.inning_half || VALID_INNING_HALF[0]
   var inning_number = req.query.inning_number || VALID_INNING_NUMBER[0]
@@ -485,12 +539,37 @@ app.get('/playlist', async function(req, res) {
 
   var req = function () {
     var headers = {}
+    if ( referer ) {
+      headers.referer = referer
+      headers.origin = getOriginFromURL(referer)
+    }
     requestRetry(u, headers, function(err, response) {
       if (err) return res.error(err)
 
       //session.debuglog(response.body)
 
       var body = response.body.trim().split('\n')
+
+      // check if HLS
+      let hls_detected = false
+      for (var i=0; i<body.length; i++) {
+        if ( body[i] == '#EXTM3U' ) {
+          session.debuglog('hls detected')
+          hls_detected = true
+          break
+        } else if ( body[i] == '' ) {
+          session.debuglog('skipping blank lines at beginning of file')
+          continue
+        } else {
+          session.debuglog(body[i])
+          break
+        }
+      }
+      if ( !hls_detected ) {
+        session.log('not a valid hls stream')
+        return
+      }
+
       var key
       var iv
 
@@ -517,6 +596,9 @@ app.get('/playlist', async function(req, res) {
 
       body = body
       .map(function(line) {
+        // Skip blank lines
+        if (line.trim() == '') return null
+
         if ( ((skip != 'off') || (inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0])) && (typeof session.temp_cache[contentId] !== 'undefined') && (typeof session.temp_cache[contentId].inning_offsets !== 'undefined') ) {
           if ( skip_next ) {
             skip_next = false
@@ -579,10 +661,17 @@ app.get('/playlist', async function(req, res) {
         }
 
         if (line.indexOf('-KEY:METHOD=AES-128') > 0) {
+          session.debuglog('key line : ' + line)
           var parsed = line.match(/URI="([^"]+)"(?:,IV=(.+))?$/)
           if ( parsed ) {
             if ( parsed[1].substr(0,4) == 'http' ) key = parsed[1]
             else key = url.resolve(u, parsed[1])
+            session.debuglog('found key : ' + key)
+            if ( key.startsWith('data:;base64,') ) {
+              let newparsed = key.split(',')
+              key = newparsed[1]
+              session.debuglog('found new key : ' + key)
+            }
             if (parsed[2]) iv = parsed[2].slice(2).toLowerCase()
           }
           return null
@@ -590,8 +679,8 @@ app.get('/playlist', async function(req, res) {
 
         if (line[0] === '#') return line
 
-        if ( key ) return 'ts?url='+encodeURIComponent(url.resolve(u, line.trim()))+'&key='+encodeURIComponent(key)+'&iv='+encodeURIComponent(iv) + content_protect
-        else return 'ts?url='+encodeURIComponent(url.resolve(u, line.trim())) + content_protect
+        if ( key ) return 'ts?url='+encodeURIComponent(url.resolve(u, line.trim()))+'&key='+encodeURIComponent(key)+'&iv='+encodeURIComponent(iv) + content_protect + referer_parameter
+        else return 'ts?url='+encodeURIComponent(url.resolve(u, line.trim())) + content_protect + referer_parameter
       })
       .filter(function(line) {
         return line
@@ -625,23 +714,42 @@ app.get('/ts', async function(req, res) {
 
   var headers = {encoding:null}
 
+  if ( req.query.referer ) {
+    session.debuglog('found segment referer : ' + req.query.referer)
+    referer = decodeURIComponent(req.query.referer)
+    headers.referer = referer
+    headers.origin = getOriginFromURL(referer)
+  }
+
   requestRetry(u, headers, function(err, response) {
     if (err) return res.error(err)
     if (!req.query.key) return respond(response, res, response.body)
 
     //var ku = url.resolve(manifest, req.query.key)
     var ku = req.query.key
-    getKey(ku, headers, function(err, key) {
-      if (err) return res.error(err)
-
+    if ( ku.substr(0,4) != 'http' ) {
       var iv = Buffer.from(req.query.iv, 'hex')
       session.debuglog('iv : 0x'+req.query.iv)
 
+      let key = Buffer.from(ku, "base64")
+
       var dc = crypto.createDecipheriv('aes-128-cbc', key, iv)
       var buffer = Buffer.concat([dc.update(response.body), dc.final()])
 
       respond(response, res, buffer)
-    })
+    } else {
+      getKey(ku, headers, function(err, key) {
+        if (err) return res.error(err)
+
+        var iv = Buffer.from(req.query.iv, 'hex')
+        session.debuglog('iv : 0x'+req.query.iv)
+
+        var dc = crypto.createDecipheriv('aes-128-cbc', key, iv)
+        var buffer = Buffer.concat([dc.update(response.body), dc.final()])
+
+        respond(response, res, buffer)
+      })
+    }
   })
 })
 
@@ -872,6 +980,8 @@ app.get('/', async function(req, res) {
     }
     body += '</p>' + "\n"
 
+    body += '<p><span class="tooltip tinytext">* indicates a free game<span class="tooltiptext">Free games are available to anyone with an account, no subscription necessary. Blackouts still apply.</span></span></p>' + "\n"
+
     body += "<table>" + "\n"
 
     // Rename some parameters before display links
@@ -903,7 +1013,7 @@ app.get('/', async function(req, res) {
       let compareEnd = new Date(big_inning.end)
       compareEnd.setHours(compareEnd.getHours()+1)
       if ( (currentDate >= compareStart) && (currentDate < compareEnd) ) {
-        let querystring = '?type=biginning'
+        let querystring = '?event=biginning'
         let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION
         if ( resolution != VALID_RESOLUTIONS[0] ) querystring += '&resolution=' + resolution
         querystring += content_protect_b
@@ -921,6 +1031,10 @@ app.get('/', async function(req, res) {
 
       let awayteam = cache_data.dates[0].games[j].teams['away'].team.abbreviation
       let hometeam = cache_data.dates[0].games[j].teams['home'].team.abbreviation
+      if ( cache_data.dates[0].games[j].teams['home'].team.sport.name == 'Winter Leagues' ) {
+        awayteam = cache_data.dates[0].games[j].teams['away'].team.name
+        hometeam = cache_data.dates[0].games[j].teams['home'].team.name
+      }
 
       let teams = awayteam + " @ " + hometeam
       let pitchers = ""
@@ -996,6 +1110,9 @@ app.get('/', async function(req, res) {
       } else if ( cache_data.dates[0].games[j].gameUtils.isDelayed ) {
         state += "<br/>" + detailedState
       }
+      if ( cache_data.dates[0].games[j].teams['home'].team.sport.name == 'Winter Leagues' ) {
+        state += "<br/>" + cache_data.dates[0].games[j].teams['home'].team.league.name
+      }
 
       if ( cache_data.dates[0].games[j].doubleHeader != 'N'  ) {
         state += "<br/>Game " + cache_data.dates[0].games[j].gameNumber
@@ -1049,103 +1166,139 @@ app.get('/', async function(req, res) {
 
       body += "<tr><td>" + teams + pitchers + state + "</td>"
 
-      if ( ((typeof cache_data.dates[0].games[j].content.media) == 'undefined') || ((typeof cache_data.dates[0].games[j].content.media.epg) == 'undefined') ) {
-        body += "<td></td>"
-      } else {
+      // Check if Winter League game first
+      if ( cache_data.dates[0].games[j].teams['home'].team.sport.name == 'Winter Leagues' ) {
         body += "<td>"
-        for (var k = 0; k < cache_data.dates[0].games[j].content.media.epg.length; k++) {
-          let epgTitle = cache_data.dates[0].games[j].content.media.epg[k].title
-          if ( epgTitle == mediaType ) {
-            let lastStation
-            for (var x = 0; x < cache_data.dates[0].games[j].content.media.epg[k].items.length; x++) {
-              // check that pay TV authentication isn't required
-              if ( (mediaType == 'MLBTV') && ((cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState != 'MEDIA_ARCHIVE') || !cache_data.dates[0].games[j].gameUtils.isFinal) && (cache_data.dates[0].games[j].content.media.epg[k].items[x].foxAuthRequired || cache_data.dates[0].games[j].content.media.epg[k].items[x].tbsAuthRequired || cache_data.dates[0].games[j].content.media.epg[k].items[x].espnAuthRequired || cache_data.dates[0].games[j].content.media.epg[k].items[x].fs1AuthRequired || cache_data.dates[0].games[j].content.media.epg[k].items[x].mlbnAuthRequired) ) {
-                continue
+        if ( cache_data.dates[0].games[j].broadcasts ) {
+          for (var k = 0; k < cache_data.dates[0].games[j].broadcasts.length; k++) {
+            if ( (mediaType == 'MLBTV') && (cache_data.dates[0].games[j].broadcasts[k].name == 'MLB.TV') ) {
+              // Check if game should be live
+              let currentTime = new Date()
+              let startTime = new Date(cache_data.dates[0].games[j].gameDate)
+              startTime.setMinutes(startTime.getMinutes()-30)
+              let endTime = new Date(cache_data.dates[0].games[j].gameDate)
+              endTime.setHours(endTime.getHours()+4)
+              if ( (currentTime >= startTime) && (currentTime < endTime) ) {
+                let querystring
+                querystring = '?event=' + cache_data.dates[0].games[j].teams['home'].team.clubName.toLowerCase()
+                let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION + '&audio_track=' + DEFAULT_MULTIVIEW_AUDIO_TRACK
+                if ( resolution != VALID_RESOLUTIONS[0] ) querystring += '&resolution=' + resolution
+                if ( audio_track != VALID_AUDIO_TRACKS[0] ) querystring += '&audio_track=' + encodeURIComponent(audio_track)
+                querystring += content_protect_b
+                multiviewquerystring += content_protect_b
+                body += '<a href="' + thislink + querystring + '">' + cache_data.dates[0].games[j].broadcasts[k].name + '</a>'
+                body += '<input type="checkbox" value="' + server + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
+              } else {
+                body += cache_data.dates[0].games[j].broadcasts[k].name
               }
-              if ( ((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType) == 'undefined') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType.indexOf('IN_MARKET_') == -1) ) {
-                if ( ((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].language) == 'undefined') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].language == language) ) {
-                  let teamabbr
-                  if ( (((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType) != 'undefined') && (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType == 'NATIONAL')) || ((mediaType == 'MLBTV') && cache_data.dates[0].games[j].gameUtils.isPostSeason) ) {
-                    teamabbr = 'NATIONAL'
-                  } else {
-                    teamabbr = hometeam
-                    if ( cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType] == 'AWAY' ) {
-                      teamabbr = awayteam
-                    }
-                  }
-                  let station = cache_data.dates[0].games[j].content.media.epg[k].items[x].callLetters
-                  if ( (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ON') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ARCHIVE') || cache_data.dates[0].games[j].gameUtils.isFinal ) {
-                    game_started = true
-                    let mediaId = cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaId
-                    if ( (mediaType == 'MLBTV') && session.cache.media && session.cache.media[mediaId] && session.cache.media[mediaId].blackout && session.cache.media[mediaId].blackoutExpiry && (new Date(session.cache.media[mediaId].blackoutExpiry) > new Date()) ) {
-                      body += teamabbr + ': <s>' + station + '</s>'
+              break
+            }
+          }
+        }
+        body += "</td>"
+      } else {
+        // Begin MLB games
+        if ( ((typeof cache_data.dates[0].games[j].content.media) == 'undefined') || ((typeof cache_data.dates[0].games[j].content.media.epg) == 'undefined') ) {
+          body += "<td></td>"
+        } else {
+          body += "<td>"
+          for (var k = 0; k < cache_data.dates[0].games[j].content.media.epg.length; k++) {
+            let epgTitle = cache_data.dates[0].games[j].content.media.epg[k].title
+            if ( epgTitle == mediaType ) {
+              let lastStation
+              for (var x = 0; x < cache_data.dates[0].games[j].content.media.epg[k].items.length; x++) {
+                // check that pay TV authentication isn't required
+                if ( (mediaType == 'MLBTV') && ((cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState != 'MEDIA_ARCHIVE') || !cache_data.dates[0].games[j].gameUtils.isFinal) && (cache_data.dates[0].games[j].content.media.epg[k].items[x].foxAuthRequired || cache_data.dates[0].games[j].content.media.epg[k].items[x].tbsAuthRequired || cache_data.dates[0].games[j].content.media.epg[k].items[x].espnAuthRequired || cache_data.dates[0].games[j].content.media.epg[k].items[x].fs1AuthRequired || cache_data.dates[0].games[j].content.media.epg[k].items[x].mlbnAuthRequired) ) {
+                  continue
+                }
+                if ( ((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType) == 'undefined') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType.indexOf('IN_MARKET_') == -1) ) {
+                  if ( ((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].language) == 'undefined') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].language == language) ) {
+                    let teamabbr
+                    if ( (((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType) != 'undefined') && (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType == 'NATIONAL')) || ((mediaType == 'MLBTV') && cache_data.dates[0].games[j].gameUtils.isPostSeason) ) {
+                      teamabbr = 'NATIONAL'
                     } else {
-                      let querystring
-                      querystring = '?mediaId=' + mediaId
-                      let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION + '&audio_track=' + DEFAULT_MULTIVIEW_AUDIO_TRACK
-                      if ( linkType == 'embed' ) {
-                        if ( startFrom != 'Beginning' ) querystring += '&startFrom=' + startFrom
+                      teamabbr = hometeam
+                      if ( cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType] == 'AWAY' ) {
+                        teamabbr = awayteam
                       }
-                      if ( mediaType == 'MLBTV' ) {
-                        if ( inning_half != VALID_INNING_HALF[0] ) querystring += '&inning_half=' + inning_half
-                        if ( inning_number != '' ) querystring += '&inning_number=' + relative_inning
-                        if ( skip != 'off' ) querystring += '&skip=' + skip
-                        if ( skip_adjust != '0' ) querystring += '&skip_adjust=' + skip_adjust
-                        if ( (inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0]) || (skip != VALID_SKIP[0]) ) {
-                          let contentId = cache_data.dates[0].games[j].content.media.epg[k].items[x].contentId
-                          querystring += '&contentId=' + contentId
+                    }
+                    let station = cache_data.dates[0].games[j].content.media.epg[k].items[x].callLetters
+                    if ( cache_data.dates[0].games[j].content.media.freeGame ) {
+                      station += '*'
+                    }
+                    if ( (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ON') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ARCHIVE') || cache_data.dates[0].games[j].gameUtils.isFinal ) {
+                      game_started = true
+                      let mediaId = cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaId
+                      if ( (mediaType == 'MLBTV') && session.cache.media && session.cache.media[mediaId] && session.cache.media[mediaId].blackout && session.cache.media[mediaId].blackoutExpiry && (new Date(session.cache.media[mediaId].blackoutExpiry) > new Date()) ) {
+                        body += teamabbr + ': <s>' + station + '</s>'
+                      } else {
+                        let querystring
+                        querystring = '?mediaId=' + mediaId
+                        let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION + '&audio_track=' + DEFAULT_MULTIVIEW_AUDIO_TRACK
+                        if ( linkType == 'embed' ) {
+                          if ( startFrom != 'Beginning' ) querystring += '&startFrom=' + startFrom
                         }
-                        if ( resolution != VALID_RESOLUTIONS[0] ) querystring += '&resolution=' + resolution
-                        if ( audio_track != VALID_AUDIO_TRACKS[0] ) querystring += '&audio_track=' + encodeURIComponent(audio_track)
-                        // audio_url is disabled here, now used in multiview instead
-                        //if ( audio_url != '' ) querystring += '&audio_url=' + encodeURIComponent(audio_url)
-                      }
-                      if ( linkType == 'stream' ) {
-                        if ( cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ON' ) {
-                          if ( force_vod != VALID_FORCE_VOD[0] ) querystring += '&force_vod=' + force_vod
+                        if ( mediaType == 'MLBTV' ) {
+                          if ( inning_half != VALID_INNING_HALF[0] ) querystring += '&inning_half=' + inning_half
+                          if ( inning_number != '' ) querystring += '&inning_number=' + relative_inning
+                          if ( skip != 'off' ) querystring += '&skip=' + skip
+                          if ( skip_adjust != '0' ) querystring += '&skip_adjust=' + skip_adjust
+                          if ( (inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0]) || (skip != VALID_SKIP[0]) ) {
+                            let contentId = cache_data.dates[0].games[j].content.media.epg[k].items[x].contentId
+                            querystring += '&contentId=' + contentId
+                          }
+                          if ( resolution != VALID_RESOLUTIONS[0] ) querystring += '&resolution=' + resolution
+                          if ( audio_track != VALID_AUDIO_TRACKS[0] ) querystring += '&audio_track=' + encodeURIComponent(audio_track)
+                          // audio_url is disabled here, now used in multiview instead
+                          //if ( audio_url != '' ) querystring += '&audio_url=' + encodeURIComponent(audio_url)
                         }
-                      }
-                      querystring += content_protect_b
-                      multiviewquerystring += content_protect_b
-                      body += teamabbr + ': <a href="' + thislink + querystring + '">' + station + '</a>'
-                      if ( mediaType == 'MLBTV' ) {
-                        body += '<input type="checkbox" value="' + server + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
-                      }
-                      if ( resumeStatus ) {
-                        if ( resumeStatus == 'live' ) {
-                          if ( cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ARCHIVE' ) {
-                            body += '(1)'
-                          } else if ( cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ON' ) {
-                            body += '(2)'
+                        if ( linkType == 'stream' ) {
+                          if ( cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ON' ) {
+                            if ( force_vod != VALID_FORCE_VOD[0] ) querystring += '&force_vod=' + force_vod
                           }
-                        } else {
-                          if ( station == lastStation ) {
-                            body += '(2)'
+                        }
+                        querystring += content_protect_b
+                        multiviewquerystring += content_protect_b
+                        body += teamabbr + ': <a href="' + thislink + querystring + '">' + station + '</a>'
+                        if ( mediaType == 'MLBTV' ) {
+                          body += '<input type="checkbox" value="' + server + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
+                        }
+                        if ( resumeStatus ) {
+                          if ( resumeStatus == 'live' ) {
+                            if ( cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ARCHIVE' ) {
+                              body += '(1)'
+                            } else if ( cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ON' ) {
+                              body += '(2)'
+                            }
                           } else {
-                            body += '(1)'
-                            lastStation = station
+                            if ( station == lastStation ) {
+                              body += '(2)'
+                            } else {
+                              body += '(1)'
+                              lastStation = station
+                            }
                           }
                         }
+                        body += ', '
                       }
-                      body += ', '
+                    } else {
+                      body += teamabbr + ': ' + station + ', '
                     }
-                  } else {
-                    body += teamabbr + ': ' + station + ', '
                   }
                 }
               }
+              break
             }
-            break
           }
-        }
-        if ( body.substr(-2) == ', ' ) {
-          body = body.slice(0, -2)
-        }
-        if ( (mediaType == 'MLBTV') && (game_started) ) {
-          body += '<br/><a href="javascript:showhighlights(\'' + cache_data.dates[0].games[j].gamePk + '\',\'' + gameDate + '\')">Highlights</a>'
-        }
-        if ( body.substr(-2) == ', ' ) {
-          body = body.slice(0, -2)
+          if ( body.substr(-2) == ', ' ) {
+            body = body.slice(0, -2)
+          }
+          if ( (mediaType == 'MLBTV') && (game_started) ) {
+            body += '<br/><a href="javascript:showhighlights(\'' + cache_data.dates[0].games[j].gamePk + '\',\'' + gameDate + '\')">Highlights</a>'
+          }
+          if ( body.substr(-2) == ', ' ) {
+            body = body.slice(0, -2)
+          }
         }
         body += "</td>"
         body += "</tr>" + "\n"
@@ -1237,7 +1390,9 @@ app.get('/', async function(req, res) {
 
     body += '<p><span class="tooltip">Exclude a team + national<span class="tooltiptext">This is useful for excluding games you may be blacked out from. Excluding a team will exclude every game involving that team. National refers to USA national TV broadcasts.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&excludeTeams=ari,national' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&excludeTeams=ari,national' + content_protect_b + '">guide.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.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=biginning' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=biginning' + content_protect_b + '">guide.xml</a></p>' + "\n"
+    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="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=lidom' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=lidom' + content_protect_b + '">guide.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. Live stream only, does not support starting from the beginning.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=biginning' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=biginning' + content_protect_b + '">guide.xml</a></p>' + "\n"
 
     body += '<p><span class="tooltip">Include (or exclude) Multiview<span class="tooltiptext">Requires starting and stopping the multiview stream from the web interface.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=multiview' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=multiview' + content_protect_b + '">guide.xml</a></p>' + "\n"
 
@@ -1280,6 +1435,9 @@ app.get('/', async function(req, res) {
 
     body += '<p><span class="tooltip">Bookmarklets for MLB.com<span class="tooltiptext">If you watch at MLB.com, drag these bookmarklets to your bookmarks toolbar and use them to hide parts of the interface.</span></span>: <a href="javascript:(function(){let x=document.querySelector(\'#mlbtv-stats-panel\');if(x.style.display==\'none\'){x.style.display=\'initial\';}else{x.style.display=\'none\';}})();">Boxscore</a> | <a href="javascript:(function(){let x=document.querySelector(\'.mlbtv-header-container\');if(x.style.display==\'none\'){let y=document.querySelector(\'.mlbtv-players-container\');y.style.display=\'none\';x.style.display=\'initial\';setTimeout(function(){y.style.display=\'initial\';},15);}else{x.style.display=\'none\';}})();">Scoreboard</a> | <a href="javascript:(function(){let x=document.querySelector(\'.mlbtv-container--footer\');if(x.style.display==\'none\'){let y=document.querySelector(\'.mlbtv-players-container\');y.style.display=\'none\';x.style.display=\'initial\';setTimeout(function(){y.style.display=\'initial\';},15);}else{x.style.display=\'none\';}})();">Linescore</a> | <a href="javascript:(function(){let x=document.querySelector(\'#mlbtv-stats-panel\');if(x.style.display==\'none\'){x.style.display=\'initial\';}else{x.style.display=\'none\';}x=document.querySelector(\'.mlbtv-header-container\');if(x.style.display==\'none\'){x.style.display=\'initial\';}else{x.style.display=\'none\';}x=document.querySelector(\'.mlbtv-container--footer\');if(x.style.display==\'none\'){let y=document.querySelector(\'.mlbtv-players-container\');y.style.display=\'none\';x.style.display=\'initial\';setTimeout(function(){y.style.display=\'initial\';},15);}else{x.style.display=\'none\';}})();">All</a></p>' + "\n"
 
+    // Print version
+    body += '<p class="tinytext">Version ' + version + '</p>' + "\n"
+
     // Datepicker functions
     body += '<script>var datePicker=document.getElementById("gameDate");function changeDate(e){date=datePicker.value;reload()}function removeDate(e){datePicker.removeEventListener("change",changeDate,false);datePicker.addEventListener("blur",changeDate,false);if(e.keyCode===13){date=datePicker.value;reload()}}datePicker.addEventListener("change",changeDate,false);datePicker.addEventListener("keypress",removeDate,false)</script>' + "\n"
 
@@ -1749,7 +1907,6 @@ function start_multiview_stream(streams, sync, dvr, faster, audio_url, audio_url
       ffmpeg_command.addOutputOption('-c:v', 'copy')
     }
     ffmpeg_command.addOutputOption('-c:a', 'aac')
-    .addOutputOption('-strict', 'experimental')
     .addOutputOption('-sn')
     .addOutputOption('-t', '6:00:00')
     .addOutputOption('-f', 'hls')

package/package.json

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