From f15c40aadec0b005e90ff06ac776d5524efd1de8 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Mon, 24 Aug 2026 16:11:29 +0200
Subject: [PATCH 01/16] fix(AudioPlayer): modify AudioPlayer::resume, expand
 AudioPlayer::onErrorAfterClose

---
 .../cpp/audioapi/android/core/AudioPlayer.cpp | 37 +++++++++++++++----
 .../cpp/audioapi/android/core/AudioPlayer.h   |  2 +
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
index 38371018f..9ddbc8557 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
@@ -88,11 +88,20 @@ bool AudioPlayer::resume() {
   }
 
   if (mStream_ != nullptr) {
-    auto result = mStream_->requestStart() == oboe::Result::OK;
-    isRunning_.store(result, std::memory_order_release);
-    return result;
+    if (mStream_->requestStart() == oboe::Result::OK) {
+      isRunning_.store(true, std::memory_order_release);
+      return true;
+    }
   }
 
+  if (rebuildStream()) {
+    if (mStream_ != nullptr && mStream_->requestStart() == oboe::Result::OK) {
+      isRunning_.store(true, std::memory_order_release);
+      return true;
+    }
+  }
+
+  isRunning_.store(false, std::memory_order_release);
   return false;
 }
 
@@ -158,7 +167,8 @@ AudioPlayer::onAudioReady(AudioStream *oboeStream, void *audioData, int32_t numF
 }
 
 void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result error) {
-  if (error != oboe::Result::ErrorDisconnected || driverMutex_ == nullptr) {
+  // error != oboe::Result::ErrorDisconnected condition is deleted to handle more cases of errors
+  if (driverMutex_ == nullptr) {
     return;
   }
 
@@ -176,9 +186,17 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
     return;
   }
 
-  cleanup();
-  if (openAudioStream()) {
-    resume();
+  // Check if the stream was expected to be running when the error occurred
+  const bool wasRunning = isRunning_.load(std::memory_order_acquire);
+
+  if (!rebuildStream()) {
+    return;
+  }
+
+  // Restart the stream if it was expected to be running when the error occurred
+  if (wasRunning) {
+    auto result = mStream_->requestStart() == oboe::Result::OK;
+    isRunning_.store(result, std::memory_order_release);
   }
 }
 
@@ -225,4 +243,9 @@ double AudioPlayer::getOutputLatency() const {
 
   return minBaseLatency;
 }
+
+bool AudioPlayer::rebuildStream() {
+  cleanup();
+  return openAudioStream();
+}
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
index 2f9a4ac01..760fd5c7f 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
@@ -69,6 +69,8 @@ class AudioPlayer : public CommonPlayer,
   std::weak_ptr<AudioContext> context_;
 
   bool openAudioStream();
+
+  bool rebuildStream();
 };
 
 } // namespace audioapi

From 88e61675d8c5cfc288cfef44b905057abbb200a8 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Wed, 26 Aug 2026 15:54:02 +0200
Subject: [PATCH 02/16] fix(AudioPlayer): update onErrorAfterClose, delete
 stream-rebuilding logic from resume

---
 .../cpp/audioapi/android/core/AudioPlayer.cpp | 70 +++++++++++--------
 .../cpp/audioapi/android/core/AudioPlayer.h   |  1 -
 .../common/cpp/audioapi/core/AudioContext.cpp |  2 +
 3 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
index 9ddbc8557..595b312db 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
@@ -55,21 +55,38 @@ bool AudioPlayer::openAudioStream() {
   return true;
 }
 
