mlbserver 2023.5.25 → 2023.8.27

package/README.md

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

package/index.js

@@ -46,8 +46,6 @@ const SAMPLE_STREAM_URL = 'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8'
 
 const SECONDS_PER_SEGMENT = 5
 
-const AFFILIATE_TEAM_IDS = { 'ARI': '419,516,2310,5368', 'ATL': '430,432,478,431', 'BAL': '418,568,548,488', 'BOS': '428,414,533,546', 'CHC': '521,451,550,553', 'CIN': '450,459,498,416', 'CLE': '445,402,437,481', 'COL': '259,486,342,538', 'CWS': '247,580,487,494', 'DET': '512,570,582,106', 'HOU': '482,5434,573,3712', 'KC': '1350,3705,541,565', 'LAA': '401,559,460,561', 'LAD': '260,238,456,526', 'MIA': '479,564,554,4124', 'MIL': '249,572,556,5015', 'MIN': '492,509,1960,3898', 'NYM': '453,507,552,505', 'NYY': '1956,587,531,537', 'OAK': '237,499,400,524', 'PHI': '427,522,1410,566', 'PIT': '3390,484,452,477', 'SD': '103,510,584,4904', 'SEA': '403,515,529,574', 'SF': '105,461,476,3410', 'STL': '279,235,440,443', 'TB': '2498,233,234,421', 'TEX': '102,485,540,448', 'TOR': '424,435,463,422', 'WSH': '436,534,547,426' }
-
 // for favorites: text, then background, based on https://teamcolors.jim-nielsen.com/
 const TEAM_COLORS = {'ARI': ['E3D4AD', 'A71930'], 'ATL': ['13274F', 'CE1141'], 'BAL': ['000000', 'DF4601'], 'BOS': ['0D2B56', 'BD3039'], 'CHC': ['CC3433', '0E3386'], 'CWS': ['000000', 'C4CED4'], 'CIN': ['FFFFFF', 'C6011F'], 'CLE': ['002B5C', 'E31937'], 'COL': ['C4CED4', '333366'], 'DET': ['0C2C56', 'FFFFFF'], 'HOU': ['002D62', 'EB6E1F'], 'KC': ['C09A5B', '004687'], 'LAA': ['FFFFFF', 'BA0021'], 'LAD': ['FFFFFF', '005A9C'], 'MIA': ['0077C8', 'FF6600'], 'MIL': ['0A2351', 'B6922E'], 'MIN': ['D31145', '002B5C'], 'NYM': ['002D72', 'FF5910'], 'NYY': ['FFFFFF', '003087'], 'OAK': ['003831', 'EFB21E'], 'PHI': ['284898', 'E81828'], 'PIT': ['000000', 'FDB827'], 'STL': ['FEDB00', 'C41E3A'], 'SD': ['FEC325', '7F411C'], 'SF': ['000000', 'FD5A1E'], 'SEA': ['C4CED4', '005C5C'], 'TB': ['092C5C', '8FBCE6'], 'TEX': ['003278', 'C0111F'], 'TOR': ['FFFFFF', '134A8E'], 'WSH': ['AB0003', '11225B']}
 
