react-native-audio-api 0.6.5-rc.1 → 0.6.5

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

@@ -4,6 +4,8 @@
 #include <audioapi/libs/signalsmith-stretch/signalsmith-stretch.h>
 
 #include <memory>
+#include <mutex>
+#include <atomic>
 
 namespace audioapi {
 
@@ -18,6 +20,7 @@ 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();
@@ -36,7 +39,7 @@ class AudioBufferBaseSourceNode : public AudioScheduledSourceNode {
     // internal helper
     double vReadIndex_;
 
-    uint64_t onPositionChangedCallbackId_ = 0; // 0 means no callback
+    std::atomic<uint64_t> onPositionChangedCallbackId_ = 0; // 0 means no callback
     int onPositionChangedInterval_;
     int onPositionChangedTime_ = 0;
 

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

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

package/common/cpp/audioapi/core/utils/AudioNodeDestructor.h

@@ -4,6 +4,7 @@
 #include <mutex>
 #include <thread>
 #include <atomic>
+#include <functional>
 #include <vector>
 #include <memory>
 

package/common/cpp/audioapi/core/utils/AudioNodeManager.h

@@ -20,8 +20,6 @@ class AudioNodeManager {
   AudioNodeManager() = default;
   ~AudioNodeManager();
 
-  std::mutex &getGraphLock();
-
   void preProcessGraph();
 
   void addPendingNodeConnection(
@@ -62,6 +60,7 @@ class AudioNodeManager {
       ConnectionType>>
       audioParamToConnect_;
 
+  std::mutex &getGraphLock();
   void settlePendingConnections();
   void cleanupNode(const std::shared_ptr<AudioNode> &node);
   void prepareNodesForDestruction();

package/common/cpp/audioapi/dsp/AudioUtils.cpp

@@ -28,6 +28,6 @@ float linearToDecibels(float value) {
 }
 
 float decibelsToLinear(float value) {
-  return powf(10, value / 20);
+  return pow(10, value / 20);
 }
 } // namespace audioapi::dsp

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

@@ -4,7 +4,8 @@ namespace audioapi {
 
 AudioEventHandlerRegistry::AudioEventHandlerRegistry(
     jsi::Runtime *runtime,
-    const std::shared_ptr<react::CallInvoker> &callInvoker) {
+    const std::shared_ptr<react::CallInvoker> &callInvoker)
+    : IAudioEventHandlerRegistry() {
   runtime_ = runtime;
   callInvoker_ = callInvoker;
 
@@ -91,8 +92,18 @@ void AudioEventHandlerRegistry::invokeHandlerWithEventBody(
         continue;
       }
 
-      auto eventObject = createEventObject(body);
-      handler->call(*runtime_, eventObject);
+      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());
+      }
     }
   });
 }
@@ -122,8 +133,26 @@ void AudioEventHandlerRegistry::invokeHandlerWithEventBody(
       return;
     }
 
-    auto eventObject = createEventObject(body);
-    handlerIt->second->call(*runtime_, eventObject);
+    // 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());
+    }
   });
 }
 
@@ -135,19 +164,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/events/AudioEventHandlerRegistry.h

@@ -2,6 +2,7 @@
 
 #include <jsi/jsi.h>
 #include <ReactCommon/CallInvoker.h>
+#include <audioapi/events/IAudioEventHandlerRegistry.h>
 #include <memory>
 #include <unordered_map>
 #include <array>
@@ -14,18 +15,18 @@ using namespace facebook;
 
 using EventValue = std::variant<int, float, double, std::string, bool, std::shared_ptr<jsi::HostObject>>;
 