+bool AudioPlayer::rebuildStream() {
+  cleanup();
+  return openAudioStream();
+}
+
 bool AudioPlayer::start() {
   std::scoped_lock lock(streamMutex_);
-  if (!isInitialized_.load(std::memory_order_acquire)) {
+
+  // Ensure a live stream exists. A prior Oboe death can leave isInitialized_ true
+  // with a closed/null stream, or a stream that rejects requestStart.
+  if (!isInitialized_.load(std::memory_order_acquire) || mStream_ == nullptr) {
+    if (isInitialized_.load(std::memory_order_acquire) || mStream_ != nullptr) {
+      cleanup();
+    }
     if (!openAudioStream()) {
       return false;
     }
   }
 
-  if (mStream_ != nullptr) {
-    auto result = mStream_->requestStart() == oboe::Result::OK;
-    isRunning_.store(result, std::memory_order_release);
-    return result;
+  if (mStream_ != nullptr && mStream_->requestStart() == oboe::Result::OK) {
+    isRunning_.store(true, std::memory_order_release);
+    return true;
   }
 
-  return false;
+  if (!rebuildStream() || mStream_ == nullptr) {
+    isRunning_.store(false, std::memory_order_release);
+    return false;
+  }
+
+  const bool started = mStream_->requestStart() == oboe::Result::OK;
+  isRunning_.store(started, std::memory_order_release);
+  return started;
 }
 
 void AudioPlayer::stop() {
@@ -88,20 +105,11 @@ bool AudioPlayer::resume() {
   }
 
   if (mStream_ != nullptr) {
-    if (mStream_->requestStart() == oboe::Result::OK) {
-      isRunning_.store(true, std::memory_order_release);
-      return true;
-    }
-  }
-
-  if (rebuildStream()) {
-    if (mStream_ != nullptr && mStream_->requestStart() == oboe::Result::OK) {
-      isRunning_.store(true, std::memory_order_release);
-      return true;
-    }
+    auto result = mStream_->requestStart() == oboe::Result::OK;
+    isRunning_.store(result, std::memory_order_release);
+    return result;
   }
 
-  isRunning_.store(false, std::memory_order_release);
   return false;
 }
 
@@ -167,11 +175,19 @@ AudioPlayer::onAudioReady(AudioStream *oboeStream, void *audioData, int32_t numF
 }
 
 void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result error) {
-  // error != oboe::Result::ErrorDisconnected condition is deleted to handle more cases of errors
   if (driverMutex_ == nullptr) {
     return;
   }
 
+  switch (error) {
+    case oboe::Result::ErrorDisconnected:
+    case oboe::Result::ErrorTimeout:
+    case oboe::Result::ErrorInternal:
+      break;
+    default:
+      return;
+  }
+
   // Serialize with start()/resume()/suspend()/close() on the JS / promise-pool threads.
   std::scoped_lock lock(*driverMutex_, streamMutex_);
 
@@ -186,17 +202,18 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
     return;
   }
 
-  // Check if the stream was expected to be running when the error occurred
+  // Capture before rebuild: cleanup clears the stream that was expected to run.
   const bool wasRunning = isRunning_.load(std::memory_order_acquire);
 
   if (!rebuildStream()) {
+    isRunning_.store(false, std::memory_order_release);
     return;
   }
 
-  // Restart the stream if it was expected to be running when the error occurred
-  if (wasRunning) {
-    auto result = mStream_->requestStart() == oboe::Result::OK;
-    isRunning_.store(result, std::memory_order_release);
+  // requestStart only — do not call resume() (keeps resume free of rebuild side effects).
+  if (wasRunning && mStream_ != nullptr) {
+    const bool started = mStream_->requestStart() == oboe::Result::OK;
+    isRunning_.store(started, std::memory_order_release);
   }
 }
 
@@ -243,9 +260,4 @@ double AudioPlayer::getOutputLatency() const {
 
   return minBaseLatency;
 }
-
-bool AudioPlayer::rebuildStream() {
-  cleanup();
-  return openAudioStream();
-}
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
index 760fd5c7f..107ec9236 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
@@ -69,7 +69,6 @@ class AudioPlayer : public CommonPlayer,
   std::weak_ptr<AudioContext> context_;
 
   bool openAudioStream();
-
   bool rebuildStream();
 };
 
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
index c7a038e48..113d48ca4 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
+++ b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
@@ -116,6 +116,8 @@ bool AudioContext::resume(const std::shared_ptr<ContextPromiseResolver<void>> &p
     getGraph()->disableProducerSelfDrain();
     if (audioPlayer_->resume()) {
       result = true;
+    } else if (audioPlayer_->rebuildStream() && audioPlayer_->resume()) {
+      result = true;
     } else {
       getGraph()->enableProducerSelfDrain();
     }

From 194e3bc59a9667cfe40f3f025f03b2a93f253d94 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Wed, 26 Aug 2026 15:54:02 +0200
Subject: [PATCH 03/16] fix(AudioPlayer): update onErrorAfterClose, remove
 rebuilding the stream from resume

---
 .../cpp/audioapi/android/core/AudioPlayer.cpp | 66 +++++++++++--------
 .../cpp/audioapi/android/core/AudioPlayer.h   |  1 -
 2 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
index 9ddbc8557..47ea5c8fe 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
@@ -55,21 +55,38 @@ bool AudioPlayer::openAudioStream() {
   return true;
 }
 
+bool AudioPlayer::rebuildStream() {
+  cleanup();
+  return openAudioStream();
+}
+
 bool AudioPlayer::start() {
   std::scoped_lock lock(streamMutex_);
-  if (!isInitialized_.load(std::memory_order_acquire)) {
+
+  // Ensure a live stream exists. A prior Oboe death can leave isInitialized_ true
+  // with a closed/null stream, or a stream that rejects requestStart.
+  if (!isInitialized_.load(std::memory_order_acquire) || mStream_ == nullptr) {
+    if (isInitialized_.load(std::memory_order_acquire) || mStream_ != nullptr) {
+      cleanup();
+    }
     if (!openAudioStream()) {
       return false;
     }
   }
 
-  if (mStream_ != nullptr) {
-    auto result = mStream_->requestStart() == oboe::Result::OK;
-    isRunning_.store(result, std::memory_order_release);
-    return result;
+  if (mStream_ != nullptr && mStream_->requestStart() == oboe::Result::OK) {
+    isRunning_.store(true, std::memory_order_release);
+    return true;
   }
 
-  return false;
+  if (!rebuildStream() || mStream_ == nullptr) {
+    isRunning_.store(false, std::memory_order_release);
+    return false;
+  }
+
+  const bool started = mStream_->requestStart() == oboe::Result::OK;
+  isRunning_.store(started, std::memory_order_release);
+  return started;
 }
 
 void AudioPlayer::stop() {
@@ -88,20 +105,11 @@ bool AudioPlayer::resume() {
   }
 
   if (mStream_ != nullptr) {
-    if (mStream_->requestStart() == oboe::Result::OK) {
-      isRunning_.store(true, std::memory_order_release);
-      return true;
-    }
-  }
-
-  if (rebuildStream()) {
-    if (mStream_ != nullptr && mStream_->requestStart() == oboe::Result::OK) {
-      isRunning_.store(true, std::memory_order_release);
-      return true;
-    }
+    auto result = mStream_->requestStart() == oboe::Result::OK;
+    isRunning_.store(result, std::memory_order_release);
+    return result;
   }
 
-  isRunning_.store(false, std::memory_order_release);
   return false;
 }
 
@@ -167,11 +175,19 @@ AudioPlayer::onAudioReady(AudioStream *oboeStream, void *audioData, int32_t numF
 }
 
 void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result error) {
-  // error != oboe::Result::ErrorDisconnected condition is deleted to handle more cases of errors
   if (driverMutex_ == nullptr) {
     return;
   }
 
+  switch (error) {
+    case oboe::Result::ErrorDisconnected:
+    case oboe::Result::ErrorTimeout:
+    case oboe::Result::ErrorInternal:
+      break;
+    default:
+      return;
+  }
+
   // Serialize with start()/resume()/suspend()/close() on the JS / promise-pool threads.
   std::scoped_lock lock(*driverMutex_, streamMutex_);
 
@@ -190,13 +206,14 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
   const bool wasRunning = isRunning_.load(std::memory_order_acquire);
 
   if (!rebuildStream()) {
+    isRunning_.store(false, std::memory_order_release);
     return;
   }
 
   // Restart the stream if it was expected to be running when the error occurred
-  if (wasRunning) {
-    auto result = mStream_->requestStart() == oboe::Result::OK;
-    isRunning_.store(result, std::memory_order_release);
+  if (wasRunning && mStream_ != nullptr) {
+    const bool started = mStream_->requestStart() == oboe::Result::OK;
+    isRunning_.store(started, std::memory_order_release);
   }
 }
 
@@ -243,9 +260,4 @@ double AudioPlayer::getOutputLatency() const {
 
   return minBaseLatency;
 }
-
-bool AudioPlayer::rebuildStream() {
-  cleanup();
-  return openAudioStream();
-}
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
index 760fd5c7f..107ec9236 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
@@ -69,7 +69,6 @@ class AudioPlayer : public CommonPlayer,
   std::weak_ptr<AudioContext> context_;
 
   bool openAudioStream();
-
   bool rebuildStream();
 };
 

From 995dca8b3990132b785765489e010cf485971591 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Mon, 14 Sep 2026 14:58:07 +0200
Subject: [PATCH 04/16] fix: added onerror event handler to AudioContext

---
 .../cpp/audioapi/android/core/AudioPlayer.cpp | 10 ++++++++
 .../HostObjects/AudioContextHostObject.cpp    | 16 ++++++++++++
 .../HostObjects/AudioContextHostObject.h      |  1 +
 .../common/cpp/audioapi/core/AudioContext.cpp | 25 +++++++++++++++++++
 .../common/cpp/audioapi/core/AudioContext.h   |  9 +++++++
 .../src/core/AudioContext.ts                  | 16 ++++++++++++
 .../src/jsi-interfaces.ts                     |  2 ++
 .../react-native-audio-api/src/mock/index.ts  |  2 ++
 .../src/web-core/AudioContext.web.ts          | 16 ++++++++++++
 9 files changed, 97 insertions(+)

diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
index 7241c2e9f..afc1a4b63 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
@@ -61,6 +61,7 @@ bool AudioPlayer::rebuildStream() {
 }
 
 bool AudioPlayer::start() {
+  __android_log_print(ANDROID_LOG_ERROR, "AudioPlayer", "=== TEST LOGOWANIA - C++ DZIALA ===");
   std::scoped_lock lock(streamMutex_);
   if (!isInitialized_.load(std::memory_order_acquire)) {
     if (!openAudioStream()) {
@@ -71,6 +72,7 @@ bool AudioPlayer::start() {
   if (mStream_ != nullptr) {
     auto result = mStream_->requestStart() == oboe::Result::OK;
     isRunning_.store(result, std::memory_order_release);
+    //    rebuiltNeeded_ = !result;
     return result;
   }
 
@@ -95,6 +97,7 @@ bool AudioPlayer::resume() {
   if (mStream_ != nullptr) {
     auto result = mStream_->requestStart() == oboe::Result::OK;
     isRunning_.store(result, std::memory_order_release);
+    //    rebuiltNeeded_ = !result;
     return result;
   }
 
@@ -166,11 +169,14 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
   if (driverMutex_ == nullptr) {
     return;
   }
+  __android_log_print(ANDROID_LOG_ERROR, "AudioPlayer", "onErrorAfterClose");
+  __android_log_print(ANDROID_LOG_ERROR, "AudioPlayer", "error: %s", oboe::convertToText(error));
 
   switch (error) {
     case oboe::Result::ErrorDisconnected:
     case oboe::Result::ErrorTimeout:
     case oboe::Result::ErrorInternal:
+    case oboe::Result::ErrorNoService:
       break;
     default:
       return;
@@ -190,11 +196,15 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
     return;
   }
 
+  context->onStreamFail();
+  return;
+
   // Check if the stream was expected to be running when the error occurred
   const bool wasRunning = isRunning_.load(std::memory_order_acquire);
 
   if (!rebuildStream()) {
     isRunning_.store(false, std::memory_order_release);
+    context->onStreamFail();
     return;
   }
 
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.cpp b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.cpp
index 4bc1c6843..6f280d210 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.cpp
+++ b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.cpp
@@ -20,6 +20,7 @@ AudioContextHostObject::AudioContextHostObject(
           callInvoker) {
   addGetters(JSI_EXPORT_PROPERTY_GETTER(AudioContextHostObject, outputLatency));
   addGetters(JSI_EXPORT_PROPERTY_GETTER(AudioContextHostObject, baseLatency));
+  addSetters(JSI_EXPORT_PROPERTY_SETTER(AudioContextHostObject, onerror));
   addFunctions(
       JSI_EXPORT_FUNCTION(AudioContextHostObject, close),
       JSI_EXPORT_FUNCTION(AudioContextHostObject, resume),
@@ -78,4 +79,19 @@ JSI_HOST_FUNCTION_IMPL(AudioContextHostObject, createMediaElementSource) {
   return object;
 }
 
+JSI_PROPERTY_SETTER_IMPL(AudioContextHostObject, onerror) {
+  auto audioContext = std::static_pointer_cast<AudioContext>(context_);
+
+  if (!value.isObject() || !value.getObject(runtime).isFunction(runtime)) {
+    audioContext->setOnError(nullptr);
+    return;
+  }
+
+  auto jsFunc = std::make_shared<jsi::Function>(value.getObject(runtime).getFunction(runtime));
+
+  audioContext->setOnError([jsFunc, invoker = callInvoker_, rt = &runtime]() {
+    invoker->invokeAsync([jsFunc, rt]() { jsFunc->call(*rt); });
+  });
+}
+
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.h b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.h
index 4952c6c85..3761f7111 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.h
+++ b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.h
@@ -26,5 +26,6 @@ class AudioContextHostObject : public BaseAudioContextHostObject {
 
   JSI_PROPERTY_GETTER_DECL(outputLatency);
   JSI_PROPERTY_GETTER_DECL(baseLatency);
+  JSI_PROPERTY_SETTER_DECL(onerror);
 };
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
index c7a038e48..d76bd4e9f 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
+++ b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
@@ -8,9 +8,15 @@
 
 #include <audioapi/core/AudioContext.h>
 #include <audioapi/core/destinations/AudioDestinationNode.h>
+
+#ifdef ANDROID
+#include <android/log.h>
+#endif
+
 #include <memory>
 #include <string>
 #include <thread>
+#include <utility>
 
 namespace audioapi {
 AudioContext::AudioContext(
@@ -121,6 +127,7 @@ bool AudioContext::resume(const std::shared_ptr<ContextPromiseResolver<void>> &p
     }
   } else {
     result = tryStartDriver();
+    __android_log_print(ANDROID_LOG_ERROR, "AudioContext", "tryStartDriver");
   }
 
   if (result) {
@@ -190,4 +197,22 @@ double AudioContext::getOutputLatency() const {
   return audioPlayer_->getOutputLatency();
 }
 
+void AudioContext::setOnError(std::function<void()> callback) {
+  onerror = std::move(callback);
+}
+
+void AudioContext::onStreamFail() {
+  assertDriverMutexHeld();
+
+  if (audioPlayer_ != nullptr) {
+    audioPlayer_->cleanup();
+  }
+
+  isInitialized_.store(false, std::memory_order_release);
+
+  if (onerror) {
+    onerror();
+  }
+}
+
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.h b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.h
index 0cad163a2..f8497ae82 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.h
+++ b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.h
@@ -7,6 +7,7 @@
 #include <audioapi/utils/Macros.h>
 
 #include <atomic>
+#include <functional>
 #include <memory>
 
 namespace audioapi {
@@ -37,6 +38,12 @@ class AudioContext : public BaseAudioContext {
   /// @returns The output latency in seconds.
   [[nodiscard]] double getOutputLatency() const;
 
+  /// @brief Called when the audio stream failed to rebuild.
+  /// @note This method is called when the audio stream fails.
+  void onStreamFail();
+
+  void setOnError(std::function<void()> callback);
+
  private:
   std::shared_ptr<CommonPlayer> audioPlayer_;
   std::atomic<bool> isInitialized_{false};
@@ -51,6 +58,8 @@ class AudioContext : public BaseAudioContext {
 
   /// Blocks until no audio I/O callback is in flight. Caller must hold `driverMutex_`.
   void waitForRenderQuiescence() const;
+
+  std::function<void()> onerror;
 };
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/src/core/AudioContext.ts b/packages/react-native-audio-api/src/core/AudioContext.ts
index 8941e656c..2fc98e11c 100644
--- a/packages/react-native-audio-api/src/core/AudioContext.ts
+++ b/packages/react-native-audio-api/src/core/AudioContext.ts
@@ -8,6 +8,8 @@ import BaseAudioContext from './BaseAudioContext';
 import MediaElementAudioSourceNode from './MediaElementAudioSourceNode';
 
 export default class AudioContext extends BaseAudioContext {
+  private onerrorCallback: (() => void) | null = null;
+
   constructor(options?: AudioContextOptions) {
     if (options?.sampleRate != null) {
       assertSupportedSampleRate(options.sampleRate);
@@ -28,6 +30,20 @@ export default class AudioContext extends BaseAudioContext {
     return (this.context as IAudioContext).outputLatency;
   }
 
+  /**
+   * Web Audio `onerror` — fired when the output device/stream fails natively.
+   *
+   * @see https://webaudio.github.io/web-audio-api/#dom-audiocontext-onerror
+   */
+  public get onerror(): (() => void) | null {
+    return this.onerrorCallback;
+  }
+
+  public set onerror(callback: (() => void) | null) {
+    this.onerrorCallback = callback;
+    (this.context as IAudioContext).onerror = callback;
+  }
+
   async close(): Promise<undefined> {
     if (this._state === 'closed') {
       throw new InvalidStateError('Cannot close a closed audio context.');
diff --git a/packages/react-native-audio-api/src/jsi-interfaces.ts b/packages/react-native-audio-api/src/jsi-interfaces.ts
index 9a9a2a552..4daafe78e 100644
--- a/packages/react-native-audio-api/src/jsi-interfaces.ts
+++ b/packages/react-native-audio-api/src/jsi-interfaces.ts
@@ -91,6 +91,8 @@ export interface IAudioContext extends IBaseAudioContext {
   close(): Promise<undefined>;
   resume(): Promise<undefined>;
   suspend(): Promise<undefined>;
+  /** Web Audio `onerror` — JS function stored on the native HostObject. */
+  onerror: (() => void) | null;
 }
 
 export interface IOfflineAudioContext extends IBaseAudioContext {
diff --git a/packages/react-native-audio-api/src/mock/index.ts b/packages/react-native-audio-api/src/mock/index.ts
index 5d596e392..724057f58 100644
--- a/packages/react-native-audio-api/src/mock/index.ts
+++ b/packages/react-native-audio-api/src/mock/index.ts
@@ -825,6 +825,8 @@ class AudioContextMock extends BaseAudioContextMock {
     return Promise.resolve();
   }
 
+  onerror: (() => void) | null = null;
+
   createMediaElementSource(
     mediaElement: HTMLMediaElement | AudioNodeMock
   ): MediaElementAudioSourceNodeMock {
diff --git a/packages/react-native-audio-api/src/web-core/AudioContext.web.ts b/packages/react-native-audio-api/src/web-core/AudioContext.web.ts
index 220b4a85d..308f5d378 100644
--- a/packages/react-native-audio-api/src/web-core/AudioContext.web.ts
+++ b/packages/react-native-audio-api/src/web-core/AudioContext.web.ts
@@ -193,4 +193,20 @@ export default class AudioContext implements BaseAudioContext {
   async suspend(): Promise<void> {
     await this.context.suspend();
   }
+
+  private _onerrorCallback:
+    | ((this: globalThis.AudioContext, ev: Event) => unknown)
+    | null = null;
+
+  public get onerror():
+    | ((this: globalThis.AudioContext, ev: Event) => unknown)
+    | null {
+    return this._onerrorCallback;
+  }
+
+  public set onerror(
+    callback: ((this: globalThis.AudioContext, ev: Event) => unknown) | null
+  ) {
+    this._onerrorCallback = callback;
+  }
 }

From 890fa567e9efb26dd95db2b5a1e67ce096f1e695 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Mon, 14 Sep 2026 15:06:43 +0200
Subject: [PATCH 05/16] chore: deleted logs

---
 .../src/main/cpp/audioapi/android/core/AudioPlayer.cpp    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
index afc1a4b63..2d54a93f5 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
@@ -61,7 +61,6 @@ bool AudioPlayer::rebuildStream() {
 }
 
 bool AudioPlayer::start() {
-  __android_log_print(ANDROID_LOG_ERROR, "AudioPlayer", "=== TEST LOGOWANIA - C++ DZIALA ===");
   std::scoped_lock lock(streamMutex_);
   if (!isInitialized_.load(std::memory_order_acquire)) {
     if (!openAudioStream()) {
@@ -72,7 +71,6 @@ bool AudioPlayer::start() {
   if (mStream_ != nullptr) {
     auto result = mStream_->requestStart() == oboe::Result::OK;
     isRunning_.store(result, std::memory_order_release);
-    //    rebuiltNeeded_ = !result;
     return result;
   }
 
@@ -97,7 +95,6 @@ bool AudioPlayer::resume() {
   if (mStream_ != nullptr) {
     auto result = mStream_->requestStart() == oboe::Result::OK;
     isRunning_.store(result, std::memory_order_release);
-    //    rebuiltNeeded_ = !result;
     return result;
   }
 
@@ -169,8 +166,6 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
   if (driverMutex_ == nullptr) {
     return;
   }
-  __android_log_print(ANDROID_LOG_ERROR, "AudioPlayer", "onErrorAfterClose");
-  __android_log_print(ANDROID_LOG_ERROR, "AudioPlayer", "error: %s", oboe::convertToText(error));
 
   switch (error) {
     case oboe::Result::ErrorDisconnected:
@@ -196,9 +191,6 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
     return;
   }
 
-  context->onStreamFail();
-  return;
-
   // Check if the stream was expected to be running when the error occurred
   const bool wasRunning = isRunning_.load(std::memory_order_acquire);
 

From e991d8fbb639ce1a8b8b324aed700cd14d4c9eda Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Mon, 14 Sep 2026 16:34:01 +0200
Subject: [PATCH 06/16] fix: add reentrancy guard and deleted isFailed_

---
 .../cpp/audioapi/android/core/AudioPlayer.cpp | 24 +++++++++++++++++++
 .../cpp/audioapi/android/core/AudioPlayer.h   |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
index 2d54a93f5..143e7abf3 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
@@ -62,6 +62,7 @@ bool AudioPlayer::rebuildStream() {
 
 bool AudioPlayer::start() {
   std::scoped_lock lock(streamMutex_);
+
   if (!isInitialized_.load(std::memory_order_acquire)) {
     if (!openAudioStream()) {
       return false;
@@ -162,6 +163,18 @@ AudioPlayer::onAudioReady(AudioStream *oboeStream, void *audioData, int32_t numF
   return DataCallbackResult::Continue;
 }
 
+namespace {
+struct ReentrancyGuard {
+  bool &flag;
+  explicit ReentrancyGuard(bool &f) : flag(f) {
+    flag = true;
+  }
+  ~ReentrancyGuard() {
+    flag = false;
+  }
+};
+} // namespace
+
 void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result error) {
   if (driverMutex_ == nullptr) {
     return;
@@ -177,6 +190,13 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
       return;
   }
 
+  // Reentrancy guard - prevent recursive calls to onErrorAfterClose.
+  static thread_local bool isInsideOnError = false;
+  if (isInsideOnError) {
+    return;
+  }
+  ReentrancyGuard guard(isInsideOnError);
+
   // Serialize with start()/resume()/suspend()/close() on the JS / promise-pool threads.
   std::scoped_lock lock(*driverMutex_, streamMutex_);
 
@@ -194,6 +214,7 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
   // Check if the stream was expected to be running when the error occurred
   const bool wasRunning = isRunning_.load(std::memory_order_acquire);
 
+  // Best effort rebuild - only once, then fire AudioContext::onStreamFail.
   if (!rebuildStream()) {
     isRunning_.store(false, std::memory_order_release);
     context->onStreamFail();
@@ -204,6 +225,9 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
   if (wasRunning && mStream_ != nullptr) {
     const bool started = mStream_->requestStart() == oboe::Result::OK;
     isRunning_.store(started, std::memory_order_release);
+    if (!started) {
+      context->onStreamFail();
+    }
   }
 }
 
diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
index 107ec9236..36ae4685e 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
@@ -70,6 +70,8 @@ class AudioPlayer : public CommonPlayer,
 
   bool openAudioStream();
   bool rebuildStream();
+
+  std::atomic<bool> isFailed_{false};
 };
 
 } // namespace audioapi

From d603c6ed35cdddb3e1fad047d5cf1ddb5178aad3 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Mon, 14 Sep 2026 17:10:56 +0200
Subject: [PATCH 07/16] chore: delete log from AudioContext

---
 .../common/cpp/audioapi/core/AudioContext.cpp                    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
index d76bd4e9f..a2126cdf8 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
+++ b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
@@ -127,7 +127,6 @@ bool AudioContext::resume(const std::shared_ptr<ContextPromiseResolver<void>> &p
     }
   } else {
     result = tryStartDriver();
-    __android_log_print(ANDROID_LOG_ERROR, "AudioContext", "tryStartDriver");
   }
 
   if (result) {

From d024c14acc9486d9278e6cbc42151936f1d2baf4 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Wed, 16 Sep 2026 13:19:06 +0200
Subject: [PATCH 08/16] fix: add EventCaller to AudioContext to handle onerror

---
 .../cpp/audioapi/android/core/AudioPlayer.h   |  2 --
 .../swmansion/audioapi/system/AudioEvent.kt   |  1 +
 .../HostObjects/AudioContextHostObject.cpp    | 16 ++++-------
 .../HostObjects/AudioContextHostObject.h      |  1 +
 .../HostObjects/utils/JsEnumParser.cpp        |  2 ++
 .../common/cpp/audioapi/core/AudioContext.cpp | 18 ++++--------
 .../common/cpp/audioapi/core/AudioContext.h   |  9 +++---
 .../common/cpp/audioapi/events/AudioEvent.h   |  1 +
 .../events/AudioEventPayloadMapping.hpp       |  1 +
 .../cpp/test/src/events/EventCallerTest.cpp   |  1 +
 .../src/core/AudioContext.ts                  | 28 +++++++++----------
 .../src/events/types.ts                       |  1 +
 .../src/jsi-interfaces.ts                     |  3 +-
 13 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
index 36ae4685e..107ec9236 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h
@@ -70,8 +70,6 @@ class AudioPlayer : public CommonPlayer,
 
   bool openAudioStream();
   bool rebuildStream();
-
-  std::atomic<bool> isFailed_{false};
 };
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/AudioEvent.kt b/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/AudioEvent.kt
index 324fac4e2..a60d76998 100644
--- a/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/AudioEvent.kt
+++ b/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/AudioEvent.kt
@@ -27,4 +27,5 @@ enum class AudioEvent {
   RECORDER_ERROR,
   BUFFERING_STATE_CHANGE,
   STATE_CHANGE,
+  CONTEXT_ERROR,
 }
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.cpp b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.cpp
index 6f280d210..65917a3e5 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.cpp
+++ b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.cpp
@@ -28,6 +28,10 @@ AudioContextHostObject::AudioContextHostObject(
       JSI_EXPORT_FUNCTION(AudioContextHostObject, createMediaElementSource));
 }
 
+AudioContextHostObject::~AudioContextHostObject() {
+  std::static_pointer_cast<AudioContext>(context_)->assignOnErrorCallbackId(0);
+}
+
 JSI_HOST_FUNCTION_IMPL(AudioContextHostObject, close) {
   return promiseVendor_->createPromise([this](Promise &&promise) {
     auto contextPromise = ContextPromiseResolver<void>::makeContextPromiseResolver(
@@ -81,17 +85,7 @@ JSI_HOST_FUNCTION_IMPL(AudioContextHostObject, createMediaElementSource) {
 
 JSI_PROPERTY_SETTER_IMPL(AudioContextHostObject, onerror) {
   auto audioContext = std::static_pointer_cast<AudioContext>(context_);
-
-  if (!value.isObject() || !value.getObject(runtime).isFunction(runtime)) {
-    audioContext->setOnError(nullptr);
-    return;
-  }
-
-  auto jsFunc = std::make_shared<jsi::Function>(value.getObject(runtime).getFunction(runtime));
-
-  audioContext->setOnError([jsFunc, invoker = callInvoker_, rt = &runtime]() {
-    invoker->invokeAsync([jsFunc, rt]() { jsFunc->call(*rt); });
-  });
+  audioContext->assignOnErrorCallbackId(std::stoull(value.getString(runtime).utf8(runtime)));
 }
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.h b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.h
index 3761f7111..470bf2a35 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.h
+++ b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioContextHostObject.h
@@ -18,6 +18,7 @@ class AudioContextHostObject : public BaseAudioContextHostObject {
       const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry,
       jsi::Runtime *runtime,
       const std::shared_ptr<react::CallInvoker> &callInvoker);
+  ~AudioContextHostObject() override;
 
   JSI_HOST_FUNCTION_DECL(close);
   JSI_HOST_FUNCTION_DECL(resume);
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/utils/JsEnumParser.cpp b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/utils/JsEnumParser.cpp
index 0e481a80b..1eaa8b8da 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/utils/JsEnumParser.cpp
+++ b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/utils/JsEnumParser.cpp
@@ -152,6 +152,8 @@ AudioEvent audioEventFromString(const std::string &event) {
     return AudioEvent::BUFFERING_STATE_CHANGE;
   if (event == "stateChange")
     return AudioEvent::STATE_CHANGE;
+  if (event == "contextError")
+    return AudioEvent::CONTEXT_ERROR;
 
   throw std::invalid_argument("Unknown audio event: " + event);
 }
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
index 03e7f18e2..b3d5ac4a3 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
+++ b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
@@ -9,20 +9,16 @@
 #include <audioapi/core/AudioContext.h>
 #include <audioapi/core/destinations/AudioDestinationNode.h>
 
-#ifdef ANDROID
-#include <android/log.h>
-#endif
-
 #include <memory>
-#include <string>
 #include <thread>
-#include <utility>
 
 namespace audioapi {
 AudioContext::AudioContext(
     float sampleRate,
     const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry)
-    : BaseAudioContext(sampleRate, audioEventHandlerRegistry), isInitialized_(false) {
+    : BaseAudioContext(sampleRate, audioEventHandlerRegistry),
+      isInitialized_(false),
+      onErrorEvent_(audioEventHandlerRegistry) {
   // Context starts SUSPENDED with no audio-thread consumer. Let the producer
   // drain the channels itself until start()/resume() hands draining to the
   // audio callback (same pattern as OfflineAudioContext before rendering).
@@ -194,8 +190,8 @@ double AudioContext::getOutputLatency() const {
   return audioPlayer_->getOutputLatency();
 }
 
-void AudioContext::setOnError(std::function<void()> callback) {
-  onerror = std::move(callback);
+void AudioContext::assignOnErrorCallbackId(uint64_t callbackId) {
+  onErrorEvent_.assignCallbackId(callbackId);
 }
 
 void AudioContext::onStreamFail() {
@@ -207,9 +203,7 @@ void AudioContext::onStreamFail() {
 
   isInitialized_.store(false, std::memory_order_release);
 
-  if (onerror) {
-    onerror();
-  }
+  onErrorEvent_.dispatchEmpty();
 }
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.h b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.h
index f8497ae82..16b8efcc6 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.h
+++ b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.h
@@ -2,12 +2,13 @@
 
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/CommonPlayer.h>
+#include <audioapi/events/AudioEvent.h>
+#include <audioapi/events/EventCaller.hpp>
 #include <audioapi/jsi/ContextPromiseResolver.hpp>
 #include <audioapi/utils/AudioBuffer.hpp>
 #include <audioapi/utils/Macros.h>
 
 #include <atomic>
-#include <functional>
 #include <memory>
 
 namespace audioapi {
@@ -42,7 +43,7 @@ class AudioContext : public BaseAudioContext {
   /// @note This method is called when the audio stream fails.
   void onStreamFail();
 
-  void setOnError(std::function<void()> callback);
+  void assignOnErrorCallbackId(uint64_t callbackId);
 
  private:
   std::shared_ptr<CommonPlayer> audioPlayer_;
@@ -51,6 +52,8 @@ class AudioContext : public BaseAudioContext {
   /// control thread waits on suspend/close.
   std::atomic<uint32_t> currentRenders_{0};
 
+  EventCaller<AudioEvent::CONTEXT_ERROR> onErrorEvent_;
+
   bool isDriverRunning() const override;
 
   /// Caller must hold `driverMutex_`.
@@ -58,8 +61,6 @@ class AudioContext : public BaseAudioContext {
 
   /// Blocks until no audio I/O callback is in flight. Caller must hold `driverMutex_`.
   void waitForRenderQuiescence() const;
-
-  std::function<void()> onerror;
 };
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/events/AudioEvent.h b/packages/react-native-audio-api/common/cpp/audioapi/events/AudioEvent.h
index beb125403..6042480fd 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/events/AudioEvent.h
+++ b/packages/react-native-audio-api/common/cpp/audioapi/events/AudioEvent.h
@@ -30,5 +30,6 @@ enum class AudioEvent : uint8_t {
   RECORDER_ERROR,
   BUFFERING_STATE_CHANGE,
   STATE_CHANGE,
+  CONTEXT_ERROR,
 };
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/events/AudioEventPayloadMapping.hpp b/packages/react-native-audio-api/common/cpp/audioapi/events/AudioEventPayloadMapping.hpp
index eb44b720c..9385e22c6 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/events/AudioEventPayloadMapping.hpp
+++ b/packages/react-native-audio-api/common/cpp/audioapi/events/AudioEventPayloadMapping.hpp
@@ -42,6 +42,7 @@ AUDIOAPI_DEFINE_EVENT_PAYLOAD(AudioEvent::BUFFER_ENDED, BufferEndedPayload);
 AUDIOAPI_DEFINE_EVENT_PAYLOAD(AudioEvent::RECORDER_ERROR, StringPayload);
 AUDIOAPI_DEFINE_EVENT_PAYLOAD(AudioEvent::BUFFERING_STATE_CHANGE, BoolValuePayload);
 AUDIOAPI_DEFINE_EVENT_PAYLOAD(AudioEvent::STATE_CHANGE, StringPayload);
+AUDIOAPI_DEFINE_EVENT_PAYLOAD(AudioEvent::CONTEXT_ERROR, EmptyPayload);
 
 #undef AUDIOAPI_DEFINE_EVENT_PAYLOAD
 
diff --git a/packages/react-native-audio-api/common/cpp/test/src/events/EventCallerTest.cpp b/packages/react-native-audio-api/common/cpp/test/src/events/EventCallerTest.cpp
index da36dede5..28a282b55 100644
--- a/packages/react-native-audio-api/common/cpp/test/src/events/EventCallerTest.cpp
+++ b/packages/react-native-audio-api/common/cpp/test/src/events/EventCallerTest.cpp
@@ -15,6 +15,7 @@ constexpr uint64_t ERROR_CALLBACK_ID = 88;
 constexpr uint64_t POSITION_CALLBACK_ID = 19;
 
 static_assert(EventPayloadFor<AudioEvent::ENDED, EmptyPayload>);
+static_assert(EventPayloadFor<AudioEvent::CONTEXT_ERROR, EmptyPayload>);
 static_assert(EventPayloadFor<AudioEvent::POSITION_CHANGED, DoubleValuePayload>);
 static_assert(EventPayloadFor<AudioEvent::RECORDER_ERROR, StringPayload>);
 static_assert(EventPayloadFor<AudioEvent::BUFFERING_STATE_CHANGE, BoolValuePayload>);
diff --git a/packages/react-native-audio-api/src/core/AudioContext.ts b/packages/react-native-audio-api/src/core/AudioContext.ts
index 9dd416b66..8779bae01 100644
--- a/packages/react-native-audio-api/src/core/AudioContext.ts
+++ b/packages/react-native-audio-api/src/core/AudioContext.ts
@@ -1,6 +1,7 @@
 import { InvalidStateError } from '../errors';
 import { assertSupportedSampleRate } from '../utils/validation';
 import { AudioTagHandle } from '../Audio/types';
+import { AudioEventEmitter } from '../events';
 import { IAudioContext } from '../jsi-interfaces';
 import AudioManager from '../system';
 import { AudioContextOptions, ContextState } from '../types';
@@ -8,7 +9,11 @@ import BaseAudioContext from './BaseAudioContext';
 import MediaElementAudioSourceNode from './MediaElementAudioSourceNode';
 
 export default class AudioContext extends BaseAudioContext {
-  private onerrorCallback: (() => void) | null = null;
+  public onerror: (() => void) | null = null;
+
+  private readonly errorSubscription: ReturnType<
+    AudioEventEmitter['addAudioEventListener']
+  >;
 
   constructor(options?: AudioContextOptions) {
     if (options?.sampleRate != null) {
@@ -20,6 +25,13 @@ export default class AudioContext extends BaseAudioContext {
         options?.sampleRate || AudioManager.getDevicePreferredSampleRate()
       )
     );
+
+    this.errorSubscription = this.audioEventEmitter.addAudioEventListener(
+      'contextError',
+      () => this.onerror?.()
+    );
+    (this.context as IAudioContext).onerror =
+      this.errorSubscription.subscriptionId;
   }
 
   public get baseLatency(): number {
@@ -30,20 +42,6 @@ export default class AudioContext extends BaseAudioContext {
     return (this.context as IAudioContext).outputLatency;
   }
 
-  /**
-   * Web Audio `onerror` — fired when the output device/stream fails natively.
-   *
-   * @see https://webaudio.github.io/web-audio-api/#dom-audiocontext-onerror
-   */
-  public get onerror(): (() => void) | null {
-    return this.onerrorCallback;
-  }
-
-  public set onerror(callback: (() => void) | null) {
-    this.onerrorCallback = callback;
-    (this.context as IAudioContext).onerror = callback;
-  }
-
   async close(): Promise<undefined> {
     if (this._state === 'closed') {
       throw new InvalidStateError('Cannot close a closed audio context.');
diff --git a/packages/react-native-audio-api/src/events/types.ts b/packages/react-native-audio-api/src/events/types.ts
index c025a1aef..c3114e931 100644
--- a/packages/react-native-audio-api/src/events/types.ts
+++ b/packages/react-native-audio-api/src/events/types.ts
@@ -82,6 +82,7 @@ interface AudioAPIEvents {
   /** `value` is true while an `<Audio>` source is stalled on decoded data. */
   bufferingStateChanged: EventTypeWithBool;
   stateChange: EventEmptyType;
+  contextError: EventEmptyType;
 }
 
 type AudioEvents = SystemEvents & AudioAPIEvents & NotificationEvents;
diff --git a/packages/react-native-audio-api/src/jsi-interfaces.ts b/packages/react-native-audio-api/src/jsi-interfaces.ts
index b7087224d..6c1985c1b 100644
--- a/packages/react-native-audio-api/src/jsi-interfaces.ts
+++ b/packages/react-native-audio-api/src/jsi-interfaces.ts
@@ -95,8 +95,7 @@ export interface IAudioContext extends IBaseAudioContext {
   close(): Promise<undefined>;
   resume(): Promise<undefined>;
   suspend(): Promise<undefined>;
-  /** Web Audio `onerror` — JS function stored on the native HostObject. */
-  onerror: (() => void) | null;
+  onerror: string;
 }
 
 export interface IOfflineAudioContext extends IBaseAudioContext {

From d43fedc89957373b0c4ed7ec24de28abd9f74db4 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Wed, 16 Sep 2026 13:49:32 +0200
Subject: [PATCH 09/16] docs: mention onerror in docs

---
 .../audiodocs/docs/core/audio-context.mdx     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/audiodocs/docs/core/audio-context.mdx b/packages/audiodocs/docs/core/audio-context.mdx
index 45eaebeca..0a2e1bb94 100644
--- a/packages/audiodocs/docs/core/audio-context.mdx
+++ b/packages/audiodocs/docs/core/audio-context.mdx
@@ -75,3 +75,22 @@ Resumes a previously suspended audio context.
 
 Inherits [`onstatechange`](./base-audio-context.mdx#onstatechange) from [`BaseAudioContext`](./base-audio-context.mdx#events); `close`, `suspend` and `resume` each fire it once their returned promise has resolved.
 
+### `onerror`
+
+Sets (or removes, when `null` is assigned) a callback fired when the live output stream fails natively and cannot keep rendering — for example after the audio device disconnects or the OS audio service dies while the context is running.
+
+This matches the Web Audio [`AudioContext.onerror`](https://webaudio.github.io/web-audio-api/#dom-audiocontext-onerror) handler. The callback receives no arguments.
+
+On **Android**, the event is dispatched from the native driver after an Oboe stream error when recovery fails (the context’s driver is cleared so a later [`resume`](./audio-context.mdx#resume) can reopen it). You can assign `onerror` on every platform, but **iOS** does not yet call it from the audio engine, and **web** does not yet forward the browser’s `AudioContext.onerror`.
+
+Typical recovery is to call [`resume`](./audio-context.mdx#resume) from the handler (or recreate the context).
+
+```tsx
+const audioContext = new AudioContext();
+
+audioContext.onerror = () => {
+  console.error('Audio output failed');
+  void audioContext.resume();
+};
+```
+

From e59f04c6b6e5fb513141260e5ecfaa733987eeb0 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Wed, 16 Sep 2026 16:00:05 +0200
Subject: [PATCH 10/16] fix: rebuild once only for ErrorDisconnected, for other
 errors onStreamFail

---
 .../cpp/audioapi/android/core/AudioPlayer.cpp | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
index 143e7abf3..0b4cbb3ef 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
@@ -179,6 +179,7 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
   if (driverMutex_ == nullptr) {
     return;
   }
+  error = oboe::Result::ErrorNoService;
 
   switch (error) {
     case oboe::Result::ErrorDisconnected:
@@ -214,20 +215,25 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
   // Check if the stream was expected to be running when the error occurred
   const bool wasRunning = isRunning_.load(std::memory_order_acquire);
 
-  // Best effort rebuild - only once, then fire AudioContext::onStreamFail.
-  if (!rebuildStream()) {
-    isRunning_.store(false, std::memory_order_release);
-    context->onStreamFail();
-    return;
-  }
-
-  // Restart the stream if it was expected to be running when the error occurred
-  if (wasRunning && mStream_ != nullptr) {
-    const bool started = mStream_->requestStart() == oboe::Result::OK;
-    isRunning_.store(started, std::memory_order_release);
-    if (!started) {
+  if (error == oboe::Result::ErrorDisconnected) {
+    // Best effort rebuild - only once, then fire AudioContext::onStreamFail.
+    if (!rebuildStream()) {
+      isRunning_.store(false, std::memory_order_release);
       context->onStreamFail();
+      return;
+    }
+
+    // Restart the stream if it was expected to be running when the error occurred
+    if (wasRunning && mStream_ != nullptr) {
+      const bool started = mStream_->requestStart() == oboe::Result::OK;
+      isRunning_.store(started, std::memory_order_release);
+      if (!started) {
+        context->onStreamFail();
+      }
     }
+  } else {
+    isRunning_.store(false, std::memory_order_release);
+    context->onStreamFail();
   }
 }
 

From c1bd2094efb877966aef35e519c836dd6928646d Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <82549088+basiav@users.noreply.github.com>
Date: Wed, 16 Sep 2026 16:01:21 +0200
Subject: [PATCH 11/16] Update packages/audiodocs/docs/core/audio-context.mdx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michał Dydek <dydmichal@gmail.com>
---
 packages/audiodocs/docs/core/audio-context.mdx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/audiodocs/docs/core/audio-context.mdx b/packages/audiodocs/docs/core/audio-context.mdx
index 0a2e1bb94..d7782d243 100644
--- a/packages/audiodocs/docs/core/audio-context.mdx
+++ b/packages/audiodocs/docs/core/audio-context.mdx
@@ -79,9 +79,6 @@ Inherits [`onstatechange`](./base-audio-context.mdx#onstatechange) from [`BaseAu
 
 Sets (or removes, when `null` is assigned) a callback fired when the live output stream fails natively and cannot keep rendering — for example after the audio device disconnects or the OS audio service dies while the context is running.
 
-This matches the Web Audio [`AudioContext.onerror`](https://webaudio.github.io/web-audio-api/#dom-audiocontext-onerror) handler. The callback receives no arguments.
-
-On **Android**, the event is dispatched from the native driver after an Oboe stream error when recovery fails (the context’s driver is cleared so a later [`resume`](./audio-context.mdx#resume) can reopen it). You can assign `onerror` on every platform, but **iOS** does not yet call it from the audio engine, and **web** does not yet forward the browser’s `AudioContext.onerror`.
 
 Typical recovery is to call [`resume`](./audio-context.mdx#resume) from the handler (or recreate the context).
 

From 69eefaa2cd3d56b9a8c82d6f092c4e51e9bb3a30 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Wed, 16 Sep 2026 16:39:49 +0200
Subject: [PATCH 12/16] docs: update info about onerror

---
 packages/audiodocs/docs/core/audio-context.mdx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/audiodocs/docs/core/audio-context.mdx b/packages/audiodocs/docs/core/audio-context.mdx
index d7782d243..c2ee43fcf 100644
--- a/packages/audiodocs/docs/core/audio-context.mdx
+++ b/packages/audiodocs/docs/core/audio-context.mdx
@@ -80,14 +80,16 @@ Inherits [`onstatechange`](./base-audio-context.mdx#onstatechange) from [`BaseAu
 Sets (or removes, when `null` is assigned) a callback fired when the live output stream fails natively and cannot keep rendering — for example after the audio device disconnects or the OS audio service dies while the context is running.
 
 
-Typical recovery is to call [`resume`](./audio-context.mdx#resume) from the handler (or recreate the context).
+Typical recovery is to call [`resume`](./audio-context.mdx#resume) from the handler (or recreate the context). A short delay before `resume` gives the OS audio server time to recover from some errors, e.g. hardware errors, and prevents rapid retry loops.
 
 ```tsx
 const audioContext = new AudioContext();
 
 audioContext.onerror = () => {
   console.error('Audio output failed');
-  void audioContext.resume();
+  setTimeout(() => {
+    void audioContext.resume();
+  }, 2000);
 };
 ```
 

From f6587cf4121abe94668ddf99d70b070b396596e7 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Wed, 16 Sep 2026 17:14:41 +0200
Subject: [PATCH 13/16] fix: fix in AudioPlayer

---
 .../android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
index 0b4cbb3ef..a08d99e30 100644
--- a/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
+++ b/packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp
@@ -179,7 +179,6 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
   if (driverMutex_ == nullptr) {
     return;
   }
-  error = oboe::Result::ErrorNoService;
 
   switch (error) {
     case oboe::Result::ErrorDisconnected:

From 77281023faebb192c7df4147eb1fd4df905b9795 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Thu, 17 Sep 2026 12:57:35 +0200
Subject: [PATCH 14/16] fix: added error listening and onerror dispatch on ios

---
 .../FabricExampleTests/AudioEngineTests.mm    |  6 ++-
 .../FabricExampleTests/AudioPlayerTests.mm    | 20 +++++++++-
 .../common/cpp/audioapi/core/AudioContext.cpp |  4 +-
 .../common/cpp/audioapi/core/CommonPlayer.h   |  2 +
 .../ios/audioapi/ios/core/IOSAudioPlayer.h    | 11 +++++-
 .../ios/audioapi/ios/core/IOSAudioPlayer.mm   | 39 ++++++++++++++++++-
 .../ios/audioapi/ios/core/NativeAudioPlayer.h |  1 +
 .../ios/audioapi/ios/core/NativeAudioPlayer.m |  4 +-
 .../ios/audioapi/ios/system/AudioEngine.h     |  6 ++-
 .../ios/audioapi/ios/system/AudioEngine.mm    | 31 ++++++++++++++-
 10 files changed, 113 insertions(+), 11 deletions(-)

diff --git a/apps/fabric-example/ios/FabricExampleTests/AudioEngineTests.mm b/apps/fabric-example/ios/FabricExampleTests/AudioEngineTests.mm
index f9e29f45f..48ddc2fee 100644
--- a/apps/fabric-example/ios/FabricExampleTests/AudioEngineTests.mm
+++ b/apps/fabric-example/ios/FabricExampleTests/AudioEngineTests.mm
@@ -329,7 +329,8 @@ - (NSString *)attachSourceNodeToAudioEngine {
   return [self.audioEngine
       attachSourceNodeWithRenderBlock:[self testSourceRenderBlock]
                            sampleRate:44100
-                         channelCount:2];
+                         channelCount:2
+             onOutputRecoveryFailed:nil];
 }
 
 - (void)testCleanupDestroysInternalEngineAndResetsStateAndDeactivatesSession {
@@ -370,7 +371,8 @@ - (void)testAttachSourceNodeStoresAndConnectsSource {
   NSString *sourceNodeId = [self.audioEngine
       attachSourceNodeWithRenderBlock:[self testSourceRenderBlock]
                            sampleRate:44100
-                         channelCount:2];
+                         channelCount:2
+             onOutputRecoveryFailed:nil];
   AVAudioSourceNode *sourceNode = self.audioEngine.sourceNodes[sourceNodeId];
   AVAudioFormat *format = self.audioEngine.sourceFormats[sourceNodeId];
 
diff --git a/apps/fabric-example/ios/FabricExampleTests/AudioPlayerTests.mm b/apps/fabric-example/ios/FabricExampleTests/AudioPlayerTests.mm
index a115ec460..93518d340 100644
--- a/apps/fabric-example/ios/FabricExampleTests/AudioPlayerTests.mm
+++ b/apps/fabric-example/ios/FabricExampleTests/AudioPlayerTests.mm
@@ -12,6 +12,7 @@
 #include <cstddef>
 #include <functional>
 #include <memory>
+#include <mutex>
 #include <utility>
 #include <vector>
 
@@ -19,13 +20,17 @@
 
 namespace audioapi {
 
+class AudioContext;
+
 class IOSAudioPlayer : public CommonPlayer {
  public:
   IOSAudioPlayer(
       const std::function<void(DSPAudioBuffer *, int)> &renderAudio,
       float sampleRate,
       int channelCount,
-      std::atomic<uint32_t> &currentRenders);
+      std::atomic<uint32_t> &currentRenders,
+      std::weak_ptr<AudioContext> context,
+      std::mutex *driverMutex);
   ~IOSAudioPlayer() override;
 
   bool start() override;
@@ -39,6 +44,8 @@
   [[nodiscard]] double getBaseLatency() const override;
   [[nodiscard]] double getOutputLatency() const override;
 
+  void notifyStreamFailed() override;
+
  protected:
   std::shared_ptr<DSPAudioBuffer> audioBuffer_;
   NativeAudioPlayer *audioPlayer_;
@@ -50,6 +57,8 @@
   std::atomic<bool> flushOverflowNextPull_;
   int pendingSavedCount_;
   DSPAudioBuffer pendingSaved_;
+  std::weak_ptr<AudioContext> context_;
+  std::mutex *driverMutex_;
 };
 
 } // namespace audioapi
@@ -159,6 +168,7 @@ - (void)stopIfPossible
 - (NSString *)attachSourceNodeWithRenderBlock:(AVAudioSourceNodeRenderBlock)renderBlock
                                    sampleRate:(float)sampleRate
                                  channelCount:(AVAudioChannelCount)channelCount
+                     onOutputRecoveryFailed:(OnOutputRecoveryFailedBlock)onOutputRecoveryFailed
 {
   self.attachSourceNodeCallCount += 1;
   self.lastAttachedRenderBlock = renderBlock;
@@ -235,7 +245,13 @@ - (void)cleanup
       float sampleRate,
       int channelCount)
       : currentRendersStorage_(0),
-        IOSAudioPlayer(renderAudio, sampleRate, channelCount, currentRendersStorage_) {}
+        IOSAudioPlayer(
+            renderAudio,
+            sampleRate,
+            channelCount,
+            currentRendersStorage_,
+            std::weak_ptr<AudioContext>{},
+            nullptr) {}
 
   NativeAudioPlayer *replaceAudioPlayer(NativeAudioPlayer *audioPlayer) {
     NativeAudioPlayer *previous = audioPlayer_;
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
index b3d5ac4a3..434c4e8d6 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
+++ b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp
@@ -53,7 +53,9 @@ void AudioContext::initialize(const AudioDestinationNode *destination) {
       [this](DSPAudioBuffer *buf, int n) { processGraph(buf, n); },
       getSampleRate(),
       destination_->getChannelCount(),
-      currentRenders_);
+      currentRenders_,
+      std::static_pointer_cast<AudioContext>(shared_from_this()),
+      &driverMutex_);
 #endif
 }
 
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/CommonPlayer.h b/packages/react-native-audio-api/common/cpp/audioapi/core/CommonPlayer.h
index 632e9300c..54504c048 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/core/CommonPlayer.h
+++ b/packages/react-native-audio-api/common/cpp/audioapi/core/CommonPlayer.h
@@ -20,6 +20,8 @@ class CommonPlayer {
   [[nodiscard]] virtual double getOutputLatency() const = 0;
 
   [[nodiscard]] virtual bool isRunning() const = 0;
+
+  virtual void notifyStreamFailed() {}
 };
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.h b/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.h
index d5203af6b..792b20fce 100644
--- a/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.h
+++ b/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.h
@@ -14,6 +14,9 @@ typedef struct objc_object AudioBufferList;
 #include <atomic>
 #include <cstddef>
 #include <functional>
+#include <memory>
+#include <mutex>
+
 namespace audioapi {
 
 class AudioContext;
@@ -24,7 +27,9 @@ class IOSAudioPlayer : public CommonPlayer {
       const std::function<void(DSPAudioBuffer *, int)> &renderAudio,
       float sampleRate,
       int channelCount,
-      std::atomic<uint32_t> &currentRenders);
+      std::atomic<uint32_t> &currentRenders,
+      std::weak_ptr<AudioContext> context,
+      std::mutex *driverMutex);
   ~IOSAudioPlayer() override;
 
   DELETE_COPY_AND_MOVE(IOSAudioPlayer);
@@ -40,6 +45,8 @@ class IOSAudioPlayer : public CommonPlayer {
   [[nodiscard]] double getBaseLatency() const override;
   [[nodiscard]] double getOutputLatency() const override;
 
+  void notifyStreamFailed() override;
+
  private:
   void clearPendingSaved();
   /// @note Audio Thread only
@@ -60,6 +67,8 @@ class IOSAudioPlayer : public CommonPlayer {
   /// Frames valid at the front of each `pendingSaved_[ch]` (0 … RENDER_QUANTUM_SIZE).
   int pendingSavedCount_{0};
   DSPAudioBuffer pendingSaved_;
+  std::weak_ptr<AudioContext> context_;
+  std::mutex *driverMutex_;
 };
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.mm b/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.mm
index cfd860e3e..be4ee6c2c 100644
--- a/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.mm
+++ b/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.mm
@@ -4,6 +4,7 @@
 #include <algorithm>
 #include <cstring>
 
+#include <audioapi/core/AudioContext.h>
 #include <audioapi/core/utils/Constants.h>
 #include <audioapi/core/utils/CurrentRenderScope.h>
 #include <audioapi/ios/core/IOSAudioPlayer.h>
@@ -11,13 +12,36 @@
 #include <audioapi/ios/system/AudioSessionManager.h>
 #include <audioapi/utils/AudioBuffer.hpp>
 
+#include <mutex>
+
 namespace audioapi {
 
+namespace {
+
+void reportStreamFailToContext(std::mutex *driverMutex, const std::weak_ptr<AudioContext> &context)
+{
+  if (driverMutex == nullptr) {
+    return;
+  }
+
+  std::scoped_lock lock(*driverMutex);
+  if (auto ctx = context.lock()) {
+    if (ctx->isClosed()) {
+      return;
+    }
+    ctx->onStreamFail();
+  }
+}
+
+} // namespace
+
 IOSAudioPlayer::IOSAudioPlayer(
     const std::function<void(DSPAudioBuffer *, int)> &renderAudio,
     float sampleRate,
     int channelCount,
-    std::atomic<uint32_t> &currentRenders)
+    std::atomic<uint32_t> &currentRenders,
+    std::weak_ptr<AudioContext> context,
+    std::mutex *driverMutex)
     : audioBuffer_(nullptr),
       audioPlayer_(nullptr),
       renderAudio_(renderAudio),
@@ -25,7 +49,9 @@
       currentRenders_(currentRenders),
       channelCount_(channelCount),
       isRunning_(false),
-      pendingSaved_(RENDER_QUANTUM_SIZE, channelCount_, sampleRate)
+      pendingSaved_(RENDER_QUANTUM_SIZE, channelCount_, sampleRate),
+      context_(std::move(context)),
+      driverMutex_(driverMutex)
 {
   RenderAudioBlock renderAudioBlock = ^(AudioBufferList *outputData, int numFrames) {
     deliverOutputBuffers(outputData, numFrames);
@@ -35,6 +61,10 @@
                                                      sampleRate:sampleRate
                                                    channelCount:channelCount_];
   audioBuffer_ = std::make_shared<DSPAudioBuffer>(RENDER_QUANTUM_SIZE, channelCount_, sampleRate);
+
+  std::mutex *driverMutexForCallback = driverMutex_;
+  std::weak_ptr<AudioContext> weakContext = context_;
+  audioPlayer_.onStreamFail = ^{ reportStreamFailToContext(driverMutexForCallback, weakContext); };
 }
 
 IOSAudioPlayer::~IOSAudioPlayer()
@@ -197,4 +227,9 @@
   return [sessionManager outputLatencySeconds] + [sessionManager ioBufferDurationSeconds];
 }
 
+void IOSAudioPlayer::notifyStreamFailed()
+{
+  reportStreamFailToContext(driverMutex_, context_);
+}
+
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/ios/audioapi/ios/core/NativeAudioPlayer.h b/packages/react-native-audio-api/ios/audioapi/ios/core/NativeAudioPlayer.h
index 31b283a6d..e172e3442 100644
--- a/packages/react-native-audio-api/ios/audioapi/ios/core/NativeAudioPlayer.h
+++ b/packages/react-native-audio-api/ios/audioapi/ios/core/NativeAudioPlayer.h
@@ -12,6 +12,7 @@ typedef void (^RenderAudioBlock)(AudioBufferList *outputBuffer, int numFrames);
 @property (nonatomic, assign) int channelCount;
 @property (nonatomic, strong) NSString *sourceNodeId;
 @property (nonatomic, strong) AVAudioSourceNodeRenderBlock renderBlock;
+@property (nonatomic, copy) void (^onStreamFail)(void);
 
 - (instancetype)initWithRenderAudio:(RenderAudioBlock)renderAudio
                          sampleRate:(float)sampleRate
diff --git a/packages/react-native-audio-api/ios/audioapi/ios/core/NativeAudioPlayer.m b/packages/react-native-audio-api/ios/audioapi/ios/core/NativeAudioPlayer.m
index d5292e417..7593b7738 100644
--- a/packages/react-native-audio-api/ios/audioapi/ios/core/NativeAudioPlayer.m
+++ b/packages/react-native-audio-api/ios/audioapi/ios/core/NativeAudioPlayer.m
@@ -22,7 +22,8 @@ - (void)attachSourceNodeIfNeeded:(AudioEngine *)audioEngine
 
   self.sourceNodeId = [audioEngine attachSourceNodeWithRenderBlock:self.renderBlock
                                                         sampleRate:self.sampleRate
-                                                      channelCount:self.channelCount];
+                                                      channelCount:self.channelCount
+                                            onOutputRecoveryFailed:self.onStreamFail];
 }
 
 - (bool)startPlaybackGraph:(AudioEngine *)audioEngine
@@ -121,6 +122,7 @@ - (void)cleanup
 {
   self.renderAudio = nil;
   self.renderBlock = nil;
+  self.onStreamFail = nil;
 }
 
 @end
diff --git a/packages/react-native-audio-api/ios/audioapi/ios/system/AudioEngine.h b/packages/react-native-audio-api/ios/audioapi/ios/system/AudioEngine.h
index 02c4b38a2..e87e58aa8 100644
--- a/packages/react-native-audio-api/ios/audioapi/ios/system/AudioEngine.h
+++ b/packages/react-native-audio-api/ios/audioapi/ios/system/AudioEngine.h
@@ -12,6 +12,8 @@ typedef NS_ENUM(NSInteger, AudioEngineState) {
   AudioEngineStateInterrupted
 };
 
+typedef void (^OnOutputRecoveryFailedBlock)(void);
+
 @interface AudioEngine : NSObject
 
 @property (nonatomic, assign) AudioEngineState state;
@@ -30,7 +32,9 @@ typedef NS_ENUM(NSInteger, AudioEngineState) {
 
 - (NSString *)attachSourceNodeWithRenderBlock:(AVAudioSourceNodeRenderBlock)renderBlock
                                    sampleRate:(float)sampleRate
-                                 channelCount:(AVAudioChannelCount)channelCount;
+                                 channelCount:(AVAudioChannelCount)channelCount
+                       onOutputRecoveryFailed:
+                           (nullable OnOutputRecoveryFailedBlock)onOutputRecoveryFailed;
 - (void)detachSourceNodeWithId:(NSString *)sourceNodeId;
 
 - (void)attachInputNodeWithReceiverBlock:(AVAudioSinkNodeReceiverBlock)receiverBlock
diff --git a/packages/react-native-audio-api/ios/audioapi/ios/system/AudioEngine.mm b/packages/react-native-audio-api/ios/audioapi/ios/system/AudioEngine.mm
index 519edfcad..fc535c842 100644
--- a/packages/react-native-audio-api/ios/audioapi/ios/system/AudioEngine.mm
+++ b/packages/react-native-audio-api/ios/audioapi/ios/system/AudioEngine.mm
@@ -8,6 +8,7 @@ @interface AudioEngineSourceRegistration : NSObject
 @property (nonatomic, copy) AVAudioSourceNodeRenderBlock renderBlock;
 @property (nonatomic, assign) float sampleRate;
 @property (nonatomic, assign) AVAudioChannelCount channelCount;
+@property (nonatomic, copy) OnOutputRecoveryFailedBlock onOutputRecoveryFailed;
 
 @end
 
@@ -147,6 +148,26 @@ - (void)cleanup
   }
 }
 
+- (void)notifyOutputRecoveryFailed
+{
+  NSMutableArray *blocks = [NSMutableArray array];
+  for (AudioEngineSourceRegistration *reg in self.sourceRegistrations.allValues) {
+    if (reg.onOutputRecoveryFailed != nil) {
+      [blocks addObject:[reg.onOutputRecoveryFailed copy]];
+    }
+  }
+  if (blocks.count == 0) {
+    return;
+  }
+
+  // Invoke after the engine lock is released so player cleanup can detach nodes.
+  dispatch_async(dispatch_get_main_queue(), ^{
+    for (OnOutputRecoveryFailedBlock onOutputRecoveryFailed in blocks) {
+      onOutputRecoveryFailed();
+    }
+  });
+}
+
 - (void)materializeSourceNodeWithId:(NSString *)sourceNodeId
 {
   AudioEngineSourceRegistration *registration = self.sourceRegistrations[sourceNodeId];
@@ -298,6 +319,7 @@ - (void)materializeTrackedNodesIfNeeded
 - (NSString *)attachSourceNodeWithRenderBlock:(AVAudioSourceNodeRenderBlock)renderBlock
                                    sampleRate:(float)sampleRate
                                  channelCount:(AVAudioChannelCount)channelCount
+                       onOutputRecoveryFailed:(OnOutputRecoveryFailedBlock)onOutputRecoveryFailed
 {
   std::scoped_lock lock(_engineLock);
   [self createAudioEngineIfNeeded];
@@ -307,6 +329,7 @@ - (NSString *)attachSourceNodeWithRenderBlock:(AVAudioSourceNodeRenderBlock)rend
   registration.renderBlock = renderBlock;
   registration.sampleRate = sampleRate;
   registration.channelCount = channelCount;
+  registration.onOutputRecoveryFailed = onOutputRecoveryFailed;
 
   self.sourceRegistrations[sourceNodeId] = registration;
   [self materializeSourceNodeWithId:sourceNodeId];
@@ -456,6 +479,9 @@ - (void)onInterruptionEnd:(bool)shouldResume
         @"Error while restarting the audio engine after interruption: %@",
         [error debugDescription]);
     self.state = AudioEngineState::AudioEngineStateIdle;
+
+    [self notifyOutputRecoveryFailed];
+
     [self notifyConfigurationChanges];
     return;
   }
@@ -506,7 +532,10 @@ - (void)rebuildAudioEngineAndResumeIfNeeded
   self.sessionDeactivationInvalidatedGraph = false;
 
   if (self.state == AudioEngineState::AudioEngineStateRunning) {
-    [self startEngine];
+    if (![self startEngine]) {
+      self.state = AudioEngineState::AudioEngineStateIdle;
+      [self notifyOutputRecoveryFailed];
+    }
   }
 
   [self notifyConfigurationChanges];

From 1486226c8470381e01322bdae94634c3a8563712 Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Thu, 17 Sep 2026 13:40:08 +0200
Subject: [PATCH 15/16] fix: deleted CommonPlayer interface method
 notifyStreamFailed

---
 .../common/cpp/audioapi/core/CommonPlayer.h                  | 2 --
 .../ios/audioapi/ios/core/IOSAudioPlayer.h                   | 2 --
 .../ios/audioapi/ios/core/IOSAudioPlayer.mm                  | 5 -----
 3 files changed, 9 deletions(-)

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/CommonPlayer.h b/packages/react-native-audio-api/common/cpp/audioapi/core/CommonPlayer.h
index 54504c048..632e9300c 100644
--- a/packages/react-native-audio-api/common/cpp/audioapi/core/CommonPlayer.h
+++ b/packages/react-native-audio-api/common/cpp/audioapi/core/CommonPlayer.h
@@ -20,8 +20,6 @@ class CommonPlayer {
   [[nodiscard]] virtual double getOutputLatency() const = 0;
 
   [[nodiscard]] virtual bool isRunning() const = 0;
-
-  virtual void notifyStreamFailed() {}
 };
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.h b/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.h
index 792b20fce..10a49e9a1 100644
--- a/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.h
+++ b/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.h
@@ -45,8 +45,6 @@ class IOSAudioPlayer : public CommonPlayer {
   [[nodiscard]] double getBaseLatency() const override;
   [[nodiscard]] double getOutputLatency() const override;
 
-  void notifyStreamFailed() override;
-
  private:
   void clearPendingSaved();
   /// @note Audio Thread only
diff --git a/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.mm b/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.mm
index be4ee6c2c..cf88986c0 100644
--- a/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.mm
+++ b/packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioPlayer.mm
@@ -227,9 +227,4 @@ void reportStreamFailToContext(std::mutex *driverMutex, const std::weak_ptr<Audi
   return [sessionManager outputLatencySeconds] + [sessionManager ioBufferDurationSeconds];
 }
 
-void IOSAudioPlayer::notifyStreamFailed()
-{
-  reportStreamFailToContext(driverMutex_, context_);
-}
-
 } // namespace audioapi

From 1fa64a251643ce14eb0d6232a4beb276f701abef Mon Sep 17 00:00:00 2001
From: Barbara Wojtarowicz <basiavj@gmail.com>
Date: Thu, 17 Sep 2026 18:53:12 +0200
Subject: [PATCH 16/16] chore: delete leftover of notifyStreamFailed

---
 apps/fabric-example/ios/FabricExampleTests/AudioPlayerTests.mm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/fabric-example/ios/FabricExampleTests/AudioPlayerTests.mm b/apps/fabric-example/ios/FabricExampleTests/AudioPlayerTests.mm
index 93518d340..9a3b1c379 100644
--- a/apps/fabric-example/ios/FabricExampleTests/AudioPlayerTests.mm
+++ b/apps/fabric-example/ios/FabricExampleTests/AudioPlayerTests.mm
@@ -44,8 +44,6 @@
   [[nodiscard]] double getBaseLatency() const override;
   [[nodiscard]] double getOutputLatency() const override;
 
-  void notifyStreamFailed() override;
-
  protected:
   std::shared_ptr<DSPAudioBuffer> audioBuffer_;
   NativeAudioPlayer *audioPlayer_;