@@ -315,13 +313,19 @@ app.get('/stream.m3u8', async function(req, res) {
             }
           } else if ( req.query.team ) {
             let mediaType = req.query.mediaType || VALID_MEDIA_TYPES[0]
-            let mediaInfo = await session.getMediaId(decodeURIComponent(req.query.team), mediaType, req.query.date, req.query.game, includeBlackouts)
+            let level = req.query.level || 'MLB'
+            let mediaInfo = await session.getMediaId(decodeURIComponent(req.query.team), decodeURIComponent(level), mediaType, req.query.date, req.query.game, includeBlackouts)
             if ( mediaInfo ) {
-              mediaId = mediaInfo.mediaId
-              contentId = mediaInfo.contentId
-              if ( mediaInfo.alternateAudioTracks ) {
-                for (const [key, value] of Object.entries(mediaInfo.alternateAudioTracks)) {
-                  options.alternate_audio_tracks[key] = value
+
+              if ( mediaInfo.gamePk ) {
+                streamURL = await session.getEventStreamURL(false, mediaInfo.gamePk)
+              } else {
+                mediaId = mediaInfo.mediaId
+                contentId = mediaInfo.contentId
+                if ( mediaInfo.alternateAudioTracks ) {
+                  for (const [key, value] of Object.entries(mediaInfo.alternateAudioTracks)) {
+                    options.alternate_audio_tracks[key] = value
+                  }
                 }
               }
             } else {
@@ -329,13 +333,15 @@ app.get('/stream.m3u8', async function(req, res) {
             }
           }
 
-          if ( !mediaId ) {
-            session.log('failed to get mediaId : ' + req.url)
-            res.end('')
-            return
-          } else {
-            session.debuglog('mediaId : ' + mediaId)
-            streamURL = await session.getStreamURL(mediaId)
+          if ( !streamURL ) {
+            if ( !mediaId ) {
+              session.log('failed to get mediaId : ' + req.url)
+              res.end('')
+              return
+            } else {
+              session.debuglog('mediaId : ' + mediaId)
+              streamURL = await session.getStreamURL(mediaId)
+            }
           }
         }
       }
@@ -1264,25 +1270,23 @@ app.get('/', async function(req, res) {
     var team_ids = ''
     if ( req.query.org ) {
       org = decodeURIComponent(req.query.org)
-      if ( typeof AFFILIATE_TEAM_IDS[org] === 'undefined' ) {
+      if ( typeof session.getAffiliateTeamIds(org) === 'undefined' ) {
         org = default_org
       } else {
-        team_ids += session.getTeamIds(org) + ',' + AFFILIATE_TEAM_IDS[org]
+        team_ids += session.getTeamIds(org) + ',' + session.getAffiliateTeamIds(org)
         level = default_org
       }
-    } else if ( level_ids == '1' ) {
+    } else if ( level_ids == levels['MLB'] ) {
       team_ids = session.getTeamIds()
       for (let i=0; i<session.credentials.fav_teams.length; i++) {
         if ( session.credentials.fav_teams[i] != '' ) {
-          if ( level_ids == '1' ) {
-            level_ids = levels['All']
-          }
-          team_ids += ',' + AFFILIATE_TEAM_IDS[session.credentials.fav_teams[i]]
+          level_ids = levels['All']
+          team_ids += ',' + session.getAffiliateTeamIds(session.credentials.fav_teams[i])
         }
       }
     }
     let cache_name = gameDate
-    if ( level_ids != '1' ) {
+    if ( level_ids != levels['MLB'] ) {
       cache_name += '.' + level_ids
     }
     if ( team_ids != '' ) {
@@ -1408,10 +1412,11 @@ app.get('/', async function(req, res) {
     body += ' or <span class="tooltip">Org<span class="tooltiptext">Major league parent organization</span></span>: '
     body += '<select id="org" onchange="level=\'' + default_org + '\';org=this.value;reload()">'
     body += '<option value="' + default_org + '">' + default_org + '</option>'
-    for (const [key, value] of Object.entries(AFFILIATE_TEAM_IDS)) {
-      body += '<option value="' + key + '"'
-      if ( org == key ) body += ' selected'
-      body += '>' + key + '</option> '
+    var orgs = session.getOrgs()
+    for (var i = 0; i < orgs.length; i++) {
+      body += '<option value="' + orgs[i] + '"'
+      if ( org == orgs[i] ) body += ' selected'
+      body += '>' + orgs[i] + '</option> '
     }
     body += '</select></p>' + "\n"
 
@@ -1507,9 +1512,9 @@ app.get('/', async function(req, res) {
 
     let blackouts = {}
 
-    if ( (mediaType == 'MLBTV') && ((level_ids == '1') || level_ids.startsWith('1,')) ) {
-      // Recap Rundown beginning in 2023
-      if ( (gameDate <= yesterday) && (gameDate >= '2023-03-31') && cache_data.dates && cache_data.dates[0] && cache_data.dates[0].games && (cache_data.dates[0].games.length > 0) ) {
+    if ( (mediaType == 'MLBTV') && ((level_ids == levels['MLB']) || level_ids.startsWith(levels['MLB'] + ',')) ) {
+      // Recap Rundown beginning in 2023, disabled because it stopped working
+      /*if ( (gameDate <= yesterday) && (gameDate >= '2023-03-31') && cache_data.dates && cache_data.dates[0] && cache_data.dates[0].games && (cache_data.dates[0].games.length > 0) ) {
         body += '<tr><td><span class="tooltip">VOD<span class="tooltiptext">Recap Rundown plays all of a day\'s recaps in order.</span></span></td><td>'
         let dateArray = gameDate.split('-')
         let querystring = '?event=recaprundown' + parseInt(dateArray[1]).toString() + '-' + parseInt(dateArray[2]).toString() + '-' + dateArray[0].substring(2,4)
@@ -1520,7 +1525,7 @@ app.get('/', async function(req, res) {
         querystring += content_protect_b
         body += '<a href="' + thislink + querystring + '">Recap Rundown</a>'
         body += '</td></tr>' + "\n"
-      }
+      }*/
 
       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)
@@ -1599,15 +1604,32 @@ app.get('/', async function(req, res) {
         let game_started = false
 
         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_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_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)
         }
 
-        let teams = awayteam + " @ " + hometeam
+        let teams = ""
+        if ( awayteam_abbr ) {
+          teams += '<span class="tooltip">' + awayteam + '<span class="tooltiptext">Team Abbreviation: ' + awayteam_abbr + ', level ' + awayteam_level + '</span></span>'
+        } else {
+          teams += awayteam
+        }
+        teams += " @ "
+        if ( hometeam_abbr ) {
+          teams += '<span class="tooltip">' + hometeam + '<span class="tooltiptext">Team Abbreviation: ' + hometeam_abbr + ', level ' + hometeam_level + '</span></span>'
+        } else {
+          teams += hometeam
+        }
         let pitchers = ""
         let state = "<br/>"
 
@@ -1768,7 +1790,7 @@ app.get('/', async function(req, res) {
         body += '><td>' + description + teams + pitchers + state + '</td>'
 
         // Check if Winter League / MiLB game first
-        if ( (cache_data.dates[0].games[j].teams['home'].team.sport.id != '1') && (mediaType == 'MLBTV') ) {
+        if ( (cache_data.dates[0].games[j].teams['home'].team.sport.id != levels['MLB']) && (mediaType == 'MLBTV') ) {
           body += "<td>"
           if ( cache_data.dates[0].games[j].broadcasts ) {
             let broadcastName = 'N/A'
@@ -2088,13 +2110,13 @@ app.get('/', async function(req, res) {
       resolution = 'best'
     }
 
-    body += '<p><span class="tooltip">All<span class="tooltiptext">Will include all live broadcasts. If a zip code has been provided, channels/games subject to blackout will be omitted by default. See below for an additional option to override that.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + content_protect_b + '">guide.xml</a></p>' + "\n"
+    body += '<p><span class="tooltip">All<span class="tooltiptext">Will include all live MLB broadcasts. If favorite team(s) have been provided, it will also include affiliate games for those organizations. If a zip code has been provided, channels/games subject to blackout will be omitted by default. See below for an additional option to override that.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + content_protect_b + '">guide.xml</a></p>' + "\n"
 
     let include_teams = 'ari,national'
     if ( session.credentials.fav_teams.length > 0 ) {
       include_teams = session.credentials.fav_teams.toString()
     }
-    body += '<p><span class="tooltip">By team<span class="tooltiptext">Including a team (by abbreviation, in a comma-separated list if more than 1) will include all of its broadcasts, or if that team is not broadcasting the game, it will include the national broadcast or opponent\'s broadcast if available. If a zip code has been provided, channels/games subject to blackout will be omitted by default. See below for an additional option to override that.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=' + include_teams + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + content_protect_b + '">guide.xml</a></p>' + "\n"
+    body += '<p><span class="tooltip">By team<span class="tooltiptext">Including a team (MLB only, by abbreviation, in a comma-separated list if more than 1) will include all of its broadcasts, or if that team is not broadcasting the game, it will include the national broadcast or opponent\'s broadcast if available. It will also include affiliate games for those organizations. If a zip code has been provided, channels/games subject to blackout will be omitted by default. See below for an additional option to override that.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=' + include_teams + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + content_protect_b + '">guide.xml</a></p>' + "\n"
 
     body += '<p><span class="tooltip">Include blackouts<span class="tooltiptext">An optional parameter added to the URL will include channels/games subject to blackout (although you may not be able to play those games).</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=' + include_teams + '&includeBlackouts=true' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&includeBlackouts=true' + content_protect_b + '">guide.xml</a></p>' + "\n"
 
@@ -2103,7 +2125,7 @@ app.get('/', async function(req, res) {
       exclude_teams = session.credentials.blackout_teams.toString()
       exclude_teams += ',national'
     }
-    body += '<p><span class="tooltip">Exclude a team + national<span class="tooltiptext">This is useful for excluding games you may be blacked out from, even if you have not provided a zip code. Excluding a team (by abbreviation, in a comma-separated list if more than 1) will exclude every game involving that team. National refers to <a href="https://www.mlb.com/live-stream-games/national-blackout">USA national TV broadcasts</a>.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&excludeTeams=' + exclude_teams + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&excludeTeams=' + exclude_teams + content_protect_b + '">guide.xml</a></p>' + "\n"
+    body += '<p><span class="tooltip">Exclude a team + national<span class="tooltiptext">This is useful for excluding games you may be blacked out from, even if you have not provided a zip code. Excluding a team (MLB only, by abbreviation, in a comma-separated list if more than 1) will exclude every game involving that team. National refers to <a href="https://www.mlb.com/live-stream-games/national-blackout">USA national TV broadcasts</a>.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&excludeTeams=' + exclude_teams + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&excludeTeams=' + exclude_teams + content_protect_b + '">guide.xml</a></p>' + "\n"
 
     body += '<p><span class="tooltip">Include (or exclude) LIDOM<span class="tooltiptext">Dominican Winter League, aka Liga de Beisbol Dominicano. Live stream only, does not support starting from the beginning or certain innings, skip options, etc.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=lidom' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=lidom' + content_protect_b + '">guide.xml</a></p>' + "\n"
 
@@ -2121,6 +2143,10 @@ app.get('/', async function(req, res) {
       body += '<p><span class="tooltip">Free games only<span class="tooltiptext">Only includes games marked as free. Blackouts still apply. If a zip code has been provided, channels/games subject to blackout will be omitted by default.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=free' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=free' + content_protect_b + '">guide.xml</a></p>' + "\n"
     }
 
+    body += '<p><span class="tooltip">Include affiliates by org<span class="tooltiptext">Including an organization (by MLB team abbreviation, in a comma-separated list if more than 1) will include all of its affiliate broadcasts, or if that affiliate is not broadcasting the game, it will include the opponent\'s broadcast if available. If this option is not specified, but favorite team(s) have been provided, affiliate games for those organizations will be included anyway.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeOrgs=ari,atl' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeOrgs=ari,atl' + content_protect_b + '">guide.xml</a></p>' + "\n"
+
+    body += '<p><span class="tooltip">Include by level<span class="tooltiptext">Including a level (AAA, AA, A+, or A, in a comma-separated list if more than 1) will include all of its broadcasts, and exclude all other levels.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeLevels=aaa,aa' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeLevels=aaa,aa' + content_protect_b + '">guide.xml</a></p>' + "\n"
+
     body += '</td></tr></table><br/>' + "\n"
 
     body += '<table><tr><td>' + "\n"
@@ -2135,6 +2161,7 @@ app.get('/', async function(req, res) {
 
     let examples = [
       ['Team live video', '?team=' + example_team + '&resolution=best'],
+      ['MiLB team live video', '?team=COL&level=AAA&resolution=best'],
       ['Team live radio', '?team=' + example_team + '&mediaType=Audio'],
       ['Catch-up/condensed', '?team=' + example_team + '&resolution=best&skip=pitches&date=today'],
       ['Condensed yesterday', '?team=' + example_team + '&resolution=best&skip=pitches&date=yesterday'],
@@ -2419,7 +2446,17 @@ app.get('/channels.m3u', async function(req, res) {
     includeBlackouts = req.query.includeBlackouts
   }
 
-  var body = await session.getTVData('channels', mediaType, includeTeams, excludeTeams, server, includeBlackouts, resolution, pipe, startingChannelNumber)
+  let includeLevels = []
+  if ( req.query.includeLevels ) {
+    includeLevels = decodeURIComponent(req.query.includeLevels.toUpperCase()).split(',')
+  }
+
+  let includeOrgs = []
+  if ( req.query.includeOrgs ) {
+    includeOrgs = req.query.includeOrgs.toUpperCase().split(',')
+  }
+
+  var body = await session.getTVData('channels', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, resolution, pipe, startingChannelNumber)
 
   res.writeHead(200, {'Content-Type': 'audio/x-mpegurl'})
   res.end(body)
@@ -2450,9 +2487,19 @@ app.get('/guide.xml', async function(req, res) {
     includeBlackouts = req.query.includeBlackouts
   }
 
+  let includeLevels = []
+  if ( req.query.includeLevels ) {
+    includeLevels = decodeURIComponent(req.query.includeLevels.toUpperCase()).split(',')
+  }
+
+  let includeOrgs = []
+  if ( req.query.includeOrgs ) {
+    includeOrgs = req.query.includeOrgs.toUpperCase().split(',')
+  }
+
   let server = 'http://' + req.headers.host
 
-  var body = await session.getTVData('guide', mediaType, includeTeams, excludeTeams, server, includeBlackouts)
+  var body = await session.getTVData('guide', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts)
 
   res.end(body)
 })

package/package.json

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

package/session.js

@@ -25,6 +25,8 @@ const TODAY_UTC_HOURS = 8 // UTC hours (EST + 4) into tomorrow to still use toda
 
 const TEAM_IDS = {'ARI':'109','ATL':'144','BAL':'110','BOS':'111','CHC':'112','CWS':'145','CIN':'113','CLE':'114','COL':'115','DET':'116','HOU':'117','KC':'118','LAA':'108','LAD':'119','MIA':'146','MIL':'158','MIN':'142','NYM':'121','NYY':'147','OAK':'133','PHI':'143','PIT':'134','STL':'138','SD':'135','SF':'137','SEA':'136','TB':'139','TEX':'140','TOR':'141','WSH':'120'}
 
+const AFFILIATE_TEAM_IDS = { 'ARI': '419,516,2310,5368', 'ATL': '430,432,478,431', 'BAL': '418,568,548,488', 'BOS': '428,414,533,546', 'CHC': '521,451,550,553', 'CIN': '450,459,498,416', 'CLE': '445,402,437,481', 'COL': '259,486,342,538', 'CWS': '247,580,487,494', 'DET': '512,570,582,106', 'HOU': '482,5434,573,3712', 'KC': '1350,3705,541,565', 'LAA': '401,559,460,561', 'LAD': '260,238,456,526', 'MIA': '479,564,554,4124', 'MIL': '249,572,556,5015', 'MIN': '492,509,1960,3898', 'NYM': '453,507,552,505', 'NYY': '1956,587,531,537', 'OAK': '237,499,400,524', 'PHI': '427,522,1410,566', 'PIT': '3390,484,452,477', 'SD': '103,510,584,4904', 'SEA': '403,515,529,574', 'SF': '105,461,476,3410', 'STL': '279,235,440,443', 'TB': '2498,233,234,421', 'TEX': '102,485,540,448', 'TOR': '424,435,463,422', 'WSH': '436,534,547,426' }
+
 // Other country options would be USA, Canada, or other
 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"]
 
@@ -1106,14 +1108,36 @@ class sessionClass {
     return LEVELS
   }
 
+  getLevelNameFromSportId(sportId) {
+    let sportIds = Object.values(LEVELS)
+    for (var i=0; i<sportIds.length; i++) {
+      if ( sportId == sportIds[i] ) {
+        let levelNames = Object.keys(LEVELS)
+        return levelNames[i]
+      }
+    }
+  }
+
   getTeamIds(team_abbr = false) {
     if ( team_abbr ) {
       return TEAM_IDS[team_abbr]
     } else {
-      return Object.values(TEAM_IDS).toString()
+      return Object.values(TEAM_IDS).toString() + ',159,160'
+    }
+  }
+
+  getAffiliateTeamIds(team_abbr = false) {
+    if ( team_abbr ) {
+      return AFFILIATE_TEAM_IDS[team_abbr]
+    } else {
+      return Object.values(AFFILIATE_TEAM_IDS).toString()
     }
   }
 
+  getOrgs() {
+    return Object.keys(AFFILIATE_TEAM_IDS)
+  }
+
   // get parent org nickname
   getParent(parent) {
     let long_orgs = [ 'Jays', 'Sox' ]
@@ -1179,6 +1203,17 @@ class sessionClass {
     this.save_cache_data()
   }
 
+  setWeekCacheExpiry(cache_name, expiryDate) {
+    if ( !this.cache.weeks ) {
+      this.cache.weeks={}
+    }
+    if ( !this.cache.weeks[cache_name] ) {
+      this.cache.weeks[cache_name] = {}
+    }
+    this.cache.weeks[cache_name].weekCacheExpiry = expiryDate
+    this.save_cache_data()
+  }
+
   setAiringsCacheExpiry(cache_name, expiryDate) {
     if ( !this.cache.airings ) {
       this.cache.airings={}
@@ -1775,7 +1810,7 @@ class sessionClass {
   }
 
   // get mediaId for a live channel request
-  async getMediaId(team, mediaType, mediaDate, gameNumber, includeBlackouts) {
+  async getMediaId(team, level, mediaType, mediaDate, gameNumber, includeBlackouts) {
     try {
       this.debuglog('getMediaId')
 
@@ -1820,100 +1855,136 @@ class sessionClass {
           if ( includeBlackouts == 'false' ) blackouts = await this.get_blackout_games(cache_data.dates[0].games, true)
 
           for (var j = 0; j < cache_data.dates[0].games.length; j++) {
-            if ( mediaInfo.mediaId ) break
+            if ( mediaInfo.mediaId || mediaInfo.gamePk ) break
 
-            // check blackout status, if necessary
             let gamePk = cache_data.dates[0].games[j].gamePk.toString()
-            if ( (mediaType == 'MLBTV') && (includeBlackouts == 'false') && blackouts[gamePk] ) {
-              if ( !blackouts[gamePk].blackoutExpiry || (currentDate < blackouts[gamePk].blackoutExpiry) ) {
-                this.debuglog('getMediaId requested game is blacked out')
-                continue
-              }
-            }
 
-            if ( (typeof cache_data.dates[0].games[j] !== 'undefined') && cache_data.dates[0].games[j].content && cache_data.dates[0].games[j].content.media && cache_data.dates[0].games[j].content.media.epg ) {
+            if ( typeof cache_data.dates[0].games[j] !== 'undefined' ) {
               let home_team = cache_data.dates[0].games[j].teams['home'].team.abbreviation
               let away_team = cache_data.dates[0].games[j].teams['away'].team.abbreviation
+              let home_level = cache_data.dates[0].games[j].teams['home'].team.sport.id
+              let away_level = cache_data.dates[0].games[j].teams['away'].team.sport.id
+              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 it's a national or free game and we've requested that
-              if ( (team.toUpperCase() == home_team) || (team.toUpperCase() == away_team) || ((team.toUpperCase().indexOf('NATIONAL.') == 0) && ((cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType] == 'NATIONAL') || ((mediaType == 'MLBTV') && (cache_data.dates[0].games[j].seriesDescription != 'Regular Season') && (cache_data.dates[0].games[j].seriesDescription != 'Spring Training')))) || (team.toUpperCase().startsWith('FREE.') && cache_data.dates[0].games[j].content.media.freeGame) ) {
-
-                let teamType
-                let broadcast_count = 0
-                for (var k = 0; k < cache_data.dates[0].games[j].content.media.epg.length; k++) {
-                  if ( mediaInfo.mediaId ) break
-                  let mediaTitle = cache_data.dates[0].games[j].content.media.epg[k].title
-                  if ( mediaType == mediaTitle ) {
-                    // initial loop will count number of broadcasts
-                    broadcast_count = await this.count_broadcasts(cache_data.dates[0].games[j].content.media.epg[k].items, mediaType, mediaTitle, language)
-
-                    for (var x = 0; x < cache_data.dates[0].games[j].content.media.epg[k].items.length; x++) {
-                      // for video, check that it's not in-market
-                      if ( (mediaType == 'MLBTV') && await this.check_in_market(cache_data.dates[0].games[j].content.media.epg[k].items[x]) ) {
-                        continue
+              if ( ((team.toUpperCase() == home_team) && (LEVELS[level.toUpperCase()] == home_level)) || ((team.toUpperCase() == away_team) && (LEVELS[level.toUpperCase()] == away_level)) || ((team.toUpperCase().indexOf('NATIONAL.') == 0) && ((cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType] == 'NATIONAL') || ((mediaType == 'MLBTV') && (cache_data.dates[0].games[j].seriesDescription != 'Regular Season') && (cache_data.dates[0].games[j].seriesDescription != 'Spring Training')))) || (team.toUpperCase().startsWith('FREE.') && cache_data.dates[0].games[j].content.media.freeGame) ) {
+                this.debuglog('matched team for ' + cache_data.dates[0].games[j].teams['home'].team.abbreviation + '@' + cache_data.dates[0].games[j].teams['away'].team.abbreviation)
+
+                // Check if Winter League / MiLB game first
+                if ( (cache_data.dates[0].games[j].teams['home'].team.sport.id != LEVELS['MLB']) && (mediaType == 'MLBTV') ) {
+                  if ( cache_data.dates[0].games[j].broadcasts ) {
+                    let broadcastName = 'N/A'
+                    for (var k = 0; k < cache_data.dates[0].games[j].broadcasts.length; k++) {
+                      if ( cache_data.dates[0].games[j].broadcasts[k].name != 'Audio' ) {
+                        broadcastName = mediaType
+                        break
+                      }
+                    }
+                    if ( broadcastName == 'N/A' ) {
+                      break
+                    } else {
+                      if ( gameNumber && (gameNumber > 1) ) {
+                        this.debuglog('matched team for MILB game number 1')
+                        gameNumber--
+                      } else {
+                        this.debuglog('matched team for MILB event')
+                        mediaInfo.gamePk = gamePk
+                        break
                       }
+                    }
+                  }
+                  break
+                }
 
-                      if ( ((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].language) == 'undefined') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].language == language) ) {
-                        teamType = cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType]
+                // MLB games
+                if ( cache_data.dates[0].games[j].content && cache_data.dates[0].games[j].content.media && cache_data.dates[0].games[j].content.media.epg ) {
 
-                        let station = cache_data.dates[0].games[j].content.media.epg[k].items[x].callLetters
+                  // check blackout status, if necessary
+                  if ( (mediaType == 'MLBTV') && (includeBlackouts == 'false') && blackouts[gamePk] ) {
+                    if ( !blackouts[gamePk].blackoutExpiry || (currentDate < blackouts[gamePk].blackoutExpiry) ) {
+                      this.debuglog('getMediaId requested game is blacked out')
+                      continue
+                    }
+                  }
 
-                        // process requested national games (with the team/channel NATIONAL.x)
-                        if ( (team.toUpperCase().indexOf('NATIONAL.') == 0) && ((cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType] == 'NATIONAL') || ((mediaType == 'MLBTV') && (cache_data.dates[0].games[j].seriesDescription != 'Regular Season') && (cache_data.dates[0].games[j].seriesDescription != 'Spring Training'))) ) {
+                  let teamType
+                  let broadcast_count = 0
+                  for (var k = 0; k < cache_data.dates[0].games[j].content.media.epg.length; k++) {
+                    if ( mediaInfo.mediaId ) break
+                    let mediaTitle = cache_data.dates[0].games[j].content.media.epg[k].title
+                    if ( mediaType == mediaTitle ) {
+                      // initial loop will count number of broadcasts
+                      broadcast_count = await this.count_broadcasts(cache_data.dates[0].games[j].content.media.epg[k].items, mediaType, mediaTitle, language)
 
-                          nationalCount += 1
-                          let nationalArray = team.split('.')
-                          if ( (nationalArray.length == 2) && (nationalArray[1] == nationalCount) ) {
-                            this.debuglog('matched national event')
-                            mediaInfo = await this.check_media_state(cache_data.dates[0].games[j].content.media.epg[k].items[x], cache_data.dates[0].games[j].status.abstractGameState, mediaDate)
-                            break
-                          }
+                      for (var x = 0; x < cache_data.dates[0].games[j].content.media.epg[k].items.length; x++) {
+                        // for video, check that it's not in-market
+                        if ( (mediaType == 'MLBTV') && await this.check_in_market(cache_data.dates[0].games[j].content.media.epg[k].items[x]) ) {
+                          continue
+                        }
 
-                        // process requested free games (with the team/channel FREE.x)
-                        } else if ( team.toUpperCase().startsWith('FREE.') && cache_data.dates[0].games[j].content.media.freeGame ) {
+                        if ( ((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].language) == 'undefined') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].language == language) ) {
+                          teamType = cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType]
 
-                          freeCount += 1
-                          let freeArray = team.split('.')
-                          if ( (freeArray.length == 2) && (freeArray[1] == freeCount) ) {
-                            this.debuglog('matched free event')
-                            mediaInfo = await this.check_media_state(cache_data.dates[0].games[j].content.media.epg[k].items[x], cache_data.dates[0].games[j].status.abstractGameState, mediaDate)
-                            break
-                          }
+                          let station = cache_data.dates[0].games[j].content.media.epg[k].items[x].callLetters
 
-                        // process requested team games
-                        } else if ( (team.toUpperCase() == home_team) || (team.toUpperCase() == away_team) ) {
+                          // process requested national games (with the team/channel NATIONAL.x)
+                          if ( (team.toUpperCase().indexOf('NATIONAL.') == 0) && ((cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType] == 'NATIONAL') || ((mediaType == 'MLBTV') && (cache_data.dates[0].games[j].seriesDescription != 'Regular Season') && (cache_data.dates[0].games[j].seriesDescription != 'Spring Training'))) ) {
 
-                          if ( ((team.toUpperCase() == home_team) && (teamType == 'HOME')) || ((team.toUpperCase() == away_team) && (teamType == 'AWAY')) || (broadcast_count == 1) ) {
-                            if ( gameNumber && (gameNumber > 1) ) {
-                              this.debuglog('matched team for game number 1')
-                              gameNumber--
-                            } else {
-                              this.debuglog('matched team for event')
+                            nationalCount += 1
+                            let nationalArray = team.split('.')
+                            if ( (nationalArray.length == 2) && (nationalArray[1] == nationalCount) ) {
+                              this.debuglog('matched national event')
                               mediaInfo = await this.check_media_state(cache_data.dates[0].games[j].content.media.epg[k].items[x], cache_data.dates[0].games[j].status.abstractGameState, mediaDate)
                               break
                             }
-                          }
 
+                          // process requested free games (with the team/channel FREE.x)
+                          } else if ( team.toUpperCase().startsWith('FREE.') && cache_data.dates[0].games[j].content.media.freeGame ) {
+
+                            freeCount += 1
+                            let freeArray = team.split('.')
+                            if ( (freeArray.length == 2) && (freeArray[1] == freeCount) ) {
+                              this.debuglog('matched free event')
+                              mediaInfo = await this.check_media_state(cache_data.dates[0].games[j].content.media.epg[k].items[x], cache_data.dates[0].games[j].status.abstractGameState, mediaDate)
+                              break
+                            }
+
+                          // process requested team games
+                          } else if ( (team.toUpperCase() == home_team) || (team.toUpperCase() == away_team) ) {
+
+                            if ( ((team.toUpperCase() == home_team) && (teamType == 'HOME')) || ((team.toUpperCase() == away_team) && (teamType == 'AWAY')) || (broadcast_count == 1) ) {
+                              if ( gameNumber && (gameNumber > 1) ) {
+                                this.debuglog('matched team for game number 1')
+                                gameNumber--
+                              } else {
+                                this.debuglog('matched team for event')
+                                mediaInfo = await this.check_media_state(cache_data.dates[0].games[j].content.media.epg[k].items[x], cache_data.dates[0].games[j].status.abstractGameState, mediaDate)
+                                break
+                              }
+                            }
+
+                          }
                         }
                       }
                     }
                   }
-                }
 
-                // grab any alternate audio tracks, if necessary
-                if ( mediaInfo.mediaId && (mediaType == 'MLBTV') && (broadcast_count == 1) ) {
-                  mediaInfo.alternateAudioTracks = await this.getAlternateAudioTracks(cache_data.dates[0].games[j].content.media.epg, teamType)
+                  // grab any alternate audio tracks, if necessary
+                  if ( mediaInfo.mediaId && (mediaType == 'MLBTV') && (broadcast_count == 1) ) {
+                    mediaInfo.alternateAudioTracks = await this.getAlternateAudioTracks(cache_data.dates[0].games[j].content.media.epg, teamType)
+                  }
+
                 }
 
               }
             }
           }
 
-          if (mediaInfo.mediaId) {
+          if (mediaInfo.mediaId || mediaInfo.gamePk) {
             return mediaInfo
           }
         }
-        this.log('could not find mediaId')
+        this.log('could not find mediaId or gamePk')
       } else {
         this.log('will not find mediaId for future date')
       }
@@ -2012,11 +2083,11 @@ class sessionClass {
   }
 
   // get data for a day, either from cache or an API call
-  async getDayData(dateString, team = false, level_ids = LEVELS.MLB, team_ids = '') {
+  async getDayData(dateString, team = false, level_ids = LEVELS.All, team_ids = '') {
     try {
       let cache_data
       let cache_name = dateString
-      if ( level_ids != '1' ) {
+      if ( level_ids != LEVELS['MLB'] ) {
         cache_name += '.' + level_ids
       }
       if ( team_ids != '' ) {
@@ -2109,7 +2180,7 @@ class sessionClass {
   }
 
   // get data for 3 weeks, either from cache or an API call
-  async getWeeksData() {
+  async getWeeksData(level_ids, team_ids) {
     try {
       this.debuglog('getWeeksData')
 
@@ -2118,15 +2189,29 @@ class sessionClass {
 
       let cache_data
       let cache_name = 'week'
+
+      if ( level_ids != LEVELS['All'] ) {
+        cache_name += '.' + level_ids
+      }
+      if ( team_ids != '' ) {
+        cache_name += '.' + team_ids
+      }
+
       let cache_file = path.join(this.CACHE_DIRECTORY, cache_name + '.json')
       let currentDate = new Date()
-      if ( !fs.existsSync(cache_file) || !this.cache || !this.cache.weekCacheExpiry || (currentDate > new Date(this.cache.weekCacheExpiry)) ) {
+      if ( !fs.existsSync(cache_file) || !this.cache || !this.cache.weeks || !this.cache.weeks[cache_name] || !this.cache.weeks[cache_name].weekCacheExpiry || (currentDate > new Date(this.cache.weeks[cache_name].weekCacheExpiry)) ) {
         let startDate = this.liveDate(utcHours)
         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
+        if ( team_ids != '' ) {
+          data_url += '&teamId=' + team_ids
+        }
+        data_url += '&startDate=' + startDate + '&endDate=' + endDate + '&hydrate=broadcasts(all),game(content(media(epg))),probablePitcher,linescore,team'
         let reqObj = {
-          url: 'https://bdfed.stitch.mlbinfra.com/bdfed/transform-mlb-scoreboard?stitch_env=prod&sortTemplate=2&sportId=1&sportId=17&startDate=' + startDate + '&endDate=' + endDate + '&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=',
+          //url: 'https://bdfed.stitch.mlbinfra.com/bdfed/transform-mlb-scoreboard?stitch_env=prod&sortTemplate=2&sportId=1&sportId=17&startDate=' + startDate + '&endDate=' + endDate + '&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=',
+          url: data_url,
           headers: {
             'User-agent': USER_AGENT,
             'Origin': 'https://www.mlb.com',
@@ -2140,17 +2225,18 @@ class sessionClass {
           //this.debuglog(response)
           cache_data = JSON.parse(response)
           this.save_json_cache_file(cache_name, cache_data)
+
           this.debuglog('setting channels cache expiry to next day')
-          let nextDate = new Date(startDate)
-          nextDate.setDate(nextDate.getDate()+1)
-          nextDate.setHours(nextDate.getHours()+utcHours)
-          this.cache.weekCacheExpiry = nextDate
-          this.save_cache_data()
+          let cacheExpiry = new Date(startDate)
+          cacheExpiry.setDate(cacheExpiry.getDate()+1)
+          cacheExpiry.setHours(cacheExpiry.getHours()+utcHours)
+          // finally save the setting
+          this.setWeekCacheExpiry(cache_name, cacheExpiry)
         } else {
           this.log('error : invalid json from url ' + reqObj.url)
         }
       } else {
-        this.debuglog('using cached channel data')
+        this.debuglog('using cached week data')
         cache_data = this.readFileToJson(cache_file)
       }
       if (cache_data) {
@@ -2162,7 +2248,7 @@ class sessionClass {
   }
 
   // get TV data (channels or guide)
-  async getTVData(dataType, mediaType, includeTeams, excludeTeams, server, includeBlackouts, resolution='best', pipe='false', startingChannelNumber=1) {
+  async getTVData(dataType, mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, resolution='best', pipe='false', startingChannelNumber=1) {
     try {
       this.debuglog('getTVData for ' + dataType)
 
@@ -2194,7 +2280,40 @@ class sessionClass {
           }
         }
 
-        let cache_data = await this.getWeeksData()
+        var level_ids = LEVELS['All']
+        var team_ids = ''
+        if ( includeLevels.length > 0 ) {
+          if ( (includeLevels.length > 1) || !includeLevels.includes('ALL') ) {
+            let level_list = []
+            for (let i = 0; i < includeLevels.length; i++) {
+              level_list.append(LEVELS[includeLevels[i]])
+            }
+            level_ids = level_list.toString()
+          }
+        } else {
+          if ( includeOrgs.length > 0 ) {
+            team_ids = this.getTeamIds()
+            for (let i = 0; i < includeOrgs.length; i++) {
+              team_ids += ',' + AFFILIATE_TEAM_IDS[includeOrgs[i]]
+            }
+          } else if ( includeTeams.length > 0 ) {
+            team_ids = this.getTeamIds()
+            for (let i=0; i<includeTeams.length; i++) {
+              if ( includeTeams[i] != '' ) {
+                team_ids += ',' + AFFILIATE_TEAM_IDS[includeTeams[i]]
+              }
+            }
+          } else {
+            team_ids = this.getTeamIds()
+            for (let i=0; i<this.credentials.fav_teams.length; i++) {
+              if ( this.credentials.fav_teams[i] != '' ) {
+                team_ids += ',' + AFFILIATE_TEAM_IDS[this.credentials.fav_teams[i]]
+              }
+            }
+          }
+        }
+
+        let cache_data = await this.getWeeksData(level_ids, team_ids)
         if (cache_data) {
           let today = this.liveDate()
           var nationalChannels = {}
@@ -2214,59 +2333,92 @@ class sessionClass {
 
             for (var j = 0; j < cache_data.dates[i].games.length; j++) {
               this.debuglog('getTVData processing game ' + j + ' for date ' + cache_data.dates[i].date)
-              // First check if Winter League games
-              if ( cache_data.dates[i].games[j].teams['home'].team.sport.name == 'Winter Leagues' ) {
-                if ( (excludeTeams.length > 0) && excludeTeams.includes('LIDOM') ) {
-                  continue
-                } else if ( (includeTeams.length == 0) || includeTeams.includes('LIDOM') ) {
-                  if ( cache_data.dates[i].games[j].broadcasts ) {
+              // Check if Winter League / MiLB game first
+              if ( (cache_data.dates[i].games[j].teams['home'].team.sport.id != LEVELS['MLB']) && (mediaType == 'MLBTV') ) {
+                if ( cache_data.dates[i].games[j].broadcasts ) {
+                  let broadcastName = 'N/A'
+                  for (var k = 0; k < cache_data.dates[i].games[j].broadcasts.length; k++) {
+                    if ( cache_data.dates[i].games[j].broadcasts[k].name != 'Audio' ) {
+                      broadcastName = mediaType
+                      break
+                    }
+                  }
+                  if ( broadcastName == 'N/A' ) {
+                    continue
+                  } else {
                     for (var k = 0; k < cache_data.dates[i].games[j].broadcasts.length; k++) {
-                      if ( (mediaType == 'MLBTV') && (cache_data.dates[i].games[j].broadcasts[k].name == 'MLB.TV') ) {
-                        let team = cache_data.dates[i].games[j].teams['home'].team.clubName.toUpperCase()
-                        let channelid = mediaType + '.' + team
-                        let logo = server + '/image.svg?teamId=MLB'
-                        let streamMediaType = 'Video'
-                        let stream = server + '/stream.m3u8?event=' + encodeURIComponent(team) + '&mediaType=' + streamMediaType
-                        stream += '&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)
-                        channels[channelid] = await this.create_channel_object(channelid, logo, stream, mediaType)
-
-                        let title = cache_data.dates[i].games[j].teams['home'].team.league.name + ': ' + cache_data.dates[i].games[j].teams['away'].team.name + ' at ' + cache_data.dates[i].games[j].teams['home'].team.name
-
-                        let description = ''
-                        if ( cache_data.dates[i].games[j].doubleHeader != 'N' ) {
-                          description += 'Game ' + cache_data.dates[i].games[j].gameNumber + '. '
+                      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
+                      let opponent_team_id = cache_data.dates[i].games[j].teams['away'].team.id
+                      if ( team_ids.includes(opponent_team_id) && !team_ids.includes(team_id) ) {
+                        team_id = opponent_team_id
+                        team = cache_data.dates[i].games[j].teams['away'].team.abbreviation
+                      }
+                      let channelid = mediaType + '.' + team
+                      let logo = server + '/image.svg?teamId=' + team_id
+                      let streamMediaType = 'Video'
+                      let stream = server + '/stream.m3u8?team=' + encodeURIComponent(team) + '&mediaType=' + streamMediaType
+                      let sportId = cache_data.dates[i].games[j].teams['home'].team.sport.id
+                      stream += '&level=' + this.getLevelNameFromSportId(sportId)
+                      stream += '&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)
+                      channels[channelid] = await this.create_channel_object(channelid, logo, stream, mediaType)
+
+                      let title = cache_data.dates[i].games[j].teams['home'].team.league.name + ': ' + cache_data.dates[i].games[j].teams['away'].team.name + ' at ' + cache_data.dates[i].games[j].teams['home'].team.name
+
+                      let description = ''
+                      if ( cache_data.dates[i].games[j].seriesDescription != 'Regular Season' ) {
+                        description += cache_data.dates[i].games[j].seriesDescription + '. '
+                      }
+                      if ( cache_data.dates[i].games[j].doubleHeader != 'N' ) {
+                        description += 'Doubleheader game ' + cache_data.dates[i].games[j].gameNumber + '. '
+                      }
+                      var scheduledInnings = await this.get_scheduled_innings(cache_data.dates[0].games[j])
+                      if ( scheduledInnings != '9' ) {
+                        description += scheduledInnings + '-inning game. '
+                      }
+                      if ( (cache_data.dates[i].games[j].teams['away'].probablePitcher && cache_data.dates[i].games[j].teams['away'].probablePitcher.fullName) || (cache_data.dates[i].games[j].teams['home'].probablePitcher && cache_data.dates[i].games[j].teams['home'].probablePitcher.fullName) ) {
+                        if ( cache_data.dates[i].games[j].teams['away'].probablePitcher && cache_data.dates[i].games[j].teams['away'].probablePitcher.fullName ) {
+                          description += cache_data.dates[i].games[j].teams['away'].probablePitcher.fullName
+                        } else {
+                          description += 'TBD'
                         }
-                        description += 'In Spanish. From ' + cache_data.dates[i].games[j].teams['home'].team.venue.name + '. '
-
-                        let gameDate = new Date(cache_data.dates[i].games[j].gameDate)
-                        let gameHours = 3
-                        // Handle suspended, TBD, and doubleheaders
-                        if ( cache_data.dates[i].games[j].status.resumedFrom ) {
-                          gameHours = 1
-                          if ( cache_data.dates[i].games[j].description ) {
-                            description += cache_data.dates[i].games[j].description
-                          } else {
-                            description += 'Resumption of suspended game.'
-                          }
-                          gameDate = new Date(cache_data.dates[i].games[j].gameDate)
-                          gameDate.setHours(gameDate.getHours()+1)
-                        } else if ( (cache_data.dates[i].games[j].status.startTimeTBD == true) && (cache_data.dates[i].games[j].doubleHeader == 'Y') && (cache_data.dates[i].games[j].gameNumber == 2) ) {
-                          description += 'Start time TBD.'
-                          gameDate = new Date(cache_data.dates[i].games[j-1].gameDate)
-                          gameDate.setHours(gameDate.getHours()+4)
-                        } else if ( cache_data.dates[i].games[j].status.startTimeTBD == true ) {
-                          continue
+                        description += ' vs. '
+                        if ( cache_data.dates[i].games[j].teams['home'].probablePitcher && cache_data.dates[i].games[j].teams['home'].probablePitcher.fullName ) {
+                          description += cache_data.dates[i].games[j].teams['home'].probablePitcher.fullName
+                        } else {
+                          description += 'TBD'
                         }
-                        let start = this.convertDateToXMLTV(gameDate)
-                        gameDate.setHours(gameDate.getHours()+gameHours)
-                        let stop = this.convertDateToXMLTV(gameDate)
-
-                        programs += await this.generate_xml_program(channelid, start, stop, title, description, logo)
+                        description += '. '
+                      }
 
-                        break
+                      let gameDate = new Date(cache_data.dates[i].games[j].gameDate)
+                      let gameHours = 3
+                      // Handle suspended, TBD, and doubleheaders
+                      if ( cache_data.dates[i].games[j].status.resumedFrom ) {
+                        gameHours = 1
+                        if ( cache_data.dates[i].games[j].description ) {
+                          description += cache_data.dates[i].games[j].description
+                        } else {
+                          description += 'Resumption of suspended game.'
+                        }
+                        gameDate = new Date(cache_data.dates[i].games[j].gameDate)
+                        gameDate.setHours(gameDate.getHours()+1)
+                      } else if ( (cache_data.dates[i].games[j].status.startTimeTBD == true) && (cache_data.dates[i].games[j].doubleHeader == 'Y') && (cache_data.dates[i].games[j].gameNumber == 2) ) {
+                        description += 'Start time TBD.'
+                        gameDate = new Date(cache_data.dates[i].games[j-1].gameDate)
+                        gameDate.setHours(gameDate.getHours()+4)
+                      } else if ( cache_data.dates[i].games[j].status.startTimeTBD == true ) {
+                        continue
                       }
+                      let start = this.convertDateToXMLTV(gameDate)
+                      gameDate.setHours(gameDate.getHours()+gameHours)
+                      let stop = this.convertDateToXMLTV(gameDate)
+
+                      programs += await this.generate_xml_program(channelid, start, stop, title, description, logo)
+
+                      break
                     }
                   }
                 }
@@ -2446,7 +2598,7 @@ class sessionClass {
           channels = Object.assign(channels, nationalChannels)
 
           // Big Inning
-          if ( mediaType == 'MLBTV' ) {
+          if ( (mediaType == 'MLBTV') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
             if ( (excludeTeams.length > 0) && excludeTeams.includes('BIGINNING') ) {
               // do nothing
             } else if ( (includeTeams.length == 0) || includeTeams.includes('BIGINNING') ) {
@@ -2493,7 +2645,7 @@ class sessionClass {
           }
 
           // Game Changer
-          if ( mediaType == 'MLBTV' ) {
+          if ( (mediaType == 'MLBTV') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
             if ( (excludeTeams.length > 0) && excludeTeams.includes('GAMECHANGER') ) {
               // do nothing
             } else if ( (includeTeams.length == 0) || includeTeams.includes('GAMECHANGER') ) {
@@ -2530,7 +2682,7 @@ class sessionClass {
           }
 
           // Multiview
-          if ( (mediaType == 'MLBTV') && (typeof this.data.multiviewStreamURLPath !== 'undefined') ) {
+          if ( (mediaType == 'MLBTV') && (typeof this.data.multiviewStreamURLPath !== 'undefined') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
             if ( (excludeTeams.length > 0) && excludeTeams.includes('MULTIVIEW') ) {
               // do nothing
             } else if ( (includeTeams.length == 0) || includeTeams.includes('MULTIVIEW') ) {
@@ -3026,7 +3178,8 @@ class sessionClass {
                   day = parts[1].substring(0,parts[1].length-3)*/
                   // new date format (01/01/70)
                   parts = col[0].split('/')
-                  year = '20' + parts[2]
+                  //year = '20' + parts[2]
+                  year = parts[2]
                   // get month index, zero-based
                   month = parseInt(parts[0]) - 1
                   day = parts[1]
@@ -3366,6 +3519,7 @@ class sessionClass {
         this.log('getBlackoutTeams for zip code ' + this.credentials.zip_code)
         let reqObj = {
           url: 'https://content.mlb.com/data/blackouts/' + this.credentials.zip_code + '.json',
+          rejectUnauthorized: false,
           headers: {
             'User-Agent': USER_AGENT,
             'Origin': 'https://www.mlb.com',
@@ -3404,13 +3558,16 @@ class sessionClass {
         for (var k = 0; k < games[j].content.media.epg.length; k++) {
           if ( games[j].content.media.epg[k].title == 'MLBTV' ) {
             for (var x = 0; x < games[j].content.media.epg[k].items.length; x++) {
+              this.debuglog('check_regional_fox_games checking ' + games[j].content.media.epg[k].items[x].callLetters)
               if ( games[j].content.media.epg[k].items[x].callLetters == 'FOX' ) {
+                this.debuglog('check_regional_fox_games found FOX game')
                 if ( fox_start_time && (games[j].gameDate == fox_start_time) ) {
-                  this.debuglog('check_regional_fox_games found')
+                  this.debuglog('check_regional_fox_games determined regional game')
                   regional_fox_games_exist = 'true'
                   break
                 } else {
                   fox_start_time = games[j].gameDate
+                  break
                 }
               }
             }
@@ -3424,6 +3581,7 @@ class sessionClass {
 
   // get all blackout games for a date
   async get_blackout_games(games, calculate_expiries=false) {
+    this.debuglog('get_blackout_games')
     let blackouts = {}
 
     let usa_blackout = /(^\d{5}$)/.test(this.credentials.zip_code) && (this.credentials.country == 'USA')
@@ -3434,14 +3592,18 @@ class sessionClass {
       if ( games[j].content && games[j].content.media && games[j].content.media.epg ) {
         for (var k = 0; k < games[j].content.media.epg.length; k++) {
           if ( games[j].content.media.epg[k].title == 'MLBTV' ) {
+            this.debuglog('get_blackout_games checking ' + game_pk)
             for (var x = 0; x < games[j].content.media.epg[k].items.length; x++) {
-              if (games[j].content.media.epg[k].items[x].mediaFeedType == 'NATIONAL') {
+              this.debuglog('get_blackout_games checking feed ' + games[j].content.media.epg[k].items[x].mediaFeedType + ' ' + games[j].content.media.epg[k].items[x].callLetters)
+              if ( (games[j].content.media.epg[k].items[x].mediaFeedType == 'NATIONAL') || (await this.check_pay_tv(games[j].content.media.epg[k].items[x])) ) {
+                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 && (games[j].content.media.epg[k].items[x].callLetters == 'FOX') && (games[j].seriesDescription == 'Regular Season') ) {
-                  if ( !regional_fox_games_exist ) {
+                if ( usa_blackout && (games[j].content.media.epg[k].items[x].callLetters == '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 == 'false' ) {
+                  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
                   }
@@ -4023,7 +4185,7 @@ class sessionClass {
 
   async check_pay_tv(item) {
     try {
-      if ( item.foxAuthRequired || item.tbsAuthRequired || item.espnAuthRequired || item.fs1AuthRequired || item.mlbnAuthRequired ) {
+      if ( item.foxAuthRequired || item.tbsAuthRequired || item.espnAuthRequired || item.espn2AuthRequired || item.fs1AuthRequired || item.mlbnAuthRequired || item.abcAuthRequired ) {
         return true
       }
     } catch (e) {
@@ -4034,7 +4196,7 @@ class sessionClass {
 
   async get_scheduled_innings(game) {
     var scheduledInnings = '9'
-    if ( game.linescore && game.linescore.scheduledInnings ) {
+    if ( game && game.linescore && game.linescore.scheduledInnings ) {
       scheduledInnings = game.linescore.scheduledInnings
       if ( (game.status.abstractGameState == 'Final') && game.linescore.currentInning && (game.linescore.currentInning < 9) ) {
         scheduledInnings = game.linescore.currentInning