mlbserver 2026.3.27-2 → 2026.4.16

package/Dockerfile

@@ -1,24 +1,13 @@
-# --- Build Stage ---
-FROM node:18-alpine AS build
+FROM node:16-alpine
 
-# 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
+RUN apk update && apk add tzdata
 
 # 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+)
@@ -31,29 +20,5 @@ 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/README.md

@@ -50,6 +50,7 @@ Basic command line or Docker environment options:
 --session or -s (clears session)
 --cache or -c (clears cache)
 --env or -e (use environment variables instead of command line arguments; automatically applied in the Docker image)
+--login_page or -lp (false if not specified, login is done via a login page and uses cookies)
 ```
 
 Advanced command line or Docker environment options:
@@ -68,6 +69,7 @@ Advanced command line or Docker environment options:
 --page_username (username to protect pages; default is no protection)
 --page_password (password to protect pages; default is no protection)
 --content_protect (specify the content protection key to include as a URL parameter, if page protection is enabled)
+--login_page (optional, enable login page authentication; default is false, uses browswer popup when unset)
 --gamechanger_delay (specify extra delay for the gamechanger switches in 10 second increments, default is 0)
 --data_directory (defaults to installed application directory; in the Docker image, this defaults to /mlbserver/data_directory for mapping persistent storage)
 ```

package/docker-compose.yml

@@ -15,6 +15,7 @@ services:
       #- page_username=
       #- page_password=
       #- content_protect=
+      #- login_page=false
       #- gamechanger_delay=0
       #- PUID=1000
       #- PGID=1000

package/index.js

@@ -129,9 +129,10 @@ var argv = minimist(process.argv, {
     s: 'session',
     c: 'cache',
     v: 'version',
-    e: 'env'
+    e: 'env',
+    lp: 'login_page'
   },
-  boolean: ['ffmpeg_logging', 'debug', 'logout', 'session', 'cache', 'version', 'free', 'env'],
+  boolean: ['ffmpeg_logging', 'debug', 'logout', 'session', 'cache', 'version', 'free', 'env', 'login_page'],
   string: ['account_username', 'account_password', 'fav_teams', 'multiview_path', 'ffmpeg_path', 'ffmpeg_encoder', 'page_username', 'page_password', 'content_protect', 'data_directory', 'http_root']
 })
 
