mlbserver 2025.4.1 → 2025.4.2

package/index.js

@@ -44,7 +44,7 @@ const VALID_SCAN_MODES = [ 'off', 'on' ]
 
 const SAMPLE_STREAM_URL = 'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8'
 
-const SECONDS_PER_SEGMENT = 5
+const SECONDS_PER_SEGMENT = 4
 
 // for favorites: text, then background, based on https://teamcolors.jim-nielsen.com/
 const TEAM_COLORS = { 'ATH': ['003831', 'EFB21E'], 'ATL': ['13274F', 'CE1141'], 'AZ': ['E3D4AD', 'A71930'], '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'] }
@@ -863,26 +863,31 @@ app.get('/playlist.m3u8', async function(req, res) {
       })
       .join('\n')+'\n'
 
+      let end_tag = '#EXT-X-ENDLIST'
       if ( pad != VALID_PAD[0] ) {
         let body_array = body.trim().split('\n')
-        let last_segment_index = body_array.length-1
-        if ( body_array[last_segment_index] == '#EXT-X-ENDLIST' ) {
+        let segment_index = body_array.length-1
+        if ( body_array[segment_index] == end_tag ) {
           session.debuglog('padding archive stream with extra segments')
-          last_segment_index--
-          while ( !body_array[last_segment_index].startsWith('#EXTINF:') ) {
-            last_segment_index--
+          while ( body_array[segment_index].startsWith('#') ) {
+            segment_index--
           }
-          last_segment_inf = body_array[last_segment_index]
-          last_segment = body_array[last_segment_index+1]
-          let pad_lines = '#EXT-X-DISCONTINUITY' + '\n' + '#EXTINF:' + SECONDS_PER_SEGMENT + '\n' + last_segment + '\n'
-          session.debuglog(pad_lines)
+          let last_segment = body_array[segment_index]
+          body_array.pop()
           for (i=0; i<pad; i++) {
-            body += pad_lines
+            body_array.push('#EXT-X-DISCONTINUITY')
+            body_array.push('#EXTINF:' + SECONDS_PER_SEGMENT)
+            body_array.push(last_segment)
           }
-          body += '#EXT-X-ENDLIST' + '\n'
+          body_array.push(end_tag)
+          body = body_array.join('\n')
+        }
+      } else if ( force_vod != VALID_FORCE_VOD[0] ) {
+        let body_array = body.trim().split('\n')
+        if ( body_array[body_array.length-1] != end_tag ) {
+          body += end_tag + '\n'
         }
       }
-      if ( force_vod != VALID_FORCE_VOD[0] ) body += '#EXT-X-ENDLIST' + '\n'
       session.debuglog(body)
       respond(response, res, Buffer.from(body))
     })

package/package.json

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

package/session.js

