react-native-audio-api 0.6.4-nightly-e199fd6-20250715 → 0.6.4-nightly-c1e4367-20250715

package/android/src/main/cpp/audioapi/android/core/AudioDecoder.cpp

@@ -7,7 +7,7 @@
 #define MINIAUDIO_IMPLEMENTATION
 #include <audioapi/libs/miniaudio/miniaudio.h>
 
-#include <android/log.h>
+// #include <android/log.h>
 
 namespace audioapi {
 
@@ -18,12 +18,11 @@ std::shared_ptr<AudioBus> AudioDecoder::decodeWithFilePath(
       ma_decoder_config_init(ma_format_f32, 2, static_cast<int>(sampleRate_));
   ma_result result = ma_decoder_init_file(path.c_str(), &config, &decoder);
   if (result != MA_SUCCESS) {
-    __android_log_print(
-        ANDROID_LOG_ERROR,
-        "AudioDecoder",
-        "Failed to initialize decoder for file: %s",
-        path.c_str());
-
+    // __android_log_print(
+    //   ANDROID_LOG_ERROR,
+    //   "AudioDecoder",
+    //   "Failed to initialize decoder for file: %s",
+    //   path.c_str());
     ma_decoder_uninit(&decoder);
 
     return nullptr;
@@ -40,7 +39,7 @@ std::shared_ptr<AudioBus> AudioDecoder::decodeWithFilePath(
   ma_decoder_read_pcm_frames(&decoder, buffer, totalFrameCount, &framesDecoded);
 
   if (framesDecoded == 0) {
-    __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode");
+    // __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode");
 
     delete[] buffer;
     ma_decoder_uninit(&decoder);
@@ -70,11 +69,10 @@ std::shared_ptr<AudioBus> AudioDecoder::decodeWithMemoryBlock(
       ma_decoder_config_init(ma_format_f32, 2, static_cast<int>(sampleRate_));
   ma_result result = ma_decoder_init_memory(data, size, &config, &decoder);
   if (result != MA_SUCCESS) {
-    __android_log_print(
-        ANDROID_LOG_ERROR,
-        "AudioDecoder",
-        "Failed to initialize decoder for memory block");
-
+    // __android_log_print(
+    //   ANDROID_LOG_ERROR,
+    //   "AudioDecoder",
+    //   "Failed to initialize decoder for memory block");
     ma_decoder_uninit(&decoder);
 
     return nullptr;
@@ -90,7 +88,7 @@ std::shared_ptr<AudioBus> AudioDecoder::decodeWithMemoryBlock(
   ma_uint64 framesDecoded;
   ma_decoder_read_pcm_frames(&decoder, buffer, totalFrameCount, &framesDecoded);
   if (framesDecoded == 0) {
-    __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode");
+    // __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode");
 
     delete[] buffer;
     ma_decoder_uninit(&decoder);

package/common/cpp/audioapi/HostObjects/AudioBufferBaseSourceNodeHostObject.h

@@ -26,15 +26,6 @@ class AudioBufferBaseSourceNodeHostObject
                 JSI_EXPORT_PROPERTY_SETTER(AudioBufferBaseSourceNodeHostObject, onPositionChangedInterval));
     }
 
-    ~AudioBufferBaseSourceNodeHostObject() {
-        auto sourceNode =
-                std::static_pointer_cast<AudioBufferBaseSourceNode>(node_);
-
-      // When JSI object is garbage collected (together with the eventual callback),
-      // underlying source node might still be active and try to call the non-existing callback.
-      sourceNode->clearOnPositionChangedCallback();
-    }
-
     JSI_PROPERTY_GETTER(detune) {
         auto sourceNode =
                 std::static_pointer_cast<AudioBufferBaseSourceNode>(node_);

package/common/cpp/audioapi/HostObjects/AudioScheduledSourceNodeHostObject.h

@@ -21,15 +21,6 @@ class AudioScheduledSourceNodeHostObject : public AudioNodeHostObject {
         JSI_EXPORT_FUNCTION(AudioScheduledSourceNodeHostObject, stop));
   }
 
-  ~AudioScheduledSourceNodeHostObject() {
-    auto audioScheduledSourceNode =
-        std::static_pointer_cast<AudioScheduledSourceNode>(node_);
-
-    // When JSI object is garbage collected (together with the eventual callback),
-    // underlying source node might still be active and try to call the non-existing callback.
-    audioScheduledSourceNode->clearOnEndedCallback();
-  }
-
   JSI_PROPERTY_SETTER(onEnded) {
     auto audioScheduleSourceNode =
             std::static_pointer_cast<AudioScheduledSourceNode>(node_);

package/common/cpp/audioapi/core/AudioParam.cpp

@@ -18,10 +18,11 @@ AudioParam::AudioParam(
       minValue_(minValue),
       maxValue_(maxValue),
       context_(context),
-      audioBus_(std::make_shared<AudioBus>(
-          RENDER_QUANTUM_SIZE,
-          1,
-          context->getSampleRate())) {
+      audioBus_(
+          std::make_shared<AudioBus>(
+              RENDER_QUANTUM_SIZE,
+              1,
+              context->getSampleRate())) {
   startTime_ = 0;
   endTime_ = 0;
   startValue_ = value_;

package/common/cpp/audioapi/core/BaseAudioContext.cpp

@@ -119,7 +119,6 @@ std::shared_ptr<AnalyserNode> BaseAudioContext::createAnalyser() {
 
 std::shared_ptr<AudioBuffer> BaseAudioContext::decodeAudioDataSource(
     const std::string &path) {
-#ifndef AUDIO_API_TEST_SUITE
   auto audioBus = audioDecoder_->decodeWithFilePath(path);
 
   if (!audioBus) {
@@ -127,15 +126,11 @@ std::shared_ptr<AudioBuffer> BaseAudioContext::decodeAudioDataSource(
   }
 
   return std::make_shared<AudioBuffer>(audioBus);
-#else
-  return nullptr;
-#endif // AUDIO_API_TEST_SUITE
 }
 
 std::shared_ptr<AudioBuffer> BaseAudioContext::decodeAudioData(
     const void *data,
     size_t size) {
-#ifndef AUDIO_API_TEST_SUITE
   auto audioBus = audioDecoder_->decodeWithMemoryBlock(data, size);
 
   if (!audioBus) {
@@ -143,14 +138,10 @@ std::shared_ptr<AudioBuffer> BaseAudioContext::decodeAudioData(
   }
 
   return std::make_shared<AudioBuffer>(audioBus);
-#else
-  return nullptr;
-#endif // AUDIO_API_TEST_SUITE
 }
 
 std::shared_ptr<AudioBuffer> BaseAudioContext::decodeWithPCMInBase64(
     const std::string &data) {
-#ifndef AUDIO_API_TEST_SUITE
   auto audioBus = audioDecoder_->decodeWithPCMInBase64(data);
 
   if (!audioBus) {
@@ -158,7 +149,6 @@ std::shared_ptr<AudioBuffer> BaseAudioContext::decodeWithPCMInBase64(
   }
 
   return std::make_shared<AudioBuffer>(audioBus);
-#endif // AUDIO_API_TEST_SUITE
 }
 
 AudioNodeManager *BaseAudioContext::getNodeManager() {

package/common/cpp/audioapi/core/sources/AudioBufferBaseSourceNode.cpp

@@ -41,17 +41,6 @@ std::shared_ptr<AudioParam> AudioBufferBaseSourceNode::getPlaybackRateParam()
   return playbackRateParam_;
 }
 
-void AudioBufferBaseSourceNode::clearOnPositionChangedCallback() {
-  if (onPositionChangedCallbackId_ == 0 || context_ == nullptr ||
-      context_->audioEventHandlerRegistry_ == nullptr) {
-    return;
-  }
-
-  context_->audioEventHandlerRegistry_->unregisterHandler(
-      "positionChanged", onPositionChangedCallbackId_);
-  onPositionChangedCallbackId_ = 0;
-}
-
 void AudioBufferBaseSourceNode::setOnPositionChangedCallbackId(
     uint64_t callbackId) {
   onPositionChangedCallbackId_ = callbackId;

package/common/cpp/audioapi/core/sources/AudioBufferBaseSourceNode.h

@@ -5,7 +5,6 @@
 
 #include <memory>
 #include <mutex>
-#include <atomic>
 
 namespace audioapi {
 
@@ -20,7 +19,6 @@ class AudioBufferBaseSourceNode : public AudioScheduledSourceNode {
   [[nodiscard]] std::shared_ptr<AudioParam> getDetuneParam() const;
   [[nodiscard]] std::shared_ptr<AudioParam> getPlaybackRateParam() const;
 
-  void clearOnPositionChangedCallback();
   void setOnPositionChangedCallbackId(uint64_t callbackId);
   void setOnPositionChangedInterval(int interval);
   [[nodiscard]] int getOnPositionChangedInterval();
@@ -39,7 +37,7 @@ class AudioBufferBaseSourceNode : public AudioScheduledSourceNode {
     // internal helper
     double vReadIndex_;
 
-    std::atomic<uint64_t> onPositionChangedCallbackId_ = 0; // 0 means no callback
+    uint64_t onPositionChangedCallbackId_ = 0; // 0 means no callback
     int onPositionChangedInterval_;
     int onPositionChangedTime_ = 0;
 

package/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.cpp

@@ -54,17 +54,6 @@ bool AudioScheduledSourceNode::isStopScheduled() {
   return playbackState_ == PlaybackState::STOP_SCHEDULED;
 }
 
-void AudioScheduledSourceNode::clearOnEndedCallback() {
-  if (onEndedCallbackId_ == 0 || context_ == nullptr ||
-      context_->audioEventHandlerRegistry_ == nullptr) {
-    return;
-  }
-
-  context_->audioEventHandlerRegistry_->unregisterHandler(
-      "ended", onEndedCallbackId_);
-  onEndedCallbackId_ = 0;
-}
-
 void AudioScheduledSourceNode::setOnEndedCallbackId(const uint64_t callbackId) {
   onEndedCallbackId_ = callbackId;
 }

package/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.h

@@ -38,7 +38,6 @@ class AudioScheduledSourceNode : public AudioNode {
   bool isFinished();
   bool isStopScheduled();
 
-  void clearOnEndedCallback();
   void setOnEndedCallbackId(uint64_t callbackId);
 
   void disable() override;
@@ -49,7 +48,7 @@ class AudioScheduledSourceNode : public AudioNode {
 
   PlaybackState playbackState_;
 
-  std::atomic<uint64_t> onEndedCallbackId_ = 0;
+  uint64_t onEndedCallbackId_ = 0;
 
   void updatePlaybackInfo(
       const std::shared_ptr<AudioBus>& processingBus,

package/common/cpp/audioapi/events/AudioEventHandlerRegistry.cpp

@@ -92,18 +92,8 @@ void AudioEventHandlerRegistry::invokeHandlerWithEventBody(
         continue;
       }
 
-      try {
-        auto eventObject = createEventObject(body);
-        handler->call(*runtime_, eventObject);
-      } catch (const std::exception &e) {
-        // re-throw the exception to be handled by the caller
-        // std::exception is safe to parse by the rn bridge
-        throw;
-      } catch (...) {
-        printf(
-            "Unknown exception occurred while invoking handler for event: %s\n",
-            eventName.c_str());
-      }
+      auto eventObject = createEventObject(body);
+      handler->call(*runtime_, eventObject);
     }
   });
 }
@@ -133,26 +123,8 @@ void AudioEventHandlerRegistry::invokeHandlerWithEventBody(
       return;
     }
 
-    // Depending on how the AudioBufferSourceNode is handled on the JS side,
-    // it sometimes might enter race condition where the ABSN is deleted on JS
-    // side, but it is still processed on the audio thread, leading to a crash
-    // when f.e. `positionChanged` event is triggered.
-
-    // In case of debugging this, please increment the hours spent counter
-
-    // Hours spent on this: 5
-    try {
-      auto eventObject = createEventObject(body);
-      handlerIt->second->call(*runtime_, eventObject);
-    } catch (const std::exception &e) {
-      // re-throw the exception to be handled by the caller
-      // std::exception is safe to parse by the rn bridge
-      throw;
-    } catch (...) {
-      printf(
-          "Unknown exception occurred while invoking handler for event: %s\n",
-          eventName.c_str());
-    }
+    auto eventObject = createEventObject(body);
+    handlerIt->second->call(*runtime_, eventObject);
   });
 }
 
@@ -164,19 +136,20 @@ jsi::Object AudioEventHandlerRegistry::createEventObject(
     const auto name = pair.first.data();
     const auto &value = pair.second;
 
-    if (holds_alternative<int>(value)) {
-      eventObject.setProperty(*runtime_, name, get<int>(value));
-    } else if (holds_alternative<double>(value)) {
-      eventObject.setProperty(*runtime_, name, get<double>(value));
-    } else if (holds_alternative<float>(value)) {
-      eventObject.setProperty(*runtime_, name, get<float>(value));
-    } else if (holds_alternative<bool>(value)) {
-      eventObject.setProperty(*runtime_, name, get<bool>(value));
-    } else if (holds_alternative<std::string>(value)) {
-      eventObject.setProperty(*runtime_, name, get<std::string>(value));
-    } else if (holds_alternative<std::shared_ptr<jsi::HostObject>>(value)) {
+    if (std::holds_alternative<int>(value)) {
+      eventObject.setProperty(*runtime_, name, std::get<int>(value));
+    } else if (std::holds_alternative<double>(value)) {
+      eventObject.setProperty(*runtime_, name, std::get<double>(value));
+    } else if (std::holds_alternative<float>(value)) {
+      eventObject.setProperty(*runtime_, name, std::get<float>(value));
+    } else if (std::holds_alternative<bool>(value)) {
+      eventObject.setProperty(*runtime_, name, std::get<bool>(value));
+    } else if (std::holds_alternative<std::string>(value)) {
+      eventObject.setProperty(*runtime_, name, std::get<std::string>(value));
+    } else if (std::holds_alternative<std::shared_ptr<jsi::HostObject>>(
+                   value)) {
       auto hostObject = jsi::Object::createFromHostObject(
-          *runtime_, get<std::shared_ptr<jsi::HostObject>>(value));
+          *runtime_, std::get<std::shared_ptr<jsi::HostObject>>(value));
       eventObject.setProperty(*runtime_, name, hostObject);
     }
   }

package/common/cpp/audioapi/jsi/JsiPromise.cpp

@@ -1,4 +1,5 @@
 #include <audioapi/jsi/JsiPromise.h>
+#include <stdexcept>
 
 namespace audioapi {
 

package/common/cpp/test/CMakeLists.txt

@@ -7,46 +7,29 @@ set(ROOT ${CMAKE_SOURCE_DIR}/../../../../..)
 set(REACT_NATIVE_DIR "${ROOT}/node_modules/react-native")
 set(JSI_DIR "${REACT_NATIVE_DIR}/ReactCommon/jsi")
 
-include(CMakePrintHelpers)
-cmake_print_variables(ROOT)
-
 include(FetchContent)
 FetchContent_Declare(
   googletest
-  URL https://github.com/google/googletest/archive/c67de117379f4d1c889c7581a0a76aa0979c2083.zip
+  URL https://github.com/google/googletest/archive/3983f67e32fb3e9294487b9d4f9586efa6e5d088.zip
 )
 # For Windows: Prevent overriding the parent project's compiler/linker settings
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(googletest)
 
-message(STATUS "Using C++ compiler: ${CMAKE_CXX_COMPILER}")
-
 enable_testing()
-add_compile_definitions(AUDIO_API_TEST_SUITE)
 
 file(GLOB_RECURSE RNAUDIOAPI_SRC
   CONFIGURE_DEPENDS
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/core/AudioNode.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/core/AudioParam.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/core/BaseAudioContext.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/core/OfflineAudioContext.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/core/analysis/*.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/core/destinations/*.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/core/effects/*.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/core/inputs/*.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/core/sources/*.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/core/types/*.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/core/utils/*.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/dsp/*.cpp"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/utils/*.cpp"
+  "${ROOT}/node_modules/react-native-audio-api/common/cpp/audioapi/*.cpp"
+  "${ROOT}/node_modules/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioDecoder.cpp"
 )
 
+list(REMOVE_ITEM RNAUDIOAPI_SRC "${ROOT}/node_modules/react-native-audio-api/common/cpp/audioapi/core/AudioContext.cpp")
+
 file(GLOB_RECURSE RNAUDIOAPI_LIBS
   CONFIGURE_DEPENDS
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/libs/base64/*.h"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/libs/miniaudio/*.h"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/libs/pffft/*.c"
-  "${ROOT}/packages/react-native-audio-api/common/cpp/audioapi/libs/signalsmith-stretch/*.h"
+  "${ROOT}/node_modules/react-native-audio-api/common/cpp/audioapi/libs/*.c"
+  "${ROOT}/node_modules/react-native-audio-api/common/cpp/audioapi/libs/*.h"
 )
 
 add_library(rnaudioapi STATIC ${RNAUDIOAPI_SRC})

package/ios/audioapi/ios/AudioAPIModule.mm

@@ -85,8 +85,9 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getDevicePreferredSampleRate)
   return [self.audioSessionManager getDevicePreferredSampleRate];
 }
 
-RCT_EXPORT_METHOD(setAudioSessionActivity : (BOOL)enabled resolve : (RCTPromiseResolveBlock)
-                      resolve reject : (RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(
+    setAudioSessionActivity : (BOOL)enabled resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)
+        reject)
 {
   if ([self.audioSessionManager setActive:enabled]) {
     resolve(@"true");
@@ -96,8 +97,9 @@ RCT_EXPORT_METHOD(setAudioSessionActivity : (BOOL)enabled resolve : (RCTPromiseR
   resolve(@"false");
 }
 
-RCT_EXPORT_METHOD(setAudioSessionOptions : (NSString *)category mode : (NSString *)mode options : (NSArray *)
-                      options allowHaptics : (BOOL)allowHaptics)
+RCT_EXPORT_METHOD(
+    setAudioSessionOptions : (NSString *)category mode : (NSString *)mode options : (NSArray *)
+        options allowHaptics : (BOOL)allowHaptics)
 {
   [self.audioSessionManager setAudioSessionOptions:category mode:mode options:options allowHaptics:allowHaptics];
 }
@@ -127,20 +129,21 @@ RCT_EXPORT_METHOD(observeVolumeChanges : (BOOL)enabled)
   [self.notificationManager observeVolumeChanges:(BOOL)enabled];
 }
 
-RCT_EXPORT_METHOD(requestRecordingPermissions : (nonnull RCTPromiseResolveBlock)
-                      resolve reject : (nonnull RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(
+    requestRecordingPermissions : (nonnull RCTPromiseResolveBlock)resolve reject : (nonnull RCTPromiseRejectBlock)
+        reject)
 {
   [self.audioSessionManager requestRecordingPermissions:resolve reject:reject];
 }
 
-RCT_EXPORT_METHOD(checkRecordingPermissions : (nonnull RCTPromiseResolveBlock)
-                      resolve reject : (nonnull RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(
+    checkRecordingPermissions : (nonnull RCTPromiseResolveBlock)resolve reject : (nonnull RCTPromiseRejectBlock)reject)
 {
   [self.audioSessionManager checkRecordingPermissions:resolve reject:reject];
 }
 
-RCT_EXPORT_METHOD(getDevicesInfo : (nonnull RCTPromiseResolveBlock)resolve reject : (nonnull RCTPromiseRejectBlock)
-                      reject)
+RCT_EXPORT_METHOD(
+    getDevicesInfo : (nonnull RCTPromiseResolveBlock)resolve reject : (nonnull RCTPromiseRejectBlock)reject)
 {
   [self.audioSessionManager getDevicesInfo:resolve reject:reject];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-api",
-  "version": "0.6.4-nightly-e199fd6-20250715",
+  "version": "0.6.4-nightly-c1e4367-20250715",
   "description": "react-native-audio-api provides system for controlling audio in React Native environment compatible with Web Audio API specification",
   "bin": {
     "setup-rn-audio-api-web": "./scripts/setup-rn-audio-api-web.js"