mlbserver 2026.2.23 → 2026.3.27-2

package/Dockerfile

@@ -1,13 +1,24 @@
-FROM node:16-alpine
+# --- Build Stage ---
+FROM node:18-alpine AS build
 
-RUN apk update && apk add tzdata
+# Set environment variable to skip the automatic Chromium download by Puppeteer
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+
+# Install system-level dependencies for Chromium on Alpine
+RUN apk update && apk add --no-cache \
+    tzdata \
+    udev \
+    ttf-freefont \
+    chromium \
+    nss \
+    freetype \
+    harfbuzz \
+    ca-certificates
 
 # Create app directory
 WORKDIR /mlbserver
 
-# Add data directory
-VOLUME /mlbserver/data_directory 
-
 # Install app dependencies
 # A wildcard is used to ensure both package.json AND package-lock.json are copied
 # where available (npm@5+)
@@ -20,5 +31,29 @@ RUN npm install
 # Bundle app source
 COPY . .
 
+# --- Runtime Stage ---
+FROM node:20-alpine AS runtime
+
+# Install only the necessary runtime dependencies again
+RUN apk add --no-cache \
+    tzdata \
+    udev \
+    ttf-freefont \
+    chromium \
+    nss \
+    freetype \
+    harfbuzz \
+    ca-certificates
+
+# Set the executable path for Puppeteer
+ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
+
+WORKDIR /mlbserver
+# Copy built application from the build stage
+COPY --from=build /mlbserver .
+
+# Add data directory
+VOLUME /mlbserver/data_directory 
+
 EXPOSE 9999 10000
 CMD [ "node", "index.js", "--env", "--port", "9999", "--multiview_port", "10000", "--data_directory", "/mlbserver/data_directory" ]

package/index.js

