mlbserver 2021.10.1 → 2021.10.10

package/README.md

@@ -1,6 +1,6 @@
 # mlbserver
 
-Current version 2021.10.01
+Current version 2021.10.10
 
 Credit to https://github.com/tonycpsu/streamglob and https://github.com/mafintosh/hls-decryptor
 
@@ -41,6 +41,7 @@ Advanced command line options:
 --ffmpeg_logging (if present, logs all ffmpeg output -- useful for experimenting or troubleshooting)
 --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)
 ```
 
 You may want to experiment with different ffmpeg hardware encoders depending on your system as described at https://stackoverflow.com/a/50703794

package/index.js

@@ -57,6 +57,7 @@ const SAMPLE_STREAM_URL = 'https://www.radiantmediaplayer.com/media/rmp-segment/
 // --ffmpeg_logging (if present, logs all ffmpeg output -- useful for experimenting or troubleshooting)
 // --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)
 var argv = minimist(process.argv, {
   alias: {
     p: 'port',
@@ -67,7 +68,7 @@ var argv = minimist(process.argv, {
     v: 'version'
   },
   boolean: ['ffmpeg_logging', 'debug', 'logout', 'session', 'cache', 'version'],
-  string: ['port', 'account_username', 'account_password', 'multiview_port', 'multiview_path', 'ffmpeg_path', 'ffmpeg_encoder', 'page_username', 'page_password']
+  string: ['port', 'account_username', 'account_password', 'multiview_port', 'multiview_path', 'ffmpeg_path', 'ffmpeg_encoder', 'page_username', 'page_password', 'content_protect']
 })
 
 // Version
@@ -147,23 +148,17 @@ multiview_app.listen(multiview_port)
 
 // Listen for stream requests
 app.get('/stream.m3u8', async function(req, res) {
+  if ( ! (await protect(req, res)) ) return
+
   try {
     session.log('stream.m3u8 request : ' + req.url)
 
-    if ( session.protection.content_protect ) {
-      if ( !req.query.content_protect || (req.query.content_protect != session.protection.content_protect) ) {
-        session.log('stream request rejected due to missing/invalid content_protect value')
-        res.end('')
-        return
-      }
-    }
-
     let mediaId
     let contentId
     let streamURL
     let options = {}
     let urlArray = req.url.split('?')
-    if ( (urlArray.length == 1) || ((session.data.scan_mode == 'on') && req.query.team) || (!req.query.src && !req.query.highlight_src && !req.query.type && !req.query.mediaId && !req.query.contentId) ) {
+    if ( (urlArray.length == 1) || ((session.data.scan_mode == 'on') && req.query.team) || (!req.query.team && !req.query.src && !req.query.highlight_src && !req.query.type && !req.query.id && !req.query.mediaId && !req.query.contentId) ) {
       // load a sample encrypted HLS stream
       session.log('loading sample stream')
       options.resolution = 'adaptive'
@@ -333,6 +328,11 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
         inning_half = VALID_INNING_HALF[1]
       }
 
+      var content_protect = ''
+      if ( session.protection.content_protect ) {
+        content_protect = '&content_protect=' + session.protection.content_protect
+      }
+
       // Some variables for controlling audio/video stream selection, if specified
       var video_track_matched = false
       var audio_track_matched = false
@@ -344,10 +344,22 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
         resolution = resolution.slice(0, 3)
       }
 
+      var segment_found = false
+
       body = body
       .map(function(line) {
         let newurl = ''
 
+        // Check if segment playlist instead of master
+        if ( line.startsWith('#EXTINF:') ) {
+          session.debuglog('segment playlist instead of master')
+          segment_found = true
+          return line
+        } else if ( segment_found ) {
+          segment_found = false
+          return 'ts?url='+encodeURIComponent(url.resolve(streamURL, line.trim())) + content_protect
+        }
+
         // Omit keyframe tracks
         if (line.indexOf('#EXT-X-I-FRAME-STREAM-INF:') === 0) {
           return
@@ -363,7 +375,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
           if ( audio_track_matched ) return
           if ( audio_url != '' ) {
             audio_track_matched = true
-            return '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="Alternate Audio",AUTOSELECT=YES,DEFAULT=YES,URI="' + audio_url + '"'
+            return '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="Alternate Audio",AUTOSELECT=YES,DEFAULT=YES,URI="' + audio_url + content_protect + '"'
           }
           if ( audio_track == 'none') return
           if ( (resolution == 'none') && (line.indexOf(',URI=') < 0) ) return
@@ -385,6 +397,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
                 if ( inning_number != VALID_INNING_NUMBER[0] ) newurl += '&inning_number=' + inning_number
                 if ( skip != VALID_SKIP[0] ) newurl += '&skip=' + skip
                 if ( contentId ) newurl += '&contentId=' + contentId
+                newurl += content_protect
                 if ( resolution == 'none' ) {
                   audio_track_matched = true
                   return line.replace(parsed[0],'') + "\n" + '#EXT-X-STREAM-INF:BANDWIDTH=50000,CODECS="mp4a.40.2",AUDIO="aac"' + "\n" + newurl
@@ -430,6 +443,7 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
           if ( inning_number != VALID_INNING_NUMBER[0] ) newurl += '&inning_number=' + inning_number
           if ( skip != VALID_SKIP[0] ) newurl += '&skip=' + skip
           if ( contentId ) newurl += '&contentId=' + contentId
+          newurl += content_protect
           return 'playlist?url='+newurl
         }
       })
@@ -453,7 +467,9 @@ function getMasterPlaylist(streamURL, req, res, options = {}) {
 
 
 // Listen for playlist requests
-app.get('/playlist', function(req, res) {
+app.get('/playlist', async function(req, res) {
+  if ( ! (await protect(req, res)) ) return
+
   session.debuglog('playlist request : ' + req.url)
 
   delete req.headers.host
@@ -478,6 +494,11 @@ app.get('/playlist', function(req, res) {
       var key
       var iv
 
+      var content_protect = ''
+      if ( session.protection.content_protect ) {
+        content_protect = '&content_protect=' + session.protection.content_protect
+      }
+
       if ( (contentId) && ((inning_half != VALID_INNING_HALF[0]) || (inning_number != VALID_INNING_NUMBER[0]) || (skip != VALID_SKIP[0]))) {
         // If inning offsets don't exist, we'll force those options off
         if ( (typeof session.temp_cache[contentId] === 'undefined') || (typeof session.temp_cache[contentId].inning_offsets === 'undefined') ) {
@@ -569,8 +590,8 @@ app.get('/playlist', 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)
-        else return 'ts?url='+encodeURIComponent(url.resolve(u, line.trim()))
+        if ( key ) return 'ts?url='+encodeURIComponent(url.resolve(u, line.trim()))+'&key='+encodeURIComponent(key)+'&iv='+encodeURIComponent(iv) + content_protect
+        else return 'ts?url='+encodeURIComponent(url.resolve(u, line.trim())) + content_protect
       })
       .filter(function(line) {
         return line
@@ -592,7 +613,9 @@ app.get('/playlist', function(req, res) {
 })
 
 // Listen for ts requests (video segments) and decode them
-app.get('/ts', function(req, res) {
+app.get('/ts', async function(req, res) {
+  if ( ! (await protect(req, res)) ) return
+
   session.debuglog('ts request : ' + req.url)
 
   delete req.headers.host
@@ -622,25 +645,29 @@ app.get('/ts', function(req, res) {
   })
 })
 
-// Protect pages by password
+// Protect pages by password, or content by content_protect url parameter
 async function protect(req, res) {
   if (argv.page_username && argv.page_password) {
-    const reject = () => {
-      res.setHeader('www-authenticate', 'Basic')
-      res.error(401, ' Not Authorized')
-      return false
-    }
+    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
+        }
 
-    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
@@ -1034,8 +1061,13 @@ app.get('/', async function(req, res) {
               if ( ((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType) == 'undefined') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType.indexOf('IN_MARKET_') == -1) ) {
                 if ( ((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].language) == 'undefined') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].language == language) ) {
                   let teamabbr
-                  if ( ((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType) != 'undefined') && (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType == 'NATIONAL') ) {
+                  if ( (((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType) != 'undefined') && (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType == 'NATIONAL')) || ((mediaType == 'MLBTV') && cache_data.dates[0].games[j].gameUtils.isPostSeason) ) {
                     teamabbr = 'NATIONAL'
+                    if ( (typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType) != 'undefined' ) {
+                      if ( cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType] == 'AWAY' ) {
+                        teamabbr += '*'
+                      }
+                    }
                   } else {
                     teamabbr = hometeam
                     if ( cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType] == 'AWAY' ) {
@@ -1075,7 +1107,13 @@ app.get('/', async function(req, res) {
                         }
                       }
                       querystring += content_protect_b
-                      body += teamabbr + ': <a href="' + thislink + querystring + '">' + station + '</a>'
+                      multiviewquerystring += content_protect_b
+                      if ( teamabbr.endsWith('*') ) {
+                        body += '<span class="tooltip">' + teamabbr + '<span class="tooltiptext">* includes the away team\'s alternate audio, instead of the default home team\'s</span></span>'
+                      } else {
+                        body += teamabbr
+                      }
+                      body += ': <a href="' + thislink + querystring + '">' + station + '</a>'
                       if ( mediaType == 'MLBTV' ) {
                         body += '<input type="checkbox" value="' + server + '/stream.m3u8' + multiviewquerystring + '" onclick="addmultiview(this)">'
                       }
@@ -1098,7 +1136,12 @@ app.get('/', async function(req, res) {
                       body += ', '
                     }
                   } else {
-                    body += teamabbr + ': ' + station + ', '
+                    if ( teamabbr.endsWith('*') ) {
+                      body += '<span class="tooltip">' + teamabbr + '<span class="tooltiptext">* will include the away team\'s alternate audio, instead of the default home team\'s</span></span>'
+                    } else {
+                      body += teamabbr
+                    }
+                    body += ': ' + station + ', '
                   }
                 }
               }
@@ -1416,15 +1459,9 @@ app.get('/chromecast.html', async function(req, res) {
 
 // Listen for channels.m3u playlist request
 app.get('/channels.m3u', async function(req, res) {
-  session.log('channels.m3u request : ' + req.url)
+  if ( ! (await protect(req, res)) ) return
 
-  if ( session.protection.content_protect ) {
-    if ( !req.query.content_protect || (req.query.content_protect != session.protection.content_protect) ) {
-      session.log('playlist request rejected due to missing/invalid content_protect value')
-      res.end('')
-      return
-    }
-  }
+  session.log('channels.m3u request : ' + req.url)
 
   let mediaType = 'Video'
   if ( req.query.mediaType ) {
@@ -1465,15 +1502,9 @@ app.get('/channels.m3u', async function(req, res) {
 
 // Listen for guide.xml request
 app.get('/guide.xml', async function(req, res) {
-  session.log('guide.xml request : ' + req.url)
+  if ( ! (await protect(req, res)) ) return
 
-  if ( session.protection.content_protect ) {
-    if ( !req.query.content_protect || (req.query.content_protect != session.protection.content_protect) ) {
-      session.log('xml request rejected due to missing/invalid content_protect value')
-      res.end('')
-      return
-    }
-  }
+  session.log('guide.xml request : ' + req.url)
 
   let mediaType = 'Video'
   if ( req.query.mediaType ) {
@@ -1498,15 +1529,9 @@ app.get('/guide.xml', async function(req, res) {
 
 // Listen for image requests
 app.get('/image.svg', async function(req, res) {
-  session.debuglog('image request : ' + req.url)
+  if ( ! (await protect(req, res)) ) return
 
-  if ( session.protection.content_protect ) {
-    if ( !req.query.content_protect || (req.query.content_protect != session.protection.content_protect) ) {
-      session.debuglog('image request rejected due to missing/invalid content_protect value')
-      res.end('')
-      return
-    }
-  }
+  session.debuglog('image request : ' + req.url)
 
   let teamId = 'MLB'
   if ( req.query.teamId ) {
@@ -1521,15 +1546,9 @@ app.get('/image.svg', async function(req, res) {
 
 // Listen for favicon requests
 app.get('/favicon.svg', async function(req, res) {
-  session.debuglog('favicon request : ' + req.url)
+  if ( ! (await protect(req, res)) ) return
 
-  if ( session.protection.content_protect ) {
-    if ( !req.query.content_protect || (req.query.content_protect != session.protection.content_protect) ) {
-      session.debuglog('image request rejected due to missing/invalid content_protect value')
-      res.end('')
-      return
-    }
-  }
+  session.debuglog('favicon request : ' + req.url)
 
   var body = await session.getImage('MLB')
 

package/package.json

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

package/session.js

@@ -66,11 +66,19 @@ class sessionClass {
       // Read protection data from file, if present
       this.protection = this.readFileToJson(PROTECTION_FILE) || {}
 
-      if ( !this.protection.content_protect ) {
-        this.log('generating new content protection value')
-        this.log('** YOU WILL NEED TO UPDATE ANY CONTENT URLS YOU HAVE COPIED OUTSIDE OF MLBSERVER **')
-        this.protection.content_protect = this.getRandomString(this.getRandomInteger(32,64))
-        this.save_protection()
+      // 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) ) {
+        this.log('using specified content protection key')
+        this.log('you may need to update any content URLs you have copied outside of mlbserver')
+        this.protection.content_protect = argv.content_protect
+      } else {
+        // Generate a content_protect key if it doesn't exist
+        if ( !this.protection.content_protect ) {
+          this.log('generating new content protection key')
+          this.log('** YOU WILL NEED TO UPDATE ANY CONTENT URLS YOU HAVE COPIED OUTSIDE OF MLBSERVER **')
+          this.protection.content_protect = this.getRandomString(this.getRandomInteger(32,64))
+          this.save_protection()
+        }
       }
     }
 
@@ -348,7 +356,7 @@ class sessionClass {
     try {
       fs.unlinkSync(CREDENTIALS_FILE)
     } catch(e){
-      this.halt('logout error : ' + e.message)
+      this.debuglog('credentials cannot be cleared or do not exist yet : ' + e.message)
     }
   }
 
@@ -357,7 +365,7 @@ class sessionClass {
       fs.unlinkSync(COOKIE_FILE)
       fs.unlinkSync(DATA_FILE)
     } catch(e){
-      this.halt('reset session error : ' + e.message)
+      this.debuglog('session cannot be cleared or does not exist yet : ' + e.message)
     }
   }
 
@@ -365,7 +373,7 @@ class sessionClass {
     try {
       fs.unlinkSync(CACHE_FILE)
     } catch(e){
-      this.halt('clear cache error : ' + e.message)
+      this.debuglog('cache cannot be cleared or does not exist yet : ' + e.message)
     }
   }
 
@@ -397,7 +405,7 @@ class sessionClass {
           })
         }
       } catch(e){
-        this.halt('clear multiview files error : ' + e.message)
+        this.debuglog('clear multiview files error : ' + e.message)
       }
     }
   }
@@ -884,8 +892,8 @@ class sessionClass {
           'content-type': 'application/json'
         },
         json: {
-          'username': this.credentials.account_username || this.halt('missing username'),
-          'password': this.credentials.account_password || this.halt('missing password'),
+          'username': this.credentials.account_username || this.halt('missing account username'),
+          'password': this.credentials.account_password || this.halt('missing account password'),
           'options': {
             'multiOptionalFactorEnroll': false,
             'warnBeforePasswordExpired': true
@@ -927,13 +935,13 @@ class sessionClass {
       let mediaId = false
       let contentId = false
 
-      // First check if cached day data is available and non-expired
+      // First check if national game or if cached day data is available and non-expired
       // if not, just get data for this team
       let cache_data
       let cache_name = gameDate
       let cache_file = path.join(CACHE_DIRECTORY, gameDate+'.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)) ) {
+      if ( (team.toUpperCase().indexOf('NATIONAL.') == 0) || (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))) ) {
         cache_data = await this.getDayData(gameDate)
       } else {
         cache_data = await this.getDayData(gameDate, team)
@@ -950,7 +958,7 @@ class sessionClass {
                 for (var x = 0; x < cache_data.dates[0].games[j].content.media.epg[k].items.length; x++) {
                   if ( (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ON') || ((mediaDate) && ((cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaState == 'MEDIA_ARCHIVE') || (cache_data.dates[0].games[j].status.abstractGameState == 'Final'))) ) {
                     if ( ((typeof cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType) == 'undefined') || (cache_data.dates[0].games[j].content.media.epg[k].items[x].mediaFeedType.indexOf('IN_MARKET_') == -1) ) {
-                      if ( (team.toUpperCase().indexOf('NATIONAL.') == 0) && (cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType] == 'NATIONAL') ) {
+                      if ( (team.toUpperCase().indexOf('NATIONAL.') == 0) && ((cache_data.dates[0].games[j].content.media.epg[k].items[x][mediaFeedType] == 'NATIONAL') || ((mediaType == 'MLBTV') && cache_data.dates[0].games[j].gameUtils.isPostSeason)) ) {
                         nationalCount += 1
                         let nationalArray = team.split('.')
                         if ( (nationalArray.length == 2) && (nationalArray[1] == nationalCount) ) {
@@ -1234,6 +1242,9 @@ class sessionClass {
                   for (var x = 0; x < cache_data.dates[i].games[j].content.media.epg[k].items.length; x++) {
                     if ( ((((typeof cache_data.dates[i].games[j].content.media.epg[k].items[x].mediaFeedType) == 'undefined') || (cache_data.dates[i].games[j].content.media.epg[k].items[x].mediaFeedType.indexOf('IN_MARKET_') == -1)) && (((typeof cache_data.dates[i].games[j].content.media.epg[k].items[x].language) == 'undefined') || (cache_data.dates[i].games[j].content.media.epg[k].items[x].language != 'es'))) ) {
                       let teamType = cache_data.dates[i].games[j].content.media.epg[k].items[x][mediaFeedType]
+                      if ( (mediaType == 'MLBTV') && cache_data.dates[i].games[j].gameUtils.isPostSeason ) {
+                        teamType = 'NATIONAL'
+                      }
                       let team
                       let opponent_team
                       if ( teamType == 'NATIONAL' ) {
@@ -1388,6 +1399,9 @@ class sessionClass {
                   for (var x = 0; x < cache_data.dates[i].games[j].content.media.epg[k].items.length; x++) {
                     if ( ((((typeof cache_data.dates[i].games[j].content.media.epg[k].items[x].mediaFeedType) == 'undefined') || (cache_data.dates[i].games[j].content.media.epg[k].items[x].mediaFeedType.indexOf('IN_MARKET_') == -1)) && (((typeof cache_data.dates[i].games[j].content.media.epg[k].items[x].language) == 'undefined') || (cache_data.dates[i].games[j].content.media.epg[k].items[x].language != 'es'))) ) {
                       let teamType = cache_data.dates[i].games[j].content.media.epg[k].items[x][mediaFeedType]
+                      if ( (mediaType == 'MLBTV') && cache_data.dates[i].games[j].gameUtils.isPostSeason ) {
+                        teamType = 'NATIONAL'
+                      }
                       let team
                       let opponent_team
                       if ( teamType == 'NATIONAL' ) {
@@ -1449,6 +1463,14 @@ class sessionClass {
                           }
                           description += '. '
                         }
+                        if ( teamType == 'NATIONAL' ) {
+                          if ( cache_data.dates[i].games[j].content.media.epg[k].items[x][mediaFeedType] == 'AWAY' ) {
+                            description += cache_data.dates[i].games[j].teams['away'].team.teamName
+                          } else {
+                            description += cache_data.dates[i].games[j].teams['home'].team.teamName
+                          }
+                          description += ' alternate audio. '
+                        }
 
                         let gameDate = new Date(cache_data.dates[i].games[j].gameDate)
                         let gameHours = 3