mlbserver 2022.8.8 → 2022.8.23

package/Dockerfile

@@ -0,0 +1,24 @@
+FROM node:16-alpine
+
+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+)
+COPY package*.json ./
+
+RUN npm install
+# If you are building your code for production
+# RUN npm ci --only=production
+
+# Bundle app source
+COPY . .
+
+EXPOSE 9999 10000
+CMD [ "node", "index.js", "--env" ]

package/README.md

@@ -1,24 +1,94 @@
 # mlbserver
 
-Current version 2022.08.08
+Current version 2022.08.23
 
 Credit to https://github.com/tonycpsu/streamglob and https://github.com/mafintosh/hls-decryptor
 
+## Installation
+
+### node-cli
 ```
 npm install -g mlbserver
 ```
 
-## Usage
+### docker
+```
+docker pull tonywagner/mlbserver
+```
+
 
-Launch the server
+## Launch
 
+### node-cli (follow the prompts on first run, or see below for possible command line options)
 ```
 mlbserver
 ```
+or in application directory:
+```
+node index.js
+```
+
+### docker-compose
+Update the environment variables below and save it as docker-compose.yml:
+```
+version: "3"
+services:
+  mlbserver:
+    image: tonywagner/mlbserver:latest
+    container_name: mlbserver
+    environment:
+      - TZ=America/New York
+      - data_directory=/mlbserver/data_directory
+      - account_username=your.account.email@example.com
+      - account_password=youraccountpassword
+      - zip_code=0
+      - fav_teams=0
+      #- zip_code=00000
+      #- fav_teams=ARI,ATL
+      #- debug=false
+      #- port=9999
+      #- multiview_port=10000
+      #- multiview_path=
+      #- ffmpeg_path=
+      #- ffmpeg_encoder=
+      #- page_username=
+      #- page_password=
+      #- content_protect=
+      #- gamechanger_delay=0
+    ports:
+      - 9999:9999
+      - 10000:10000
+    volumes:
+      - /mlbserver/data_directory
+```
+Then launch it with ```docker-compose up --detach```
+
+### docker-cli
+Update the environment variables in the command below and run it:
+```
+docker run -d \
+  --name mlbserver \
+  --env TZ="America/New_York" \
+  --env data_directory=/mlbserver/data_directory \
+  --env account_username=your.account.email@example.com \
+  --env account_password=youraccountpassword \
+  --env zip_code=0 \
+  --env fav_teams=0 \
+  -p 9999:9999 \
+  -p 10000:10000 \
+  --volume /mlbserver/data_directory \
+  tonywagner/mlbserver
+```
+Subsequent runs can be launched with ```docker start mlbserver```
+
+Docker installs may require further configuration to get multiview streaming to work.
+
+
+## Usage
 
-and follow the prompts. Load the resulting web URL in a browser to start using the server and to see more documentation.
+After launching the server or Docker container, you can access it at http://localhost:9999 on the same machine, or substitute your computer's IP address for localhost to access it from a different device. Load that address in a web browser to start using the server and to see more documentation.
 
-Basic command line options:
+Basic command line or Docker environment options:
 
 ```
 --port or -p (primary port to run on; defaults to 9999 if not specified)
@@ -27,9 +97,10 @@ Basic command line options:
 --logout or -l (logs out and clears session)
 --session or -s (clears session)
 --cache or -c (clears cache)
+--env or -e (use environment variables instead of command line arguments; necessary for Docker)
 ```
 
