some minor tweaks to fix racy exceptions

player-ui · Jul 8, 2024 · 2b42f7a · 2b42f7a
1 parent c9f99e5
commit 2b42f7a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/android/player/src/main/java/com/intuit/playerui/android/lifecycle/PlayerViewModel.kt b/android/player/src/main/java/com/intuit/playerui/android/lifecycle/PlayerViewModel.kt
@@ -101,7 +101,11 @@ public open class PlayerViewModel(flows: AsyncFlowIterator) : ViewModel(), Andro
                     AsyncIterationManager.State.NotStarted -> _state.emit(ManagedPlayerState.NotStarted)
                     AsyncIterationManager.State.Pending -> _state.emit(ManagedPlayerState.Pending)
                     AsyncIterationManager.State.Done -> _state.emit(ManagedPlayerState.Done(player.completedState))
-                    is AsyncIterationManager.State.Item<*> -> start(it.value as String)
+                    is AsyncIterationManager.State.Item<*> -> try {
+                        start(it.value as String)
+                    } catch (e: Exception) {
+                        _state.emit(ManagedPlayerState.Error(e))
+                    }
                     is AsyncIterationManager.State.Error -> _state.emit(ManagedPlayerState.Error(it.error)) // player.fail()
                 }
             }

diff --git a/jvm/core/src/main/kotlin/com/intuit/playerui/core/player/HeadlessPlayer.kt b/jvm/core/src/main/kotlin/com/intuit/playerui/core/player/HeadlessPlayer.kt
@@ -86,7 +86,7 @@ public constructor(
     public val runtime: Runtime<*> = explicitRuntime ?: runtimeFactory.create {
         debuggable = config.debuggable
         coroutineExceptionHandler = config.coroutineExceptionHandler ?: CoroutineExceptionHandler { _, throwable ->
-            inProgressState?.fail(throwable) ?: logger.error(
+            if (state !is ReleasedState) inProgressState?.fail(throwable) ?: logger.error(
                 "Exception caught in Player scope: ${throwable.message}",
                 throwable.stackTrace.joinToString("\n") {
                     "\tat $it"