mlbserver 2024.6.26 → 2024.6.29

package/README.md

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

package/index.js

@@ -355,16 +355,23 @@ app.get('/stream.m3u8', async function(req, res) {
       }
 
       // resolve any alternate audio mediaIds into playlist URLs, if necessary
-      if ( options.alternate_audio_tracks ) {
-        for (const [key, value] of Object.entries(options.alternate_audio_tracks)) {
-          if ( (options.audio_track == VALID_AUDIO_TRACKS[0]) || (options.audio_track == key) ) {
-            let audioStreamURL = await session.getStreamURL(value)
-            let audioPlaylistURL = audioStreamURL.replace(/\/(master_radio_complete|master_radio)/g,'/48K/48_complete')
-            options.alternate_audio_tracks[key] = audioPlaylistURL
-          } else {
+      try {
+        if ( options.alternate_audio_tracks ) {
+          for (const [key, value] of Object.entries(options.alternate_audio_tracks)) {
+            if ( (options.audio_track == VALID_AUDIO_TRACKS[0]) || (options.audio_track == key) ) {
+              session.debuglog('stream request attempting to add alternate audio from ' + value)
+              let audioStreamURL = await session.getStreamURL(value)
+              if ( audioStreamURL ) {
+                let audioPlaylistURL = audioStreamURL.replace(/\/(master_radio_complete|master_radio)/g,'/48K/48_complete')
+                options.alternate_audio_tracks[key] = audioPlaylistURL
+                continue
+              }
+            }
             delete options.alternate_audio_tracks[key]
           }
         }
+      } catch (e) {
+        session.debuglog('stream request alternate audio error : ' + e.message)
       }
 
       if ( (options.inning_half != VALID_INNING_HALF[0]) || (options.inning_number != VALID_INNING_NUMBER[0]) || (options.skip != VALID_SKIP[0]) ) {

package/package.json

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

package/session.js

@@ -37,9 +37,9 @@ const LEVELS = { 'MLB': '1', 'AAA': '11', 'AA': '12', 'A+': '13', 'A': '14', 'Al
 const BREAK_TYPES = ['Game Advisory', 'Pitching Substitution', 'Offensive Substitution', 'Defensive Sub', 'Defensive Switch', 'Runner Placed On Base']
 // These are the events to keep, in addition to the last event of each at-bat, if we're skipping pitches
 const ACTION_TYPES = ['Wild Pitch', 'Passed Ball', 'Stolen Base', 'Caught Stealing', 'Pickoff', 'Error', 'Out', 'Balk', 'Defensive Indiff', 'Other Advance']
-const EVENT_START_PADDING = 0
+const EVENT_START_PADDING = 8
 const PITCH_END_PADDING = 7
-const ACTION_END_PADDING = 10
+const ACTION_END_PADDING = 18
 const MINIMUM_BREAK_DURATION = 5
 
 const LI_TABLE = {
@@ -1607,9 +1607,12 @@ class sessionClass {
       if ( response && this.isValidJson(response) ) {
         this.debuglog('getStreamURL response : ' + response)
         let obj = JSON.parse(response)
-        if ( obj.errors && (obj.errors[0] == 'blackout') ) {
-          this.log('blackout error')
-          this.markBlackoutError(mediaId)
+        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)