-class AudioEventHandlerRegistry {
+class AudioEventHandlerRegistry : public IAudioEventHandlerRegistry {
  public:
   explicit AudioEventHandlerRegistry(
       jsi::Runtime *runtime,
       const std::shared_ptr<react::CallInvoker> &callInvoker);
   ~AudioEventHandlerRegistry();
 
-  uint64_t registerHandler(const std::string &eventName, const std::shared_ptr<jsi::Function> &handler);
-  void unregisterHandler(const std::string &eventName, uint64_t listenerId);
+  uint64_t registerHandler(const std::string &eventName, const std::shared_ptr<jsi::Function> &handler) override;
+  void unregisterHandler(const std::string &eventName, uint64_t listenerId) override;
 
-  void invokeHandlerWithEventBody(const std::string &eventName, const std::unordered_map<std::string, EventValue> &body);
-  void invokeHandlerWithEventBody(const std::string &eventName, uint64_t listenerId, const std::unordered_map<std::string, EventValue> &body);
+  void invokeHandlerWithEventBody(const std::string &eventName, const std::unordered_map<std::string, EventValue> &body) override;
+  void invokeHandlerWithEventBody(const std::string &eventName, uint64_t listenerId, const std::unordered_map<std::string, EventValue> &body) override;
 
  private:
     std::atomic<uint64_t> listenerIdCounter_{1}; // Atomic counter for listener IDs

package/common/cpp/audioapi/events/IAudioEventHandlerRegistry.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include <ReactCommon/CallInvoker.h>
+#include <unordered_map>
+#include <variant>
+#include <string>
+#include <memory>
+
+namespace audioapi {
+
+using EventValue = std::variant<int, float, double, std::string, bool, std::shared_ptr<facebook::jsi::HostObject>>;
+
+class IAudioEventHandlerRegistry {
+ public:
+  virtual ~IAudioEventHandlerRegistry() = default;
+
+  virtual uint64_t registerHandler(const std::string &eventName, const std::shared_ptr<facebook::jsi::Function> &handler) = 0;
+  virtual void unregisterHandler(const std::string &eventName, uint64_t listenerId) = 0;
+
+  virtual void invokeHandlerWithEventBody(const std::string &eventName, const std::unordered_map<std::string, EventValue> &body) = 0;
+  virtual void invokeHandlerWithEventBody(const std::string &eventName, uint64_t listenerId, const std::unordered_map<std::string, EventValue> &body) = 0;
+};
+
+} // namespace audioapi

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

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

package/common/cpp/audioapi/utils/AudioArray.h

@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <memory>
 #include <cstddef>
+#include <cstring>
 
 namespace audioapi {
 

package/common/cpp/audioapi/utils/CircularAudioArray.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <audioapi/utils/AudioArray.h>
+#include <stdexcept>
 
 namespace audioapi {
 

package/common/cpp/test/CMakeLists.txt

@@ -0,0 +1,63 @@
+cmake_minimum_required(VERSION 3.14)
+project(rnaudioapi_test)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(ROOT ${CMAKE_SOURCE_DIR}/../../../../..)
+set(REACT_NATIVE_DIR "${ROOT}/node_modules/react-native")
+set(JSI_DIR "${REACT_NATIVE_DIR}/ReactCommon/jsi")
+
+include(FetchContent)
+FetchContent_Declare(
+  googletest
+  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)
+
+enable_testing()
+
+file(GLOB_RECURSE RNAUDIOAPI_SRC
+  CONFIGURE_DEPENDS
+  "${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}/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})
+add_library(rnaudioapi_libs STATIC ${RNAUDIOAPI_LIBS})
+
+target_include_directories(rnaudioapi PUBLIC
+  ${ROOT}/packages/react-native-audio-api/common/cpp
+  ${JSI_DIR}
+  "${REACT_NATIVE_DIR}/ReactCommon"
+  "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
+)
+
+target_include_directories(rnaudioapi_libs PUBLIC
+  ${ROOT}/packages/react-native-audio-api/common/cpp
+)
+
+add_executable(
+  tests
+  OscillatorTest.cpp
+  GainTest.cpp
+)
+
+target_link_libraries(tests
+  rnaudioapi
+  rnaudioapi_libs
+  GTest::gtest_main
+  GTest::gmock
+)
+
+include(GoogleTest)
+gtest_discover_tests(tests)

package/common/cpp/test/GainTest.cpp

@@ -0,0 +1,78 @@
+#include <audioapi/core/OfflineAudioContext.h>
+#include <audioapi/core/effects/GainNode.h>
+#include <audioapi/utils/AudioArray.h>
+#include <audioapi/utils/AudioBus.h>
+#include <gtest/gtest.h>
+#include "MockAudioEventHandlerRegistry.h"
+
+class GainTest : public ::testing::Test {
+ protected:
+  std::shared_ptr<audioapi::IAudioEventHandlerRegistry> eventRegistry;
+  std::unique_ptr<audioapi::OfflineAudioContext> context;
+  static constexpr int sampleRate = 44100;
+
+  void SetUp() override {
+    eventRegistry = std::make_shared<MockAudioEventHandlerRegistry>();
+    context = std::make_unique<audioapi::OfflineAudioContext>(
+        2, 5 * sampleRate, sampleRate, eventRegistry);
+  }
+};
+
+class TestableGainNode : public audioapi::GainNode {
+ public:
+  explicit TestableGainNode(audioapi::BaseAudioContext *context)
+      : audioapi::GainNode(context) {}
+
+  void setGainParam(float value) {
+    getGainParam()->setValue(value);
+  }
+
+  void processNode(
+      const std::shared_ptr<audioapi::AudioBus> &processingBus,
+      int framesToProcess) override {
+    audioapi::GainNode::processNode(processingBus, framesToProcess);
+  }
+};
+
+TEST_F(GainTest, GainCanBeCreated) {
+  auto gain = context->createGain();
+  ASSERT_NE(gain, nullptr);
+}
+
+TEST_F(GainTest, GainModulatesVolumeCorrectly) {
+  static constexpr float GAIN_VALUE = 0.5f;
+  static constexpr int FRAMES_TO_PROCESS = 4;
+  auto gainNode = std::make_shared<TestableGainNode>(context.get());
+  gainNode->setGainParam(GAIN_VALUE);
+
+  auto bus =
+      std::make_shared<audioapi::AudioBus>(FRAMES_TO_PROCESS, 1, sampleRate);
+  for (size_t i = 0; i < bus->getSize(); ++i) {
+    bus->getChannel(0)->getData()[i] = i + 1;
+  }
+
+  gainNode->processNode(bus, FRAMES_TO_PROCESS);
+  for (size_t i = 0; i < bus->getSize(); ++i) {
+    EXPECT_FLOAT_EQ((*bus->getChannel(0))[i], (i + 1) * GAIN_VALUE);
+  }
+}
+
+TEST_F(GainTest, GainModulatesVolumeCorrectlyMultiChannel) {
+  static constexpr float GAIN_VALUE = 0.5f;
+  static constexpr int FRAMES_TO_PROCESS = 4;
+  auto gainNode = std::make_shared<TestableGainNode>(context.get());
+  gainNode->setGainParam(GAIN_VALUE);
+
+  auto bus =
+      std::make_shared<audioapi::AudioBus>(FRAMES_TO_PROCESS, 2, sampleRate);
+  for (size_t i = 0; i < bus->getSize(); ++i) {
+    bus->getChannel(0)->getData()[i] = i + 1;
+    bus->getChannel(1)->getData()[i] = -i - 1;
+  }
+
+  gainNode->processNode(bus, FRAMES_TO_PROCESS);
+  for (size_t i = 0; i < bus->getSize(); ++i) {
+    EXPECT_FLOAT_EQ((*bus->getChannel(0))[i], (i + 1) * GAIN_VALUE);
+    EXPECT_FLOAT_EQ((*bus->getChannel(1))[i], (-i - 1) * GAIN_VALUE);
+  }
+}

package/common/cpp/test/MockAudioEventHandlerRegistry.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <gmock/gmock.h>
+#include <audioapi/events/IAudioEventHandlerRegistry.h>
+#include <unordered_map>
+#include <string>
+#include <memory>
+
+using EventMap = std::unordered_map<std::string, audioapi::EventValue>;
+
+class MockAudioEventHandlerRegistry : public audioapi::IAudioEventHandlerRegistry {
+ public:
+  MOCK_METHOD(uint64_t, registerHandler,
+              (const std::string &eventName, const std::shared_ptr<facebook::jsi::Function> &handler), (override));
+  MOCK_METHOD(void, unregisterHandler,
+              (const std::string &eventName, uint64_t listenerId), (override));
+
+  MOCK_METHOD(void, invokeHandlerWithEventBody,
+              (const std::string &eventName, const EventMap &body), (override));
+  MOCK_METHOD(void, invokeHandlerWithEventBody,
+              (const std::string &eventName, uint64_t listenerId, const EventMap &body), (override));
+};

package/common/cpp/test/OscillatorTest.cpp

@@ -0,0 +1,22 @@
+#include <audioapi/core/OfflineAudioContext.h>
+#include <audioapi/core/sources/OscillatorNode.h>
+#include <gtest/gtest.h>
+#include "MockAudioEventHandlerRegistry.h"
+
+class OscillatorTest : public ::testing::Test {
+ protected:
+  std::shared_ptr<audioapi::IAudioEventHandlerRegistry> eventRegistry;
+  std::unique_ptr<audioapi::OfflineAudioContext> context;
+  static constexpr int sampleRate = 44100;
+
+  void SetUp() override {
+    eventRegistry = std::make_shared<MockAudioEventHandlerRegistry>();
+    context = std::make_unique<audioapi::OfflineAudioContext>(
+        2, 5 * sampleRate, sampleRate, eventRegistry);
+  }
+};
+
+TEST_F(OscillatorTest, OscillatorCanBeCreated) {
+  auto osc = context->createOscillator();
+  ASSERT_NE(osc, nullptr);
+}

package/common/cpp/test/RunTests.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+cleanup() {
+    echo "Cleaning up..."
+    rm -rf build/
+}
+
+trap cleanup EXIT
+# Step 1: Move to the script's directory
+cd packages/react-native-audio-api/common/cpp/test
+# Step 2: Configure CMake project
+# mkdir build
+cmake -S . -B build
+
+# Step 3: Build the project
+cmake --build build
+
+# Step 4: Run the test binary
+cd build
+./tests
+cd ..
+
+# Step 5: Clean up build directory
+rm -rf build/

package/ios/audioapi/ios/AudioAPIModule.mm

@@ -139,6 +139,12 @@ RCT_EXPORT_METHOD(checkRecordingPermissions : (nonnull RCTPromiseResolveBlock)
   [self.audioSessionManager checkRecordingPermissions:resolve reject:reject];
 }
 
+RCT_EXPORT_METHOD(getDevicesInfo : (nonnull RCTPromiseResolveBlock)resolve reject : (nonnull RCTPromiseRejectBlock)
+                      reject)
+{
+  [self.audioSessionManager getDevicesInfo:resolve reject:reject];
+}
+
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params

package/ios/audioapi/ios/core/IOSAudioPlayer.h

@@ -17,7 +17,8 @@ class IOSAudioPlayer {
  public:
   IOSAudioPlayer(
       const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio,
-      float sampleRate);
+      float sampleRate,
+      int channelCount);
   ~IOSAudioPlayer();
 
   void start();

package/ios/audioapi/ios/core/IOSAudioPlayer.mm

@@ -8,8 +8,11 @@
 
 namespace audioapi {
 
-IOSAudioPlayer::IOSAudioPlayer(const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio, float sampleRate)
-    : channelCount_(2), renderAudio_(renderAudio), audioBus_(0), isRunning_(false)
+IOSAudioPlayer::IOSAudioPlayer(
+    const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio,
+    float sampleRate,
+    int channelCount)
+    : renderAudio_(renderAudio), channelCount_(channelCount), audioBus_(0), isRunning_(false)
 {
   RenderAudioBlock renderAudioBlock = ^(AudioBufferList *outputData, int numFrames) {
     int processedFrames = 0;

package/ios/audioapi/ios/system/AudioSessionManager.h

@@ -26,7 +26,11 @@
                        options:(NSArray *)options
                   allowHaptics:(BOOL)allowHaptics;
 - (bool)setActive:(bool)active;
+
 - (void)requestRecordingPermissions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject;
 - (void)checkRecordingPermissions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject;
 
+- (void)getDevicesInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject;
+- (NSArray<NSDictionary *> *)parseDeviceList:(NSArray<AVAudioSessionPortDescription *> *)devices;
+
 @end

package/ios/audioapi/ios/system/AudioSessionManager.mm

@@ -292,4 +292,30 @@
   }
 }
 
+- (void)getDevicesInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
+{
+  NSMutableDictionary *devicesInfo = [[NSMutableDictionary alloc] init];
+
+  [devicesInfo setValue:[self parseDeviceList:[self.audioSession availableInputs]] forKey:@"availableInputs"];
+  [devicesInfo setValue:[self parseDeviceList:[[self.audioSession currentRoute] inputs]] forKey:@"currentInputs"];
+  [devicesInfo setValue:[self parseDeviceList:[[self.audioSession currentRoute] outputs]] forKey:@"availableOutputs"];
+  [devicesInfo setValue:[self parseDeviceList:[[self.audioSession currentRoute] outputs]] forKey:@"currentOutputs"];
+
+  resolve(devicesInfo);
+}
+
+- (NSArray<NSDictionary *> *)parseDeviceList:(NSArray<AVAudioSessionPortDescription *> *)devices
+{
+  NSMutableArray<NSDictionary *> *deviceList = [[NSMutableArray alloc] init];
+
+  for (AVAudioSessionPortDescription *device in devices) {
+    [deviceList addObject:@{
+      @"name" : device.portName,
+      @"category" : device.portType,
+    }];
+  }
+
+  return deviceList;
+}
+
 @end

package/ios/audioapi/ios/system/LockScreenManager.mm

@@ -189,8 +189,10 @@
   } else if ([name isEqual:@"remotePreviousTrack"]) {
     [self enableCommand:remoteCenter.previousTrackCommand withSelector:@selector(onPreviousTrack:) enabled:enabled];
   } else if ([name isEqual:@"remoteSkipForward"]) {
+    remoteCenter.skipForwardCommand.preferredIntervals = @[ @15 ];
     [self enableCommand:remoteCenter.skipForwardCommand withSelector:@selector(onSkipForward:) enabled:enabled];
   } else if ([name isEqual:@"remoteSkipBackward"]) {
+    remoteCenter.skipBackwardCommand.preferredIntervals = @[ @15 ];
     [self enableCommand:remoteCenter.skipBackwardCommand withSelector:@selector(onSkipBackward:) enabled:enabled];
   } else if ([name isEqual:@"remoteSeekForward"]) {
     [self enableCommand:remoteCenter.seekForwardCommand withSelector:@selector(onSeekForward:) enabled:enabled];

package/lib/commonjs/core/AudioBufferSourceNode.js

@@ -18,10 +18,10 @@ class AudioBufferSourceNode extends _AudioBufferBaseSourceNode.default {
   }
   set buffer(buffer) {
     if (!buffer) {
-      this.node.setBuffer(this.node, null);
+      this.node.setBuffer(null);
       return;
     }
-    this.node.setBuffer(this.node, buffer.buffer);
+    this.node.setBuffer(buffer.buffer);
   }
   get loopSkip() {
     return this.node.loopSkip;

package/lib/commonjs/core/AudioBufferSourceNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["_AudioBufferBaseSourceNode","_interopRequireDefault","require","_AudioBuffer","_errors","e","__esModule","default","AudioBufferSourceNode","AudioBufferBaseSourceNode","buffer","node","AudioBuffer","setBuffer","loopSkip","value","loop","loopStart","loopEnd","start","when","offset","duration","RangeError","hasBeenStarted","InvalidStateError","exports"],"sourceRoot":"../../../src","sources":["core/AudioBufferSourceNode.ts"],"mappings":";;;;;;AACA,IAAAA,0BAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAA0D,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE3C,MAAMG,qBAAqB,SAASC,kCAAyB,CAAC;EAC3E,IAAWC,MAAMA,CAAA,EAAuB;IACtC,MAAMA,MAAM,GAAI,IAAI,CAACC,IAAI,CAA4BD,MAAM;IAC3D,IAAI,CAACA,MAAM,EAAE;MACX,OAAO,IAAI;IACb;IACA,OAAO,IAAIE,oBAAW,CAACF,MAAM,CAAC;EAChC;EAEA,IAAWA,MAAMA,CAACA,MAA0B,EAAE;IAC5C,IAAI,CAACA,MAAM,EAAE;MACV,IAAI,CAACC,IAAI,CAA4BE,SAAS,CAC7C,IAAI,CAACF,IAAI,EACT,IACF,CAAC;MACD;IACF;IAEC,IAAI,CAACA,IAAI,CAA4BE,SAAS,CAC7C,IAAI,CAACF,IAAI,EACTD,MAAM,CAACA,MACT,CAAC;EACH;EAEA,IAAWI,QAAQA,CAAA,EAAY;IAC7B,OAAQ,IAAI,CAACH,IAAI,CAA4BG,QAAQ;EACvD;EAEA,IAAWA,QAAQA,CAACC,KAAc,EAAE;IACjC,IAAI,CAACJ,IAAI,CAA4BG,QAAQ,GAAGC,KAAK;EACxD;EAEA,IAAWC,IAAIA,CAAA,EAAY;IACzB,OAAQ,IAAI,CAACL,IAAI,CAA4BK,IAAI;EACnD;EAEA,IAAWA,IAAIA,CAACD,KAAc,EAAE;IAC7B,IAAI,CAACJ,IAAI,CAA4BK,IAAI,GAAGD,KAAK;EACpD;EAEA,IAAWE,SAASA,CAAA,EAAW;IAC7B,OAAQ,IAAI,CAACN,IAAI,CAA4BM,SAAS;EACxD;EAEA,IAAWA,SAASA,CAACF,KAAa,EAAE;IACjC,IAAI,CAACJ,IAAI,CAA4BM,SAAS,GAAGF,KAAK;EACzD;EAEA,IAAWG,OAAOA,CAAA,EAAW;IAC3B,OAAQ,IAAI,CAACP,IAAI,CAA4BO,OAAO;EACtD;EAEA,IAAWA,OAAOA,CAACH,KAAa,EAAE;IAC/B,IAAI,CAACJ,IAAI,CAA4BO,OAAO,GAAGH,KAAK;EACvD;EAEOI,KAAKA,CAACC,IAAY,GAAG,CAAC,EAAEC,MAAc,GAAG,CAAC,EAAEC,QAAiB,EAAQ;IAC1E,IAAIF,IAAI,GAAG,CAAC,EAAE;MACZ,MAAM,IAAIG,kBAAU,CAClB,8CAA8CH,IAAI,EACpD,CAAC;IACH;IAEA,IAAIC,MAAM,GAAG,CAAC,EAAE;MACd,MAAM,IAAIE,kBAAU,CAClB,gDAAgDF,MAAM,EACxD,CAAC;IACH;IAEA,IAAIC,QAAQ,IAAIA,QAAQ,GAAG,CAAC,EAAE;MAC5B,MAAM,IAAIC,kBAAU,CAClB,kDAAkDD,QAAQ,EAC5D,CAAC;IACH;IAEA,IAAI,IAAI,CAACE,cAAc,EAAE;MACvB,MAAM,IAAIC,yBAAiB,CAAC,kCAAkC,CAAC;IACjE;IAEA,IAAI,CAACD,cAAc,GAAG,IAAI;IACzB,IAAI,CAACb,IAAI,CAA4BQ,KAAK,CAACC,IAAI,EAAEC,MAAM,EAAEC,QAAQ,CAAC;EACrE;AACF;AAACI,OAAA,CAAAnB,OAAA,GAAAC,qBAAA","ignoreList":[]}
+{"version":3,"names":["_AudioBufferBaseSourceNode","_interopRequireDefault","require","_AudioBuffer","_errors","e","__esModule","default","AudioBufferSourceNode","AudioBufferBaseSourceNode","buffer","node","AudioBuffer","setBuffer","loopSkip","value","loop","loopStart","loopEnd","start","when","offset","duration","RangeError","hasBeenStarted","InvalidStateError","exports"],"sourceRoot":"../../../src","sources":["core/AudioBufferSourceNode.ts"],"mappings":";;;;;;AACA,IAAAA,0BAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAA0D,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE3C,MAAMG,qBAAqB,SAASC,kCAAyB,CAAC;EAC3E,IAAWC,MAAMA,CAAA,EAAuB;IACtC,MAAMA,MAAM,GAAI,IAAI,CAACC,IAAI,CAA4BD,MAAM;IAC3D,IAAI,CAACA,MAAM,EAAE;MACX,OAAO,IAAI;IACb;IACA,OAAO,IAAIE,oBAAW,CAACF,MAAM,CAAC;EAChC;EAEA,IAAWA,MAAMA,CAACA,MAA0B,EAAE;IAC5C,IAAI,CAACA,MAAM,EAAE;MACV,IAAI,CAACC,IAAI,CAA4BE,SAAS,CAAC,IAAI,CAAC;MACrD;IACF;IAEC,IAAI,CAACF,IAAI,CAA4BE,SAAS,CAACH,MAAM,CAACA,MAAM,CAAC;EAChE;EAEA,IAAWI,QAAQA,CAAA,EAAY;IAC7B,OAAQ,IAAI,CAACH,IAAI,CAA4BG,QAAQ;EACvD;EAEA,IAAWA,QAAQA,CAACC,KAAc,EAAE;IACjC,IAAI,CAACJ,IAAI,CAA4BG,QAAQ,GAAGC,KAAK;EACxD;EAEA,IAAWC,IAAIA,CAAA,EAAY;IACzB,OAAQ,IAAI,CAACL,IAAI,CAA4BK,IAAI;EACnD;EAEA,IAAWA,IAAIA,CAACD,KAAc,EAAE;IAC7B,IAAI,CAACJ,IAAI,CAA4BK,IAAI,GAAGD,KAAK;EACpD;EAEA,IAAWE,SAASA,CAAA,EAAW;IAC7B,OAAQ,IAAI,CAACN,IAAI,CAA4BM,SAAS;EACxD;EAEA,IAAWA,SAASA,CAACF,KAAa,EAAE;IACjC,IAAI,CAACJ,IAAI,CAA4BM,SAAS,GAAGF,KAAK;EACzD;EAEA,IAAWG,OAAOA,CAAA,EAAW;IAC3B,OAAQ,IAAI,CAACP,IAAI,CAA4BO,OAAO;EACtD;EAEA,IAAWA,OAAOA,CAACH,KAAa,EAAE;IAC/B,IAAI,CAACJ,IAAI,CAA4BO,OAAO,GAAGH,KAAK;EACvD;EAEOI,KAAKA,CAACC,IAAY,GAAG,CAAC,EAAEC,MAAc,GAAG,CAAC,EAAEC,QAAiB,EAAQ;IAC1E,IAAIF,IAAI,GAAG,CAAC,EAAE;MACZ,MAAM,IAAIG,kBAAU,CAClB,8CAA8CH,IAAI,EACpD,CAAC;IACH;IAEA,IAAIC,MAAM,GAAG,CAAC,EAAE;MACd,MAAM,IAAIE,kBAAU,CAClB,gDAAgDF,MAAM,EACxD,CAAC;IACH;IAEA,IAAIC,QAAQ,IAAIA,QAAQ,GAAG,CAAC,EAAE;MAC5B,MAAM,IAAIC,kBAAU,CAClB,kDAAkDD,QAAQ,EAC5D,CAAC;IACH;IAEA,IAAI,IAAI,CAACE,cAAc,EAAE;MACvB,MAAM,IAAIC,yBAAiB,CAAC,kCAAkC,CAAC;IACjE;IAEA,IAAI,CAACD,cAAc,GAAG,IAAI;IACzB,IAAI,CAACb,IAAI,CAA4BQ,KAAK,CAACC,IAAI,EAAEC,MAAM,EAAEC,QAAQ,CAAC;EACrE;AACF;AAACI,OAAA,CAAAnB,OAAA,GAAAC,qBAAA","ignoreList":[]}

package/lib/commonjs/core/AudioScheduledSourceNode.js

@@ -30,12 +30,12 @@ class AudioScheduledSourceNode extends _AudioNode.default {
     }
     this.node.stop(when);
   }
-  get onended() {
+  get onEnded() {
     return this.onEndedCallback;
   }
-  set onended(callback) {
+  set onEnded(callback) {
     if (!callback) {
-      this.node.onended = '0';
+      this.node.onEnded = '0';
       this.onendedSubscription?.remove();
       this.onendedSubscription = undefined;
       this.onEndedCallback = undefined;
@@ -43,7 +43,7 @@ class AudioScheduledSourceNode extends _AudioNode.default {
     }
     this.onEndedCallback = callback;
     this.onendedSubscription = this.audioEventEmitter.addAudioEventListener('ended', callback);
-    this.node.onended = this.onendedSubscription.subscriptionId;
+    this.node.onEnded = this.onendedSubscription.subscriptionId;
   }
 }
 exports.default = AudioScheduledSourceNode;

package/lib/commonjs/core/AudioScheduledSourceNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["_AudioNode","_interopRequireDefault","require","_errors","_events","e","__esModule","default","AudioScheduledSourceNode","AudioNode","hasBeenStarted","audioEventEmitter","AudioEventEmitter","global","start","when","RangeError","InvalidStateError","node","stop","onended","onEndedCallback","callback","onendedSubscription","remove","undefined","addAudioEventListener","subscriptionId","exports"],"sourceRoot":"../../../src","sources":["core/AudioScheduledSourceNode.ts"],"mappings":";;;;;;AACA,IAAAA,UAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEA,IAAAE,OAAA,GAAAF,OAAA;AAAsE,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEvD,MAAMG,wBAAwB,SAASC,kBAAS,CAAC;EACpDC,cAAc,GAAY,KAAK;EACtBC,iBAAiB,GAAG,IAAIC,yBAAiB,CAC1DC,MAAM,CAACD,iBACT,CAAC;EAKME,KAAKA,CAACC,IAAY,GAAG,CAAC,EAAQ;IACnC,IAAIA,IAAI,GAAG,CAAC,EAAE;MACZ,MAAM,IAAIC,kBAAU,CAClB,8CAA8CD,IAAI,EACpD,CAAC;IACH;IAEA,IAAI,IAAI,CAACL,cAAc,EAAE;MACvB,MAAM,IAAIO,yBAAiB,CAAC,kCAAkC,CAAC;IACjE;IAEA,IAAI,CAACP,cAAc,GAAG,IAAI;IACzB,IAAI,CAACQ,IAAI,CAA+BJ,KAAK,CAACC,IAAI,CAAC;EACtD;EAEOI,IAAIA,CAACJ,IAAY,GAAG,CAAC,EAAQ;IAClC,IAAIA,IAAI,GAAG,CAAC,EAAE;MACZ,MAAM,IAAIC,kBAAU,CAClB,8CAA8CD,IAAI,EACpD,CAAC;IACH;IAEA,IAAI,CAAC,IAAI,CAACL,cAAc,EAAE;MACxB,MAAM,IAAIO,yBAAiB,CACzB,8CACF,CAAC;IACH;IAEC,IAAI,CAACC,IAAI,CAA+BC,IAAI,CAACJ,IAAI,CAAC;EACrD;EAEA,IAAWK,OAAOA,CAAA,EAAkD;IAClE,OAAO,IAAI,CAACC,eAAe;EAC7B;EAEA,IAAWD,OAAOA,CAACE,QAAkD,EAAE;IACrE,IAAI,CAACA,QAAQ,EAAE;MACZ,IAAI,CAACJ,IAAI,CAA+BE,OAAO,GAAG,GAAG;MACtD,IAAI,CAACG,mBAAmB,EAAEC,MAAM,CAAC,CAAC;MAClC,IAAI,CAACD,mBAAmB,GAAGE,SAAS;MACpC,IAAI,CAACJ,eAAe,GAAGI,SAAS;MAChC;IACF;IAEA,IAAI,CAACJ,eAAe,GAAGC,QAAQ;IAC/B,IAAI,CAACC,mBAAmB,GAAG,IAAI,CAACZ,iBAAiB,CAACe,qBAAqB,CACrE,OAAO,EACPJ,QACF,CAAC;IAEA,IAAI,CAACJ,IAAI,CAA+BE,OAAO,GAC9C,IAAI,CAACG,mBAAmB,CAACI,cAAc;EAC3C;AACF;AAACC,OAAA,CAAArB,OAAA,GAAAC,wBAAA","ignoreList":[]}
+{"version":3,"names":["_AudioNode","_interopRequireDefault","require","_errors","_events","e","__esModule","default","AudioScheduledSourceNode","AudioNode","hasBeenStarted","audioEventEmitter","AudioEventEmitter","global","start","when","RangeError","InvalidStateError","node","stop","onEnded","onEndedCallback","callback","onendedSubscription","remove","undefined","addAudioEventListener","subscriptionId","exports"],"sourceRoot":"../../../src","sources":["core/AudioScheduledSourceNode.ts"],"mappings":";;;;;;AACA,IAAAA,UAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEA,IAAAE,OAAA,GAAAF,OAAA;AAAsE,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEvD,MAAMG,wBAAwB,SAASC,kBAAS,CAAC;EACpDC,cAAc,GAAY,KAAK;EACtBC,iBAAiB,GAAG,IAAIC,yBAAiB,CAC1DC,MAAM,CAACD,iBACT,CAAC;EAKME,KAAKA,CAACC,IAAY,GAAG,CAAC,EAAQ;IACnC,IAAIA,IAAI,GAAG,CAAC,EAAE;MACZ,MAAM,IAAIC,kBAAU,CAClB,8CAA8CD,IAAI,EACpD,CAAC;IACH;IAEA,IAAI,IAAI,CAACL,cAAc,EAAE;MACvB,MAAM,IAAIO,yBAAiB,CAAC,kCAAkC,CAAC;IACjE;IAEA,IAAI,CAACP,cAAc,GAAG,IAAI;IACzB,IAAI,CAACQ,IAAI,CAA+BJ,KAAK,CAACC,IAAI,CAAC;EACtD;EAEOI,IAAIA,CAACJ,IAAY,GAAG,CAAC,EAAQ;IAClC,IAAIA,IAAI,GAAG,CAAC,EAAE;MACZ,MAAM,IAAIC,kBAAU,CAClB,8CAA8CD,IAAI,EACpD,CAAC;IACH;IAEA,IAAI,CAAC,IAAI,CAACL,cAAc,EAAE;MACxB,MAAM,IAAIO,yBAAiB,CACzB,8CACF,CAAC;IACH;IAEC,IAAI,CAACC,IAAI,CAA+BC,IAAI,CAACJ,IAAI,CAAC;EACrD;EAEA,IAAWK,OAAOA,CAAA,EAAkD;IAClE,OAAO,IAAI,CAACC,eAAe;EAC7B;EAEA,IAAWD,OAAOA,CAACE,QAAkD,EAAE;IACrE,IAAI,CAACA,QAAQ,EAAE;MACZ,IAAI,CAACJ,IAAI,CAA+BE,OAAO,GAAG,GAAG;MACtD,IAAI,CAACG,mBAAmB,EAAEC,MAAM,CAAC,CAAC;MAClC,IAAI,CAACD,mBAAmB,GAAGE,SAAS;MACpC,IAAI,CAACJ,eAAe,GAAGI,SAAS;MAChC;IACF;IAEA,IAAI,CAACJ,eAAe,GAAGC,QAAQ;IAC/B,IAAI,CAACC,mBAAmB,GAAG,IAAI,CAACZ,iBAAiB,CAACe,qBAAqB,CACrE,OAAO,EACPJ,QACF,CAAC;IAEA,IAAI,CAACJ,IAAI,CAA+BE,OAAO,GAC9C,IAAI,CAACG,mBAAmB,CAACI,cAAc;EAC3C;AACF;AAACC,OAAA,CAAArB,OAAA,GAAAC,wBAAA","ignoreList":[]}