mlbserver 2024.8.2 → 2024.10.1

package/index.js

@@ -37,6 +37,7 @@ const VALID_AUDIO_TRACKS = [ 'all', 'English', 'English Radio', 'Radio Española
 const DISPLAY_AUDIO_TRACKS = [ 'all', 'TV', 'Radio', 'Spanish', 'Alt.', 'Alt. Spanish', '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
 
@@ -559,6 +565,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,6 +633,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
@@ -681,6 +689,7 @@ 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
 
@@ -1045,10 +1054,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 +1173,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 +1338,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,10 +1374,10 @@ 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"
@@ -1546,7 +1559,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
@@ -1835,7 +1848,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] ) {
@@ -1927,6 +1940,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
                           }
@@ -2053,6 +2067,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"
       }
 
@@ -2215,7 +2232,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"

package/package.json

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

package/session.js

@@ -1201,6 +1201,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 +1674,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')
@@ -1714,7 +1726,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
@@ -2181,13 +2193,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
@@ -2829,6 +2842,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 +2869,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 +2990,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 +3506,111 @@ 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
+          }
+        }
+        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 }
+        }
 
-    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 +3626,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)
@@ -4066,7 +4126,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 +4135,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 +4194,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 +4204,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)
           }
         }
       }