@@ -262,6 +263,7 @@ app.get('/clearcache', async function(req, res) {
     session.log('Clearing session...')
     session.clear_session_data()
     session = new sessionClass(argv)
+    session.setPorts(port, multiview_port)
 
     let server = (req.headers['x-forwarded-proto'] ? req.headers['x-forwarded-proto'] : 'http') + '://' + req.headers.host + http_root
     res.redirect(server)
@@ -1352,31 +1354,92 @@ app.get('/gamechangerplaylist.m3u8', async function(req, res) {
 })
 
 // Protect pages by password, or content by content_protect url parameter
+function isAuthenticated(req) {
+  if (!req.headers.cookie) return false;
+  const cookies = req.headers.cookie.split(';').map(c => c.trim());
+  const authCookie = cookies.find(c => c.startsWith('auth_token='));
+  if (!authCookie) return false;
+  const token = authCookie.split('=')[1];
+  return token === session.protection.content_protect;
+}
+
+const AUTH_TOKEN_TTL = 24 * 60 * 60 * 1000; // 1 day
+const authenticatedSessions = new Map();
+
+function isSecure(req) {
+  const forwarded = req.headers['x-forwarded-proto'];
+  if (forwarded) {
+    return forwarded.split(',')[0].trim().toLowerCase() === 'https';
+  }
+  return (req.connection && req.connection.encrypted) || false;
+}
+
+function cleanupExpiredSessions() {
+  const now = Date.now();
+  for (const [token, sessionData] of authenticatedSessions.entries()) {
+    if (sessionData.expiry <= now) {
+      authenticatedSessions.delete(token);
+    }
+  }
+}
+
+function isAuthenticated(req) {
+  if (!req.headers.cookie) return false;
+  const cookies = req.headers.cookie.split(';').map(c => c.trim());
+  const authCookie = cookies.find(c => c.startsWith('auth_token='));
+  if (!authCookie) return false;
+
+  const token = authCookie.split('=')[1];
+  const sessionData = authenticatedSessions.get(token);
+  if (!sessionData) return false;
+
+  if (sessionData.expiry <= Date.now()) {
+    authenticatedSessions.delete(token);
+    return false;
+  }
+
+  sessionData.expiry = Date.now() + AUTH_TOKEN_TTL;
+  return true;
+}
+
 async function protect(req, res) {
+  cleanupExpiredSessions();
+
   if (argv.page_username && argv.page_password) {
     if ( !session.protection.content_protect || !req.query.content_protect || (req.query.content_protect != session.protection.content_protect) ) {
       if ( !session.protection.content_protect || !req.query.content_protect || !req.query.content_protect[0] || (req.query.content_protect[0] != session.protection.content_protect) ) {
-        const reject = () => {
-          res.setHeader('www-authenticate', 'Basic')
-          res.error(401, ' Not Authorized')
-          return false
-        }
+        if (argv.login_page && isAuthenticated(req)) {
+          // Already authenticated via cookie
+        } else {
+          if (argv.login_page) {
+            const redirectUrl = encodeURIComponent(req.url);
+            res.writeHead(302, { 'Location': http_root + '/login?redirect=' + redirectUrl });
+            res.end();
+            return false;
+          } else {
+            const reject = () => {
+              res.setHeader('www-authenticate', 'Basic');
+              res.error(401, ' Not Authorized');
+              return false;
+            }
 
-        const authorization = req.headers.authorization
+            const authorization = req.headers.authorization;
 
-        if(!authorization) {
-          return reject()
-        }
+            if (!authorization) {
+              return reject();
+            }
 
-        const [username, password] = Buffer.from(authorization.replace('Basic ', ''), 'base64').toString().split(':')
+            const [username, password] = Buffer.from(authorization.replace('Basic ', ''), 'base64').toString().split(':');
 
-        if(! (username === argv.page_username && password === argv.page_password)) {
-          return reject()
+            if (! (username === argv.page_username && password === argv.page_password)) {
+              return reject();
+            }
+          }
         }
       }
     }
   }
-  return true
+  return true;
 }
 
 function getLastName(fullName) {
@@ -1389,6 +1452,89 @@ function getLastName(fullName) {
   return fullName.substring(indexOfSpace + 1);
 }
 
+// Login page
+app.get('/login', async function(req, res) {
+  try {
+    if (!argv.login_page) {
+      res.error(404, 'Not Found');
+      return;
+    }
+    const redirect = req.query.redirect || '/';
+    const error = req.query.error ? '<p style="color:red;">Invalid username or password</p>' : '';
+    res.writeHead(200, {'Content-Type': 'text/html'});
+    res.end(`<!DOCTYPE html><html><head><meta charset="UTF-8"><title>Login - ${appname}</title><style>body{color:lightgray;background-color:black;font-family:Arial,Helvetica,sans-serif;}input{background-color:black;color:lightgray;border:1px solid lightgray;}button{background-color:black;color:lightgray;border:1px solid lightgray;}</style></head><body><h1>Login to ${appname}</h1>${error}<form method="POST" action="${http_root}/login"><input type="hidden" name="redirect" value="${redirect}"><p>Username: <input type="text" name="username" required></p><p>Password: <input type="password" name="password" required></p><p><button type="submit">Login</button></p></form></body></html>`);
+  } catch (e) {
+    session.log('login get request error : ' + e.message);
+    res.end('login get request error, check log');
+  }
+});
+
+function getCookieOptions(req) {
+  const options = ['HttpOnly', 'Path=/', 'SameSite=Strict'];
+  if (isSecure(req)) options.push('Secure');
+  return options.join('; ');
+}
+
+// Login POST handler
+app.post('/login', async function(req, res) {
+  try {
+    if (!argv.login_page) {
+      res.error(404, 'Not Found');
+      return;
+    }
+    let body = '';
+    req.on('data', chunk => { body += chunk.toString(); });
+    req.on('end', () => {
+      const params = new URLSearchParams(body);
+      const username = params.get('username');
+      const password = params.get('password');
+      const redirect = params.get('redirect') || '/';
+      if (username === argv.page_username && password === argv.page_password) {
+        const token = crypto.randomBytes(16).toString('hex');
+        authenticatedSessions.set(token, { expiry: Date.now() + AUTH_TOKEN_TTL });
+        res.writeHead(302, {
+          'Location': redirect,
+          'Set-Cookie': `auth_token=${token}; ${getCookieOptions(req)}`
+        });
+        res.end();
+      } else {
+        res.writeHead(302, { 'Location': `${http_root}/login?redirect=${encodeURIComponent(redirect)}&error=1` });
+        res.end();
+      }
+    });
+  } catch (e) {
+    session.log('login post request error : ' + e.message);
+    res.end('login post request error, check log');
+  }
+});
+
+// Logout
+app.get('/logout', async function(req, res) {
+  try {
+    if (!argv.login_page) {
+      res.error(404, 'Not Found');
+      return;
+    }
+    let token = '';
+    if (req.headers.cookie) {
+      const cookies = req.headers.cookie.split(';').map(c => c.trim());
+      const authCookie = cookies.find(c => c.startsWith('auth_token='));
+      if (authCookie) token = authCookie.split('=')[1];
+    }
+    if (token && authenticatedSessions.has(token)) {
+      authenticatedSessions.delete(token);
+    }
+    res.writeHead(302, {
+      'Location': '/',
+      'Set-Cookie': `auth_token=; ${getCookieOptions(req)}; Max-Age=0`
+    });
+    res.end();
+  } catch (e) {
+    session.log('logout request error : ' + e.message);
+    res.end('logout request error, check log');
+  }
+});
+
 // Server homepage, base URL
 app.get('/', async function(req, res) {
   try {
@@ -1542,8 +1688,7 @@ app.get('/', async function(req, res) {
     var body = '<!DOCTYPE html><html><head><meta charset="UTF-8"><meta http-equiv="Content-type" content="text/html;charset=UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><title>' + appname + '</title><link rel="icon" href="favicon.svg' + content_protect_a + '"><style type="text/css">input[type=text],input[type=button]{-webkit-appearance:none;-webkit-border-radius:0}body{width:480px;color:lightgray;background-color:black;font-family:Arial,Helvetica,sans-serif;-webkit-text-size-adjust:none}a{color:darkgray}button{color:lightgray;background-color:black}button.default{color:black;background-color:lightgray}table{width:100%;pad}table,th,td{border:1px solid darkgray;border-collapse:collapse}th,td{padding:5px}.tinytext,textarea,input[type="number"]{font-size:.8em}textarea{width:380px}.freegame,.freegame a{color:green}.blackout,.blackout a{text-decoration:line-through}'
 
     // Highlights CSS
-    //max-height:calc(100vh-110px);
-    body += '.modal{display:none;position:fixed;z-index:1;padding-top:100px;left:0;top:0;width:100%;height:100%;overflow:auto;-webkit-overflow-scrolling:touch;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}.modal-content{background-color:#fefefe;margin:auto;padding:10px;border:1px solid #888;width:360px;color:black}#highlights a{color:black}.close{color:black;float:right;font-size:28px;font-weight:bold;}#highlights a:hover,#highlights a:focus,.close:hover,.close:focus{color:gray;text-decoration:none;cursor:pointer;}'
+    body += '.modal{display:none;position:fixed;z-index:1;left:0;top:0;width:100%;height:100%;overflow:hidden;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}.modal-content{position:absolute;top:100px;bottom:20px;left:50%;transform:translateX(-50%);background-color:#fefefe;padding:10px;border:1px solid #888;width:360px;overflow-y:auto;color:black}#highlights{overflow-y:auto;}#highlights a{color:black}.close{color:black;float:right;font-size:28px;font-weight:bold;}#highlights a:hover,#highlights a:focus,.close:hover,.close:focus{color:gray;text-decoration:none;cursor:pointer;}'
 
     // Tooltip CSS
     body += '.tooltip{position:relative;display:inline-block;border-bottom: 1px dotted gray;}.tooltip .tooltiptext{font-size:.8em;visibility:hidden;width:360px;background-color:gray;color:white;text-align:left;padding:5px;border-radius:6px;position:absolute;z-index:1;top:100%;left:75%;margin-left:-30px;}.tooltip:hover .tooltiptext{visibility:visible;}'
@@ -1570,6 +1715,10 @@ app.get('/', async function(req, res) {
 
 		body += '</script></head><body><h1>' + appname + '</h1>' + "\n"
 
+    if (argv.login_page) {
+      body += '<p><a href="' + http_root + '/logout">Logout</a></p>' + "\n"
+    }
+
     body += '<p><span class="tooltip tinytext">Touch or hover over an option name for more details</span></p>' + "\n"
 
     todayUTCHours -= 4
@@ -1829,37 +1978,38 @@ app.get('/', async function(req, res) {
       if ( (entitlements.length > 0) && cache_data.dates && cache_data.dates[0] && (cache_data.dates[0].date >= today) && cache_data.dates[0].games && (cache_data.dates[0].games.length > 1) && cache_data.dates[0].games[0] && (cache_data.dates[0].games[0].seriesDescription == 'Regular Season') ) {
         // Scraped Big Inning schedule
         big_inning = await session.getBigInningSchedule(gameDate)
-
-        // Generated Big Inning schedule (disabled)
-        //big_inning = await session.generateBigInningSchedule(gameDate)
-      }
-      if ( big_inning && big_inning.start ) {
-        body += '<tr><td><span class="tooltip">' + new Date(big_inning.start).toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + ' - ' + new Date(big_inning.end).toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + '<span class="tooltiptext">Big Inning is the live look-in and highlights show. <a href="https://support.mlb.com/s/article/What-Is-MLB-Big-Inning">See here for more information</a>.</span></span></td><td>'
-        let compareStart = new Date(big_inning.start)
-        compareStart.setMinutes(compareStart.getMinutes()-10)
-        let compareEnd = new Date(big_inning.end)
-        compareEnd.setHours(compareEnd.getHours()+1)
-        if ( (currentDate >= compareStart) && (currentDate < compareEnd) ) {
-          let querystring = '?event=biginning'
-          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 + ' Big Inning'
+      }
+      if ( big_inning ) {
+        for (var i = 0; i < big_inning.length; i++) {
+          if ( big_inning[i].start ) {
+            body += '<tr><td><span class="tooltip">' + new Date(big_inning[i].start).toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + ' - ' + new Date(big_inning[i].end).toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + '<span class="tooltiptext">Big Inning is the live look-in and highlights show. <a href="https://support.mlb.com/s/article/What-Is-MLB-Big-Inning">See here for more information</a>.</span></span></td><td>'
+            let compareStart = new Date(big_inning[i].start)
+            compareStart.setMinutes(compareStart.getMinutes()-10)
+            let compareEnd = new Date(big_inning[i].end)
+            compareEnd.setHours(compareEnd.getHours()+1)
+            if ( (currentDate >= compareStart) && (currentDate < compareEnd) ) {
+              let querystring = '?event=biginning'
+              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 + ' Big Inning'
+              }
+              querystring += content_protect_b
+              multiviewquerystring += content_protect_b
+              body += '<a href="' + thislink + querystring + '">Big Inning</a>'
+              body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
+            } else {
+              body += 'Big Inning'
+            }
+            body += '</td></tr>' + "\n"
           }
-          querystring += content_protect_b
-          multiviewquerystring += content_protect_b
-          body += '<a href="' + thislink + querystring + '">Big Inning</a>'
-          body += '<input type="checkbox" value="http://127.0.0.1:' + session.data.port + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
-        } else {
-          body += 'Big Inning'
         }
-        body += '</td></tr>' + "\n"
       }
 
       // Game Changer and Stream Finder
@@ -3320,11 +3470,13 @@ function start_multiview_stream(streams, sync, dvr, faster, reencode, park_audio
       //let audio_input = audio_present[i] + ':a:m:language:en?'
       let audio_input = audio_present[i] + ':a:'
       let video_url = streams[audio_present[i]]
-      if ( !video_url || video_url.includes('audio_track=English') || !video_url.includes('audio_track=') ) {
+      // disabled code below because we can now assume 
+      // the first audio track is the one we want
+      //if ( !video_url || video_url.includes('audio_track=English') || !video_url.includes('audio_track=') ) {
         audio_input += '0'
-      } else {
+      /*} else {
         audio_input += '1'
-      }
+      }*/
       let filter = ''
       // Optionally apply sync adjustments
       if ( sync[audio_present[i]] ) {
@@ -3531,11 +3683,13 @@ app.get('/download.ts', async function(req, res) {
   if ( ! (await protect(req, res)) ) return
 
   try {
+    let ffmpeg_timeout = 432000
     // we'll know it's an actual download request if it include a filename parameter
     if ( req.query.filename ) {
       session.requestlog('download.ts', req)
     } else {
       session.debuglog('force alternate audio', req)
+      ffmpeg_timeout = 20
     }
 
     let server = 'http://127.0.0.1:' + session.data.port + http_root
@@ -3561,7 +3715,7 @@ app.get('/download.ts', async function(req, res) {
       }
     }
 
-    ffmpeg_command = ffmpeg({ timeout: 432000 })
+    ffmpeg_command = ffmpeg({ timeout: ffmpeg_timeout })
 
     // Set input stream and minimize ffmpeg startup latency
     ffmpeg_command.input(video_url)
@@ -3619,15 +3773,21 @@ app.get('/download.ts', async function(req, res) {
     ffmpeg_command.addOutputOption('-f', 'mpegts')
     .output(res)
     .on('start', function(commandLine) {
-      session.debuglog('download.ts command started')
+      session.debuglog('download.ts command started for ' + video_url)
       if ( argv.debug || argv.ffmpeg_logging ) {
-        session.debuglog('download.ts command: ' + commandLine)
+        session.log('download.ts command: ' + commandLine)
       }
     })
     .on('error', function(err, stdout, stderr) {
-      session.debuglog('download.ts command stopped: ' + err.message)
-      if ( stdout ) session.log(stdout)
-      if ( stderr ) session.log(stderr)
+      if (err.message.includes('timeout')) {
+        session.debuglog('download.ts command timeout: ' + err.message)
+      } else {
+        session.debuglog('download.ts command error: ' + err.message)
+      }
+      if ( stdout ) session.debuglog(stdout)
+      if ( stderr ) session.debuglog(stderr)
+      ffmpeg_command.kill('SIGKILL')
+      session.debuglog('killed ffmpeg process due to error processing ' + video_url)
     })
     .on('end', function() {
       session.debuglog('download.ts command ended')
@@ -3795,3 +3955,142 @@ app.get('/comskip.txt', async function(req, res) {
     res.end('comskip.txt request error, check log')
   }
 })
+
+// Listen for embedded MPEGTS stream requests
+// embedded player not fully tested
+app.get('/mpegts.html', async function(req, res) {
+  if ( ! (await protect(req, res)) ) return
+
+  try {
+    let server = 'http://127.0.0.1:' + session.data.port + http_root
+
+    let video_url = '/stream.ts'
+    if ( req.query.src ) {
+      video_url = req.query.src
+    } else {
+      let urlArray = req.url.split('?')
+      if ( (urlArray.length == 2) ) {
+        video_url += '?' + urlArray[1]
+      }
+      video_url = server + video_url
+    }
+    session.debuglog('mpegts.html src : ' + video_url)
+    
+    var body = '<html><script src="https://xqq.im/mpegts.js/dist/mpegts.js"></script><style type"text/css">body{background-color:black}video{width:100% !important;height:auto !important;max-width:1280px}</style><body><video id="videoElement" controls autoplay playsinline></video><script>if (mpegts.getFeatureList().mseLivePlayback) { var videoElement = document.getElementById("videoElement"); var player = mpegts.createPlayer({ type: "mpegts", isLive: true, url: "' + video_url + '" }); player.attachMediaElement(videoElement); player.load(); player.play(); }</script></body></html>'
+
+    res.end(body)
+  } catch (e) {
+    session.log('mpegts.html request error : ' + e.message)
+    res.end('')
+  }
+})
+
+
+// Listen for MPEGTS stream requests
+app.get('/stream.ts', async function(req, res) {
+  if ( ! (await protect(req, res)) ) return
+
+  try {
+    let server = 'http://127.0.0.1:' + session.data.port + http_root
+
+    let video_url = '/stream.m3u8'
+    if ( req.query.src ) {
+      video_url = req.query.src
+    } else {
+      let urlArray = req.url.split('?')
+      if ( (urlArray.length == 2) ) {
+        video_url += '?' + urlArray[1]
+      }
+      video_url = server + video_url
+    }
+    session.debuglog('stream.ts src : ' + video_url)
+
+    // force adaptive streams to just use a single video resolution/track
+    if ( !video_url.includes('resolution=') ) {
+      video_url += '&resolution=best'
+    } else if ( video_url.includes('resolution=adaptive') ) {
+      video_url = video_url.replace('resolution=adaptive', 'resolution=best')
+    }
+
+    // force streams to just use a single audio track, if they aren't already
+    if ( !video_url.includes('audio_track=') ) {
+      video_url += '&audio_track=English'
+    } else if ( video_url.includes('audio_track=all') ) {
+      video_url = video_url.replace('audio_track=all', 'audio_track=English')
+    }
+
+    ffmpeg_command = ffmpeg({ timeout: 432000 })
+
+    // Set input live stream and minimize ffmpeg startup latency
+    ffmpeg_command.input(video_url)
+    .addInputOption('-thread_queue_size', '4096')
+    .addInputOption('-fflags', 'nobuffer')
+    .addInputOption('-probesize', '1000000')
+    .addInputOption('-analyzeduration', '0')
+    
+    // We'll limit our processing to real-time
+    ffmpeg_command.native()
+
+    let video_input = 0
+    let audio_input = 0
+    
+    // Adjust audio sync, if specified
+    if ( req.query.sync ) {
+      if ( req.query.sync > 0 ) {
+        session.log('stream.ts delaying video by ' + req.query.sync + ' seconds')
+        video_input = 1
+        ffmpeg_command.addInputOption('-itsoffset', req.query.sync)
+      } else {
+        session.log('stream.ts delaying audio by ' + (req.query.sync * -1) + ' seconds')
+        audio_input = 1
+        ffmpeg_command.addInputOption('-itsoffset', (req.query.sync * -1))
+      }
+      ffmpeg_command.input(video_url)
+      .addInputOption('-thread_queue_size', '4096')
+      
+      // We'll limit our processing to real-time
+      ffmpeg_command.native()
+    }
+
+    // video
+    ffmpeg_command.addOutputOption('-map', video_input + ':v:0')
+    .addOutputOption('-c:v', 'copy')
+
+    // audio
+    ffmpeg_command.addOutputOption('-map', audio_input + ':a')
+    .addOutputOption('-c:a', 'copy')
+
+    // output mpegts to response stream
+    ffmpeg_command.addOutputOption('-f', 'mpegts')
+    .output(res)
+    .on('start', function(commandLine) {
+      session.debuglog('stream.ts command started')
+      if ( argv.debug || argv.ffmpeg_logging ) {
+        session.log('stream.ts command: ' + commandLine)
+      }
+    })
+    .on('error', function(err, stdout, stderr) {
+      session.debuglog('stream.ts command stopped: ' + err.message)
+      if ( stdout ) session.debuglog(stdout)
+      if ( stderr ) session.debuglog(stderr)
+    })
+    .on('end', function() {
+      session.debuglog('stream.ts command ended')
+    })
+
+    if ( argv.ffmpeg_logging ) {
+      session.log('ffmpeg output logging enabled')
+      ffmpeg_command.on('stderr', function(stderrLine) {
+        session.log(stderrLine);
+      })
+    }
+
+    var headers = {'Content-Type': 'video/mp2t',"access-control-allow-origin":"*"}
+    res.writeHead(200, headers)
+
+    ffmpeg_command.run()
+  } catch (e) {
+    session.log('stream.ts request error : ' + e.message)
+    res.end('')
+  }
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlbserver",
-  "version": "2026.3.27-2",
+  "version": "2026.4.16",
   "description": "",
   "repository": {
     "type": "git",
@@ -13,7 +13,6 @@
     "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,7 +8,6 @@ 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'
 
@@ -865,8 +864,6 @@ 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
@@ -2922,25 +2919,28 @@ class sessionClass {
                 let gameDate = cache_data.dates[i].date
                 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))
-
-                  // Big Inning calendar ICS
-                  let prefix = 'Watch'
-                  let location = server + '/embed.html?event=biginning&mediaType=Video&resolution=' + resolution
-                  if ( this.protection.content_protect ) location += '&content_protect=' + this.protection.content_protect
-                  calendar += await this.generate_ics_event(prefix, new Date(this.cache.bigInningSchedule[gameDate].start), new Date(this.cache.bigInningSchedule[gameDate].end), title, description, location)
                   
-                  // Off Air if necessary
-                  let off_air_event = await this.generate_off_air_event(offAir, channelid, gameDate, channels[channelid].stop, this.cache.bigInningSchedule[gameDate].start, title)
-                  if ( off_air_event ) {
-                    programs += off_air_event
-                    channels[channelid].stop = stop
-                  }
+                  for (var j = 0; j < this.cache.bigInningSchedule[gameDate].length; j++) {
+                    // Scraped Big Inning schedule
+                    let start = this.convertDateToXMLTV(new Date(this.cache.bigInningSchedule[gameDate][j].start))
+                    let stop = this.convertDateToXMLTV(new Date(this.cache.bigInningSchedule[gameDate][j].end))
 
-                  // Big Inning guide XML
-                  programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertDateToAirDate(new Date(this.cache.bigInningSchedule[gameDate].start)))
+                    // Big Inning calendar ICS
+                    let prefix = 'Watch'
+                    let location = server + '/embed.html?event=biginning&mediaType=Video&resolution=' + resolution
+                    if ( this.protection.content_protect ) location += '&content_protect=' + this.protection.content_protect
+                    calendar += await this.generate_ics_event(prefix, new Date(this.cache.bigInningSchedule[gameDate][j].start), new Date(this.cache.bigInningSchedule[gameDate][j].end), title, description, location)
+                  
+                    // Off Air if necessary
+                    let off_air_event = await this.generate_off_air_event(offAir, channelid, gameDate, channels[channelid].stop, this.cache.bigInningSchedule[gameDate][j].start, title)
+                    if ( off_air_event ) {
+                      programs += off_air_event
+                      channels[channelid].stop = stop
+                    }
+
+                    // Big Inning guide XML
+                    programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertDateToAirDate(new Date(this.cache.bigInningSchedule[gameDate][j].start)))
+                  }
                 }
                 this.debuglog('getTVData completed Big Inning for date ' + cache_data.dates[i].date)
               }
@@ -3542,122 +3542,69 @@ class sessionClass {
       // temporarily disable Big Inning schedule checking until a new source URL is available
       /*this.cache.bigInningSchedule = {}
       return*/
-
+      
+      // reset for new format as of 2026-04-01
+      try {
+        if ( !this.cache.bigInningSchedule[Object.keys(this.cache.bigInningSchedule)[0]].length ) {
+          this.log('getBigInningSchedule cache reset')
+          delete this.cache.bigInningScheduleCacheExpiry
+          delete this.cache.bigInningSchedule
+        }
+      } catch (e) {
+        //this.debuglog('getBigInningSchedule cache reset error : ' + e.message)
+      }
+      
       let currentDate = new Date()
       if ( !this.cache || !this.cache.bigInningScheduleCacheExpiry || (currentDate > new Date(this.cache.bigInningScheduleCacheExpiry)) ) {
         if ( !this.cache.bigInningSchedule ) this.cache.bigInningSchedule = {}
-        
-        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
+        let reqObj = {
+          url: 'https://watch.product.api.espn.com/api/product/v3/watchespn/web/catalog/ae4eb028-0af3-42e7-8965-9304c5817969?lang=en&features=continueWatching%2Csfb-all%2Cpbov7%2Chigh-volume-row%2Csc4u%2Cguide-menu-header%2Ccutl%2Cheader-quickserve%2Cautoplay%2Cwatch-web-redesign%2CimageRatio58x13%2CpromoTiles%2CopenAuthz%2Cvideo-header%2Cexplore-row%2Cbutton-service%2Cinline-header%2Cflagship&deviceBrand=web&streamMenu=true&headerBgImageWidth=1280&countryCode=US&entitlements=no&tz=UTC-0400&userab=espn_watch_for_you_web-392*watch-fy-a-1642',
+          headers: {
+            'accept': '*/*',
+            'accept-encoding': 'gzip, deflate, br, zstd',
+            'origin': 'https://www.espn.com',
+            'referer': 'https://www.espn.com/',
+            'user-agent': USER_AGENT
+          },
+          json: true,
+          gzip: true
+        }
+        var response = await this.httpGet(reqObj, false)
+        if ( response ) {
+          this.debuglog(JSON.stringify(response))
+          
+          if ( response.page && response.page.buckets && response.page.buckets[0] && response.page.buckets[0].contents ) {
+            for (var i=0; i < response.page.buckets[0].contents.length; i++) {
+              let content = response.page.buckets[0].contents[i]
+              let big_inning_date = content.utc.substring(0, 10)
+              let big_inning_start = content.utc
+              for (var j=0; j < content.streams.length; j++) {
+                let stream = content.streams[j]
+                let big_inning_end = new Date(content.utc)
+                big_inning_end.setSeconds(stream.durationInSeconds)
+                if ( !this.cache.bigInningSchedule[big_inning_date] || !this.cache.bigInningSchedule[big_inning_date].length ) {
+                  this.cache.bigInningSchedule[big_inning_date] = []
                 }
+                this.cache.bigInningSchedule[big_inning_date].push({
+                  start: big_inning_start, 
+                  end: big_inning_end
+                })
                 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()
+          this.save_cache_data()
+        } else {
+          this.log('error : invalid response from url ' + reqObj.url)
+        }
       } else {
         this.debuglog('using cached big inning schedule')
       }
@@ -3672,35 +3619,6 @@ class sessionClass {
     }
   }
 
-  // Generate generic Big Inning schedule for specified date
-  // times in UTC (and DST) according to https://www.mlb.com/live-stream-games/help-center/subscription-access-big-inning
-  async generateBigInningSchedule(dateString) {
-    try {
-      this.debuglog('generateBigInningSchedule')
-
-      let utc_start_string = '01:00'
-      let utc_end_string = '03:30'
-      let add_date = 1
-      // Different Sunday schedule
-      let weekday_index = new Date(dateString + ' 00:00:00').getDay()
-      if ( weekday_index == 0 ) {
-        utc_start_string = '19:00'
-        utc_end_string = '21:30'
-        add_date = 0
-      }
-      let d = new Date(dateString + 'T' + utc_start_string + ':00.000+00:00')
-      d.setDate(d.getDate()+add_date)
-      let start = d
-      d = new Date(dateString + 'T' + utc_end_string + ':00.000+00:00')
-      d.setDate(d.getDate()+add_date)
-      let end = d
-
-      return {start: start, end: end}
-    } catch(e) {
-      this.log('generateBigInningSchedule error : ' + e.message)
-    }
-  }
-
   // Get event data
   async getEventData(url) {
     try {