mlbserver 2022.3.22 → 2022.4.9

package/README.md

@@ -1,6 +1,6 @@
 # mlbserver
 
-Current version 2022.03.22
+Current version 2022.04.09
 
 Credit to https://github.com/tonycpsu/streamglob and https://github.com/mafintosh/hls-decryptor
 

package/index.js

@@ -383,6 +383,8 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
         if ( resolution.endsWith('p60') ) {
           frame_rate = '59.94'
           resolution = resolution.slice(0, -3)
+        } else if ( resolution.endsWith('p') ) {
+          resolution = resolution.slice(0, -1)
         }
       }
 
@@ -793,6 +795,7 @@ app.get('/', async function(req, res) {
 
     let gameDate = session.liveDate()
     let todayUTCHours = session.getTodayUTCHours()
+    let curDate = new Date()
     if ( req.query.date ) {
       if ( req.query.date == VALID_DATES[1] ) {
         gameDate = session.yesterdayDate()
@@ -800,7 +803,6 @@ app.get('/', async function(req, res) {
         gameDate = req.query.date
       }
     } else {
-      let curDate = new Date()
       let utcHours = curDate.getUTCHours()
       if ( (utcHours >= todayUTCHours) && (utcHours < YESTERDAY_UTC_HOURS) ) {
         gameDate = session.yesterdayDate()
@@ -1015,7 +1017,13 @@ app.get('/', async function(req, res) {
       if ( (currentDate >= compareStart) && (currentDate < compareEnd) ) {
         let querystring = '?event=biginning'
         let multiviewquerystring = querystring + '&resolution=' + DEFAULT_MULTIVIEW_RESOLUTION
+        if ( linkType == 'embed' ) {
+          if ( startFrom != 'Beginning' ) querystring += '&startFrom=' + startFrom
+        }
         if ( resolution != VALID_RESOLUTIONS[0] ) querystring += '&resolution=' + resolution
+        if ( linkType == 'stream' ) {
+          if ( force_vod != VALID_FORCE_VOD[0] ) querystring += '&force_vod=' + force_vod
+        }
         querystring += content_protect_b
         multiviewquerystring += content_protect_b
         body += '<a href="' + thislink + querystring + '">Big Inning</a>'
@@ -1227,7 +1235,11 @@ app.get('/', async function(req, res) {
                       station += '*'
                     }
                     if ( (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ON') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ARCHIVE') || cache_data.dates[0].games[j].gameUtils.isFinal ) {
-                      game_started = true
+                      let gameTime = new Date(cache_data.dates[0].games[j].gameDate)
+                      gameTime.setMinutes(gameTime.getMinutes()-10)
+                      if ( curDate >= gameTime ) {
+                        game_started = true
+                      }
                       let mediaId = cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaId
                       if ( (mediaType == 'MLBTV') && session.cache.media && session.cache.media[mediaId] && session.cache.media[mediaId].blackout && session.cache.media[mediaId].blackoutExpiry && (new Date(session.cache.media[mediaId].blackoutExpiry) > new Date()) ) {
                         body += teamabbr + ': <s>' + station + '</s>'
@@ -1293,7 +1305,7 @@ app.get('/', async function(req, res) {
           if ( body.substr(-2) == ', ' ) {
             body = body.slice(0, -2)
           }
-          if ( (mediaType == 'MLBTV') && (game_started) ) {
+          if ( (mediaType == 'MLBTV') && (game_started) && cache_data.dates[0].games[j].content && cache_data.dates[0].games[j].content.summary && cache_data.dates[0].games[j].content.summary.hasHighlightsVideo ) {
             body += '<br/><a href="javascript:showhighlights(\'' + cache_data.dates[0].games[j].gamePk + '\',\'' + gameDate + '\')">Highlights</a>'
           }
           if ( body.substr(-2) == ', ' ) {
@@ -1392,7 +1404,7 @@ app.get('/', async function(req, res) {
 
     body += '<p><span class="tooltip">Include (or exclude) LIDOM<span class="tooltiptext">Dominican Winter League, aka Liga de Beisbol Dominicano. Live stream only, does not support starting from the beginning or certain innings, skip options, etc.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=lidom' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=lidom' + content_protect_b + '">guide.xml</a></p>' + "\n"
 
-    body += '<p><span class="tooltip">Include (or exclude) Big Inning<span class="tooltiptext">Big Inning is the live look-in and highlights show. Live stream only, does not support starting from the beginning.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=biginning' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=biginning' + content_protect_b + '">guide.xml</a></p>' + "\n"
+    body += '<p><span class="tooltip">Include (or exclude) Big Inning<span class="tooltiptext">Big Inning is the live look-in and highlights show.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=biginning' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=biginning' + content_protect_b + '">guide.xml</a></p>' + "\n"
 
     body += '<p><span class="tooltip">Include (or exclude) Multiview<span class="tooltiptext">Requires starting and stopping the multiview stream from the web interface.</span></span>: <a href="/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=multiview' + content_protect_b + '">channels.m3u</a> and <a href="/guide.xml?mediaType=' + mediaType + '&includeTeams=multiview' + content_protect_b + '">guide.xml</a></p>' + "\n"
 
@@ -1925,13 +1937,18 @@ function start_multiview_stream(streams, sync, dvr, faster, audio_url, audio_url
     .addOutputOption('-master_pl_name', multiview_stream_name)
     .addOutputOption('-y')
     .output(session.get_multiview_directory() + '/stream-%v.m3u8')
-    .on('start', function() {
+    .on('start', function(commandLine) {
       session.log('multiview stream started')
       ffmpeg_status = true
+      if ( argv.debug || argv.ffmpeg_logging ) {
+        session.log('multiview stream command: ' + commandLine)
+      }
     })
-    .on('error', function(err) {
+    .on('error', function(err, stdout, stderr) {
       session.log('multiview stream stopped: ' + err.message)
       ffmpeg_status = false
+      if ( stdout ) session.log(stdout)
+      if ( stderr ) session.log(stderr)
     })
     .on('end', function() {
       session.log('multiview stream ended')

package/package.json

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

package/session.js

@@ -82,9 +82,8 @@ class sessionClass {
       }
     }
 
-    // Create storage directories if they don't already exist
+    // Create storage directory if it doesn't already exist
     this.createDirectory(DATA_DIRECTORY)
-    this.createFile(COOKIE_FILE)
 
     // Set multiview path
     if ( argv.multiview_path ) {
@@ -96,6 +95,16 @@ class sessionClass {
     }
     this.createDirectory(this.multiview_path)
 
+    // Create cookie storage file if it doesn't already exist
+    this.createFile(COOKIE_FILE)
+    // Verify its contents are valid
+    let cookieStr = fs.readFileSync(COOKIE_FILE)
+    if ( (cookieStr != '') && !this.isValidJson(cookieStr) ) {
+      this.log('invalid cookie storage file contents, resetting')
+      fs.unlinkSync(COOKIE_FILE)
+      this.createFile(COOKIE_FILE)
+    }
+
     // Set up http requests with the cookie jar
     this.request = require('request-promise')
     this.jar = this.request.jar(new FileCookieStore(COOKIE_FILE))
@@ -384,29 +393,18 @@ class sessionClass {
   clear_multiview_files() {
     try {
       if ( this.multiview_path ) {
-        fs.rmdir(this.multiview_path, { recursive: true }, (err) => {
-          if (err) throw err;
+        fs.readdir(this.multiview_path, (err, files) => {
+          if (err) throw err
 
-          this.createDirectory(this.multiview_path)
+          for (const file of files) {
+            fs.unlink(path.join(this.multiview_path, file), err => {
+              if (err) throw err
+            })
+          }
         })
       }
     } catch(e){
-      this.debuglog('recursive clear multiview files error: ' + e.message)
-      try {
-        if ( this.multiview_path ) {
-          fs.readdir(this.multiview_path, (err, files) => {
-            if (err) throw err
-
-            for (const file of files) {
-              fs.unlink(path.join(this.multiview_path, file), err => {
-                if (err) throw err
-              })
-            }
-          })
-        }
-      } catch(e){
-        this.debuglog('clear multiview files error : ' + e.message)
-      }
+      this.debuglog('clear multiview files error : ' + e.message)
     }
   }
 
@@ -565,17 +563,25 @@ class sessionClass {
       gzip: true
     }
     var response = await this.httpGet(reqObj)
-    // disabled because it's very big!
-    //this.debuglog('getApiKeys response : ' + response)
-    var parsed = response.match('"x-api-key","value":"([^"]+)"')
-    if ( parsed[1] ) {
-      this.data.xApiKey = parsed[1]
-      this.save_session_data()
-    }
-    parsed = response.match('"clientApiKey":"([^"]+)"')
-    if ( parsed[1] ) {
-      this.data.clientApiKey = parsed[1]
-      this.save_session_data()
+    if ( response ) {
+      // disabled because it's very big!
+      //this.debuglog('getApiKeys response : ' + response)
+      var parsed = response.match('"x-api-key","value":"([^"]+)"')
+      if ( parsed[1] ) {
+        this.data.xApiKey = parsed[1]
+        this.save_session_data()
+      } else {
+        this.log('getApiKeys xApiKey parse failure')
+      }
+      parsed = response.match('"clientApiKey":"([^"]+)"')
+      if ( parsed[1] ) {
+        this.data.clientApiKey = parsed[1]
+        this.save_session_data()
+      } else {
+        this.log('getApiKeys clientApiKey parse failure')
+      }
+    } else {
+      this.log('getApiKeys response failure')
     }
   }
 
@@ -594,13 +600,19 @@ class sessionClass {
         gzip: true
       }
       var response = await this.httpGet(reqObj)
-      // disabled because it's very big!
-      //this.debuglog('getOktaClientId response : ' + response)
-      var parsed = response.match('production:{clientId:"([^"]+)",')
-      if ( parsed[1] ) {
-        this.data.oktaClientId = parsed[1]
-        this.save_session_data()
-        return this.data.oktaClientId
+      if ( response ) {
+        // disabled because it's very big!
+        //this.debuglog('getOktaClientId response : ' + response)
+        var parsed = response.match('production:{clientId:"([^"]+)",')
+        if ( parsed[1] ) {
+          this.data.oktaClientId = parsed[1]
+          this.save_session_data()
+          return this.data.oktaClientId
+        } else {
+          this.log('getOktaClientId parse failure')
+        }
+      } else {
+        this.log('getOktaClientId response failure')
       }
     } else {
       return this.data.oktaClientId
@@ -672,6 +684,8 @@ class sessionClass {
           this.cacheStreamURL(mediaId, obj.stream.complete)
           return obj.stream.complete
         }
+      } else {
+        this.log('getStreamURL response failure')
       }
     }
   }
@@ -710,6 +724,8 @@ class sessionClass {
         this.data.bamAccessTokenExpiry = new Date(new Date().getTime() + obj.expires_in * 1000)
         this.save_session_data()
         return this.data.bamAccessToken
+      } else {
+        this.log('getBamAccessToken response failure')
       }
     } else {
       return this.data.bamAccessToken
@@ -735,9 +751,13 @@ class sessionClass {
       gzip: true
     }
     var response = await this.httpGet(reqObj)
-    this.debuglog('getEntitlementToken response : ' + response)
-    this.debuglog('getEntitlementToken : ' + response)
-    return response
+    if ( response ) {
+      this.debuglog('getEntitlementToken response : ' + response)
+      this.debuglog('getEntitlementToken : ' + response)
+      return response
+    } else {
+      this.log('getEntitlementToken response failure')
+    }
   }
 
   async getDeviceId() {
@@ -764,6 +784,8 @@ class sessionClass {
       let obj = JSON.parse(response)
       this.debuglog('getDeviceId : ' + obj.device.id)
       return obj.device.id
+    } else {
+      this.log('getDeviceId response failure')
     }
   }
 
@@ -791,6 +813,8 @@ class sessionClass {
       let obj = JSON.parse(response)
       this.debuglog('getDeviceAccessToken : ' + obj.access_token)
       return obj.access_token
+    } else {
+      this.log('getDeviceAccessToken response failure')
     }
   }
 
@@ -815,6 +839,8 @@ class sessionClass {
       this.debuglog('getDevicesAssertion response : ' + response)
       this.debuglog('getDevicesAssertion : ' + response.assertion)
       return response.assertion
+    } else {
+      this.log('getDevicesAssertion response failure')
     }
   }
 
@@ -854,30 +880,37 @@ class sessionClass {
         }
       }
       var response = await this.httpGet(reqObj)
-      var str = response.toString()
-      this.debuglog('retrieveOktaAccessToken response : ' + str)
-      if ( str.match ) {
-        var errorParsed = str.match("data.error = 'login_required'")
-        if ( errorParsed && errorParsed[1] ) {
-          // Need to log in again
-          this.log('Logging in...')
-          this.data.authnSessionToken = null
-          this.save_session_data()
-          return false
-        } else {
-          var parsed_token = str.match("data.access_token = '([^']+)'")
-          var parsed_expiry = str.match("data.expires_in = '([^']+)'")
-          if ( parsed_token && parsed_token[1] && parsed_expiry && parsed_expiry[1] ) {
-            let oktaAccessToken = parsed_token[1].split('\\x2D').join('-')
-            let oktaAccessTokenExpiry = parsed_expiry[1]
-            this.debuglog('retrieveOktaAccessToken : ' + oktaAccessToken)
-            this.debuglog('retrieveOktaAccessToken expires in : ' + oktaAccessTokenExpiry)
-            this.data.oktaAccessToken = oktaAccessToken
-            this.data.oktaAccessTokenExpiry = new Date(new Date().getTime() + oktaAccessTokenExpiry * 1000)
+      if ( response ) {
+        var str = response.toString()
+        this.debuglog('retrieveOktaAccessToken response : ' + str)
+        if ( str.match ) {
+          var errorParsed = str.match("data.error = 'login_required'")
+          if ( errorParsed ) {
+            // Need to log in again
+            this.log('Logging in...')
+            delete this.data.authnSessionToken
             this.save_session_data()
-            return this.data.oktaAccessToken
+          } else {
+            var parsed_token = str.match("data.access_token = '([^']+)'")
+            var parsed_expiry = str.match("data.expires_in = '([^']+)'")
+            if ( parsed_token && parsed_token[1] && parsed_expiry && parsed_expiry[1] ) {
+              let oktaAccessToken = parsed_token[1].split('\\x2D').join('-')
+              let oktaAccessTokenExpiry = parsed_expiry[1]
+              this.debuglog('retrieveOktaAccessToken : ' + oktaAccessToken)
+              this.debuglog('retrieveOktaAccessToken expires in : ' + oktaAccessTokenExpiry)
+              this.data.oktaAccessToken = oktaAccessToken
+              this.data.oktaAccessTokenExpiry = new Date(new Date().getTime() + oktaAccessTokenExpiry * 1000)
+              this.save_session_data()
+              return this.data.oktaAccessToken
+            } else {
+              this.log('retrieveOktaAccessToken parse failure')
+            }
           }
+        } else {
+          this.log('retrieveOktaAccessToken string response failure')
         }
+      } else {
+        this.log('retrieveOktaAccessToken response failure')
       }
     } else {
       return this.data.oktaAccessToken
@@ -912,8 +945,11 @@ class sessionClass {
         this.data.authnSessionToken = response.sessionToken
         this.save_session_data()
         return this.data.authnSessionToken
+      } else {
+        this.log('getAuthnSessionToken response failure')
       }
     } else {
+      this.debuglog('using cached authnSessionToken')
       return this.data.authnSessionToken
     }
   }
@@ -1066,7 +1102,7 @@ class sessionClass {
           // finally save the setting
           this.setHighlightsCacheExpiry(cache_name, cacheExpiry)
         } else {
-          this.log('error : invalid json from url ' + getObj.url)
+          this.log('error : invalid json from url ' + reqObj.url)
         }
       } else {
         this.debuglog('using cached highlight data')
@@ -1099,10 +1135,12 @@ class sessionClass {
       let cache_name = dateString
       let url = 'https://bdfed.stitch.mlbinfra.com/bdfed/transform-mlb-scoreboard?stitch_env=prod&sortTemplate=2&sportId=1&sportId=17&startDate=' + dateString + '&endDate=' + dateString + '&gameType=E&&gameType=S&&gameType=R&&gameType=F&&gameType=D&&gameType=L&&gameType=W&&gameType=A&language=en&leagueId=104&leagueId=103&leagueId=131&contextTeamId='
       if ( team ) {
+        this.debuglog('getDayData for team ' + cache_name + ' on date ' + dateString)
         cache_name = team.toUpperCase() + dateString
         url = 'http://statsapi.mlb.com/api/v1/schedule?sportId=1&teamId=' + TEAM_IDS[team.toUpperCase()] + '&startDate=' + dateString + '&endDate=' + dateString + '&gameType=&gamePk=&hydrate=team,game(content(media(epg)))'
+      } else {
+        this.debuglog('getDayData for date ' + dateString)
       }
-      this.debuglog('getDayData for ' + cache_name)
       let cache_file = path.join(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)) ) {
@@ -1162,7 +1200,7 @@ class sessionClass {
           // finally save the setting
           this.setDateCacheExpiry(cache_name, cacheExpiry)
         } else {
-          this.log('error : invalid json from url ' + getObj.url)
+          this.log('error : invalid json from url ' + reqObj.url)
         }
       } else {
         this.debuglog('using cached date data')
@@ -1215,7 +1253,7 @@ class sessionClass {
           this.cache.weekCacheExpiry = nextDate
           this.save_cache_data()
         } else {
-          this.log('error : invalid json from url ' + getObj.url)
+          this.log('error : invalid json from url ' + reqObj.url)
         }
       } else {
         this.debuglog('using cached channel data')
@@ -1834,7 +1872,7 @@ class sessionClass {
           // finally save the setting
           this.setAiringsCacheExpiry(cache_name, cacheExpiry)
         } else {
-          this.log('error : invalid json from url ' + getObj.url)
+          this.log('error : invalid json from url ' + reqObj.url)
         }
       } else {
         this.debuglog('using cached airings data')
@@ -1897,7 +1935,7 @@ class sessionClass {
           // finally save the setting
           this.setGamedayCacheExpiry(cache_name, cacheExpiry)
         } else {
-          this.log('error : invalid response from url ' + getObj.url)
+          this.log('error : invalid response from url ' + reqObj.url)
         }
       } else {
         this.debuglog('using cached gameday data')
@@ -2228,7 +2266,7 @@ class sessionClass {
 
           this.save_cache_data()
         } else {
-          this.log('error : invalid response from url ' + getObj.url)
+          this.log('error : invalid response from url ' + reqObj.url)
         }
       } else {
         this.debuglog('using cached big inning schedule')
@@ -2280,7 +2318,7 @@ class sessionClass {
           this.cache.eventURLCacheExpiry = cacheExpiry
           this.save_cache_data()
         } else {
-          this.log('error : invalid json from url ' + getObj.url)
+          this.log('error : invalid json from url ' + reqObj.url)
           return
         }
       } else {
@@ -2309,7 +2347,7 @@ class sessionClass {
               break
             } else {
               if ( cache_data.items[i].title ) {
-                if ( (eventName == 'BIGINNING') && (cache_data.items[i].title == 'LIVE NOW: MLB Big Inning') ) {
+                if ( (eventName == 'BIGINNING') && cache_data.items[i].title.includes('LIVE NOW: MLB 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) ) {