mlbserver 2024.7.24 → 2024.7.25-3

package/README.md

@@ -1,8 +1,9 @@
-# mlbserver
-
-Current version 2024.07.24
+[![Docker release](https://img.shields.io/docker/v/tonywagner/mlbserver)](https://hub.docker.com/r/tonywagner/mlbserver)
+[![NPM release](https://img.shields.io/npm/v/mlbserver)](https://www.npmjs.com/package/mlbserver)
+![License](https://img.shields.io/badge/license-MIT-blue)
+[![Contributors](https://img.shields.io/github/contributors/tonywagner/mlbserver.svg)](https://github.com/tonywagner/mlbserver/graphs/contributors)
 
-Credit to https://github.com/tonycpsu/streamglob and https://github.com/mafintosh/hls-decryptor
+# mlbserver
 
 ## Installation
 
@@ -135,6 +136,13 @@ h264_vaapi use VAAPI which is another abstraction API to access video accelerati
 h264_videotoolbox use videotoolbox an API to access hardware on OS X
 ```
 
+## Credits
+
+https://github.com/tonycpsu/streamglob
+https://github.com/mafintosh/hls-decryptor
+https://github.com/eracknaphobia/plugin.video.mlbtv
+
+
 ## License
 
 MIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlbserver",
-  "version": "2024.07.24",
+  "version": "2024.07.25-3",
   "description": "",
   "repository": {
     "type": "git",

package/session.js

@@ -1472,46 +1472,11 @@ class sessionClass {
     })
   }
 
-  // API call
-  /*async getApiKeys() {
-    this.debuglog('getApiKeys')
-    let reqObj = {
-      url: 'https://www.mlb.com/tv/g632102/',
-      headers: {
-        'User-agent': USER_AGENT,
-        'Origin': 'https://www.mlb.com',
-        'Accept-Encoding': 'gzip, deflate, br'
-      },
-      gzip: true
-    }
-    var response = await this.httpGet(reqObj)
-    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')
-    }
-  }*/
-
   // new API call
   async getDeviceId() {
     this.debuglog('getDeviceId')
     if ( !this.data.deviceId ) {
-      this.getSession()
+      await this.getSession()
     }
     if ( this.data.deviceId ) {
       this.debuglog('using cached deviceId')
@@ -1525,7 +1490,7 @@ class sessionClass {
   async getSessionId() {
     this.debuglog('getSessionId')
     if ( !this.data.sessionId ) {
-      this.getSession()
+      await this.getSession()
     }
     if ( this.data.sessionId ) {
       this.debuglog('using cached sessionId')
@@ -1651,204 +1616,6 @@ class sessionClass {
     }
   }
 
-  // API call
-  /*async getStreamURL(mediaId) {
-    this.debuglog('getStreamURL from ' + mediaId)
-    if ( this.cache.media && this.cache.media[mediaId] && this.cache.media[mediaId].streamURL && this.cache.media[mediaId].streamURLExpiry && (Date.parse(this.cache.media[mediaId].streamURLExpiry) > new Date()) ) {
-      this.debuglog('using cached streamURL')
-      return this.cache.media[mediaId].streamURL
-    } else if ( this.cache.media && this.cache.media[mediaId] && this.cache.media[mediaId].blackout && this.cache.media[mediaId].blackoutExpiry && (Date.parse(this.cache.media[mediaId].blackoutExpiry) > new Date()) ) {
-      this.log('mediaId recently blacked out, skipping')
-    } else {
-      let playbackURL = 'https://edge.svcs.mlb.com/media/' + mediaId + '/scenarios/browser~csai'
-      let reqObj = {
-        url: playbackURL,
-        simple: false,
-        headers: {
-          'Authorization': await this.getBamAccessToken() || this.halt('missing bamAccessToken'),
-          'User-agent': USER_AGENT,
-          'Accept': 'application/vnd.media-service+json; version=1',
-          'x-bamsdk-version': BAM_SDK_VERSION,
-          'x-bamsdk-platform': PLATFORM,
-          'Origin': 'https://www.mlb.com',
-          'Accept-Encoding': 'gzip, deflate, br',
-          'Content-type': 'application/json'
-        },
-        gzip: true
-      }
-      var response = await this.httpGet(reqObj)
-      if ( response && this.isValidJson(response) ) {
-        this.debuglog('getStreamURL response : ' + response)
-        let obj = JSON.parse(response)
-        if ( obj.errors ) {
-          this.log('getStreamURL error: ' + obj.errors[0])
-          if ( obj.errors[0] == 'blackout' ) {
-            this.markBlackoutError(mediaId)
-          }
-          return false
-        } else {
-          let streamURL = obj.stream.complete
-          this.debuglog('getStreamURL : ' + streamURL)
-          this.cacheStreamURL(mediaId, streamURL)
-          return streamURL
-        }
-      } else {
-        this.log('getStreamURL response failure')
-      }
-    }
-  }
-
-  // API call
-  async getBamAccessToken() {
-    this.debuglog('getBamAccessToken')
-    if ( !this.data.bamAccessToken || !this.data.bamAccessTokenExpiry || (Date.parse(this.data.bamAccessTokenExpiry) < new Date()) ) {
-      this.debuglog('need to get new bamAccessToken')
-      let reqObj = {
-        url: BAM_TOKEN_URL,
-        headers: {
-          'Authorization': 'Bearer ' + API_KEY,
-          'User-agent': USER_AGENT,
-          'Accept': 'application/vnd.media-service+json; version=1',
-          'x-bamsdk-version': BAM_SDK_VERSION,
-          'x-bamsdk-platform': PLATFORM,
-          'Origin': 'https://www.mlb.com',
-          'Accept-Encoding': 'gzip, deflate, br',
-          'Content-type': 'application/x-www-form-urlencoded'
-        },
-        form: {
-          'grant_type': 'urn:ietf:params:oauth:grant-type:token-exchange',
-          'platform': 'browser',
-          'subject_token': await this.getEntitlementToken() || this.halt('missing EntitlementToken'),
-          'subject_token_type': 'urn:bamtech:params:oauth:token-type:account'
-        },
-        gzip: true
-      }
-      var response = await this.httpPost(reqObj)
-      if ( this.isValidJson(response) ) {
-        let obj = JSON.parse(response)
-        this.debuglog('getBamAccessToken : ' + obj.access_token)
-        this.debuglog('getBamAccessToken expires in : ' + obj.expires_in)
-        this.data.bamAccessToken = obj.access_token
-        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
-    }
-  }
-
-  // API call
-  async getEntitlementToken() {
-    this.debuglog('getEntitlementToken')
-    let reqObj = {
-      url: 'https://media-entitlement.mlb.com/api/v3/jwt',
-      headers: {
-        'Authorization': 'Bearer ' + await this.getLoginToken() || this.halt('missing loginToken'),
-        'Origin': 'https://www.mlb.com'
-      },
-      qs: {
-        'os': PLATFORM,
-        'did': await this.getDeviceId() || this.halt('missing deviceId'),
-        'appname': 'mlbtv_web'
-      }
-    }
-    var response = await this.httpGet(reqObj)
-    if ( response ) {
-      this.debuglog('getEntitlementToken response : ' + response)
-      this.debuglog('getEntitlementToken : ' + response)
-      return response
-    } else {
-      this.log('getEntitlementToken response failure')
-    }
-  }
-
-  async getDeviceId() {
-    this.debuglog('getDeviceId')
-    let reqObj = {
-      url: 'https://us.edge.bamgrid.com/session',
-      headers: {
-        'Authorization': await this.getDeviceAccessToken() || this.halt('missing device_access_token'),
-        'User-agent': USER_AGENT,
-        'Origin': 'https://www.mlb.com',
-        'Accept': 'application/vnd.session-service+json; version=1',
-        'Accept-Encoding': 'gzip, deflate, br',
-        'Accept-Language': 'en-US,en;q=0.5',
-        'x-bamsdk-version': BAM_SDK_VERSION,
-        'x-bamsdk-platform': PLATFORM,
-        'Content-type': 'application/json',
-        'TE': 'Trailers'
-      },
-      gzip: true
-    }
-    var response = await this.httpGet(reqObj)
-    if ( response && this.isValidJson(response) ) {
-      this.debuglog('getDeviceId response : ' + response)
-      let obj = JSON.parse(response)
-      this.debuglog('getDeviceId : ' + obj.device.id)
-      return obj.device.id
-    } else {
-      this.log('getDeviceId response failure')
-    }
-  }
-
-  // API call
-  async getDeviceAccessToken() {
-    this.debuglog('getDeviceAccessToken')
-    let reqObj = {
-      url: BAM_TOKEN_URL,
-      headers: {
-        'Authorization': 'Bearer ' + API_KEY,
-        'Origin': 'https://www.mlb.com'
-      },
-      form: {
-        'grant_type': 'urn:ietf:params:oauth:grant-type:token-exchange',
-        'latitude': '0',
-        'longitude': '0',
-        'platform': 'browser',
-        'subject_token': await this.getDevicesAssertion() || this.halt('missing devicesAssertion'),
-        'subject_token_type': 'urn:bamtech:params:oauth:token-type:device'
-      }
-    }
-    var response = await this.httpPost(reqObj)
-    if ( this.isValidJson(response) ) {
-      this.debuglog('getDeviceAccessToken response : ' + response)
-      let obj = JSON.parse(response)
-      this.debuglog('getDeviceAccessToken : ' + obj.access_token)
-      return obj.access_token
-    } else {
-      this.log('getDeviceAccessToken response failure')
-    }
-  }
-
-  // API call
-  async getDevicesAssertion() {
-    this.debuglog('getDevicesAssertion')
-    let reqObj = {
-      url: 'https://us.edge.bamgrid.com/devices',
-      headers: {
-        'Authorization': 'Bearer ' + API_KEY,
-        'Origin': 'https://www.mlb.com'
-      },
-      json: {
-        'applicationRuntime': 'firefox',
-        'attributes': {},
-        'deviceFamily': 'browser',
-        'deviceProfile': 'macosx'
-      }
-    }
-    var response = await this.httpPost(reqObj)
-    if ( response.assertion ) {
-      this.debuglog('getDevicesAssertion response : ' + JSON.stringify(response))
-      this.debuglog('getDevicesAssertion : ' + response.assertion)
-      return response.assertion
-    } else {
-      this.log('getDevicesAssertion response failure')
-    }
-  }*/
-
   // API call
   async getLoginToken() {
     this.debuglog('getLoginToken')
@@ -2579,7 +2346,7 @@ class sessionClass {
                               team = 'FREE.' + gameCounter['Free']
                             }
 
-                            let icon = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRi5AKF6eAu9Va9BzZzgw0PSsQXw8rXPiQLHA&s'
+                            let icon = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRi5AKF6eAu9Va9BzZzgw0PSsQXw8rXPiQLHA'
                             if ( (cache_data.dates[i].games[j].teams['home'].team.id >= 108) && (cache_data.dates[i].games[j].teams['home'].team.id <= 158) && (cache_data.dates[i].games[j].teams['away'].team.id >= 108) && (cache_data.dates[i].games[j].teams['away'].team.id <= 158) ) {
                               icon = 'https://img.mlbstatic.com/mlb-photos/image/upload/ar_167:215,c_crop/fl_relative,l_team:' + cache_data.dates[i].games[j].teams['home'].team.id + ':fill:spot.png,w_1.0,h_1,x_0.5,y_0,fl_no_overflow,e_distort:100p:0:200p:0:200p:100p:0:100p/fl_relative,l_team:' + cache_data.dates[i].games[j].teams['away'].team.id + ':logo:spot:current,w_0.38,x_-0.25,y_-0.16/fl_relative,l_team:' + cache_data.dates[i].games[j].teams['home'].team.id + ':logo:spot:current,w_0.38,x_0.25,y_0.16/w_750/team/' + cache_data.dates[i].games[j].teams['away'].team.id + '/fill/spot.png'
                             }
@@ -2610,7 +2377,7 @@ class sessionClass {
                             if ( (teamType == 'NATIONAL') && ((includeTeams.length == 0) || ((includeTeams.length > 0) && includeTeams.includes(teamType))) ) {
                               //logo += '/image.svg?teamId=MLB'
                               //if ( this.protection.content_protect ) logo += '&amp;content_protect=' + this.protection.content_protect
-                              logo = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRi5AKF6eAu9Va9BzZzgw0PSsQXw8rXPiQLHA&s'
+                              logo = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRi5AKF6eAu9Va9BzZzgw0PSsQXw8rXPiQLHA'
                               nationalChannels[channelid] = await this.create_channel_object(channelid, logo, stream, channelMediaType)
                             } else {
                               seriesId = cache_data.dates[i].games[j].teams[teamType].team.teamId
@@ -2776,7 +2543,7 @@ class sessionClass {
               let channelid = mediaType + '.GAMECHANGER'
               //let logo = server + '/image.svg?teamId=MLB'
               //if ( this.protection.content_protect ) logo += '&amp;content_protect=' + this.protection.content_protect
-              let logo = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRi5AKF6eAu9Va9BzZzgw0PSsQXw8rXPiQLHA&s'
+              let logo = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRi5AKF6eAu9Va9BzZzgw0PSsQXw8rXPiQLHA'
               let stream = server + '/gamechanger.m3u8?resolution=' + resolution
               if ( this.protection.content_protect ) stream += '&content_protect=' + this.protection.content_protect
               if ( pipe == 'true' ) stream = await this.convert_stream_to_pipe(stream, channelid)
@@ -2823,7 +2590,7 @@ class sessionClass {
               let channelid = mediaType + '.MULTIVIEW'
               //let logo = server + '/image.svg?teamId=MLB'
               //if ( this.protection.content_protect ) logo += '&amp;content_protect=' + this.protection.content_protect
-              let logo = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRi5AKF6eAu9Va9BzZzgw0PSsQXw8rXPiQLHA&s'
+              let logo = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRi5AKF6eAu9Va9BzZzgw0PSsQXw8rXPiQLHA'
               let stream = server.replace(':' + this.data.port, ':' + this.data.multiviewPort) + this.data.multiviewStreamURLPath
               if ( pipe == 'true' ) stream = await this.convert_stream_to_pipe(stream, channelid)
               channels[channelid] = await this.create_channel_object(channelid, logo, stream, mediaType)
@@ -3737,6 +3504,8 @@ class sessionClass {
           end.setHours(end.getHours()+4)
         }
       }
+      this.debuglog('Game changer start ' + start)
+      this.debuglog('Game changer end ' + end)
       this.temp_cache.gamechanger = {
         date: today,
         start: start,
@@ -4226,7 +3995,7 @@ class sessionClass {
     for (var j = 0; j < games.length; j++) {
       let gamePk = games[j].gamePk.toString()
       if ( games[j].gameDate && !blackouts[gamePk] && !games[j].rescheduleDate && !games[j].status.startTimeTBD && games[j].broadcasts && (await this.count_broadcasts(games[j].broadcasts, 'MLBTV') > 0) ) {
-        this.debuglog('get_first_and_last_games first : ' + j)
+        this.debuglog('get_first_and_last_games first : ' + j + ' ' + gamePk + ' at ' + games[j].gameDate)
         firstGameIndex = j
         break
       }
@@ -4235,7 +4004,7 @@ class sessionClass {
     for (var j = (games.length-1); j >= 0; j--) {
       let gamePk = games[j].gamePk.toString()
       if ( games[j].gameDate && !blackouts[gamePk] && !games[j].rescheduleDate && games[j].broadcasts && (await this.count_broadcasts(games[j].broadcasts, 'MLBTV') > 0) ) {
-        this.debuglog('get_first_and_last_games last : ' + j)
+        this.debuglog('get_first_and_last_games last : ' + j + ' ' + gamePk + ' at ' + games[j].gameDate)
         lastGameIndex = j
         break
       }
@@ -4354,7 +4123,7 @@ class sessionClass {
     let xml_output = "\n" + '    <programme channel="' + channelid + '" start="' + start + '" stop="' + stop + '">' + "\n" +
     '      <title lang="en">' + title + '</title>' + "\n"
     if ( subtitle ) {
-      xml_output += '      <subtitle lang="en">' + subtitle + '</title>' + "\n"
+      xml_output += '      <sub-title lang="en">' + subtitle + '</sub-title>' + "\n"
     }
     xml_output += '      <desc lang="en">' + description.trim() + '</desc>' + "\n" +
     '      <category lang="en">Sports</category>' + "\n" +
@@ -4362,7 +4131,7 @@ class sessionClass {
     '      <category lang="en">Sports event</category>' + "\n" +
     '      <icon src="' + icon + '"></icon>' + "\n"
     if ( teamId ) {
-      xml_output += '      <series-id system="team-id">{' + teamId + '</series-id>' + "\n"
+      xml_output += '      <series-id system="team-id">' + teamId + '</series-id>' + "\n"
     }
     xml_output += '      <episode-num system="original-air-date">' + date + '</episode-num>' + "\n"
     if ( gamePk ) {