@@ -431,7 +431,7 @@ var getKey = function(url, headers, cb) {
   requestRetry(url, headers, function(err, response) {
     if (err) return cb(err)
     let key = response.body
-    session.debuglog('key returned ' + key)
+    session.debuglog('key returned ' + Buffer.from(key, 'binary').toString('base64'))
     session.temp_cache.prevKeys[url] = key
     cb(null, key)
   })
@@ -1262,15 +1262,28 @@ app.get('/gamechangerplaylist.m3u8', async function(req, res) {
               let new_segments_complete = false
               let segment_count = 0
               for (var i=(body.length-1); i>=0; i--) {
-                if ( body[i].startsWith('#EXTINF:') ) {
-                  let line = url.resolve(u, body[i+1])
-                  if ( !new_segments_complete ) {
-                    session.debuglog(game_changer_title + 'found segment ' + line)
+                if ( body[i].startsWith('#EXT-X-KEY') ) {
+                  let key = url.resolve(u, body[i].match('URI="([^"]+)"')[1])
+                  let iv = body[i].match('IV=0x(.*)$')[1]
+                  let ts
+                  let extinf
+                  for (var j=1; j<=4; j++) {
+                    if ( body[i+j] ) {
+                      if ( !extinf && body[i+j].startsWith('#EXTINF') ) {
+                        extinf = body[i+j]
+                      } else if ( !ts && !body[i+j].startsWith('#') ) {
+                        ts = url.resolve(u, body[i+j])
+                      }
+                      if ( extinf && ts ) break;
+                    }
+                  }
+                  if ( key && iv && extinf && ts && !new_segments_complete ) {
+                    session.debuglog(game_changer_title + 'found segment ' + ts)
                     if ( discontinuity ) {
                       session.debuglog(game_changer_title + 'only getting newest segment after stream change')
-                      new_segments.unshift({'extinf':body[i], 'ts':line, 'streamURLToken':streamURLToken})
+                      new_segments.unshift({'key':key, 'iv':iv, 'extinf':extinf, 'ts':ts, 'streamURLToken':streamURLToken})
                       new_segments_complete = true
-                    } else if ( !discontinuity && (session.temp_cache.gamechanger[id].segments.length > 0) && (line == session.temp_cache.gamechanger[id].segments[session.temp_cache.gamechanger[id].segments.length-1].ts) ) {
+                    } else if ( !discontinuity && (session.temp_cache.gamechanger[id].segments.length > 0) && (ts == session.temp_cache.gamechanger[id].segments[session.temp_cache.gamechanger[id].segments.length-1].ts) ) {
                       session.debuglog(game_changer_title + 'found previous last segment')
                       new_segments_complete = true
                     } else if ( segment_count == GAMECHANGER_LIST_SIZE ) {
@@ -1281,7 +1294,7 @@ app.get('/gamechangerplaylist.m3u8', async function(req, res) {
                       }
                       new_segments_complete = true
                     } else {
-                      new_segments.unshift({'extinf':body[i], 'ts':line, 'streamURLToken':streamURLToken})
+                      new_segments.unshift({'key':key, 'iv':iv, 'extinf':extinf, 'ts':ts, 'streamURLToken':streamURLToken})
                     }
                   }
                   segment_count++
@@ -1314,7 +1327,7 @@ app.get('/gamechangerplaylist.m3u8', async function(req, res) {
                 if ( session.temp_cache.gamechanger[id].segments[i].discontinuity ) {
                   session.temp_cache.gamechanger[id].playlist[resolution] += '#EXT-X-DISCONTINUITY' + '\n'
                 }
-                session.temp_cache.gamechanger[id].playlist[resolution] += session.temp_cache.gamechanger[id].segments[i].extinf + '\n' + http_root + '/segment.ts?url=' + encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].ts) + '&streamURLToken='+encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].streamURLToken) + content_protect + '\n'
+                session.temp_cache.gamechanger[id].playlist[resolution] += session.temp_cache.gamechanger[id].segments[i].extinf + '\n' + http_root + '/segment.ts?url=' + encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].ts) + '&streamURLToken='+encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].streamURLToken) + '&key='+encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].key) + '&iv='+encodeURIComponent(session.temp_cache.gamechanger[id].segments[i].iv) + content_protect + '\n'
               }
 
               session.debuglog(game_changer_title + 'playlist ' + session.temp_cache.gamechanger[id].playlist[resolution])
