npm - mlbserver - Versions diffs - 2025.7.18 → 2025.7.21 - Mend

mlbserver 2025.7.18 → 2025.7.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/index.js CHANGED Viewed

@@ -194,8 +194,19 @@ if (argv.http_root) {
       req.url = req.url.substr(http_root.length, (req.url.length - http_root.length))
       app.route(req, res);
     } catch (e) {
-      session.log('http_root request error : ' + e.message)
-      res.end('http_root request error, check log')
+      session.log('http_root get request error : ' + e.message)
+      res.end('http_root get request error, check log')
+    }
+  })
+  app.post(http_root + '/*', async function(req, res) {
+    if ( ! (await protect(req, res)) ) return
+    try {
+      req.url = req.url.substr(http_root.length, (req.url.length - http_root.length))
+      app.route(req, res);
+    } catch (e) {
+      session.log('http_root post request error : ' + e.message)
+      res.end('http_root post request error, check log')
     }
   })
 }
@@ -1736,7 +1747,11 @@ app.get('/', async function(req, res) {
             let multiviewquerystring = '/gamechanger.m3u8?resolution=' + DEFAULT_MULTIVIEW_RESOLUTION + content_protect_b
             streamURL += content_protect_a
             if ( resolution != VALID_RESOLUTIONS[0] ) streamURL += '&resolution=' + resolution
-            if ( linkType != VALID_LINK_TYPES[1] ) {
+            // force Video.js embed player for Game Changer
+            if ( linkType == VALID_LINK_TYPES[0] ) {
+              let mylink = http_root + '/embed-videojs.html'
+              streamURL = mylink + '?src=' + encodeURIComponent(streamURL) + '&startFrom=' + VALID_START_FROM[1] + content_protect_b
+            } else if ( linkType != VALID_LINK_TYPES[1] ) {
               streamURL = thislink + '?src=' + encodeURIComponent(streamURL) + '&startFrom=' + VALID_START_FROM[1] + content_protect_b
             }
             if ( linkType == VALID_LINK_TYPES[4] ) {
@@ -1755,7 +1770,11 @@ app.get('/', async function(req, res) {
             let multiviewquerystring = '/gamechanger.m3u8?streamFinder=on&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION + content_protect_b
             streamURL += content_protect_b
             if ( resolution != VALID_RESOLUTIONS[0] ) streamURL += '&resolution=' + resolution
-            if ( linkType != VALID_LINK_TYPES[1] ) {
+            // force Video.js embed player for Stream Finder
+            if ( linkType == VALID_LINK_TYPES[0] ) {
+              let mylink = http_root + '/embed-videojs.html'
+              streamURL = mylink + '?src=' + encodeURIComponent(streamURL) + '&startFrom=' + VALID_START_FROM[1] + content_protect_b
+            } else if ( linkType != VALID_LINK_TYPES[1] ) {
               streamURL = thislink + '?src=' + encodeURIComponent(streamURL) + '&startFrom=' + VALID_START_FROM[1] + content_protect_b
             }
             if ( linkType == VALID_LINK_TYPES[4] ) {
@@ -2462,7 +2481,142 @@ app.options('*', function(req, res) {
   return
 })
+// Listen for Video.js embed request, respond with embedded Video.js player
+// used for Game Changer and Stream Finder
+app.get('/embed-videojs.html', async function(req, res) {
+  if ( ! (await protect(req, res)) ) return
+  session.requestlog('embed-videojs.html', req)
+  let startFrom = VALID_START_FROM[0]
+  if ( req.query.startFrom ) {
+    startFrom = req.query.startFrom
+  }
+  let controls = VALID_CONTROLS[0]
+  if ( req.query.controls ) {
+    controls = req.query.controls
+  }
+  let video_url = http_root + '/stream.m3u8'
+  if ( req.query.src ) {
+    video_url = req.query.src
+  } else if ( req.query.msrc ) {
+    video_url += '?'
+    if ( req.query.content_protect ) {
+      video_url += 'content_protect=' + req.query.content_protect + '&'
+    }
+    video_url += 'src=' + req.query.msrc
+  } else {
+    let urlArray = req.url.split('?')
+    if ( (urlArray.length == 2) ) {
+      video_url += '?' + urlArray[1]
+    }
+  }
+  session.debuglog('embed-videojs src : ' + video_url)
+  let content_protect = ''
+  if ( session.protection.content_protect ) {
+    content_protect = '?content_protect=' + session.protection.content_protect
+  }
+  var body = `<html>
+<head>
+<meta charset="UTF-8">
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+<title>` + appname + ` player</title>
+<link rel="icon" href="favicon.svg` + content_protect + `">
+<style type="text/css">
+body {
+  background-color:black;
+  color:lightgrey;
+  font-family:Arial,Helvetica,sans-serif;
+}
+.video-wrapper {
+  height: 94vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+}
+button {
+  color:lightgray;
+  background-color:black;
+}
+</style>
+<script>
+function goBack() {
+  var prevPage=window.location.href;
+  window.history.go(-1);
+  setTimeout(function(){if(window.location.href==prevPage){window.location.href="` + http_root + '/' + content_protect + `"}}, 500);
+}
+</script>
+<link href="https://vjs.zencdn.net/8.23.3/video-js.css" rel="stylesheet" />
+</head>
+<body onkeydown="myKeyPress(event)">
+<div class="video-wrapper">
+<video id="video" class="video-js vjs-fill"`
+  if ( controls == VALID_CONTROLS[0] ) {
+    body += ' controls'
+  }
+  body += ` muted>
+  <source
+     src="` + video_url + `"
+     type="application/x-mpegURL">
+</video>
+</div>
+<script src="https://vjs.zencdn.net/8.23.3/video.min.js"></script>
+<script>
+var player = videojs('video', {
+  "liveui": true,
+  "playbackRates": [0.5, 1, 1.25, 1.5, 2]
+});
+function changeTime(skipAmount) {
+  player.currentTime(player.currentTime() + parseInt(skipAmount));
+}
+var skipAmounts = ['-30s', '-10s', '+10s', '+30s', '+90s', '+120s'];
+for (var i=0; i<skipAmounts.length; i++) {
+  player.getChild('ControlBar').addChild('button', {
+    controlText: skipAmounts[i],
+    className: 'vjs-visible-text',
+    clickHandler: function(event) {
+      changeTime(this.controlText());
+    }
+  });
+}
+player.ready(function() {
+  `;
+if ( startFrom != VALID_START_FROM[1] ) {
+  body += `this.currentTime(0);
+  `;
+}
+body += `this.play();
+});
+function changeRate(x) {
+  let newrate = parseFloat((player.playbackRate() + x).toFixed(1));
+  player.playbackRate(newrate);
+}
+function myKeyPress(e) {
+  if (e.key=="ArrowRight") {
+    changeTime(10);
+  } else if (e.key=="ArrowLeft") {
+    changeTime(-10);
+  } else if (e.key=="ArrowUp") {
+    changeRate(0.1);
+  } else if (e.key=="ArrowDown") {
+    changeRate(-0.1);
+  }
+}
+</script>
+<p><button onclick="goBack()">Back</button></p>
+</body>
+</html>`
+  res.end(body)
+})
 // Listen for embed request, respond with embedded hls.js player
+// used for everything except Game Changer and Stream Finder
 app.get('/embed.html', async function(req, res) {
   if ( ! (await protect(req, res)) ) return
@@ -3288,7 +3442,7 @@ app.post('/upload', async function(req, res) {
     req.on('body', function(body) {
       session.parse_stream_finder_settings(body)
-      let response = '<p><b>SUCCESS!</b></p><p>Your Stream Finder settings have been saved in mlbserver.</p><p>Select the Stream Finder stream to use them, or <a href="/upload">click here</a> to replace them with new settings.</p>'
+      let response = '<p><b>SUCCESS!</b></p><p>Your Stream Finder settings have been saved in mlbserver.</p><p>Select the Stream Finder stream to use them, or <a href="' + http_root + '/#streamfinder">click here</a> to replace them with new settings.</p>'
       res.end(response)
     })
   } catch (e) {

package/package.json CHANGED Viewed

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

package/session.js CHANGED Viewed

@@ -4074,9 +4074,9 @@ class sessionClass {
   setCurrentGame(cur_game_pk, game, team_data, game_changer_title, priority) {
     if ( cur_game_pk != game.game_pk ) {
-      this.debuglog(game_changer_title + ' set current game to ' + this.getCurrentGame(game, team_data) + ' due to ' + priority.type + ' ' + priority.data)
-      return {'game_pk': game.game_pk, 'cur_batter': game.batter}
+      this.debuglog(game_changer_title + 'set current game to ' + this.getCurrentGame(game, team_data) + ' due to ' + priority.type + ' ' + priority.data)
     }
+    return {'game_pk': game.game_pk, 'cur_batter': game.batter}
   }
   sleep(ms) {
@@ -4133,11 +4133,7 @@ class sessionClass {
           for (var i=0; i<cache_data.dates[0].games.length; i++) {
             let game = cache_data.dates[0].games[i]
-            let gamePk = game.gamePk.toString()
-            let broadcast_count = await this.count_broadcasts(game.broadcasts, 'MLBTV')
-            if ( this.temp_cache.gamechanger.blackouts[gamePk] && this.temp_cache.gamechanger.blackouts[gamePk].blackout_feeds && (this.temp_cache.gamechanger.blackouts[gamePk].blackout_feeds.length == broadcast_count) ) {
-              continue
-            }
+            let gamePk = game.gamePk.toString()
             if (!game.linescore) {
               continue
@@ -4163,9 +4159,12 @@ class sessionClass {
             if (game.linescore.outs) {
               outs = game.linescore.outs
             }
-            let status = 'scheduled'
-            if ( game.status && game.status.detailedState && (game.status.detailedState == 'In Progress') ) {
-              status = 'active'
+            let status = 'unknown'
+            let broadcast_count = await this.count_broadcasts(game.broadcasts, 'MLBTV')
+            if ( this.temp_cache.gamechanger.blackouts[gamePk] && this.temp_cache.gamechanger.blackouts[gamePk].blackout_feeds && (this.temp_cache.gamechanger.blackouts[gamePk].blackout_feeds.length == broadcast_count) ) {
+              status = 'blackout'
+            } else if ( game.status && game.status.detailedState ) {
+              status = game.status.detailedState
             }
             let half = 1
             if ( game.linescore.inningHalf && (game.linescore.inningHalf == 'Bottom') ) {
@@ -4283,6 +4282,8 @@ class sessionClass {
               }
             })
           }
+          this.debuglog(game_changer_title + 'games ' + JSON.stringify(games))
           let active_games = []
           let same_batter = 'N'
@@ -4299,18 +4300,22 @@ class sessionClass {
             let gamePk = game.gamePk.toString()
             if ( !team_data[game.teams.away.team.id.toString()] || !team_data[game.teams.home.team.id.toString()] ) {
+              this.debuglog(game_changer_title + 'invalid team(s) in game ' + gamePk)
               continue
             }
             if ( game.linescore.outs == 3 ) {
+              this.debuglog(game_changer_title + 'end of half inning in game ' + gamePk)
               continue
             }
             if ( game.linescore.inningState && !['Top', 'Bottom'].includes(game.linescore.inningState) ) {
+              this.debuglog(game_changer_title + 'between innings in game ' + gamePk)
               continue
             }
-            if ( !game.status || (game.status != 'active') ) {
+            if ( !game.status || (game.status != 'In Progress') ) {
+              this.debuglog(game_changer_title + 'non-active game ' + gamePk)
               continue
             }
@@ -4319,6 +4324,7 @@ class sessionClass {
               for (var j=0; j<this.stream_finder_settings.ignore.length; j++) {
                 let ignore_team = this.stream_finder_settings.ignore[j]
                 if ( (ignore_team == game.teams.away.team.id.toString()) || (ignore_team == game.teams.home.team.id.toString()) ) {
+                  this.debuglog(game_changer_title + 'ignoring team in game ' + gamePk)
                   ignore = true
                   break
                 }
@@ -4330,10 +4336,10 @@ class sessionClass {
             if ( this.temp_cache.gamechanger[id].break_expiries[gamePk] ) {
               if ( this.temp_cache.gamechanger[id].break_expiries[gamePk] > now ) {
-                this.debuglog(game_changer_title + ' pitching change in progress in game ' + gamePk)
+                this.debuglog(game_changer_title + 'pitching change in progress in game ' + gamePk)
                 continue
               } else {
-                this.debuglog(game_changer_title + ' pitching change complete in game ' + gamePk)
+                this.debuglog(game_changer_title + 'pitching change complete in game ' + gamePk)
                 this.removeBreakExpiry(id, gamePk)
               }
             }
@@ -4351,14 +4357,13 @@ class sessionClass {
                 this.temp_cache.gamechanger[id].cur_pitchers[gamePk] = {}
               }
               if ( !this.temp_cache.gamechanger[id].cur_pitchers[gamePk][pitching_team_id] ) {
+                this.debuglog(game_changer_title + 'storing pitcher ' + game.linescore.defense.pitcher.id + ' for team ' + pitching_team_id + ' in game ' + gamePk)
                 this.temp_cache.gamechanger[id].cur_pitchers[gamePk][pitching_team_id] = game.linescore.defense.pitcher.id
-              } else {
-                if ( game.linescore.defense.pitcher.id != this.temp_cache.gamechanger[id].cur_pitchers[gamePk][pitching_team_id] ) {
-                  this.debuglog(game_changer_title + ' pitching change begun in game ' + gamePk)
-                  this.setBreakExpiry(id, gamePk)
-                  this.temp_cache.gamechanger[id].cur_pitchers[gamePk][pitching_team_id] = game.linescore.defense.pitcher.id
-                  continue
-                }
+              } else if ( game.linescore.defense.pitcher.id != this.temp_cache.gamechanger[id].cur_pitchers[gamePk][pitching_team_id] ) {
+                this.debuglog(game_changer_title + 'pitching change begun in game ' + gamePk)
+                this.setBreakExpiry(id, gamePk)
+                this.temp_cache.gamechanger[id].cur_pitchers[gamePk][pitching_team_id] = game.linescore.defense.pitcher.id
+                continue
               }
             }
@@ -4391,6 +4396,7 @@ class sessionClass {
             // Flag to stay on current game if same batter is still at bat
             if ( (game.gamePk == this.temp_cache.gamechanger[id].cur_game_pk) && (game.linescore.offense.batter.id == this.temp_cache.gamechanger[id].cur_batter) && (game.linescore.outs < 3) && ((game.linescore.balls && ![0,4].includes(game.linescore.balls)) || (game.linescore.strikes && ![0,3].includes(game.linescore.strikes))) ) {
+              this.debuglog(game_changer_title + 'same batter is up in current game ' + gamePk)
               same_batter = 'Y'
             }
@@ -4425,7 +4431,7 @@ class sessionClass {
           }
           if ( !this.temp_cache.gamechanger[id].cur_game_pk && (active_games.length == 0) ) {
-            this.debuglog(game_changer_title + ' no active games')
+            this.debuglog(game_changer_title + 'no active games')
             return
           }
@@ -4438,14 +4444,16 @@ class sessionClass {
             return b.LI - a.LI;
           })
-          this.debuglog(game_changer_title + ' active games ' + JSON.stringify(games))
-          this.debuglog(game_changer_title + ' current pitchers ' + JSON.stringify(this.temp_cache.gamechanger[id].cur_pitchers))
-          this.debuglog(game_changer_title + ' pitching changes ' + JSON.stringify(this.temp_cache.gamechanger[id].break_expiries))
+          this.debuglog(game_changer_title + 'active games ' + JSON.stringify(games))
+          this.debuglog(game_changer_title + 'current pitchers ' + JSON.stringify(this.temp_cache.gamechanger[id].cur_pitchers))
+          this.debuglog(game_changer_title + 'pitching changes ' + JSON.stringify(this.temp_cache.gamechanger[id].break_expiries))
+          this.debuglog(game_changer_title + 'same batter? ' + same_batter)
           let game_pk = null
           let game_info = null
           if ( this.stream_finder_settings.priority ) {
             for (const [key, priority] of Object.entries(this.stream_finder_settings.priority)) {
+              this.debuglog(game_changer_title + 'checking priority ' + JSON.stringify(priority))
               if ( (same_batter == 'N') || (priority.immediate == 'Y') ) {
                 for (var i=0; i<games.length; i++) {
                   let game = games[i]
@@ -4564,7 +4572,7 @@ class sessionClass {
           if (game_pk != this.temp_cache.gamechanger[id].cur_game_pk) {
             // delay untested, disabled
             /*if ( this.temp_cache.gamechanger[id].cur_game_pk && this.stream_finder_settings.delay && (parseInt(this.stream_finder_settings.delay) > 0) ) {
-              this.debuglog(game_changer_title + ' delaying switch by ' + this.stream_finder_settings.delay)
+              this.debuglog(game_changer_title + 'delaying switch by ' + this.stream_finder_settings.delay)
               await this.sleep(this.stream_finder_settings.delay)
             }*/
             this.log(game_changer_title + 'loading game ' + game_pk)