-Advanced command line options:
+Advanced command line or Docker environment options:
 
 ```
 --account_username (email address, default will use stored credentials or prompt user to enter them)

package/docker-compose.yml

@@ -0,0 +1,29 @@
+version: "3"
+services:
+  mlbserver:
+    image: tonywagner/mlbserver:latest
+    container_name: mlbserver
+    environment:
+      - TZ=America/New York
+      - data_directory=/mlbserver/data_directory
+      - account_username=your.account.email@example.com
+      - account_password=youraccountpassword
+      - zip_code=0
+      - fav_teams=0
+      #- zip_code=00000
+      #- fav_teams=ARI,ATL
+      #- debug=false
+      #- port=9999
+      #- multiview_port=10000
+      #- multiview_path=
+      #- ffmpeg_path=
+      #- ffmpeg_encoder=
+      #- page_username=
+      #- page_password=
+      #- content_protect=
+      #- gamechanger_delay=0
+    ports:
+      - 9999:9999
+      - 10000:10000
+    volumes:
+      - /mlbserver/data_directory

package/index.js

@@ -104,9 +104,10 @@ const GAMECHANGER_RESPONSE_HEADERS = {"statusCode":200,"headers":{"content-type"
 // --account_password (default will use stored credentials or prompt user to enter them)
 // --zip_code (optional, for USA blackout labels, will prompt if not set or stored)
 // --fav_teams (optional, comma-separated list of favorite team abbreviations, will prompt if not set or stored)
+// --data_directory (defaults to app directory, must already exist if set to something else; should match storage volume for Docker)
 // --free (optional, free account, highlights free games)
 // --multiview_port (port for multiview streaming; defaults to 1 more than primary port, or 10000)
-// --multiview_path (where to create the folder for multiview encoded files; defaults to app directory)
+// --multiview_path (where to create the folder for multiview encoded files; defaults to data directory)
 // --ffmpeg_path (path to ffmpeg binary to use for multiview encoding; default downloads a binary using ffmpeg-static)
 // --ffmpeg_encoder (ffmpeg video encoder to use for multiview; default is the software encoder libx264)
 // --ffmpeg_logging (if present, logs all ffmpeg output -- useful for experimenting or troubleshooting)
@@ -125,7 +126,7 @@ var argv = minimist(process.argv, {
     e: 'env'
   },
   boolean: ['ffmpeg_logging', 'debug', 'logout', 'session', 'cache', 'version', 'free', 'env'],
-  string: ['port', 'account_username', 'account_password', 'multiview_port', 'multiview_path', 'ffmpeg_path', 'ffmpeg_encoder', 'page_username', 'page_password', 'content_protect', 'gamechanger_delay']
+  string: ['port', 'account_username', 'account_password', 'multiview_port', 'multiview_path', 'ffmpeg_path', 'ffmpeg_encoder', 'page_username', 'page_password', 'content_protect', 'gamechanger_delay', 'data_directory']
 })
 
 if (argv.env) argv = process.env
@@ -359,20 +360,18 @@ app.get('/stream.m3u8', async function(req, res) {
   }
 })
 
-// Store previous keys, for return without decoding
-var prevKeys = {}
 var getKey = function(url, headers, cb) {
-  if ( (typeof prevKeys[url] !== 'undefined') && (typeof prevKeys[url].key !== 'undefined') ) {
-    return cb(null, prevKeys[url].key)
+  if ( session.temp_cache.prevKeys[url] ) {
+    return cb(null, session.temp_cache.prevKeys[url])
   }
 
-  if ( typeof prevKeys[url] === 'undefined' ) prevKeys[url] = {}
-
   session.debuglog('key request : ' + url)
   requestRetry(url, headers, function(err, response) {
     if (err) return cb(err)
-    prevKeys[url].key = response.body
-    cb(null, response.body)
+    let key = response.body
+    session.debuglog('key returned ' + key)
+    session.temp_cache.prevKeys[url] = key
+    cb(null, key)
   })
 }
 
@@ -582,7 +581,13 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
               // if user specified "none" for video track
               if ( resolution == VALID_RESOLUTIONS[VALID_RESOLUTIONS.length-1] ) {
                 audio_track_matched = true
-                audio_output = '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="' + key + '",AUTOSELECT=YES,DEFAULT=YES' + "\n" + '#EXT-X-STREAM-INF:BANDWIDTH=50000,CODECS="mp4a.40.2",AUDIO="aac"' + "\n" + newurl
+                audio_output = '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="' + key + '",LANGUAGE="'
+                if ( key == ALTERNATE_AUDIO_TRACKS[1] ) {
+                  audio_output += 'es'
+                } else {
+                  audio_output += 'en'
+                }
+                audio_output += '",AUTOSELECT=YES,DEFAULT=YES' + "\n" + '#EXT-X-STREAM-INF:BANDWIDTH=50000,CODECS="mp4a.40.2",AUDIO="aac"' + "\n" + newurl
               } else {
                 if (audio_output != '') audio_output += "\n"
                 audio_output += '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="' + key + '",AUTOSELECT=YES,DEFAULT='
@@ -768,13 +773,16 @@ app.get('/playlist', async function(req, res) {
           session.debuglog('key line : ' + line)
           var parsed = line.match(/URI="([^"]+)"(?:,IV=(.+))?$/)
           if ( parsed ) {
-            if ( parsed[1].substr(0,4) == 'http' ) key = parsed[1]
-            else key = url.resolve(u, parsed[1])
-            session.debuglog('found key : ' + key)
-            if ( key.startsWith('data:;base64,') ) {
+            if ( parsed[1].startsWith('http') ) {
+              key = parsed[1]
+              session.debuglog('key url : ' + key)
+            } else if ( key.startsWith('data:;base64,') ) {
               let newparsed = key.split(',')
               key = newparsed[1]
-              session.debuglog('found new key : ' + key)
+              session.debuglog('found key data : ' + key)
+            } else {
+              key = url.resolve(u, parsed[1])
+              session.debuglog('resolved key url : ' + key)
             }
             if (parsed[2]) iv = parsed[2].slice(2).toLowerCase()
           }
@@ -783,8 +791,10 @@ app.get('/playlist', async function(req, res) {
 
         if (line[0] === '#') return line
 
-        if ( key ) return '/ts?url='+encodeURIComponent(url.resolve(u, line.trim()))+'&key='+encodeURIComponent(key)+'&iv='+encodeURIComponent(iv) + content_protect + referer_parameter
-        else return '/ts?url='+encodeURIComponent(url.resolve(u, line.trim())) + content_protect + referer_parameter
+        let newline = '/ts?url='+encodeURIComponent(url.resolve(u, line.trim())) + content_protect + referer_parameter
+        if ( key ) newline += '&key='+encodeURIComponent(key) + '&iv='+encodeURIComponent(iv)
+
+        return newline
       })
       .filter(function(line) {
         return line
@@ -849,19 +859,8 @@ app.get('/ts', async function(req, res) {
     if (!req.query.key) return respond(response, res, response.body)
 
     try {
-      //var ku = url.resolve(manifest, req.query.key)
       var ku = req.query.key
-      if ( ku.substr(0,4) != 'http' ) {
-        var iv = Buffer.from(req.query.iv, 'hex')
-        session.debuglog('iv : 0x'+req.query.iv)
-
-        let key = Buffer.from(ku, "base64")
-
-        var dc = crypto.createDecipheriv('aes-128-cbc', key, iv)
-        var buffer = Buffer.concat([dc.update(response.body), dc.final()])
-
-        respond(response, res, buffer)
-      } else {
+      if ( ku.startsWith('http') ) {
         getKey(ku, headers, function(err, key) {
           if (err) return res.error(err)
 
@@ -873,6 +872,16 @@ app.get('/ts', async function(req, res) {
 
           respond(response, res, buffer)
         })
+      } else {
+        var iv = Buffer.from(req.query.iv, 'hex')
+        session.debuglog('iv : 0x'+req.query.iv)
+
+        let key = Buffer.from(ku, "base64")
+
+        var dc = crypto.createDecipheriv('aes-128-cbc', key, iv)
+        var buffer = Buffer.concat([dc.update(response.body), dc.final()])
+
+        respond(response, res, buffer)
       }
     } catch (e) {
       session.log('key decode error : ' + e.message)
@@ -1267,7 +1276,7 @@ app.get('/', async function(req, res) {
     body += 'function makeGETRequest(url, callback){var request=new XMLHttpRequest();request.onreadystatechange=function(){if (request.readyState==4 && request.status==200){callback(request.responseText)}};request.open("GET", url);request.send();}' + "\n"
 
     // Multiview functions
-    body += 'function parsemultiviewresponse(responsetext){if (responsetext == "started"){setTimeout(function(){document.getElementById("startmultiview").innerHTML="Restart";document.getElementById("stopmultiview").innerHTML="Stop"},15000)}else if (responsetext == "stopped"){setTimeout(function(){document.getElementById("stopmultiview").innerHTML="Stopped";document.getElementById("startmultiview").innerHTML="Start"},3000)}else{alert(responsetext)}}function addmultiview(e){for(var i=1;i<=4;i++){var valuefound = false;var oldvalue="";var newvalue=e.value;if(!e.checked){oldvalue=e.value;newvalue=""}if (document.getElementById("multiview" + i).value == oldvalue){document.getElementById("multiview" + i).value=newvalue;valuefound=true;break}}if(e.checked && !valuefound){e.checked=false}}function startmultiview(e){var count=0;var getstr="";for(var i=1;i<=4;i++){if (document.getElementById("multiview"+i).value != ""){count++;getstr+="streams="+encodeURIComponent(document.getElementById("multiview"+i).value)+"&sync="+encodeURIComponent(document.getElementById("sync"+i).value)+"&"}}if((count >= 1) && (count <= 4)){if (document.getElementById("faster").checked){getstr+="faster=true&dvr=true&"}else if (document.getElementById("dvr").checked){getstr+="dvr=true&"}if (document.getElementById("reencode").checked){getstr+="reencode=true&"}if (document.getElementById("audio_url").value != ""){getstr+="audio_url="+encodeURIComponent(document.getElementById("audio_url").value)+"&";if (document.getElementById("audio_url_seek").value != "0"){getstr+="audio_url_seek="+encodeURIComponent(document.getElementById("audio_url_seek").value)}}e.innerHTML="starting...";makeGETRequest("/multiview?"+getstr, parsemultiviewresponse)}else{alert("Multiview requires between 1-4 streams to be selected")}return false}function stopmultiview(e){e.innerHTML="stopping...";makeGETRequest("/multiview", parsemultiviewresponse);return false}' + "\n"
+    body += 'var excludeTeams=[];function parsemultiviewresponse(responsetext){if (responsetext == "started"){setTimeout(function(){document.getElementById("startmultiview").innerHTML="Restart";document.getElementById("stopmultiview").innerHTML="Stop"},15000)}else if (responsetext == "stopped"){setTimeout(function(){document.getElementById("stopmultiview").innerHTML="Stopped";document.getElementById("startmultiview").innerHTML="Start"},3000)}else{alert(responsetext)}}function addmultiview(e, teams=[], excludes=[]){var newvalue=e.value;for(var i=1;i<=4;i++){var valuefound = false;var oldvalue="";if(!e.checked){oldvalue=e.value;newvalue=""}if ((document.getElementById("multiview" + i).value == oldvalue) || ((oldvalue != "") && (document.getElementById("multiview" + i).value.startsWith(oldvalue)))){if ((newvalue != "") && (excludes.length > 0)){newvalue+="&excludeTeams="+excludeTeams.toString()}document.getElementById("multiview" + i).value=newvalue;valuefound=true;break}}if(e.checked && !valuefound){e.checked=false}for(var i=0;i<teams.length;i++){if(e.checked){excludeTeams.push(teams[i])}else{var index=excludeTeams.indexOf(teams[i]);if (index !== -1){excludeTeams.splice(index,1)}}}}function startmultiview(e){var count=0;var getstr="";for(var i=1;i<=4;i++){if (document.getElementById("multiview"+i).value != ""){count++;getstr+="streams="+encodeURIComponent(document.getElementById("multiview"+i).value)+"&sync="+encodeURIComponent(document.getElementById("sync"+i).value)+"&"}}if((count >= 1) && (count <= 4)){if (document.getElementById("faster").checked){getstr+="faster=true&dvr=true&"}else if (document.getElementById("dvr").checked){getstr+="dvr=true&"}if (document.getElementById("reencode").checked){getstr+="reencode=true&"}if (document.getElementById("audio_url").value != ""){getstr+="audio_url="+encodeURIComponent(document.getElementById("audio_url").value)+"&";if (document.getElementById("audio_url_seek").value != "0"){getstr+="audio_url_seek="+encodeURIComponent(document.getElementById("audio_url_seek").value)}}e.innerHTML="starting...";makeGETRequest("/multiview?"+getstr, parsemultiviewresponse)}else{alert("Multiview requires between 1-4 streams to be selected")}return false}function stopmultiview(e){e.innerHTML="stopping...";makeGETRequest("/multiview", parsemultiviewresponse);return false}' + "\n"
 
     // Function to switch URLs to stream URLs, where necessary
     body += 'function stream_substitution(url){return url.replace(/\\/([a-zA-Z]+\.html)/,"/stream.m3u8")}' + "\n"
@@ -1429,15 +1438,14 @@ app.get('/', async function(req, res) {
           body += '<tr><td><span class="tooltip">' + compareStart.toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + ' - ' + compareEnd.toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }) + '<span class="tooltiptext">The game changer stream will automatically switch between the highest leverage active live non-blackout games, and should be available whenever there are such games available. Does not support adaptive bitrate switching, will default to best resolution if not specified.</span></span></td><td>'
           if ( (currentDate >= compareStart) && (currentDate < compareEnd) ) {
             let streamURL = server + '/gamechanger.m3u8'
-            let multiviewquerystring = streamURL + '?resolution=' + DEFAULT_MULTIVIEW_RESOLUTION
-            multiviewquerystring += content_protect_b
-            if ( resolution != VALID_RESOLUTIONS[0] ) streamURL += '?resolution=' + resolution
-            streamURL += content_protect_b
+            streamURL += content_protect_a
+            let multiviewquerystring = streamURL + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION
+            if ( resolution != VALID_RESOLUTIONS[0] ) streamURL += '&resolution=' + resolution
             if ( linkType != VALID_LINK_TYPES[1] ) {
               streamURL = thislink + '?src=' + encodeURIComponent(streamURL) + '&startFrom=' + VALID_START_FROM[1] + content_protect_b
             }
             body += '<a href="' + streamURL + '">Game Changer</a>'
-            body += '<input type="checkbox" value="' + multiviewquerystring + '" onclick="addmultiview(this)">'
+            body += '<input type="checkbox" value="' + multiviewquerystring + '" onclick="addmultiview(this, [], excludeTeams)">'
           } else {
             body += 'Game Changer'
           }
@@ -1733,7 +1741,7 @@ app.get('/', async function(req, res) {
                           body += stationlink
                         }
                         if ( mediaType == 'MLBTV' ) {
-                          body += '<input type="checkbox" value="' + server + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
+                          body += '<input type="checkbox" value="' + server + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this, [\'' + awayteam + '\', \'' + hometeam + '\'])">'
                         }
                         if ( resumeStatus ) {
                           body += '('
@@ -2632,4 +2640,4 @@ app.get('/kodi.strm', async function(req, res) {
     session.log('kodi.strm request error : ' + e.message)
     res.end('kodi.strm request error, check log')
   }
-})
+})

package/package.json

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

package/session.js

@@ -9,17 +9,8 @@ const readlineSync = require('readline-sync')
 const FileCookieStore = require('tough-cookie-filestore')
 const parseString = require('xml2js').parseString
 
-// Define some file paths and names
-const DATA_DIRECTORY = path.join(__dirname, 'data')
-const CACHE_DIRECTORY = path.join(__dirname, 'cache')
 const MULTIVIEW_DIRECTORY_NAME = 'multiview'
 
-const CREDENTIALS_FILE = path.join(__dirname, 'credentials.json')
-const PROTECTION_FILE = path.join(__dirname, 'protection.json')
-const COOKIE_FILE = path.join(DATA_DIRECTORY, 'cookies.json')
-const DATA_FILE = path.join(DATA_DIRECTORY, 'data.json')
-const CACHE_FILE = path.join(CACHE_DIRECTORY, 'cache.json')
-
 // Default user agent to use for API requests
 const USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:87.0) Gecko/20100101 Firefox/87.0'
 
@@ -824,8 +815,23 @@ class sessionClass {
   constructor(argv = {}) {
     this.debug = argv.debug
 
+    let dirname = __dirname
+    if ( argv.data_directory ) {
+      dirname = argv.data_directory
+    }
+
+    // Define some file paths and names
+    this.DATA_DIRECTORY = path.join(dirname, 'data')
+    this.CACHE_DIRECTORY = path.join(dirname, 'cache')
+
+    this.CREDENTIALS_FILE = path.join(dirname, 'credentials.json')
+    this.PROTECTION_FILE = path.join(dirname, 'protection.json')
+    this.COOKIE_FILE = path.join(this.DATA_DIRECTORY, 'cookies.json')
+    this.DATA_FILE = path.join(this.DATA_DIRECTORY, 'data.json')
+    this.CACHE_FILE = path.join(this.CACHE_DIRECTORY, 'cache.json')
+
     // Read credentials from file, if present
-    this.credentials = this.readFileToJson(CREDENTIALS_FILE) || {}
+    this.credentials = this.readFileToJson(this.CREDENTIALS_FILE) || {}
 
     // Check if account credentials were provided and if they are different from the stored credentials
     if ( argv.account_username && argv.account_password && ((argv.account_username != this.credentials.account_username) || (argv.account_password != this.credentials.account_password)) ) {
@@ -850,7 +856,7 @@ class sessionClass {
     this.protection = {}
     if ( argv.page_username && argv.page_password ) {
       // Read protection data from file, if present
-      this.protection = this.readFileToJson(PROTECTION_FILE) || {}
+      this.protection = this.readFileToJson(this.PROTECTION_FILE) || {}
 
       // Check if content_protect key was provided and if it is different from the stored one
       if ( argv.content_protect && (argv.content_protect != this.protection.content_protect) ) {
@@ -869,39 +875,41 @@ class sessionClass {
     }
 
     // Create storage directory if it doesn't already exist
-    this.createDirectory(DATA_DIRECTORY)
+    this.createDirectory(this.DATA_DIRECTORY)
 
     // Set multiview path
     if ( argv.multiview_path ) {
-      this.multiview_path = path.join(argv.multiview_path, path.basename(__dirname))
+      this.multiview_path = path.join(argv.multiview_path, path.basename(dirname))
       this.createDirectory(this.multiview_path)
       this.multiview_path = path.join(this.multiview_path, MULTIVIEW_DIRECTORY_NAME)
     } else {
-      this.multiview_path = path.join(__dirname, MULTIVIEW_DIRECTORY_NAME)
+      this.multiview_path = path.join(dirname, MULTIVIEW_DIRECTORY_NAME)
     }
     this.createDirectory(this.multiview_path)
 
     // Create cookie storage file if it doesn't already exist
-    this.createFile(COOKIE_FILE)
+    this.createFile(this.COOKIE_FILE)
     // Verify its contents are valid
-    let cookieStr = fs.readFileSync(COOKIE_FILE)
+    let cookieStr = fs.readFileSync(this.COOKIE_FILE)
     if ( (cookieStr != '') && !this.isValidJson(cookieStr) ) {
       this.log('invalid cookie storage file contents, resetting')
-      fs.unlinkSync(COOKIE_FILE)
-      this.createFile(COOKIE_FILE)
+      fs.unlinkSync(this.COOKIE_FILE)
+      this.createFile(this.COOKIE_FILE)
     }
 
     // Set up http requests with the cookie jar
     this.request = require('request-promise')
-    this.jar = this.request.jar(new FileCookieStore(COOKIE_FILE))
+    this.jar = this.request.jar(new FileCookieStore(this.COOKIE_FILE))
     this.request = this.request.defaults({timeout:15000, agent:false, jar: this.request.jar()})
 
     // Load session data and cache from files
-    this.data = this.readFileToJson(DATA_FILE) || {}
-    this.cache = this.readFileToJson(CACHE_FILE) || {}
+    this.data = this.readFileToJson(this.DATA_FILE) || {}
+    this.cache = this.readFileToJson(this.CACHE_FILE) || {}
 
-    // Define empty temporary cache (for skip and gamechanger data)
+    // Define empty temporary cache (for skip, gamechanger, and key data)
     this.temp_cache = {}
+    // Store previous keys, for return without retrieval
+    this.temp_cache.prevKeys = {}
 
     // Default scan_mode and linkType values
     if ( !this.data.scan_mode ) {
@@ -1222,7 +1230,7 @@ class sessionClass {
 
   logout() {
     try {
-      fs.unlinkSync(CREDENTIALS_FILE)
+      fs.unlinkSync(this.CREDENTIALS_FILE)
     } catch(e){
       this.debuglog('credentials cannot be cleared or do not exist yet : ' + e.message)
     }
@@ -1230,8 +1238,8 @@ class sessionClass {
 
   clear_session_data() {
     try {
-      fs.unlinkSync(COOKIE_FILE)
-      fs.unlinkSync(DATA_FILE)
+      fs.unlinkSync(this.COOKIE_FILE)
+      fs.unlinkSync(this.DATA_FILE)
     } catch(e){
       this.debuglog('session cannot be cleared or does not exist yet : ' + e.message)
     }
@@ -1239,7 +1247,7 @@ class sessionClass {
 
   clear_cache() {
     try {
-      fs.unlinkSync(CACHE_FILE)
+      fs.unlinkSync(this.CACHE_FILE)
     } catch(e){
       this.debuglog('cache cannot be cleared or does not exist yet : ' + e.message)
     }
@@ -1268,30 +1276,30 @@ class sessionClass {
   }
 
   save_credentials() {
-    this.writeJsonToFile(JSON.stringify(this.credentials), CREDENTIALS_FILE)
+    this.writeJsonToFile(JSON.stringify(this.credentials), this.CREDENTIALS_FILE)
     this.debuglog('credentials saved to file')
   }
 
   save_protection() {
-    this.writeJsonToFile(JSON.stringify(this.protection), PROTECTION_FILE)
+    this.writeJsonToFile(JSON.stringify(this.protection), this.PROTECTION_FILE)
     this.debuglog('protection data saved to file')
   }
 
   save_session_data() {
-    this.createDirectory(DATA_DIRECTORY)
-    this.writeJsonToFile(JSON.stringify(this.data), DATA_FILE)
+    this.createDirectory(this.DATA_DIRECTORY)
+    this.writeJsonToFile(JSON.stringify(this.data), this.DATA_FILE)
     this.debuglog('session data saved to file')
   }
 
   save_cache_data() {
-    this.createDirectory(CACHE_DIRECTORY)
-    this.writeJsonToFile(JSON.stringify(this.cache), CACHE_FILE)
+    this.createDirectory(this.CACHE_DIRECTORY)
+    this.writeJsonToFile(JSON.stringify(this.cache), this.CACHE_FILE)
     this.debuglog('cache data saved to file')
   }
 
   save_json_cache_file(cache_name, cache_data) {
-    this.createDirectory(CACHE_DIRECTORY)
-    this.writeJsonToFile(JSON.stringify(cache_data), path.join(CACHE_DIRECTORY, cache_name+'.json'))
+    this.createDirectory(this.CACHE_DIRECTORY)
+    this.writeJsonToFile(JSON.stringify(cache_data), path.join(this.CACHE_DIRECTORY, cache_name+'.json'))
     this.debuglog('cache file saved')
   }
 
@@ -1312,7 +1320,7 @@ class sessionClass {
   }
 
   // Generic http GET request function
-  httpGet(reqObj) {
+  httpGet(reqObj, exit=true) {
     reqObj.jar = this.jar
     return new Promise((resolve, reject) => {
       this.request.get(reqObj)
@@ -1322,7 +1330,11 @@ class sessionClass {
       .catch(function(e) {
         console.log('http get failed : ' + e.message)
         console.log(reqObj)
-        process.exit(1)
+        if ( exit ) {
+          process.exit(1)
+        } else {
+          resolve(false)
+        }
       })
     })
   }
@@ -1548,7 +1560,7 @@ class sessionClass {
         gzip: true
       }
       var response = await this.httpGet(reqObj)
-      if ( this.isValidJson(response) ) {
+      if ( response && this.isValidJson(response) ) {
         this.debuglog('getStreamURL response : ' + response)
         let obj = JSON.parse(response)
         if ( obj.errors && (obj.errors[0] == 'blackout') ) {
@@ -1655,7 +1667,7 @@ class sessionClass {
       gzip: true
     }
     var response = await this.httpGet(reqObj)
-    if ( this.isValidJson(response) ) {
+    if ( response && this.isValidJson(response) ) {
       this.debuglog('getDeviceId response : ' + response)
       let obj = JSON.parse(response)
       this.debuglog('getDeviceId : ' + obj.device.id)
@@ -1865,7 +1877,7 @@ class sessionClass {
 
         let cache_data
         let cache_name = gameDate
-        let cache_file = path.join(CACHE_DIRECTORY, gameDate+'.json')
+        let cache_file = path.join(this.CACHE_DIRECTORY, gameDate+'.json')
         let currentDate = new Date()
         cache_data = await this.getDayData(gameDate)
 
@@ -1985,7 +1997,7 @@ class sessionClass {
 
       let cache_data
       let cache_name = 'h' + gamePk
-      let cache_file = path.join(CACHE_DIRECTORY, cache_name+'.json')
+      let cache_file = path.join(this.CACHE_DIRECTORY, cache_name+'.json')
       let currentDate = new Date()
       if ( !fs.existsSync(cache_file) || !this.cache || !this.cache.highlights || !this.cache.highlights[cache_name] || !this.cache.highlights[cache_name].highlightsCacheExpiry || (currentDate > new Date(this.cache.highlights[cache_name].highlightsCacheExpiry)) ) {
         let reqObj = {
@@ -1998,8 +2010,8 @@ class sessionClass {
           },
           gzip: true
         }
-        var response = await this.httpGet(reqObj)
-        if ( this.isValidJson(response) ) {
+        var response = await this.httpGet(reqObj, false)
+        if ( response && this.isValidJson(response) ) {
           //this.debuglog(response)
           cache_data = JSON.parse(response)
           this.save_json_cache_file(cache_name, cache_data)
@@ -2081,7 +2093,7 @@ class sessionClass {
       } else {
         this.debuglog('getDayData for date ' + dateString)
       }
-      let cache_file = path.join(CACHE_DIRECTORY, cache_name+'.json')
+      let cache_file = path.join(this.CACHE_DIRECTORY, cache_name+'.json')
       let currentDate = new Date()
       if ( !fs.existsSync(cache_file) || !this.cache || !this.cache.dates || !this.cache.dates[cache_name] || !this.cache.dates[cache_name].dateCacheExpiry || (currentDate > new Date(this.cache.dates[cache_name].dateCacheExpiry)) ) {
         let reqObj = {
@@ -2094,8 +2106,8 @@ class sessionClass {
           },
           gzip: true
         }
-        var response = await this.httpGet(reqObj)
-        if ( this.isValidJson(response) ) {
+        var response = await this.httpGet(reqObj, false)
+        if ( response && this.isValidJson(response) ) {
           //this.debuglog(response)
           cache_data = JSON.parse(response)
           this.save_json_cache_file(cache_name, cache_data)
@@ -2164,7 +2176,7 @@ class sessionClass {
 
       let cache_data
       let cache_name = 'week'
-      let cache_file = path.join(CACHE_DIRECTORY, cache_name + '.json')
+      let cache_file = path.join(this.CACHE_DIRECTORY, cache_name + '.json')
       let currentDate = new Date()
       if ( !fs.existsSync(cache_file) || !this.cache || !this.cache.weekCacheExpiry || (currentDate > new Date(this.cache.weekCacheExpiry)) ) {
         let startDate = this.liveDate(utcHours)
@@ -2181,8 +2193,8 @@ class sessionClass {
           },
           gzip: true
         }
-        var response = await this.httpGet(reqObj)
-        if ( this.isValidJson(response) ) {
+        var response = await this.httpGet(reqObj, false)
+        if ( response && this.isValidJson(response) ) {
           //this.debuglog(response)
           cache_data = JSON.parse(response)
           this.save_json_cache_file(cache_name, cache_data)
@@ -2597,7 +2609,7 @@ class sessionClass {
   // Get image from cache or request
   async getImage(teamId) {
     this.debuglog('getImage ' + teamId)
-    let imagePath = path.join(CACHE_DIRECTORY, teamId + '.svg')
+    let imagePath = path.join(this.CACHE_DIRECTORY, teamId + '.svg')
     if ( fs.existsSync(imagePath) ) {
       this.debuglog('using cached image for ' + teamId)
       return fs.readFileSync(imagePath)
@@ -2614,7 +2626,7 @@ class sessionClass {
           'origin': 'https://www.mlb.com'
         }
       }
-      var response = await this.httpGet(reqObj)
+      var response = await this.httpGet(reqObj, false)
       if ( response ) {
         this.debuglog('getImage response : ' + response)
         fs.writeFileSync(imagePath, response)
@@ -2641,7 +2653,7 @@ class sessionClass {
       } else {
         this.debuglog('getAiringsData for content ' + contentId)
       }
-      let cache_file = path.join(CACHE_DIRECTORY, cache_name+'.json')
+      let cache_file = path.join(this.CACHE_DIRECTORY, cache_name+'.json')
       let currentDate = new Date()
       if ( !fs.existsSync(cache_file) || !this.cache || !this.cache.airings || !this.cache.airings[cache_name] || !this.cache.airings[cache_name].airingsCacheExpiry || (currentDate > new Date(this.cache.airings[cache_name].airingsCacheExpiry)) ) {
         let reqObj = {
@@ -2659,7 +2671,7 @@ class sessionClass {
           gzip: true
         }
         var response = await this.httpGet(reqObj)
-        if ( this.isValidJson(response) ) {
+        if ( response && this.isValidJson(response) ) {
           this.debuglog(response)
           cache_data = JSON.parse(response)
           this.save_json_cache_file(cache_name, cache_data)
@@ -2710,7 +2722,7 @@ class sessionClass {
 
       let cache_data
       let cache_name = 'g' + gamePk
-      let cache_file = path.join(CACHE_DIRECTORY, cache_name+'.json')
+      let cache_file = path.join(this.CACHE_DIRECTORY, cache_name+'.json')
       let currentDate = new Date()
       if ( !fs.existsSync(cache_file) || !this.cache || !this.cache.gameday || !this.cache.gameday[cache_name] || !this.cache.gameday[cache_name].gamedayCacheExpiry || (currentDate > new Date(this.cache.gameday[cache_name].gamedayCacheExpiry)) ) {
         let reqObj = {
@@ -2723,8 +2735,8 @@ class sessionClass {
           },
           gzip: true
         }
-        var response = await this.httpGet(reqObj)
-        if ( this.isValidJson(response) ) {
+        var response = await this.httpGet(reqObj, false)
+        if ( response && this.isValidJson(response) ) {
           this.debuglog(response)
           cache_data = JSON.parse(response)
           this.save_json_cache_file(cache_name, cache_data)
@@ -2910,6 +2922,19 @@ class sessionClass {
                     continue
                   } else {
                     let break_end = ((new Date(cache_data.liveData.plays.allPlays[i].playEvents[action_index].startTime) - broadcast_start_timestamp) / 1000) + EVENT_START_PADDING
+
+                    // attempt to fix erroneous timestamps, like NYY-SEA 2022-08-09, bottom 11
+                    if ( break_end < break_start ) {
+                      this.debuglog('getSkipMarkers adjusting break start')
+                      break_start = break_end - 10
+
+                      let prev_break = skip_markers.length-1
+                      if ( (prev_break > 0) && (break_start < skip_markers[prev_break].break_end) && (skip_markers[prev_break].break_start < (skip_markers[prev_break].break_end - 40)) ) {
+                        this.debuglog('getSkipMarkers adjusting previous break end')
+                        skip_markers[prev_break].break_end = skip_markers[prev_break].break_start + 30
+                      }
+                    }
+
                     // if the break duration should be greater than than our specified minimum
                     // and if skip type is not 1 (inning breaks) or the inning has changed
                     // then we'll add the skip marker
@@ -2977,7 +3002,7 @@ class sessionClass {
           },
           gzip: true
         }
-        var response = await this.httpGet(reqObj)
+        var response = await this.httpGet(reqObj, false)
         if ( response ) {
           // disabled because it's very big!
           //this.debuglog(response)
@@ -3089,11 +3114,12 @@ class sessionClass {
 
       let cache_data
       let cache_name = 'events'
-      let cache_file = path.join(CACHE_DIRECTORY, cache_name + '.json')
+      let cache_file = path.join(this.CACHE_DIRECTORY, cache_name + '.json')
       let currentDate = new Date()
       if ( !fs.existsSync(cache_file) || !this.cache || !this.cache.eventURLCacheExpiry || (currentDate > new Date(this.cache.eventURLCacheExpiry)) ) {
         let reqObj = {
-          url: 'https://dapi.cms.mlbinfra.com/v2/content/en-us/sel-mlbtv-featured-svod-video-list',
+          //url: 'https://dapi.cms.mlbinfra.com/v2/content/en-us/sel-mlbtv-featured-svod-video-list',
+          url: 'https://dapi.mlbinfra.com/v2/content/en-us/vsmcontents/mlb-tv-welcome-center-big-inning-show',
           headers: {
             'User-Agent': USER_AGENT,
             'Origin': 'https://www.mlb.com',
@@ -3103,8 +3129,8 @@ class sessionClass {
           },
           gzip: true
         }
-        var response = await this.httpGet(reqObj)
-        if ( this.isValidJson(response) ) {
+        var response = await this.httpGet(reqObj, false)
+        if ( response && this.isValidJson(response) ) {
           this.debuglog(response)
           cache_data = JSON.parse(response)
           this.save_json_cache_file(cache_name, cache_data)
@@ -3140,19 +3166,26 @@ class sessionClass {
 
       let cache_data = await this.getEventData()
 
+      let eventList
       if ( cache_data && cache_data.items ) {
-        for (var i=0; i<cache_data.items.length; i++) {
-          if ( cache_data.items[i].fields && cache_data.items[i].fields.blurb && cache_data.items[i].fields.url ) {
-            if ( !cache_data.items[i].fields.blurb.startsWith('LIVE') ) {
+        eventList = cache_data.items
+      } else if ( cache_data && cache_data.references && cache_data.references.video ) {
+        eventList = cache_data.references.video
+      }
+
+      if ( eventList ) {
+        for (var i=0; i<eventList.length; i++) {
+          if ( eventList[i].fields && eventList[i].fields.blurb && eventList[i].fields.url ) {
+            if ( !eventList[i].fields.blurb.startsWith('LIVE') ) {
               break
             } else {
-              if ( cache_data.items[i].title ) {
-                if ( (eventName == 'BIGINNING') && cache_data.items[i].title.startsWith('LIVE') && cache_data.items[i].title.includes('Big Inning') ) {
+              if ( eventList[i].title ) {
+                if ( (eventName == 'BIGINNING') && eventList[i].title.startsWith('LIVE') && eventList[i].title.includes('Big Inning') ) {
                   this.debuglog('active big inning url')
-                  return cache_data.items[i].fields.url
-                } else if ( cache_data.items[i].title.toUpperCase().endsWith(' VS. ' + eventName) ) {
+                  return eventList[i].fields.url
+                } else if ( eventList[i].title.toUpperCase().endsWith(' VS. ' + eventName) ) {
                   this.debuglog('active ' + eventName + ' url')
-                  return cache_data.items[i].fields.url
+                  return eventList[i].fields.url
                 }
               }
             }
@@ -3190,7 +3223,7 @@ class sessionClass {
           gzip: true
         }
         var response = await this.httpGet(reqObj)
-        if ( this.isValidJson(response) ) {
+        if ( response && this.isValidJson(response) ) {
           this.debuglog('getEventStreamURL response : ' + response)
           let obj = JSON.parse(response)
           if ( obj.success && (obj.success == true) ) {
@@ -3227,8 +3260,8 @@ class sessionClass {
             'Referer': 'https://www.mlb.com/'
           }
         }
-        var response = await this.httpGet(reqObj)
-        if ( this.isValidJson(response) ) {
+        var response = await this.httpGet(reqObj, false)
+        if ( response && this.isValidJson(response) ) {
           this.debuglog('getBlackoutTeams response : ' + response)
           let obj = JSON.parse(response)
           if ( obj.teams ) {
@@ -3380,7 +3413,7 @@ class sessionClass {
     try {
       let cache_data
       let cache_name = 'gamechanger'
-      let cache_file = path.join(CACHE_DIRECTORY, cache_name + '.json')
+      let cache_file = path.join(this.CACHE_DIRECTORY, cache_name + '.json')
       let currentDate = new Date()
       if ( !this.temp_cache.gamechanger.cache_data || !this.temp_cache.gamechangerCacheExpiry || (currentDate > new Date(this.temp_cache.gamechangerCacheExpiry)) ) {
         this.debuglog(game_changer_title + 'fetching new gamechanger data')
@@ -3398,8 +3431,8 @@ class sessionClass {
           },
           gzip: true
         }
-        var response = await this.httpGet(reqObj)
-        if ( this.isValidJson(response) ) {
+        var response = await this.httpGet(reqObj, false)
+        if ( response && this.isValidJson(response) ) {
           this.debuglog(game_changer_title + 'valid json response')
           this.debuglog(response)
           this.temp_cache.gamechanger.cache_data = JSON.parse(response)