mlbserver 2024.8.2 → 2024.10.0-8.2

package/index.js

@@ -23,20 +23,21 @@ const sessionClass = require('./session.js')
 const VALID_DATES = [ 'today', 'yesterday' ]
 const YESTERDAY_UTC_HOURS = 14 // UTC hours (EST + 4) to change home page default date from yesterday to today
 const VALID_MEDIA_TYPES = [ 'Video', 'Audio', 'Spanish' ]
-const VALID_LINK_TYPES = [ 'Embed', 'Stream', 'Chromecast', 'Advanced' ]
+const VALID_LINK_TYPES = [ 'Embed', 'Stream', 'Chromecast', 'Advanced', 'Download' ]
 const VALID_START_FROM = [ 'Beginning', 'Live' ]
 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', 'English Radio', 'Radio Española', 'Alternate English', 'Alternate Spanish', 'none' ]
-const DISPLAY_AUDIO_TRACKS = [ 'all', 'TV', 'Radio', 'Spanish', 'Alt.', 'Alt. Spanish', '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
 const VALID_PAD = [ 'off', 'on' ]
 const VALID_FORCE_VOD = [ 'off', 'on' ]
 const VALID_SCAN_MODES = [ 'off', 'on' ]
@@ -221,6 +222,8 @@ app.get('/clearcache', async function(req, res) {
 
     session.log('Clearing cache...')
     session.clear_cache()
+    session.log('Clearing session...')
+    session.clear_session_data()
     session = new sessionClass(argv)
 
     let server = 'http://' + req.headers.host
@@ -338,10 +341,12 @@ app.get('/stream.m3u8', async function(req, res) {
         if ( gamePk ) {
           options.gamePk = gamePk
 
+          let skip_adjust = parseInt(req.query.skip_adjust) || DEFAULT_SKIP_ADJUST
+
           let skip_type = VALID_SKIP.indexOf(options.skip)
           // for skip other than commercial skip, look up markers
           if ( skip_type != 4 ) {
-            await session.getSkipMarkers(gamePk, skip_type, options.inning_number, options.inning_half, streamURL, streamURLToken)
+            await session.getSkipMarkers(gamePk, skip_type, options.inning_number, options.inning_half, streamURL, streamURLToken, skip_adjust)
           }
         }
       }
@@ -455,6 +460,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
       let inning_half = options.inning_half || VALID_INNING_HALF[0]
       let inning_number = options.inning_number || VALID_INNING_NUMBER[0]
       let skip = options.skip || VALID_SKIP[0]
+      let skip_adjust = options.skip_adjust || DEFAULT_SKIP_ADJUST
       let pad = options.pad || VALID_PAD[0]
       let gamePk = options.gamePk || false
 
@@ -530,19 +536,20 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
           // 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] ) {
+            if ( (audio_track == VALID_AUDIO_TRACKS[1]) || (audio_track == VALID_AUDIO_TRACKS[6]) ) {
               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]) ) {
-              // if user specified home radio or home Spanish audio track, check if this one matches
-              if ( (audio_track == VALID_AUDIO_TRACKS[2]) || (audio_track == VALID_AUDIO_TRACKS[3]) ) {
+            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 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)+'"') ) {
                   audio_track_matched = true
+                  line = line.replace('DEFAULT=NO','DEFAULT=YES')
                   line = line.replace('AUTOSELECT=NO','AUTOSELECT=YES')
                   if ( !line.includes(',DEFAULT=YES') ) line = line.replace('AUTOSELECT=YES','AUTOSELECT=YES,DEFAULT=YES')
                 } else {
@@ -559,6 +566,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
                   if ( inning_half != VALID_INNING_HALF[0] ) newurl += '&inning_half=' + inning_half
                   if ( inning_number != VALID_INNING_NUMBER[0] ) newurl += '&inning_number=' + inning_number
                   if ( skip != VALID_SKIP[0] ) newurl += '&skip=' + skip
+                  if ( skip_adjust != DEFAULT_SKIP_ADJUST ) newurl += '&skip_adjust=' + skip_adjust
                   if ( pad != VALID_PAD[0] ) newurl += '&pad=' + pad
                   if ( gamePk ) newurl += '&gamePk=' + gamePk
                   newurl += content_protect + referer_parameter + token_parameter
@@ -626,8 +634,10 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
           if ( inning_half != VALID_INNING_HALF[0] ) newurl += '&inning_half=' + inning_half
           if ( inning_number != VALID_INNING_NUMBER[0] ) newurl += '&inning_number=' + inning_number
           if ( skip != VALID_SKIP[0] ) newurl += '&skip=' + skip
+          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[6] ) newurl += '&park_audio=true'
           newurl += content_protect + referer_parameter + token_parameter
           return '/playlist?url='+newurl
         }