@@ -1311,7 +1311,11 @@ class sessionClass {
   requestlog(type, req, debug=false) {
     if ( req.url ) {
       let msg = type + ' request : ' + req.url
-      if ( req.connection && req.connection.remoteAddress ) msg += ' from: ' + req.connection.remoteAddress
+      if ( req.headers && req.headers['x-forwarded-for'] ) {
+        msg += ' from: ' + req.headers['x-forwarded-for']
+      } else if ( req.connection && req.connection.remoteAddress ) {
+        msg += ' from: ' + req.connection.remoteAddress
+      }
       if ( req.headers && req.headers['user-agent'] ) msg += ' using: ' + req.headers['user-agent']
       if (!debug || this.debug) this.log(msg)
     }
@@ -2711,7 +2715,6 @@ class sessionClass {
               let title = 'MLB Big Inning'
               let description = 'Live look-ins and big moments from around the league'
 
-              // disabled Big Inning schedule scraping March 2025
               for (var i = 0; i < cache_data.dates.length; i++) {
                 // Scraped Big Inning schedule
                 if ( (cache_data.dates[i].date >= today) && cache_data.dates[i].games && (cache_data.dates[i].games.length > 1) && cache_data.dates[i].games[0] && (cache_data.dates[i].games[0].seriesDescription == 'Regular Season') ) {
@@ -2719,20 +2722,12 @@ class sessionClass {
                 }
                 this.debuglog('getTVData processing Big Inning for date ' + cache_data.dates[i].date)
                 let gameDate = cache_data.dates[i].date
-                // Disabled Big Inning specific schedule scraping
-                //if ( this.cache.bigInningSchedule && this.cache.bigInningSchedule[gameDate] && this.cache.bigInningSchedule[gameDate].start ) {
-                //if ( (gameDate >= today) && cache_data.dates[i].games && (cache_data.dates[i].games.length > 1) && cache_data.dates[i].games[0] && (cache_data.dates[i].games[0].seriesDescription == 'Regular Season') ) {
                 if ( (gameDate >= today) && cache_data.dates[i].games && (cache_data.dates[i].games.length > 1) && cache_data.dates[i].games[0] && (cache_data.dates[i].games[0].seriesDescription == 'Regular Season') && this.cache.bigInningSchedule[gameDate] ) {
                   this.debuglog('getTVData Big Inning active for date ' + cache_data.dates[i].date)
                   // Scraped Big Inning schedule
                   let start = this.convertDateToXMLTV(new Date(this.cache.bigInningSchedule[gameDate].start))
                   let stop = this.convertDateToXMLTV(new Date(this.cache.bigInningSchedule[gameDate].end))
 
-                  // Generated Big Inning schedule (disabled)
-                  //let big_inning = await this.generateBigInningSchedule(gameDate)
-                  //let start = this.convertDateToXMLTV(new Date(big_inning.start))
-                  //let stop = this.convertDateToXMLTV(new Date(big_inning.end))
-
                   // Big Inning calendar ICS
                   let prefix = 'Watch'
                   let location = server + '/embed.html?event=biginning&mediaType=Video&resolution=' + resolution
@@ -3054,6 +3049,21 @@ class sessionClass {
         // make sure we have play data
         if (cache_data && cache_data.liveData && cache_data.liveData.plays && cache_data.liveData.plays.allPlays) {
 
+          // make sure start inning is valid
+          if (start_inning > 0) {
+            let last_play_index = cache_data.liveData.plays.allPlays.length - 1
+            let final_inning = cache_data.liveData.plays.allPlays[last_play_index].about.inning
+            if (start_inning >= final_inning) {
+              if (start_inning > final_inning) {
+                start_inning = final_inning
+                let final_inning_half = json_source['liveData']['plays']['allPlays'][last_play_index]['about']['halfInning']
+                if ((start_inning_half == 'bottom') && (final_inning_half == 'top')) {
+                  start_inning_half = final_inning_half
+                }
+              }
+            }
+          }
+
           // keep track of inning, if skipping inning breaks only
           let previous_inning = 0
           let previous_inning_half = ''
@@ -3064,21 +3074,6 @@ class sessionClass {
           // Loop through all plays
           for (var i=0; i < cache_data.liveData.plays.allPlays.length; i++) {
 
-            // make sure start inning is valid
-            if (start_inning > 0) {
-              let last_play_index = cache_data.liveData.plays.allPlays.length - 1
-              let final_inning = cache_data.liveData.plays.allPlays[last_play_index].about.inning
-              if (start_inning >= final_inning) {
-                if (start_inning > final_inning) {
-                  start_inning = final_inning
-                  let final_inning_half = json_source['liveData']['plays']['allPlays'][last_play_index]['about']['halfInning']
-                  if ((start_inning_half == 'bottom') && (final_inning_half == 'top')) {
-                    start_inning_half = final_inning_half
-                  }
-                }
-              }
-            }
-
             // exit loop after found inning, if not skipping any breaks
             if ((skip_type == 0) && (skip_markers.length == 1)) {
               break
@@ -3104,8 +3099,8 @@ class sessionClass {
                     event_end_padding = pitch_end_padding
                   }
                   let action_index
-                  // skip type 1 (breaks) will look at all plays with an endTime
-                  if ((skip_type == 1) && cache_data.liveData.plays.allPlays[i].playEvents[j].endTime) {
+                  // skip type 0 (none, inning start) and 1 (breaks) will look at all plays with an endTime
+                  if ((skip_type <= 1) && cache_data.liveData.plays.allPlays[i].playEvents[j].endTime) {
                     action_index = j
                   // skip type 2 (idle time) will look at all non-idle plays with an endTime
                   } else if ((skip_type == 2) && cache_data.liveData.plays.allPlays[i].playEvents[j].endTime && (!cache_data.liveData.plays.allPlays[i].playEvents[j].details || !cache_data.liveData.plays.allPlays[i].playEvents[j].details.description || !IDLE_TYPES.some(v => cache_data.liveData.plays.allPlays[i].playEvents[j].details.description.includes(v)))) {
@@ -3206,7 +3201,7 @@ class sessionClass {
       if ( !this.cache || !this.cache.bigInningScheduleCacheExpiry || (currentDate > new Date(this.cache.bigInningScheduleCacheExpiry)) ) {
         if ( !this.cache.bigInningSchedule ) this.cache.bigInningSchedule = {}
         let reqObj = {
-          url: 'https://www.fubo.tv/welcome/channel/mlb-big-inning',
+          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',
@@ -3224,21 +3219,24 @@ class sessionClass {
             'upgrade-insecure-requests': '1',
             'user-agent': USER_AGENT
           },
+          json: true,
           gzip: true
         }
         var response = await this.httpGet(reqObj, false)
         if ( response ) {
-          // disabled because it's very big!
-          //this.debuglog(response)
+          this.debuglog(JSON.stringify(response))
           
-          let obj = JSON.parse(response.replace(/\\"/g, '"').match('(?<="channelPrograms":{"live":)(.+?(,"totalPages":1}))')[0])
-          for (var i=0; i < obj.data.length; i++) {
-            let est_date = new Date(obj.data[i].airings[0].start).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: obj.data[i].airings[0].start, 
-              end: obj.data[i].airings[0].end
+          if ( response.data ) {
+            for (var i=0; i < response.data.length; i++) {
+              if ( response.data[i].airings && (response.data[i].airings.length > 0) && response.data[i].airings[0] && response.data[i].airings[0].accessRights && response.data[i].airings[0].accessRights.live ) {
+                let est_date = new Date(response.data[i].airings[0].accessRights.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[0].accessRights.live.startTime, 
+                  end: response.data[i].airings[0].accessRights.live.endTime
+                }
+              }
             }
           }
           this.debuglog(JSON.stringify(this.cache.bigInningSchedule))