@@ -1684,6 +1697,33 @@ app.get('/', async function(req, res) {
     let currentDate = new Date()
 
     let entitlements = await session.getEntitlements()
+
+    // MASN live stream for entitled subscribers
+    try {
+        if ( entitlements.includes('MASN_110') ) {
+          body += '<tr><td><span class="tooltip">MASN<span class="tooltiptext">MASN live stream for entitled subscribers. <a href="https://support.mlb.com/s/article/MASN-In-Market-Offering">See here for more information</a>.</span></span></td><td>'
+          let querystring = '?event=MASN'
+          let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION
+          if ( linkType == VALID_LINK_TYPES[0] ) {
+            if ( startFrom != VALID_START_FROM[0] ) querystring += '&startFrom=' + startFrom
+            if ( controls != VALID_CONTROLS[0] ) querystring += '&controls=' + controls
+          }
+          if ( resolution != VALID_RESOLUTIONS[0] ) querystring += '&resolution=' + resolution
+          if ( linkType == VALID_LINK_TYPES[1] ) {
+            if ( force_vod != VALID_FORCE_VOD[0] ) querystring += '&force_vod=' + force_vod
+          } else if ( linkType == VALID_LINK_TYPES[4] ) {
+            querystring += '&filename=' + gameDate + ' MASN'
+          }
+          querystring += content_protect_b
+          multiviewquerystring += content_protect_b
+          body += '<a href="' + thislink + querystring + '">MASN</a>'
+          body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
+          body += '</td></tr>' + "\n"
+        } // end entitlements check
+    } catch (e) {
+      session.debuglog('MASN detect error : ' + e.message)
+    }
+    
     // MLB Network live stream for eligible USA subscribers
     try {
         if ( entitlements.includes('MLBN') || entitlements.includes('EXECMLB') || entitlements.includes('MLBTVMLBNADOBEPASS') ) {
@@ -2438,7 +2478,7 @@ app.get('/', async function(req, res) {
       resolution = 'best'
     }
 
-    body += '<p><span class="tooltip">All<span class="tooltiptext">Will include all entitled live MLB broadcasts (games plus Big Inning, Game Changer, and Multiview, as well as MLB Network, SNLA, and/or SNY as appropriate). If favorite team(s) have been provided, it will also include affiliate games for those organizations. Channels/games subject to blackout will be omitted by default. See below for an additional option to override that.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + content_protect_b + '">channels.m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + content_protect_b + '">calendar.ics</a></p>' + "\n"
+    body += '<p><span class="tooltip">All<span class="tooltiptext">Will include all entitled live MLB broadcasts (games plus Big Inning, Game Changer, and Multiview, as well as MASN, MLB Network, SNLA, and/or SNY as appropriate). If favorite team(s) have been provided, it will also include affiliate games for those organizations. Channels/games subject to blackout will be omitted by default. See below for an additional option to override that.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + content_protect_b + '">channels.m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + content_protect_b + '">calendar.ics</a></p>' + "\n"
 
     let include_teams = 'ath,atl'
     if ( (session.credentials.fav_teams.length > 0) && (session.credentials.fav_teams[0].length > 0) ) {
@@ -2457,6 +2497,10 @@ app.get('/', async function(req, res) {
 
     body += '<p><span class="tooltip">Include (or exclude) Winter Leagues<span class="tooltiptext">Winter leagues include the Arizona Fall League, Dominican Winter League aka Liga de Beisbol Dominicano, and Mexican Winter League aka Liga Mexicana del Pacífico. Live stream only, does not support starting from the beginning or certain innings, skip options, etc.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=winter' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=winter' + content_protect_b + '">xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=winter' + content_protect_b + '">ics</a></p>' + "\n"
 
+    if ( entitlements.includes('MASN_110') ) {
+      body += '<p><span class="tooltip">Include (or exclude) MASN<span class="tooltiptext">MASN live stream for entitled subscribers. <a href="https://support.mlb.com/s/article/MASN-In-Market-Offering">See here for more information</a>.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=masn' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=masn' + content_protect_b + '">xml</a></p>' + "\n"
+    }
+
     if ( entitlements.includes('MLBN') || entitlements.includes('EXECMLB') || entitlements.includes('MLBTVMLBNADOBEPASS') ) {
       body += '<p><span class="tooltip">Include (or exclude) MLB Network<span class="tooltiptext">MLB Network live stream is now available in the USA for paid MLBTV subscribers or as a paid add-on, in addition to authenticated TV subscribers. <a href="https://support.mlb.com/s/article/MLB-Network-Streaming-FAQ">See here for more information</a>.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=mlbn' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=mlbn' + content_protect_b + '">xml</a></p>' + "\n"
     }
@@ -2466,7 +2510,7 @@ app.get('/', async function(req, res) {
     }
 
     if ( entitlements.includes('SNY_121') ) {
-      body += '<p><span class="tooltip">Include (or exclude) SNY<span class="tooltiptext">SNY live stream for entitled subscribers. <a href="https://support.mlb.com/s/article/SNLA-Plus-Subscription-Packages">See here for more information</a>.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=sny' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=sny' + content_protect_b + '">xml</a></p>' + "\n"
+      body += '<p><span class="tooltip">Include (or exclude) SNY<span class="tooltiptext">SNY live stream for entitled subscribers. <a href="https://support.mlb.com/s/article/SNY-In-Market-Offering">See here for more information</a>.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=sny' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=sny' + content_protect_b + '">xml</a></p>' + "\n"
     }
 
     body += '<p><span class="tooltip">Include (or exclude) Big Inning<span class="tooltiptext">Big Inning is the live look-in and highlights show. <a href="https://www.mlb.com/live-stream-games/big-inning">See here for more information</a>.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=biginning' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=biginning' + content_protect_b + '">xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=biginning' + content_protect_b + '">ics</a></p>' + "\n"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlbserver",
-  "version": "2026.2.23",
+  "version": "2026.3.27-2",
   "description": "",
   "repository": {
     "type": "git",
@@ -13,6 +13,7 @@
     "http": "0.0.1-security",
     "http-attach": "^1.0.0",
     "minimist": "^1.2.8",
+    "puppeteer": "^24.40.0",
     "readline-sync": "^1.4.10",
     "request": "^2.88.2",
     "request-promise": "^4.2.6",

package/session.js

@@ -8,6 +8,7 @@ const path = require('path')
 const readlineSync = require('readline-sync')
 const FileCookieStore = require('tough-cookie-filestore')
 const parseString = require('xml2js').parseString
+const puppeteer = require('puppeteer')
 
 const MULTIVIEW_DIRECTORY_NAME = 'multiview'
 
@@ -28,7 +29,7 @@ const LIDOM_TEAM_IDS = { 'AGU': '667', 'TOR': '668', 'EST': '669', 'GIG': '670',
 
 const LMP_TEAM_IDS = { 'MXC': '673', 'JAL': '674', 'MOC': '675', 'HER': '677', 'CUL': '678', 'MAZ': '679', 'OBR': '680', 'GSV': '5482', 'NAY': '6483', 'TBC': '6484' }
 
-const AFFILIATE_TEAM_IDS = { 'ATH': '237,400,499,524', 'ATL': '431,432,478,6325', 'AZ': '419,516,2310,5368', 'BAL': '418,488,548,568', 'BOS': '414,428,533,546', 'CHC': '451,521,550,553', 'CIN': '416,450,459,498', 'CLE': '402,437,445,481', 'COL': '259,342,486,538', 'CWS': '247,487,494,580', 'DET': '106,512,570,582', 'HOU': '482,573,3712,5434', 'KC': '541,565,1350,3705', 'LAA': '401,460,559,561', 'LAD': '238,260,456,526', 'MIA': '479,554,564,4124', 'MIL': '249,556,572,5015', 'MIN': '492,509,1960,3898', 'NYM': '453,505,507,552', 'NYY': '531,537,587,1956', 'PHI': '427,522,566,1410', 'PIT': '452,477,484,3390', 'SD': '103,510,584,4904', 'SEA': '403,515,529,574', 'SF': '105,461,476,3410', 'STL': '235,279,440,443', 'TB': '233,234,421,2498', 'TEX': '102,448,540,6324', 'TOR': '422,424,435,463', 'WSH': '426,436,534,547' }
+const AFFILIATE_TEAM_IDS = {"ATH":"237,400,499,524","ATL":"431,432,478,6325","AZ":"419,516,2310,5368","BAL":"418,493,548,568","BOS":"414,428,533,546","CHC":"451,521,550,553","CIN":"416,450,459,498","CLE":"402,437,445,481","COL":"259,342,486,538","CWS":"247,487,494,580","DET":"106,512,570,582","HOU":"482,573,3712,5434","KC":"541,565,1350,3705","LAA":"460,526,559,561","LAD":"238,260,456,6482","MIA":"479,554,564,4124","MIL":"249,556,572,5015","MIN":"492,509,1960,3898","NYM":"453,505,507,552","NYY":"531,537,587,1956","PHI":"427,522,566,1410","PIT":"452,477,484,3390","SD":"103,510,584,4904","SEA":"401,403,529,574","SF":"105,461,476,3410","STL":"235,279,440,443","TB":"233,234,421,2498","TEX":"102,448,540,6324","TOR":"422,424,435,463","WSH":"426,436,534,547"}
 
 // First is default level, last should be All (also used as default org)
 const LEVELS = { 'MLB': '1', 'AAA': '11', 'AA': '12', 'A+': '13', 'A': '14', 'WINTER': '17', 'All': '1,11,12,13,14,17' }
@@ -864,6 +865,8 @@ class sessionClass {
   constructor(argv = {}) {
     this.debug = argv.debug
 
+    this.executablePath = argv.PUPPETEER_EXECUTABLE_PATH
+
     let dirname = __dirname
     if ( argv.data_directory ) {
       dirname = argv.data_directory
@@ -2368,8 +2371,8 @@ class sessionClass {
                           stream = server + '/stream.m3u8?event=' + encodeURIComponent(cache_data.dates[i].games[j].teams['home'].team.shortName.toUpperCase())
                         }
                         stream += '&league_id=' + league_id
+                        stream += '&mediaType=' + streamMediaType
                       }
-                      stream += '&mediaType=' + streamMediaType
                       stream += '&level=' + encodeURIComponent(this.getLevelNameFromSportId(sportId))
                       stream += '&resolution=' + resolution
                       if ( this.protection.content_protect ) stream += '&content_protect=' + this.protection.content_protect
@@ -2764,6 +2767,39 @@ class sessionClass {
           channels = this.sortObj(channels)
           
           let entitlements = await this.getEntitlements()
+          
+          // MASN live stream for entitled subscribers
+          try {
+              if ( (entitlements.includes('MASN_110')) ) {
+                if ( (mediaType == 'MLBTV') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
+                  if ( (excludeTeams.length > 0) && excludeTeams.includes('MASN') ) {
+                    // do nothing
+                  } else if ( (includeTeams.length == 0) || includeTeams.includes('MASN') ) {
+                    this.debuglog('getTVData processing MASN')
+                    let logo = 'https://img.mlbstatic.com/mlb-images/image/upload/t_16x9/t_w640/v1745242435/mlb/jov4fxbzmqikc8umj5kr.png'
+                    let channelid = mediaType + '.MASN'
+                    //if ( this.protection.content_protect ) logo += '&content_protect=' + this.protection.content_protect
+                    let stream = server + '/stream.m3u8?event=masn&mediaType=Video&resolution=' + resolution
+                    if ( this.protection.content_protect ) stream += '&content_protect=' + this.protection.content_protect
+                    if ( pipe == 'true' ) stream = await this.convert_stream_to_pipe(stream, channelid)
+                    channels[channelid] = await this.create_channel_object(channelid, logo, stream, mediaType)
+
+                    let title = 'MASN'
+                    let description = 'Live stream of MASN (Mid-Atlantic Sports Network)'
+
+                    let start = this.convertDateToXMLTV(new Date(cache_data.dates[0].date + ' 00:00:00'))
+                    let stop = this.convertDateToXMLTV(new Date(cache_data.dates[cache_data.dates.length-1].date + ' 00:00:00'))
+
+                    // MASN guide XML
+                    programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertStringToAirDate(cache_data.dates[0].date))
+                    this.debuglog('getTVData completed MASN')
+                  } // end includeTeams check
+                } // end mediaType check
+              } // end entitlements check
+          } catch (e) {
+            this.debuglog('getTVData MASN detect error : ' + e.message)
+          }
+          
           // MLB Network live stream for eligible USA subscribers
           try {
               if ( (entitlements.includes('MLBN') || entitlements.includes('EXECMLB') || entitlements.includes('MLBTVMLBNADOBEPASS')) ) {
@@ -2850,7 +2886,7 @@ class sessionClass {
                     let start = this.convertDateToXMLTV(new Date(cache_data.dates[0].date + ' 00:00:00'))
                     let stop = this.convertDateToXMLTV(new Date(cache_data.dates[cache_data.dates.length-1].date + ' 00:00:00'))
 
-                    // SNLA guide XML
+                    // SNY guide XML
                     programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertStringToAirDate(cache_data.dates[0].date))
                     this.debuglog('getTVData completed SNY')
                   } // end includeTeams check
@@ -3286,6 +3322,7 @@ class sessionClass {
   async getSkipMarkers(gamePk, skip_type, start_inning, start_inning_half, streamURL, streamURLToken, skip_adjust, broadcast_start_timestamp=false) {
     try {
       this.debuglog('getSkipMarkers')
+      let variantPlaylist;
 
       if ( skip_adjust != 0 ) this.log('manual adjustment of ' + skip_adjust + ' seconds being applied')
       
@@ -3309,7 +3346,7 @@ class sessionClass {
 
       // Get the broadcast start time first, if necessary -- event times will be relative to this
       if ( !broadcast_start_timestamp ) {
-        let variantPlaylist = await this.getVariantPlaylist(streamURL, streamURLToken)
+        variantPlaylist = await this.getVariantPlaylist(streamURL, streamURLToken)
         broadcast_start_timestamp = await this.getBroadcastStart(variantPlaylist)
       }
 
@@ -3455,6 +3492,10 @@ class sessionClass {
           // if skipping commercials, look at the variant playlist to detect insertions
           if ( skip_type == 4 ) {
             this.debuglog('detecting commercial breaks')
+            if (!variantPlaylist) {
+              this.debuglog('variantPlaylist missing, fetching...')
+              variantPlaylist = await this.getVariantPlaylist(streamURL, streamURLToken)
+            }
             let body = variantPlaylist
             let break_active = false
             let break_end = 0
@@ -3505,62 +3546,118 @@ class sessionClass {
       let currentDate = new Date()
       if ( !this.cache || !this.cache.bigInningScheduleCacheExpiry || (currentDate > new Date(this.cache.bigInningScheduleCacheExpiry)) ) {
         if ( !this.cache.bigInningSchedule ) this.cache.bigInningSchedule = {}
-        let reqObj = {
-          url: 'https://api.fubo.tv/gg/series/123881219/live-programs?limit=14&languages=en&countrySlugs=USA',
-          headers: {
-            'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
-            'accept-language': 'en-US,en;q=0.9',
-            'cache-control': 'no-cache',
-            'dnt': '1',
-            'pragma': 'no-cache',
-            'sec-ch-ua': '"Not(A:Brand";v="99", "Google Chrome";v="133", "Chromium";v="133"',
-            'sec-ch-ua-mobile': '?0',
-            'sec-ch-ua-platform': '"macOS"',
-            'sec-fetch-dest': 'document',
-            'sec-fetch-mode': 'navigate',
-            'sec-fetch-site': 'none',
-            'sec-fetch-user': '?1',
-            'sec-gpc': '1',
-            'upgrade-insecure-requests': '1',
-            'user-agent': USER_AGENT
-          },
-          json: true,
-          gzip: true
-        }
-        var response = await this.httpGet(reqObj, false)
-        if ( response ) {
-          this.debuglog(JSON.stringify(response))
-          
-          if ( response.data ) {
-            for (var i=0; i < response.data.length; i++) {
-              if ( response.data[i].airings && (response.data[i].airings.length > 0) ) {
-                for (var j=0; j < response.data[i].airings.length; j++) {
-                  if ( response.data[i].airings[j].station && response.data[i].airings[j].station.name && (response.data[i].airings[j].station.name == 'MLB Big Inning') && response.data[i].airings[j].accessRightsV2 && response.data[i].airings[j].accessRightsV2.live ) {
-                    let est_date = new Date(response.data[i].airings[j].accessRightsV2.live.startTime).toLocaleString("en-US", {timeZone: 'America/New_York'})
-                    let date_array = est_date.split(',')[0].split('/')
-                    let this_datestring = date_array[2] + '-' + date_array[0].padStart(2, '0') + '-' + date_array[1].padStart(2, '0')
-                    this.cache.bigInningSchedule[this_datestring] = {
-                      start: response.data[i].airings[j].accessRightsV2.live.startTime, 
-                      end: response.data[i].airings[j].accessRightsV2.live.endTime
-                    }
+        
+        const browser = await puppeteer.launch({
+          headless: 'new',
+          executablePath: this.executablePath,
+          args: [
+            '--no-sandbox',
+            '--disable-gpu',
+            '--disable-setuid-sandbox',
+            '--disable-dev-shm-usage'
+          ],
+        })
+        const page = await browser.newPage()
+        await page.setUserAgent(USER_AGENT)
+        await page.goto('https://support.mlb.com/s/article/What-Is-MLB-Big-Inning?language=en_US', { waitUntil: 'networkidle0' })
+        const response = await page.content()
+        await browser.close()
+        
+        // break HTML into array based on table rows
+        var rows = response.split('<tr ')
+        // start iterating at 2 (after header row)
+        for (var i=2; i<rows.length; i++) {
+          // split HTML row into array with columns
+          let cols = rows[i].split('<td ')
+
+          // define some variables that persist for each row
+          let parts
+          let year
+          let month
+          let day
+          let this_datestring
+          let add_date = 0
+          let d
+
+          // start iterating at 2 (after DOW column)
+          for (var j=2; j<cols.length; j++) {
+            // split on brackets to get column text at resulting array index 0
+            let col = cols[j].split('>')[1].split('<')
+            switch(j){
+              // first column is date
+              case 2:
+                // split date into array
+                // old date format (January 1, 1970) (disabled)
+                /*parts = col[0].split(' ')
+                year = parts[2]
+                // get month index, zero-based
+                month = new Date(Date.parse(parts[0] +" 1, 2021")).getMonth()
+                day = parts[1].substring(0,parts[1].length-3)*/
+                // new date format (01/01/70)
+                parts = col[0].split('/')
+                year = parts[2]
+                if ( year.length == 2 ) {
+                  year = '20' + parts[2]
+                }
+                // get month index, zero-based
+                month = parseInt(parts[0]) - 1
+                day = parts[1]
+                this_datestring = new Date(year, month, day).toISOString().substring(0,10)
+                this.cache.bigInningSchedule[this_datestring] = {}
+                // increment month index (not zero-based)
+                month += 1
+                break
+              // remaining columns are times
+              default:
+                let hour
+                let minute = '00'
+                let ampm
+                // if time has colon, split into array on that to get hour and minute parts
+                if ( col[0].indexOf(':') > 0 ) {
+                  parts = col[0].split(':')
+                  hour = parseInt(parts[0])
+                  minute = parts[1].substring(0,2)
+                } else {
+                  hour = parseInt(col[0].substring(0,col[0].length-2))
+                }
+                ampm = col[0].substring(col[0].length-2,col[0].length)
+                // convert hour to 24-hour format
+                if ( (ampm == 'PM') || ((hour == 12) && (ampm == 'AM')) ) {
+                  hour += 12
+                }
+                // these times are EDT so add 4 for UTC
+                hour += 4
+                // if hour is beyond 23, note we will have to add 1 day
+                if ( hour > 23 ) {
+                  add_date = 1
+                  hour -= 24
+                }
+
+                d = new Date(this_datestring + 'T' + hour.toString().padStart(2, '0') + ':' + minute.toString().padStart(2, '0') + ':00.000+00:00')
+                d.setDate(d.getDate()+add_date)
+                switch(j){
+                  // 3rd column is start time
+                  case 3:
+                    this.cache.bigInningSchedule[this_datestring].start = d
+                    break
+                  // 3rd column is end time
+                  case 4:
+                    this.cache.bigInningSchedule[this_datestring].end = d
                     break
-                  }
                 }
-              }
+                break
             }
           }
-          this.debuglog(JSON.stringify(this.cache.bigInningSchedule))
+        }
+        this.debuglog(JSON.stringify(this.cache.bigInningSchedule))
 
-          // Default cache period is 1 day from now
-          let oneDayFromNow = new Date()
-          oneDayFromNow.setDate(oneDayFromNow.getDate()+1)
-          let cacheExpiry = oneDayFromNow
-          this.cache.bigInningScheduleCacheExpiry = cacheExpiry
+        // Default cache period is 1 day from now
+        let oneDayFromNow = new Date()
+        oneDayFromNow.setDate(oneDayFromNow.getDate()+1)
+        let cacheExpiry = oneDayFromNow
+        this.cache.bigInningScheduleCacheExpiry = cacheExpiry
 
-          this.save_cache_data()
-        } else {
-          this.log('error : invalid response from url ' + reqObj.url)
-        }
+        this.save_cache_data()
       } else {
         this.debuglog('using cached big inning schedule')
       }
@@ -3848,6 +3945,8 @@ class sessionClass {
           let dateString = eventName.substring(12)
           this.debuglog('getEventStreamURL RecapRundown for ' + dateString)
           playbackURL = await this.getRecapRundownURL(dateString)
+        } else if ( eventName.toUpperCase() == 'MASN' ) {
+          playbackURL = await this.getLinearStreamURL('MASN_ONE_LIVE')
         } else if ( eventName.toUpperCase() == 'MLBN' ) {
           playbackURL = 'https://falcon.mlbinfra.com/api/v1/linear/mlbn'
         } else if ( eventName.toUpperCase() == 'SNLA' ) {
@@ -4314,6 +4413,7 @@ class sessionClass {
       if ( cache_data ) {
         if ( cache_data.dates && cache_data.dates[0] && cache_data.dates[0].games && (cache_data.dates[0].games.length > 0) ) {
           let team_data = this.temp_cache.gamechanger[id].streamFinderData.team_data
+          let games_CLI = this.temp_cache.gamechanger[id].streamFinderData.games_CLI
         
           var games = []
           
@@ -5580,6 +5680,56 @@ class sessionClass {
       this.log('getComskipMarkers error : ' + e.message)
     }
   }
+
+  // generates AFFILIATE_TEAM_IDS, should be done each season
+  async getAffiliates() {
+    try {
+      this.debuglog('getAffiliates')
+
+      let affiliates_data = {}
+      let reqObj = {
+        url: 'https://statsapi.mlb.com/api/v1/teams?sportIds=1,11,12,13,14&activeStatus=true&season=2026',
+        headers: {
+          'User-agent': USER_AGENT,
+          'Origin': 'https://www.mlb.com',
+          'Accept-Encoding': 'gzip, deflate, br',
+          'Content-type': 'application/json'
+        },
+        gzip: true
+      }
+      var response = await this.httpGet(reqObj, false)
+      if ( response && this.isValidJson(response) ) {
+        //this.debuglog(response)
+        let teams_data = JSON.parse(response)
+        
+        let parent_orgs = {}
+        if ( teams_data && teams_data.teams ) {
+          for (var i=0; i<teams_data.teams.length; i++) {
+            if (teams_data.teams[i].sport.id == 1) {
+              parent_orgs[teams_data.teams[i].id] = teams_data.teams[i].abbreviation
+              affiliates_data[teams_data.teams[i].abbreviation] = []
+            }
+          }
+          for (var i=0; i<teams_data.teams.length; i++) {
+            if (teams_data.teams[i].sport.id != 1) {
+              teams_data.teams[i].abbreviation
+              affiliates_data[parent_orgs[teams_data.teams[i].parentOrgId]].push(teams_data.teams[i].id)
+              affiliates_data[parent_orgs[teams_data.teams[i].parentOrgId]].sort((a, b) => a - b)
+            }
+          }
+          for (const [key, value] of Object.entries(affiliates_data)) {
+            affiliates_data[key] = value.join(',')
+          }
+          
+          console.log(JSON.stringify(this.sortObj(affiliates_data)))
+        }
+      } else {
+        this.log('error : invalid json from url ' + reqObj.url)
+      }
+    } catch(e) {
+      this.log('getAffiliates error : ' + e.message)
+    }
+  }
 }
 
 module.exports = sessionClass