@@ -681,8 +691,10 @@ app.get('/playlist', async function(req, res) {
   var inning_half = req.query.inning_half || VALID_INNING_HALF[0]
   var inning_number = req.query.inning_number || VALID_INNING_NUMBER[0]
   var skip = req.query.skip || VALID_SKIP[0]
+  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 park_audio = req.query.park_audio || false
 
   var req = function () {
     var headers = {}
@@ -807,6 +819,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)
 
+        // park audio
+        if ( park_audio ) {
+          newline = 'download.html?park_audio=true&src=' + encodeURIComponent('http://127.0.0.1:' + session.data.port + newline) + content_protect
+        }
+
         return newline
       })
       .filter(function(line) {
@@ -1045,10 +1062,10 @@ app.get('/gamechangerplaylist', async function(req, res) {
       }
       session.temp_cache.gamechanger[id].lastAccess = gamechangerAccess
 
-      if ( !session.temp_cache.gamechanger.start || (gamechangerAccess < session.temp_cache.gamechanger.start) || !session.temp_cache.gamechanger.end || (gamechangerAccess > session.temp_cache.gamechanger.end) ) {
+      /*if ( !session.temp_cache.gamechanger.start || (gamechangerAccess < session.temp_cache.gamechanger.start) || !session.temp_cache.gamechanger.end || (gamechangerAccess > session.temp_cache.gamechanger.end) ) {
         session.log(game_changer_title + 'outside of games starting/ending, skipping')
         respond(GAMECHANGER_RESPONSE_HEADERS, res, Buffer.from(''))
-      } else {
+      } else {*/
         let streamURL
         let streamURLToken
         let discontinuity = false
@@ -1164,7 +1181,7 @@ app.get('/gamechangerplaylist', async function(req, res) {
             respond(GAMECHANGER_RESPONSE_HEADERS, res, Buffer.from(session.temp_cache.gamechanger[id].playlist[resolution]))
           }
         }
-      }
+      //}
     }
 
     return req()
@@ -1329,6 +1346,10 @@ app.get('/', async function(req, res) {
     if ( req.query.skip ) {
       skip = req.query.skip
     }
+    var skip_adjust = DEFAULT_SKIP_ADJUST
+    if ( req.query.skip_adjust ) {
+      skip_adjust = req.query.skip_adjust
+    }
     var pad = VALID_PAD[0]
     if ( req.query.pad ) {
       pad = req.query.pad
@@ -1361,16 +1382,16 @@ app.get('/', async function(req, res) {
     body += '</style><script type="text/javascript">' + "\n";
 
     // Define option variables in page
-    body += 'var date="' + gameDate + '";var level="' + level + '";var org="' + org + '";var mediaType="' + mediaType + '";var resolution="' + resolution + '";var audio_track="' + audio_track + '";var force_vod="' + force_vod + '";var inning_half="' + inning_half + '";var inning_number="' + inning_number + '";var skip="' + skip + '";var pad="' + pad + '";var linkType="' + linkType + '";var startFrom="' + startFrom + '";var scores="' + scores + '";var controls="' + controls + '";var scan_mode="' + scan_mode + '";var content_protect="' + content_protect + '";' + "\n"
+    body += 'var date="' + gameDate + '";var level="' + level + '";var org="' + org + '";var mediaType="' + mediaType + '";var resolution="' + resolution + '";var audio_track="' + audio_track + '";var force_vod="' + force_vod + '";var inning_half="' + inning_half + '";var inning_number="' + inning_number + '";var skip="' + skip + '";var skip_adjust="' + skip_adjust + '";var pad="' + pad + '";var linkType="' + linkType + '";var startFrom="' + startFrom + '";var scores="' + scores + '";var controls="' + controls + '";var scan_mode="' + scan_mode + '";var content_protect="' + content_protect + '";' + "\n"
 
     // Reload function, called after options change
-    body += 'var defaultDate="' + today + '";var curDate=new Date();var utcHours=curDate.getUTCHours();if ((utcHours >= ' + todayUTCHours + ') && (utcHours < ' + YESTERDAY_UTC_HOURS + ')){defaultDate="' + yesterday + '"}function reload(){var newurl="/?";if (date != defaultDate){var urldate=date;if (date == "' + today + '"){urldate="today"}else if (date == "' + yesterday + '"){urldate="yesterday"}newurl+="date="+urldate+"&"}if (level != "' + default_level + '"){newurl+="level="+encodeURIComponent(level)+"&"}if (org != "All"){newurl+="org="+encodeURIComponent(org)+"&"}if (mediaType != "' + VALID_MEDIA_TYPES[0] + '"){newurl+="mediaType="+mediaType+"&"}if (mediaType=="Video"){if (resolution != "' + VALID_RESOLUTIONS[0] + '"){newurl+="resolution="+resolution+"&"}if (audio_track != "' + VALID_AUDIO_TRACKS[0] + '"){newurl+="audio_track="+encodeURIComponent(audio_track)+"&"}else if (resolution == "none"){newurl+="audio_track="+encodeURIComponent("' + VALID_AUDIO_TRACKS[2] + '")+"&"}if (inning_half != "' + VALID_INNING_HALF[0] + '"){newurl+="inning_half="+inning_half+"&"}if (inning_number != "' + VALID_INNING_NUMBER[0] + '"){newurl+="inning_number="+inning_number+"&"}if (skip != "' + VALID_SKIP[0] + '"){newurl+="skip="+skip+"&";}}if (pad != "' + VALID_PAD[0] + '"){newurl+="pad="+pad+"&";}if (linkType != "' + VALID_LINK_TYPES[0] + '"){newurl+="linkType="+linkType+"&"}if (linkType=="' + VALID_LINK_TYPES[0] + '"){if (startFrom != "' + VALID_START_FROM[0] + '"){newurl+="startFrom="+startFrom+"&"}if (controls != "' + VALID_CONTROLS[0] + '"){newurl+="controls="+controls+"&"}}if (linkType=="Stream"){if (force_vod != "' + VALID_FORCE_VOD[0] + '"){newurl+="force_vod="+force_vod+"&"}}if (scores != "' + VALID_SCORES[0] + '"){newurl+="scores="+scores+"&"}if (scan_mode != "' + session.data.scan_mode + '"){newurl+="scan_mode="+scan_mode+"&"}if (content_protect != ""){newurl+="content_protect="+content_protect+"&"}window.location=newurl.substring(0,newurl.length-1)}' + "\n"
+    body += 'var defaultDate="' + today + '";var curDate=new Date();var utcHours=curDate.getUTCHours();if ((utcHours >= ' + todayUTCHours + ') && (utcHours < ' + YESTERDAY_UTC_HOURS + ')){defaultDate="' + yesterday + '"}function reload(){var newurl="/?";if (date != defaultDate){var urldate=date;if (date == "' + today + '"){urldate="today"}else if (date == "' + yesterday + '"){urldate="yesterday"}newurl+="date="+urldate+"&"}if (level != "' + default_level + '"){newurl+="level="+encodeURIComponent(level)+"&"}if (org != "All"){newurl+="org="+encodeURIComponent(org)+"&"}if (mediaType != "' + VALID_MEDIA_TYPES[0] + '"){newurl+="mediaType="+mediaType+"&"}if (mediaType=="Video"){if (resolution != "' + VALID_RESOLUTIONS[0] + '"){newurl+="resolution="+resolution+"&"}if (audio_track != "' + VALID_AUDIO_TRACKS[0] + '"){newurl+="audio_track="+encodeURIComponent(audio_track)+"&"}else if (resolution == "none"){newurl+="audio_track="+encodeURIComponent("' + VALID_AUDIO_TRACKS[2] + '")+"&"}if (inning_half != "' + VALID_INNING_HALF[0] + '"){newurl+="inning_half="+inning_half+"&"}if (inning_number != "' + VALID_INNING_NUMBER[0] + '"){newurl+="inning_number="+inning_number+"&"}if (skip != "' + VALID_SKIP[0] + '"){newurl+="skip="+skip+"&";if (skip_adjust != "' + DEFAULT_SKIP_ADJUST + '"){newurl+="skip_adjust="+skip_adjust+"&"}}}if (pad != "' + VALID_PAD[0] + '"){newurl+="pad="+pad+"&";}if (linkType != "' + VALID_LINK_TYPES[0] + '"){newurl+="linkType="+linkType+"&"}if (linkType=="' + VALID_LINK_TYPES[0] + '"){if (startFrom != "' + VALID_START_FROM[0] + '"){newurl+="startFrom="+startFrom+"&"}if (controls != "' + VALID_CONTROLS[0] + '"){newurl+="controls="+controls+"&"}}if (linkType=="Stream"){if (force_vod != "' + VALID_FORCE_VOD[0] + '"){newurl+="force_vod="+force_vod+"&"}}if (scores != "' + VALID_SCORES[0] + '"){newurl+="scores="+scores+"&"}if (scan_mode != "' + session.data.scan_mode + '"){newurl+="scan_mode="+scan_mode+"&"}if (content_protect != ""){newurl+="content_protect="+content_protect+"&"}window.location=newurl.substring(0,newurl.length-1)}' + "\n"
 
     // Ajax function for multiview and highlights
     body += 'function makeGETRequest(url, callback){var request=new XMLHttpRequest();request.onreadystatechange=function(){if (request.readyState==4 && request.status==200){callback(request.responseText)}};request.open("GET", url);request.send();}' + "\n"
 
     // Multiview functions
-    body += 'var excludeTeams=[];function parsemultiviewresponse(responsetext){if (responsetext == "started"){setTimeout(function(){document.getElementById("startmultiview").innerHTML="Restart";document.getElementById("stopmultiview").innerHTML="Stop"},15000)}else if (responsetext == "stopped"){setTimeout(function(){document.getElementById("stopmultiview").innerHTML="Stopped";document.getElementById("startmultiview").innerHTML="Start"},3000)}else{alert(responsetext)}}function addmultiview(e, teams=[], excludes=[]){var newvalue=e.value;for(var i=1;i<=4;i++){var valuefound = false;var oldvalue="";if(!e.checked){oldvalue=e.value;newvalue=""}if ((document.getElementById("multiview" + i).value == oldvalue) || ((oldvalue != "") && (document.getElementById("multiview" + i).value.startsWith(oldvalue)))){if ((newvalue != "") && (excludes.length > 0)){newvalue+="&excludeTeams="+excludeTeams.toString()}document.getElementById("multiview" + i).value=newvalue;valuefound=true;break}}if(e.checked && !valuefound){e.checked=false}for(var i=0;i<teams.length;i++){if(e.checked){excludeTeams.push(teams[i])}else{var index=excludeTeams.indexOf(teams[i]);if (index !== -1){excludeTeams.splice(index,1)}}}}function startmultiview(e){var count=0;var getstr="";for(var i=1;i<=4;i++){if (document.getElementById("multiview"+i).value != ""){count++;getstr+="streams="+encodeURIComponent(document.getElementById("multiview"+i).value)+"&sync="+encodeURIComponent(document.getElementById("sync"+i).value)+"' + content_protect_b + '"+"&"}}if((count >= 1) && (count <= 4)){if (document.getElementById("faster").checked){getstr+="faster=true&dvr=true&"}else if (document.getElementById("dvr").checked){getstr+="dvr=true&"}if (document.getElementById("reencode").checked){getstr+="reencode=true&"}if (document.getElementById("park_audio").checked){getstr+="park_audio=true&"}if (document.getElementById("audio_url").value != ""){getstr+="audio_url="+encodeURIComponent(document.getElementById("audio_url").value)+"&";if (document.getElementById("audio_url_seek").value != "0"){getstr+="audio_url_seek="+encodeURIComponent(document.getElementById("audio_url_seek").value)}}e.innerHTML="starting...";makeGETRequest("/multiview?"+getstr, parsemultiviewresponse)}else{alert("Multiview requires between 1-4 streams to be selected")}return false}function stopmultiview(e){e.innerHTML="stopping...";makeGETRequest("/multiview", parsemultiviewresponse);return false}' + "\n"
+    body += 'var excludeTeams=[];function parsemultiviewresponse(responsetext){if (responsetext == "started"){setTimeout(function(){document.getElementById("startmultiview").innerHTML="Restart";document.getElementById("stopmultiview").innerHTML="Stop"},15000)}else if (responsetext == "stopped"){setTimeout(function(){document.getElementById("stopmultiview").innerHTML="Stopped";document.getElementById("startmultiview").innerHTML="Start"},3000)}else{alert(responsetext)}}function addmultiview(e, teams=[], excludes=[]){var newvalue=e.value;for(var i=1;i<=4;i++){var valuefound = false;var oldvalue="";if(!e.checked){oldvalue=e.value;newvalue=""}if ((document.getElementById("multiview" + i).value == oldvalue) || ((oldvalue != "") && (document.getElementById("multiview" + i).value.startsWith(oldvalue)))){if ((newvalue != "") && (excludes.length > 0)){newvalue+="&excludeTeams="+excludeTeams.toString()}document.getElementById("multiview" + i).value=newvalue;valuefound=true;break}}if(e.checked && !valuefound){e.checked=false}for(var i=0;i<teams.length;i++){if(e.checked){excludeTeams.push(teams[i])}else{var index=excludeTeams.indexOf(teams[i]);if (index !== -1){excludeTeams.splice(index,1)}}}}function startmultiview(e){var count=0;var getstr="";for(var i=1;i<=4;i++){if (document.getElementById("multiview"+i).value != ""){count++;getstr+="streams="+encodeURIComponent(document.getElementById("multiview"+i).value)+"&sync="+encodeURIComponent(document.getElementById("sync"+i).value)+"' + content_protect_b + '"+"&"}}if((count >= 1) && (count <= 4)){if (document.getElementById("faster").checked){getstr+="faster=true&dvr=true&"}else if (document.getElementById("dvr").checked){getstr+="dvr=true&"}if (document.getElementById("reencode").checked){getstr+="reencode=true&"}if (document.getElementById("park_audio").checked){getstr+="park_audio=true&"}if (document.getElementById("audio_url").value != ""){getstr+="audio_url="+encodeURIComponent(document.getElementById("audio_url").value)+"&";if (document.getElementById("audio_url_seek").value != "0"){getstr+="audio_url_seek="+encodeURIComponent(document.getElementById("audio_url_seek").value)}}e.innerHTML="starting...";makeGETRequest("/multiview?"+getstr, parsemultiviewresponse)}else{alert("Multiview requires between 1-4 streams to be selected")}return false}function stopmultiview(e){e.innerHTML="stopping...";makeGETRequest("/multiview' + content_protect_a + '", parsemultiviewresponse);return false}' + "\n"
 
     // Function to switch URLs to stream URLs, where necessary
     body += 'function stream_substitution(url){return url.replace(/\\/([a-zA-Z]+\.html)/,"/stream.m3u8")}' + "\n"
@@ -1417,7 +1438,7 @@ app.get('/', async function(req, res) {
     }
     body += '</p>' + "\n"
 
-    body += '<p><span class="tooltip">Link Type<span class="tooltiptext">Embed will play in your browser (with AirPlay support), Stream will give you a stream URL to open directly in media players like Kodi or VLC, Chromecast is a desktop browser-based casting site, and Advanced will play in your desktop browser with some extra tools and debugging information (Advanced may require you to disable insecure / mixed content blocking in your browser).<br><br>NOTE: Chromecast may not be able to resolve local domain names; if so, you can simply access this page (and thus the streams) using an IP address instead.</span></span>: '
+    body += '<p><span class="tooltip">Link Type<span class="tooltiptext">Embed will play in your browser (with AirPlay support), Stream will give you a stream URL to open directly in media players like Kodi or VLC, Chromecast is a desktop browser-based casting site, Advanced will play in your desktop browser with some extra tools and debugging information (Advanced may require you to disable insecure / mixed content blocking in your browser), and Download will prompt your browser to save the stream to a TS (Transport Stream) file.<br><br>NOTE: Chromecast may not be able to resolve local domain names; if so, you can simply access this page (and thus the streams) using an IP address instead.</span></span>: '
     for (var i = 0; i < VALID_LINK_TYPES.length; i++) {
       body += '<button '
       if ( linkType == VALID_LINK_TYPES[i] ) body += 'class="default" '
@@ -1484,7 +1505,7 @@ app.get('/', async function(req, res) {
     if ( mediaType == VALID_MEDIA_TYPES[0] ) {
       mediaType = 'MLBTV'
     } else if ( mediaType == VALID_MEDIA_TYPES[2] ) {
-      mediaType = VALID_MEDIA_TYPES[1]
+      //mediaType = VALID_MEDIA_TYPES[1]
       language = 'es'
     }
     if ( mediaType == VALID_MEDIA_TYPES[1] ) {
@@ -1518,11 +1539,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[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
@@ -1546,7 +1569,7 @@ app.get('/', async function(req, res) {
       }*/
 
       if ( (gameDate >= today) && cache_data.dates && cache_data.dates[0] && cache_data.dates[0].games && (cache_data.dates[0].games.length > 0) ) {
-        blackouts = await session.get_blackout_games(cache_data.dates[0].games, true)
+        blackouts = await session.get_blackout_games(cache_data.dates[0].date, true)
       }
 
       // Big Inning
@@ -1574,11 +1597,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[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'
         }
@@ -1605,8 +1630,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[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'
           }
@@ -1624,14 +1652,18 @@ app.get('/', async function(req, res) {
         let awayteam = cache_data.dates[0].games[j].teams['away'].team.abbreviation
         let awayteam_abbr
         if ( cache_data.dates[0].games[j].teams['away'].team.sport.name != 'Major League Baseball' ) {
-          awayteam = cache_data.dates[0].games[j].teams['away'].team.shortName + ' (' + session.getParent(cache_data.dates[0].games[j].teams['away'].team.parentOrgName) + ')'
+          awayteam = cache_data.dates[0].games[j].teams['away'].team.shortName
+          let parentOrgName = cache_data.dates[0].games[j].teams['away'].team.parentOrgName
+          if (parentOrgName != 'Office of the Commissioner') awayteam += ' (' + session.getParent(parentOrgName) + ')'
           awayteam_abbr = cache_data.dates[0].games[j].teams['away'].team.abbreviation
           awayteam_level = session.getLevelNameFromSportId(cache_data.dates[0].games[j].teams['away'].team.sport.id)
         }
         let hometeam = cache_data.dates[0].games[j].teams['home'].team.abbreviation
         let hometeam_abbr
         if ( cache_data.dates[0].games[j].teams['home'].team.sport.name != 'Major League Baseball' ) {
-          hometeam = cache_data.dates[0].games[j].teams['home'].team.shortName + ' (' + session.getParent(cache_data.dates[0].games[j].teams['home'].team.parentOrgName) + ')'
+          hometeam = cache_data.dates[0].games[j].teams['home'].team.shortName
+          let parentOrgName = cache_data.dates[0].games[j].teams['home'].team.parentOrgName
+          if (parentOrgName != 'Office of the Commissioner') hometeam += ' (' + session.getParent(parentOrgName) + ')'
           hometeam_abbr = cache_data.dates[0].games[j].teams['home'].team.abbreviation
           hometeam_level = session.getLevelNameFromSportId(cache_data.dates[0].games[j].teams['home'].team.sport.id)
         }
@@ -1726,8 +1758,11 @@ app.get('/', async function(req, res) {
           state += "<br/>" + detailedState
         }
 
+        var filename = gameDate + ' ' + teams + ' '
+
         if ( cache_data.dates[0].games[j].doubleHeader != 'N'  ) {
           state += "<br/>Game " + cache_data.dates[0].games[j].gameNumber
+          filename += 'Game ' + cache_data.dates[0].games[j].gameNumber + ' '
         }
         if ( cache_data.dates[0].games[j].description ) {
           state += "<br/>" + cache_data.dates[0].games[j].description
@@ -1824,7 +1859,11 @@ app.get('/', async function(req, res) {
                 startTime.setMinutes(startTime.getMinutes()-30)
                 if ( (currentTime >= startTime) ) {
                   let querystring
-                  querystring = '?gamePk=' + gamePk
+                  if ( cache_data.dates[0].games[j].teams['home'].team.league.id == session.getLidomId() ) {
+                    querystring = '?event=' + encodeURIComponent(cache_data.dates[0].games[j].teams['home'].team.clubName.toUpperCase())
+                  } else {
+                    querystring = '?gamePk=' + gamePk
+                  }
                   let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION
                   if ( resolution != VALID_RESOLUTIONS[0] ) querystring += '&resolution=' + resolution
                   if ( linkType == VALID_LINK_TYPES[0] ) {
@@ -1835,7 +1874,7 @@ app.get('/', async function(req, res) {
                     if ( inning_half != VALID_INNING_HALF[0] ) querystring += '&inning_half=' + inning_half
                     if ( inning_number != VALID_INNING_NUMBER[0] ) querystring += '&inning_number=' + relative_inning
                     if ( skip != VALID_SKIP[0] ) querystring += '&skip=' + skip
-                    //if ( skip_adjust != DEFAULT_SKIP_ADJUST ) querystring += '&skip_adjust=' + skip_adjust
+                    if ( skip_adjust != DEFAULT_SKIP_ADJUST ) querystring += '&skip_adjust=' + skip_adjust
                   }
                   if ( pad != VALID_PAD[0] ) querystring += '&pad=' + pad
                   if ( linkType == VALID_LINK_TYPES[1] ) {
@@ -1844,11 +1883,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[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
                 }
@@ -1898,8 +1939,6 @@ app.get('/', async function(req, res) {
                         body += ' (~' + blackouts[gamePk].blackoutExpiry.toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + ')'
                       }
                       body += '</span></span>'
-                    } else if ( (station == 'FOX') ) {
-                      body += '<span class="tooltip">' + teamabbr + '<span class="tooltiptext">Regional FOX game</span></span>'
                     } else {
                       body += teamabbr
                     }
@@ -1927,6 +1966,7 @@ app.get('/', async function(req, res) {
                           if ( inning_half != VALID_INNING_HALF[0] ) querystring += '&inning_half=' + inning_half
                           if ( inning_number != VALID_INNING_NUMBER[0] ) querystring += '&inning_number=' + relative_inning
                           if ( skip != VALID_SKIP[0] ) querystring += '&skip=' + skip
+                          if ( skip_adjust != DEFAULT_SKIP_ADJUST ) querystring += '&skip_adjust=' + skip_adjust
                           if ( (inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0]) || (skip != VALID_SKIP[0]) ) {
                             querystring += '&gamePk=' + cache_data.dates[0].games[j].gamePk
                           }
@@ -1938,6 +1978,8 @@ 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[4] ) {
+                          querystring += '&filename=' + filename + station
                         }
                         querystring += content_protect_b
                         multiviewquerystring += content_protect_b
@@ -1949,7 +1991,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 += '('
@@ -2053,6 +2095,9 @@ app.get('/', async function(req, res) {
           if ( skip == VALID_SKIP[i] ) body += 'class="default" '
           body += 'onclick="skip=\'' + VALID_SKIP[i] + '\';reload()">' + VALID_SKIP[i] + '</button> '
         }
+        if ( skip != VALID_SKIP[0] ) {
+          body += '<br><span class="tooltip">Skip Adjust<span class="tooltiptext">Seconds to adjust the skip time video segments, if necessary. Try a negative number if the plays are ending before the video segments begin; use a positive number if the video segments are ending before the play happens.</span></span>: <input type="number" id="skip_adjust" value="' + skip_adjust + '" step="1" onchange="setTimeout(function(){skip_adjust=document.getElementById(\'skip_adjust\').value;reload()},750)" onblur="skip_adjust=this.value;reload()" style="vertical-align:top;font-size:.8em;width:3em"/>'
+        }
         body += '</p>' + "\n"
       }
 
@@ -2081,7 +2126,7 @@ app.get('/', async function(req, res) {
         body += '<input type="checkbox" id="reencode"/> <span class="tooltip">Re-encode all audio<span class="tooltiptext">Uses more CPU. Generally only necessary if you need the multiview stream to continue after one of the individual streams has ended. (Any streams with sync adjustments above will automatically be re-encoded, regardless of this setting.)</span></span><br/>' + "\n"
         body += '<input type="checkbox" id="park_audio"/> <span class="tooltip">Park audio: filter out announcers<span class="tooltiptext">Implies re-encoding all audio. If this is enabled, an extra audio filter is applied to remove the announcer voices.</span></span><br/>' + "\n"
         body += '<hr><span class="tooltip">Alternate audio URL and sync<span class="tooltiptext">Optional: you can also include a separate audio-only URL as an additional alternate audio track. Archive games will likely require a very large negative sync value, as the radio broadcasts may not be trimmed like the video archives.</span></span>:<br/><textarea id="audio_url" rows=2 cols=60 oninput="this.value=stream_substitution(this.value)"></textarea><input id="audio_url_seek" type="number" value="0" style="vertical-align:top;font-size:.8em;width:4em"/>'
-        body += '<hr>Watch: <a href="/embed.html?src=' + encodeURIComponent(multiview_server + multiview_url_path) + '">Embed</a> | <a href="' + multiview_server + multiview_url_path + '">Stream</a> | <a href="/chromecast.html?src=' + encodeURIComponent(multiview_server + multiview_url_path) + '">Chromecast</a> | <a href="/advanced.html?src=' + encodeURIComponent(multiview_server + multiview_url_path) + '">Advanced</a><br/><span class="tinytext">Download: <a href="/kodi.strm?src=' + encodeURIComponent(multiview_server + multiview_url_path) + '">Kodi STRM file</a> (<a href="/kodi.strm?version=18&src=' + encodeURIComponent(multiview_server + multiview_url_path) + '">Leia/18</a>)</span>'
+        body += '<hr>Watch: <a href="/embed.html?src=' + encodeURIComponent(multiview_server + multiview_url_path) + content_protect_b + '">Embed</a> | <a href="' + multiview_server + multiview_url_path + content_protect_b + '">Stream</a> | <a href="/chromecast.html?src=' + encodeURIComponent(multiview_server + multiview_url_path) + content_protect_b + '">Chromecast</a> | <a href="/advanced.html?src=' + encodeURIComponent(multiview_server + multiview_url_path) + content_protect_b + '">Advanced</a> | <a href="/download.html?src=' + encodeURIComponent(multiview_server + multiview_url_path) + content_protect_b + '&filename=' + gameDate + ' Multiview">Download</a><br/><span class="tinytext">Kodi STRM files: <a href="/kodi.strm?src=' + encodeURIComponent(multiview_server + multiview_url_path) + content_protect_b + '">Matrix/19+</a> (<a href="/kodi.strm?version=18&src=' + encodeURIComponent(multiview_server + multiview_url_path) + content_protect_b + '">Leia/18</a>)</span>'
         body += '</td></tr></table><br/>' + "\n"
     }
 
@@ -2215,7 +2260,7 @@ 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 + ' (<a href="/clearcache">clear cache</a>)</p>' + "\n"
+    body += '<p class="tinytext">Version ' + version + ' (<a href="/clearcache">clear session and cache</a>)</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"
@@ -2321,7 +2366,7 @@ app.get('/advanced.html', async function(req, res) {
   }
   session.debuglog('advanced embed src : ' + video_url)
 
-  res.redirect('http://hls-js-dev.netlify.app/demo/?src=' + encodeURIComponent(video_url))
+  res.redirect('https://hls-js-dev.netlify.app/demo/?src=' + encodeURIComponent(video_url))
 })
 
 // Listen for Chromecast request, redirect to chromecast.link player
@@ -2710,13 +2755,19 @@ function start_multiview_stream(streams, sync, dvr, faster, reencode, park_audio
     audio_reencoded = []
     for (var i=0; i<audio_present.length; i++) {
       //let audio_input = audio_present[i] + ':a:m:language:en?'
-      let audio_input = audio_present[i] + ':a:0'
+      let audio_input = audio_present[i] + ':a:'
+      let video_url = streams[audio_present[i]]
+      if ( video_url.includes('audio_track=English') || !video_url.includes('audio_track=') ) {
+        audio_input += '0'
+      } else {
+        audio_input += '1'
+      }
       let filter = ''
       // Optionally apply sync adjustments
       if ( sync[audio_present[i]] ) {
         if ( sync[audio_present[i]] > 0 ) {
           session.log('delaying audio for stream ' + (audio_present[i]+1) + ' by ' + sync[audio_present[i]] + ' seconds')
-          filter = 'adelay=' + (sync[i] * 1000) + ','
+          filter = 'adelay=' + (sync[i] * 1000) + ':all=1,'
         } else if ( sync[audio_present[i]] < 0 ) {
           session.log('trimming audio for stream ' + (audio_present[i]+1) + ' by ' + sync[audio_present[i]] + ' seconds')
           filter = 'atrim=start=' + (sync[audio_present[i]] * -1) + 's,'
@@ -2747,7 +2798,13 @@ function start_multiview_stream(streams, sync, dvr, faster, reencode, park_audio
       if ( audio_reencoded.indexOf(audio_present[i]) > -1 ) {
         audio_output = '[out' + i + ']'
       } else {
-        audio_output = audio_present[i] + ':a:0'
+        audio_output = audio_present[i] + ':a:'
+        let video_url = streams[audio_present[i]]
+        if ( video_url.includes('audio_track=English') || !video_url.includes('audio_track=') ) {
+          audio_output += '0'
+        } else {
+          audio_output += '1'
+        }
       }
       ffmpeg_command.addOutputOption('-map', audio_output)
       var_stream_map += ' a:' + i + ',agroup:aac,language:ENG'
@@ -2898,3 +2955,94 @@ app.get('/kodi.strm', async function(req, res) {
     res.end('kodi.strm request error, check log')
   }
 })
+
+// Listen for download requests
+app.get('/download.html', async function(req, res) {
+  if ( ! (await protect(req, res)) ) return
+
+  try {
+    if ( req.query.park_audio ) {
+      session.debuglog('parkaudio', req)
+    } else {
+      session.requestlog('download', req)
+    }
+
+    let server = 'http://' + req.headers.host
+
+    let video_url = '/stream.m3u8'
+    if ( req.query.src ) {
+      video_url = req.query.src
+    } else {
+      let urlArray = req.url.split('?')
+      if ( (urlArray.length == 2) ) {
+        video_url += '?' + urlArray[1]
+      }
+      video_url = server + video_url
+    }
+    session.debuglog('download src : ' + video_url)
+
+    ffmpeg_command = ffmpeg({ timeout: 432000 })
+
+    // park audio
+    if ( req.query.park_audio ) {
+      ffmpeg_command.complexFilter([{
+        filter: 'pan=stereo|c0=c0|c1=-1*c1',
+        inputs: '0:a:0',
+        outputs: 'out0'
+      }])
+
+      // Set input stream, minimize ffmpeg startup latency, re-encode audio to mono, and copy source PTS values
+      ffmpeg_command.input(video_url)
+      .addInputOption('-fflags', 'nobuffer')
+      .addInputOption('-probesize', '32')
+      .addInputOption('-analyzeduration', '0')
+      .addOutputOption('-map', '0:v:0')
+      .addOutputOption('-map', '[out0]')
+      .addOutputOption('-c:v', 'copy')
+      .addOutputOption('-c:a', 'aac')
+      .addOutputOption('-ac:a:0', '1')
+      .addOutputOption('-copyts')
+      .addOutputOption('-muxpreload', '0')
+      .addOutputOption('-muxdelay', '0')
+    } else {
+      // Set input stream
+      ffmpeg_command.input(video_url)
+      .addOutputOption('-c', 'copy')
+    }
+
+    ffmpeg_command.addOutputOption('-f', 'mpegts')
+    .output(res)
+    .on('start', function(commandLine) {
+      session.debuglog('download command started')
+      if ( argv.debug || argv.ffmpeg_logging ) {
+        session.debuglog('download command: ' + commandLine)
+      }
+    })
+    .on('error', function(err, stdout, stderr) {
+      session.debuglog('download command stopped: ' + err.message)
+      if ( stdout ) session.log(stdout)
+      if ( stderr ) session.log(stderr)
+    })
+    .on('end', function() {
+      session.debuglog('download command ended')
+    })
+
+    if ( argv.ffmpeg_logging ) {
+      session.log('ffmpeg output logging enabled')
+      ffmpeg_command.on('stderr', function(stderrLine) {
+        session.log(stderrLine);
+      })
+    }
+
+    var download_headers = {}
+    if ( req.query.filename ) {
+      download_headers['Content-Disposition'] = 'attachment; filename="' + req.query.filename + '.ts"'
+    }
+    res.writeHead(200, download_headers)
+
+    ffmpeg_command.run()
+  } catch (e) {
+    session.log('download request error : ' + e.message)
+    res.end('')
+  }
+})

package/package.json

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

package/session.js

@@ -32,7 +32,12 @@ const AFFILIATE_TEAM_IDS = { 'ATL': '430,431,432,478', 'AZ': '419,516,2310,5368'
 const ESPN_SUNDAY_NIGHT_BLACKOUT_COUNTRIES = ["Angola", "Anguilla", "Antigua and Barbuda", "Argentina", "Aruba", "Australia", "Bahamas", "Barbados", "Belize", "Belize", "Benin", "Bermuda", "Bolivia", "Bonaire", "Botswana", "Brazil", "British Virgin Islands", "Burkina Faso", "Burundi", "Cameroon", "Cape Verde", "Cayman Islands", "Central African Republic", "Chad", "Chile", "Colombia", "Comoros", "Cook Islands", "Costa Rica", "Cote d'Ivoire", "Curacao", "Democratic Republic of the Congo", "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "El Salvador", "England", "Equatorial Guinea", "Eritrea", "Eswatini", "Ethiopia", "Falkland Islands", "Falkland Islands", "Fiji", "French Guiana", "French Guiana", "French Polynesia", "Gabon", "Ghana", "Grenada", "Guadeloupe", "Guatemala", "Guinea", "Guinea Bissau", "Guyana", "Guyana", "Haiti", "Honduras", "Ireland", "Jamaica", "Kenya", "Kiribati", "Lesotho", "Liberia", "Madagascar", "Malawi", "Mali", "Marshall Islands", "Martinique", "Mayotte", "Mexico", "Micronesia", "Montserrat", "Mozambique", "Namibia", "Netherlands", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Niue", "Northern Ireland", "Palau Islands", "Panama", "Paraguay", "Peru", "Republic of Ireland", "Reunion", "Rwanda", "Saba", "Saint Maarten", "Samoa", "Sao Tome & Principe", "Scotland", "Senegal", "Seychelles", "Sierra Leone", "Solomon Islands", "Somalia", "South Africa", "St. Barthelemy", "St. Eustatius", "St. Kitts and Nevis", "St. Lucia", "St. Martin", "St. Vincent and the Grenadines", "Sudan", "Surinam", "Suriname", "Tahiti", "Tanzania & Zanzibar", "The Gambia", "The Republic of Congo", "Togo", "Tokelau", "Tonga", "Trinidad and Tobago", "Turks and Caicos Islands", "Tuvalu", "Uganda", "Uruguay", "Venezuela", "Wales", "Zambia", "Zimbabwe"]
 
 // First is default level, last should be All (also used as default org)
-const LEVELS = { 'MLB': '1', 'AAA': '11', 'AA': '12', 'A+': '13', 'A': '14', 'All': '1,11,12,13,14' }
+const LEVELS = { 'MLB': '1', 'AAA': '11', 'AA': '12', 'A+': '13', 'A': '14', 'WINTER': '17', 'All': '1,11,12,13,14,17' }
+
+// Winter Leagues
+const AFL_ID = '119'
+const LIDOM_ID = '131'
+const WINTER_LEAGUES = [AFL_ID, LIDOM_ID]
 
 // These are the events to ignore, if we're skipping breaks
 const BREAK_TYPES = ['Game Advisory', 'Pitching Substitution', 'Offensive Substitution', 'Defensive Sub', 'Defensive Switch', 'Runner Placed On Base']
@@ -1109,6 +1114,10 @@ class sessionClass {
     return LEVELS
   }
 
+  getLidomId() {
+    return LIDOM_ID
+  }
+
   getLevelNameFromSportId(sportId) {
     let sportIds = Object.values(LEVELS)
     for (var i=0; i<sportIds.length; i++) {
@@ -1201,6 +1210,17 @@ class sessionClass {
     this.save_cache_data()
   }
 
+  setBlackoutsCacheExpiry(cache_name, expiryDate) {
+    if ( !this.cache.blackouts ) {
+      this.cache.blackouts={}
+    }
+    if ( !this.cache.blackouts[cache_name] ) {
+      this.cache.blackouts[cache_name] = {}
+    }
+    this.cache.blackouts[cache_name].blackoutsCacheExpiry = expiryDate
+    this.save_cache_data()
+  }
+
   setDateCacheExpiry(cache_name, expiryDate) {
     if ( !this.cache.dates ) {
       this.cache.dates={}
@@ -1663,6 +1683,7 @@ class sessionClass {
         this.data.loginToken = obj.access_token
         this.data.loginTokenExpiry = new Date(new Date().getTime() + obj.expires_in * 1000)
         this.save_session_data()
+        await this.getSession()
         return this.data.loginToken
       } else {
         this.log('getLoginToken response failure')
@@ -1673,6 +1694,53 @@ class sessionClass {
     }
   }
 
+  // API call
+  async getOktaId() {
+    this.debuglog('getOktaId')
+    if ( !this.data.oktaId ) {
+      this.debuglog('need to get oktaId')
+      // get a sample playback token from which to extract the base64-encoded okta_id
+      let token
+
+      // use any currently cached playback token
+      try {
+        this.debuglog('getOktaId attempting to use cached playback token')
+        let mediaIds = Object.keys(this.cache.media)
+        for (var i=0; i<mediaIds.length; i++) {
+          if ( this.cache.media[mediaIds[i]].streamURLToken && (this.cache.media[mediaIds[i]].streamURLToken != '') ) {
+            this.debuglog('getOktaId using cached playback token')
+            token = this.cache.media[mediaIds[i]].streamURLToken
+            break
+          }
+        }
+      } catch(e) {
+        this.debuglog('getOktaId failed to use cached playback token')
+      }
+
+      // otherwise, get a new playback token for a past free game
+      if ( !token ) {
+        this.debuglog('getOktaId getting new playback token')
+        let streamInfo = await this.getStreamURL('b7f0fff7-266f-4171-aa2d-af7988dc9302')
+        token = streamInfo.streamURLToken
+      }
+
+      if ( token ) {
+        this.debuglog('getOktaId using token ' + token)
+        let encoded_okta_id = token.split('_')[1]
+        let okta_id = Buffer.from(encoded_okta_id + '==', 'base64').toString('ascii')
+        this.debuglog('getOktaId extracted okta_id ' + okta_id)
+        this.data.oktaId = okta_id
+        this.save_session_data()
+        return this.data.oktaId
+      } else {
+        this.debuglog('failed to get oktaId')
+      }
+    } else {
+      this.debuglog('using cached oktaId')
+      return this.data.oktaId
+    }
+  }
+
   // get mediaId for a live channel request
   async getMediaId(team, level, mediaType, mediaDate, gameNumber, includeBlackouts) {
     try {
@@ -1714,7 +1782,7 @@ class sessionClass {
           let nationalCount = 0
           let freeCount = 0
           let blackouts = {}
-          if ( includeBlackouts == 'false' ) blackouts = await this.get_blackout_games(cache_data.dates[0].games, true)
+          if ( includeBlackouts == 'false' ) blackouts = await this.get_blackout_games(cache_data.dates[0].date, true)
 
           for (var j = 0; j < cache_data.dates[0].games.length; j++) {
             if ( mediaInfo.mediaId || mediaInfo.gamePk ) break
@@ -1729,10 +1797,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'
@@ -1946,7 +2014,7 @@ class sessionClass {
         cache_name += '.' + team_ids
       }
       //let data_url = 'https://bdfed.stitch.mlbinfra.com/bdfed/transform-mlb-scoreboard?stitch_env=prod&sortTemplate=2&sportId=1&sportId=17&startDate=' + dateString + '&endDate=' + dateString + '&gameType=E&&gameType=S&&gameType=R&&gameType=F&&gameType=D&&gameType=L&&gameType=W&&gameType=A&language=en&leagueId=104&leagueId=103&leagueId=131&contextTeamId='
-      let data_url = 'http://statsapi.mlb.com/api/v1/schedule?sportId=' + level_ids
+      let data_url = 'https://statsapi.mlb.com/api/v1/schedule?sportId=' + level_ids
       if ( team_ids != '' ) {
         data_url += '&teamId=' + team_ids
       }
@@ -1954,7 +2022,7 @@ class sessionClass {
       if ( team && !team.toUpperCase().startsWith('NATIONAL.') && !team.toUpperCase().startsWith('FREE.') ) {
         this.debuglog('getDayData for team ' + team + ' on date ' + dateString)
         cache_name = team.toUpperCase() + dateString
-        data_url = 'http://statsapi.mlb.com/api/v1/schedule?sportId=1&teamId=' + TEAM_IDS[team.toUpperCase()] + '&startDate=' + dateString + '&endDate=' + dateString + '&hydrate=team,broadcasts(all)'
+        data_url = 'https://statsapi.mlb.com/api/v1/schedule?sportId=1&teamId=' + TEAM_IDS[team.toUpperCase()] + '&startDate=' + dateString + '&endDate=' + dateString + '&hydrate=team,broadcasts(all)'
       } else {
         this.debuglog('getDayData for level(s) ' + level_ids + ' on date ' + dateString)
       }
@@ -2056,7 +2124,7 @@ class sessionClass {
         let endDate = new Date(startDate)
         endDate.setDate(endDate.getDate()+20)
         endDate = endDate.toISOString().substring(0,10)
-        let data_url = 'http://statsapi.mlb.com/api/v1/schedule?sportId=' + level_ids
+        let data_url = 'https://statsapi.mlb.com/api/v1/schedule?sportId=' + level_ids
         if ( team_ids != '' ) {
           data_url += '&teamId=' + team_ids
         }
@@ -2181,13 +2249,14 @@ class sessionClass {
 
           let gameIndexes_obj = {}
 
+          let blackouts = {}
+          if ( includeBlackouts == 'false' ) blackouts = await this.get_blackout_games()
+
           for (var i = 0; i < cache_data.dates.length; i++) {
             this.debuglog('getTVData processing date ' + cache_data.dates[i].date)
             let dateIndex = {MLBTV:i,Free:i,Audio:i}
             let gameCounter = {MLBTV:0,Free:0,Audio:0}
 
-            let blackouts = {}
-            if ( includeBlackouts == 'false' ) blackouts = await this.get_blackout_games(cache_data.dates[i].games)
             let gameIndexes = await this.get_first_and_last_games(cache_data.dates[i].games, blackouts)
             // store gameIndexes for gamechanger/multiview reference later
             gameIndexes_obj[cache_data.dates[i].date] = gameIndexes
@@ -2208,6 +2277,7 @@ class sessionClass {
                     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
                       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()
@@ -2219,9 +2289,16 @@ class sessionClass {
                       let channelid = mediaType + '.' + sportId + '.' + team
                       //let logo = server + '/image.svg?teamId=' + team_id
                       let logo = 'https://www.mlbstatic.com/team-logos/share/' + team_id + '.jpg'
-                      if ( this.protection.content_protect ) logo += '&amp;content_protect=' + this.protection.content_protect
+                      //if ( this.protection.content_protect ) logo += '&amp;content_protect=' + this.protection.content_protect
+                      if ( league_id == LIDOM_ID ) {
+                        let lidom_abbr = cache_data.dates[i].games[j].teams['home'].team.name.replace(/[^A-Z]/g, '').toLowerCase()
+                        logo = 'https://pizarra.multimediard.com/ac/' + lidom_abbr + '.png'
+                      }
                       let streamMediaType = 'Video'
                       let stream = server + '/stream.m3u8?team=' + encodeURIComponent(team) + '&mediaType=' + streamMediaType
+                      if ( league_id == LIDOM_ID ) {
+                        stream = server + '/stream.m3u8?event=' + encodeURIComponent(cache_data.dates[i].games[j].teams['home'].team.clubName.toUpperCase()) + '&mediaType=' + streamMediaType
+                      }
                       stream += '&level=' + encodeURIComponent(this.getLevelNameFromSportId(sportId))
                       stream += '&resolution=' + resolution
                       if ( this.protection.content_protect ) stream += '&content_protect=' + this.protection.content_protect
@@ -2229,13 +2306,23 @@ class sessionClass {
                       channels[channelid] = await this.create_channel_object(channelid, logo, stream, mediaType)
 
                       let title = 'Minor League Baseball'
+                      if ( WINTER_LEAGUES.includes(league_id.toString()) ) {
+                        title = cache_data.dates[i].games[j].teams['home'].team.league.name
+                      }
 
                       let away_team = cache_data.dates[i].games[j].teams['away'].team.name
                       let home_team = cache_data.dates[i].games[j].teams['home'].team.name
                       let subtitle = away_team + ' at ' + home_team
 
                       if (includeTeamsInTitles == 'true') {
-                        title = 'MiLB: ' + subtitle
+                        if ( league_id == AFL_ID ) {
+                          title = 'AFL'
+                        } else if ( league_id == LIDOM_ID ) {
+                          title = 'LIDOM'
+                        } else {
+                          title = 'MiLB'
+                        }
+                        title += ': ' + subtitle
                       }
 
                       let description = cache_data.dates[i].games[j].teams['home'].team.league.name + '. '
@@ -2528,7 +2615,7 @@ class sessionClass {
                     this.debuglog('getTVData processing MLB Network')
                     let logo = 'https://encrypted-tbn1.gstatic.com/images?q=tbn:ANd9GcQRgC2JdbtFplKjfhXm5_vzpkUQ3XyDT91SEnHmuB0p5tReQ3Ez'
                     let channelid = mediaType + '.MLBN'
-                    if ( this.protection.content_protect ) logo += '&amp;content_protect=' + this.protection.content_protect
+                    //if ( this.protection.content_protect ) logo += '&amp;content_protect=' + this.protection.content_protect
                     let stream = server + '/stream.m3u8?event=mlbn&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)
@@ -2559,7 +2646,7 @@ class sessionClass {
               this.debuglog('getTVData processing Big Inning')
               let logo = 'https://img.mlbstatic.com/mlb-images/image/private/ar_16:9,g_auto,q_auto:good,w_372,c_fill,f_jpg/mlb/uwr8vepua4t1fe8uwyki'
               let channelid = mediaType + '.BIGINNING'
-              if ( this.protection.content_protect ) logo += '&amp;content_protect=' + this.protection.content_protect
+              //if ( this.protection.content_protect ) logo += '&amp;content_protect=' + this.protection.content_protect
               let stream = server + '/stream.m3u8?event=biginning&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)
@@ -2770,7 +2857,7 @@ class sessionClass {
       let currentDate = new Date()
       if ( !fs.existsSync(cache_file) || !this.cache || !this.cache.gameday || !this.cache.gameday[cache_name] || !this.cache.gameday[cache_name].gamedayCacheExpiry || (currentDate > new Date(this.cache.gameday[cache_name].gamedayCacheExpiry)) ) {
         let reqObj = {
-          url: 'http://statsapi.mlb.com/api/v1.1/game/' + gamePk + '/feed/live',
+          url: 'https://statsapi.mlb.com/api/v1.1/game/' + gamePk + '/feed/live',
           headers: {
             'User-agent': USER_AGENT,
             'Origin': 'https://www.mlb.com',
@@ -2829,6 +2916,9 @@ class sessionClass {
       if ( streamURLToken ) {
         variant_url += '&streamURLToken=' + encodeURIComponent(streamURLToken)
       }
+      if ( this.protection.content_protect ) {
+        variant_url += '&content_protect=' + this.protection.content_protect
+      }
       let reqObj = {
         url: variant_url
       }
@@ -2853,10 +2943,12 @@ class sessionClass {
   }
 
   // Get skip markers into temporary cache
-  async getSkipMarkers(gamePk, skip_type, start_inning, start_inning_half, streamURL, streamURLToken) {
+  async getSkipMarkers(gamePk, skip_type, start_inning, start_inning_half, streamURL, streamURLToken, skip_adjust) {
     try {
       this.debuglog('getSkipMarkers')
 
+      if ( skip_adjust != 0 ) this.log('manual adjustment of ' + skip_adjust + ' seconds being applied')
+
       if ( !this.temp_cache[gamePk] ) {
         this.temp_cache[gamePk] = {}
       }
@@ -2972,6 +3064,8 @@ class sessionClass {
                     // then we'll add the skip marker
                     // otherwise we'll ignore it and move on to the next one
                     if ( ((break_end - break_start) >= MINIMUM_BREAK_DURATION) && ((skip_type != 1) || (current_inning != previous_inning) || (current_inning_half != previous_inning_half)) ) {
+                      if ( break_start > 0 ) break_start += skip_adjust
+                      break_end += skip_adjust
                       skip_markers.push({'break_start': break_start, 'break_end': break_end})
                       total_skip_time += break_end - break_start
                       previous_inning = current_inning
@@ -3486,71 +3580,122 @@ class sessionClass {
     return regional_fox_games_exist
   }
 
+  // get blackouts data for a day
+  async getBlackoutsData(dateString, endDate) {
+    try {
+      let cache_data
+      let cache_name = 'b' + dateString
+      let data_url = 'https://mastapi.mobile.mlbinfra.com/api/epg/v3/search?exp=MLB&date=' + dateString
+      let utcHours = 10
+      if ( dateString == 'guide' ) {
+        cache_name = 'bweek'
+        this.debuglog('getBlackoutsData for week')
+        let startDate = this.liveDate(utcHours)
+        let endDate = new Date(startDate)
+        endDate.setDate(endDate.getDate()+20)
+        endDate = endDate.toISOString().substring(0,10)
+        data_url = 'https://mastapi.mobile.mlbinfra.com/api/epg/v3/search?exp=MLB&startDate=' + startDate + '&endDate=' + endDate
+      } else {
+        this.debuglog('getBlackoutsData for ' + dateString)
+      }
+      let cache_file = path.join(this.CACHE_DIRECTORY, cache_name+'.json')
+      let currentDate = new Date()
+      if ( !fs.existsSync(cache_file) || !this.cache || !this.cache.blackouts || !this.cache.blackouts[cache_name] || !this.cache.blackouts[cache_name].blackoutsCacheExpiry || (currentDate > new Date(this.cache.blackouts[cache_name].blackoutsCacheExpiry)) ) {
+        let reqObj = {
+          url: data_url,
+          headers: {
+            'Accept': '*/*',
+            'Accept-Language': 'en-US,en;q=0.9',
+            'Content-Type': 'application/json',
+            'Origin': 'https://www.mlb.com',
+            'Referer': 'https://www.mlb.com/',
+            'User-Agent': USER_AGENT
+          }
+        }
+        if ( (this.credentials.account_username.length > 0) && (this.credentials.account_password.length > 0) ) {
+          let access_token = await this.getLoginToken()
+          let okta_id = await this.getOktaId()
+          if ( access_token && okta_id ) {
+            reqObj.headers['authorization'] = 'Bearer ' + access_token
+            reqObj.headers['x-okta-id'] = okta_id
+          }
+        }
+        var response = await this.httpGet(reqObj, false)
+        if ( response && this.isValidJson(response) ) {
+          //this.debuglog(response)
+          cache_data = JSON.parse(response)
+          this.save_json_cache_file(cache_name, cache_data)
+
+          // Default cache period is 1 day from now
+          let today = this.liveDate()
+          let tomorrowDate = new Date(today)
+          tomorrowDate.setDate(tomorrowDate.getDate()+1)
+          tomorrowDate.setHours(tomorrowDate.getHours()+utcHours)
+          let cacheExpiry = tomorrowDate
+
+          // finally save the setting
+          this.setBlackoutsCacheExpiry(cache_name, cacheExpiry)
+        } else {
+          this.log('error : invalid json from url ' + reqObj.url)
+        }
+      } else {
+        this.debuglog('using cached date data')
+        cache_data = this.readFileToJson(cache_file)
+      }
+      if (cache_data) {
+        return cache_data
+      }
+    } catch(e) {
+      this.log('getBlackoutsData error : ' + e.message)
+    }
+  }
+
   // get all blackout games for a date
-  async get_blackout_games(games, calculate_expiries=false) {
+  async get_blackout_games(gameDate='guide', calculate_expiries=false) {
     this.debuglog('get_blackout_games')
     let blackouts = {}
 
-    let usa_blackout = /(^\d{5}$)/.test(this.credentials.zip_code) && (this.credentials.country == 'USA')
+    let cache_data
+    cache_data = await this.getBlackoutsData(gameDate)
+
+    if ( cache_data && cache_data.results && (cache_data.results.length > 0) ) {
+      for (var j = 0; j < cache_data.results.length; j++) {
+        let game = cache_data.results[j]
+        let game_pk = game.gamePk
+        this.debuglog('get_blackout_games checking game ' + game_pk)
+        if ( game.blackedOutVideo ) {
+          this.debuglog('get_blackout_games found blackout')
+          let blackout_type = ''
+          // local/national blackout label disabled, as all were returning local
+          /*if ( game.videoStatusCodes.includes('2') ) {
+            this.debuglog('get_blackout_games found national blackout')
+            blackout_type = 'National/International'
+          } else {
+            this.debuglog('get_blackout_games found local blackout')
+            blackout_type = 'Local'
+          }*/
+          blackouts[game_pk] = { blackout_type: blackout_type }
+        } else if ( !game.entitledVideo && (game.videoStatusCodes[0] == '3') ) {
+          this.debuglog('get_blackout_games found non-entitled MVPD required blackout')
+          blackouts[game_pk] = { blackout_type: '' }
+        }
 
-    let regional_fox_games_exist
-    for (var j = 0; j < games.length; j++) {
-      let game_pk = games[j].gamePk.toString()
-      this.debuglog('get_blackout_games checking game ' + game_pk)
-      if ( games[j].broadcasts ) {
-        for (var k = 0; k < games[j].broadcasts.length; k++) {
-          let broadcast = games[j].broadcasts[k]
-          if ( broadcast.type == 'TV' ) {
-            this.debuglog('get_blackout_games checking feed ' + broadcast.callSign)
-            if ( (broadcast.isNational == true) || (await this.check_pay_tv(broadcast)) || broadcast.callSign.endsWith('-INT') ) {
-              this.debuglog('get_blackout_games checking national game')
-              // International blackouts according to https://www.mlb.com/live-stream-games/help-center/blackouts-available-games
-              if ( usa_blackout && (broadcast.callSign == 'FOX') ) {
-                if ( !regional_fox_games_exist && (games[j].seriesDescription == 'Regular Season') ) {
-                  regional_fox_games_exist = await this.check_regional_fox_games(games)
-                }
-                if ( !regional_fox_games_exist || (regional_fox_games_exist == 'false') ) {
-                  this.debuglog('get_blackout_games found non-regional FOX game')
-                  blackouts[game_pk] = { blackout_type:'National' }
-                  break
-                }
-              // Apple TV+ games are blacked out everywhere
-              } else if ( broadcast.callSign == 'Apple TV+' ) {
-                this.debuglog('get_blackout_games found Apple TV+ blackout')
-                blackouts[game_pk] = { blackout_type:'Full International' }
-              // ESPN Sunday Night games are blacked out in a list of countries
-              } else if ( (broadcast.callSign == 'ESPN') && (new Date(games[j].gameDate).getDay() == 0) && ESPN_SUNDAY_NIGHT_BLACKOUT_COUNTRIES.includes(this.credentials.country) ) {
-                this.debuglog('get_blackout_games found ESPN blackout')
-                blackouts[game_pk] = { blackout_type:'Partial International' }
-              // games with an "-INT" variant are postseason games, blacked out in USA and Canada
-              } else if ( broadcast.callSign.endsWith('-INT') && (usa_blackout || (this.credentials.country == 'Canada')) ) {
-                this.debuglog('get_blackout_games found national blackout')
-                blackouts[game_pk] = { blackout_type:'National' }
-              } else if ( usa_blackout ) {
-                this.debuglog('get_blackout_games found USA blackout')
-                blackouts[game_pk] = { blackout_type:'National' }
-              }
-              break
-            // check local blackouts
-            } else {
-              this.debuglog('get_blackout_games checking local game')
-              let awayteam = games[j].teams['away'].team.abbreviation
-              let hometeam = games[j].teams['home'].team.abbreviation
-              if ( (games[j].seriesDescription != 'Spring Training') && (this.credentials.blackout_teams.includes(hometeam) || this.credentials.blackout_teams.includes(awayteam)) ) {
-                this.debuglog('get_blackout_games found local blackout')
-                blackouts[game_pk] = { blackout_type:'Local' }
+        // add blackout expiry, if requested
+        if ( blackouts[game_pk] && calculate_expiries && await this.check_game_time(game.gameData) ) {
+          this.debuglog('get_blackout_games calculating blackout expiry')
+          let date_cache_data = await this.getDayData(gameDate)
+          if ( date_cache_data.dates && date_cache_data.dates[0] && date_cache_data.dates[0].games && (date_cache_data.dates[0].games.length > 0) ) {
+            for (var k = 0; k < date_cache_data.dates[0].games.length; k++) {
+              if ( game_pk == date_cache_data.dates[0].games[k].gamePk ) {
+                this.debuglog('get_blackout_games found matching game')
+                let blackoutExpiry = await this.get_blackout_expiry(date_cache_data.dates[0].games[k])
+                this.debuglog('get_blackout_games calculated blackout expiry as ' + blackoutExpiry)
+                blackouts[game_pk].blackoutExpiry = blackoutExpiry
                 break
               }
             }
-            break
           }
         }
-
-        // add blackout expiry, if requested
-        if ( blackouts[game_pk] && calculate_expiries && await this.check_game_time(games[j]) ) {
-          let blackoutExpiry = await this.get_blackout_expiry(games[j])
-          blackouts[game_pk].blackoutExpiry = blackoutExpiry
-        }
       }
     }
 
@@ -3566,7 +3711,7 @@ class sessionClass {
       let start
       let end
       if ( cache_data.dates && cache_data.dates[0] && cache_data.dates[0].games && (cache_data.dates[0].games.length > 0) ) {
-        blackouts = await this.get_blackout_games(cache_data.dates[0].games)
+        blackouts = await this.get_blackout_games(today)
         this.debuglog('Game changer blackouts ' + JSON.stringify(blackouts))
 
         let gameIndexes = await this.get_first_and_last_games(cache_data.dates[0].games, blackouts)
@@ -3621,8 +3766,8 @@ class sessionClass {
         cacheExpiry.setSeconds(cacheExpiry.getSeconds()+9)
         this.temp_cache.gamechangerCacheExpiry = cacheExpiry
         let reqObj = {
-          //url: 'http://gd2.mlb.com/components/game/mlb/year_' + this.temp_cache.gamechanger.dateString + '/master_scoreboard.json',
-          url: 'http://statsapi.mlb.com/api/v1/schedule?sportId=1&startDate=' + this.temp_cache.gamechanger.date + '&endDate=' + this.temp_cache.gamechanger.date + '&hydrate=broadcasts(all),linescore,team,flags,gameInfo',
+          //url: 'https://gd2.mlb.com/components/game/mlb/year_' + this.temp_cache.gamechanger.dateString + '/master_scoreboard.json',
+          url: 'https://statsapi.mlb.com/api/v1/schedule?sportId=1&startDate=' + this.temp_cache.gamechanger.date + '&endDate=' + this.temp_cache.gamechanger.date + '&hydrate=broadcasts(all),linescore,team,flags,gameInfo',
           headers: {
             'User-Agent': USER_AGENT,
             'Origin': 'https://www.mlb.com',
@@ -4066,7 +4211,7 @@ class sessionClass {
     let firstGameIndex
     for (var j = 0; j < games.length; j++) {
       let gamePk = games[j].gamePk.toString()
-      if ( games[j].gameDate && !blackouts[gamePk] && !games[j].rescheduleDate && !games[j].status.startTimeTBD && games[j].broadcasts && (await this.count_broadcasts(games[j].broadcasts, 'MLBTV') > 0) ) {
+      if ( games[j].gameDate && (games[j].teams.home.team.sport.id == 1) && (games[j].teams.away.team.sport.id == 1) && !blackouts[gamePk] && !games[j].rescheduleDate && !games[j].status.startTimeTBD && games[j].broadcasts && (await this.count_broadcasts(games[j].broadcasts, 'MLBTV') > 0) ) {
         this.debuglog('get_first_and_last_games first : ' + j + ' ' + gamePk + ' at ' + games[j].gameDate)
         firstGameIndex = j
         break
@@ -4075,7 +4220,7 @@ class sessionClass {
     let lastGameIndex
     for (var j = (games.length-1); j >= 0; j--) {
       let gamePk = games[j].gamePk.toString()
-      if ( games[j].gameDate && !blackouts[gamePk] && !games[j].rescheduleDate && games[j].broadcasts && (await this.count_broadcasts(games[j].broadcasts, 'MLBTV') > 0) ) {
+      if ( games[j].gameDate && (games[j].teams.home.team.sport.id == 1) && (games[j].teams.away.team.sport.id == 1) && !blackouts[gamePk] && !games[j].rescheduleDate && games[j].broadcasts && (await this.count_broadcasts(games[j].broadcasts, 'MLBTV') > 0) ) {
         this.debuglog('get_first_and_last_games last : ' + j + ' ' + gamePk + ' at ' + games[j].gameDate)
         lastGameIndex = j
         break
@@ -4134,8 +4279,8 @@ class sessionClass {
     return scheduledInnings
   }
 
-  async check_game_time(game) {
-    if ( !game.resumeGameDate && !game.resumedFromDate && (game.status.startTimeTBD == false) ) {
+  async check_game_time(gameData) {
+    if ( !gameData.resumeGameDate && !gameData.resumedFromDate && (gameData.startTimeTBD == false) ) {
       return true
     } else {
       return false
@@ -4144,20 +4289,25 @@ class sessionClass {
 
   async get_blackout_expiry(game) {
     let scheduledInnings = await this.get_scheduled_innings(game)
-    // avg 9 inning game was 3:11 in 2021, or 21.22 minutes per inning
-    let gameDurationMinutes = 21.22 * scheduledInnings
+    this.debuglog('get_blackout_expiry scheduledInnings ' + scheduledInnings)
+    // avg 9 inning game was 2:39 in 2023, or 17.66 minutes per inning
+    let gameDurationMinutes = 17.66 * scheduledInnings
     // default to assuming the scheduled game time is the first pitch time
     let firstPitch = new Date(game.gameDate)
+    this.debuglog('get_blackout_expiry gameDate ' + firstPitch)
     if ( game.gameInfo ) {
       // check if firstPitch has been updated with a valid time (later than the scheduled game time)
       if ( game.gameInfo.firstPitch && (game.gameInfo.firstPitch >= game.gameDate) ) {
         firstPitch = new Date(game.gameInfo.firstPitch)
+        this.debuglog('get_blackout_expiry firstPitch ' + firstPitch)
         // for completed games, get the duration too
         if ( game.gameInfo.gameDurationMinutes ) {
           gameDurationMinutes = game.gameInfo.gameDurationMinutes
+          this.debuglog('get_blackout_expiry gameDurationMinutes ' + gameDurationMinutes)
           // add any delays
           if ( game.gameInfo.delayDurationMinutes ) {
             gameDurationMinutes += game.gameInfo.delayDurationMinutes
+            this.debuglog('get_blackout_expiry delayDurationMinutes ' + game.gameInfo.delayDurationMinutes)
           }
         }
       }