Fix blackout check (#1)

src/clients/mediagateway/mediagateway.service.ts

@@ -1,6 +1,6 @@
 import type { AxiosInstance, AxiosResponse } from 'axios'
 
-import { HttpException, Injectable } from '@nestjs/common'
+import { Injectable } from '@nestjs/common'
 import { ConfigService } from '@nestjs/config'
 import axios, { AxiosError } from 'axios'
 
@@ -102,16 +102,9 @@ export class MediaGatewayService {
 
       return data.initPlaybackSession
     } catch (cause) {
-      if (cause instanceof AxiosError) {
-        throw new HttpException(`Failed to init playback session`, cause.response?.status ?? 500, { cause })
-      }
-
-      if (cause instanceof HttpException) {
-        throw cause
-      }
-
       throw new ApplicationException(`Failed to init playback session`, {
         cause,
+        status: cause instanceof AxiosError ? cause.response?.status : undefined,
       })
     }
   }
@@ -173,12 +166,9 @@ export class MediaGatewayService {
 
       return data.initSession
     } catch (cause) {
-      if (cause instanceof AxiosError) {
-        throw new HttpException(`Failed to initialize session`, cause.response?.status ?? 500, { cause })
-      }
-
       throw new ApplicationException(`Failed to initialize session`, {
         cause,
+        status: cause instanceof AxiosError ? cause.response?.status : undefined,
       })
     }
   }

src/clients/mlbauth/mlbauth.service.ts

@@ -1,6 +1,6 @@
 import type { AxiosInstance, AxiosResponse } from 'axios'
 
-import { HttpException, Injectable } from '@nestjs/common'
+import { Injectable } from '@nestjs/common'
 import { ConfigService } from '@nestjs/config'
 import axios, { AxiosError } from 'axios'
 
@@ -43,12 +43,9 @@ export class MlbAuthService {
 
       return response.data
     } catch (cause) {
-      if (cause instanceof AxiosError) {
-        throw new HttpException(`Failed to fetch grant`, cause.response?.status ?? 500, { cause })
-      }
-
       throw new ApplicationException(`Failed to fetch grant`, {
         cause,
+        status: cause instanceof AxiosError ? cause.response?.status : undefined,
       })
     }
   }

src/clients/mlbstatic/mlbstatic.service.ts

@@ -1,6 +1,6 @@
 import type { AxiosInstance, AxiosResponse } from 'axios'
 
-import { HttpException, Injectable } from '@nestjs/common'
+import { Injectable } from '@nestjs/common'
 import { ConfigService } from '@nestjs/config'
 import axios, { AxiosError } from 'axios'
 
@@ -25,12 +25,9 @@ export class MlbStaticService {
 
       return response.data
     } catch (cause) {
-      if (cause instanceof AxiosError) {
-        throw new HttpException(`Failed to fetch logo`, cause.response?.status ?? 500, { cause })
-      }
-
       throw new ApplicationException(`Failed to fetch logo`, {
         cause,
+        status: cause instanceof AxiosError ? cause.response?.status : undefined,
       })
     }
   }

src/common/errors/application.error.ts

@@ -11,6 +11,18 @@ export class ApplicationException extends Error {
     this.meta = meta
   }
 
+  public getFullMessage(): string {
+    if (this.cause instanceof ApplicationException) {
+      return `${this.message}: ${this.cause.getFullMessage()}`
+    }
+
+    if (this.cause instanceof Error) {
+      return `${this.message}: ${this.cause.message}`
+    }
+
+    return this.message
+  }
+
   public getMeta(): Record<string, any> {
     return this.meta
   }

src/features/stream/stream.service.ts

@@ -7,6 +7,7 @@ import axios from 'axios'
 import { Bitrate, BlackedOutException, Stream, StreamEntity, StreamException } from './types'
 
 import { MediaGatewayService, Playback } from '@/clients/mediagateway'
+import { ApplicationException } from '@/common/errors'
 import { Token } from '@/features/auth'
 import { Game } from '@/features/game'
 import { Session } from '@/features/session'
@@ -109,7 +110,7 @@ export class StreamService {
         url: stream.url,
       }
     } catch (cause) {
-      if (cause instanceof Error && cause.message.includes('blackout')) {
+      if (cause instanceof ApplicationException && cause.getFullMessage().includes('blacked out')) {
         this.logger.warn({ ...game }, 'Game is blacked out')
         throw new BlackedOutException('Game is blacked out', { ...game })
       }