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

package/android/src/main/cpp/audioapi/android/AudioAPIModule.cpp

@@ -58,11 +58,19 @@ void AudioAPIModule::invokeHandlerWithEventNameAndEventBody(
     } else if (value->isInstanceOf(jni::JFloat::javaClassStatic())) {
       body[name] = jni::static_ref_cast<jni::JFloat>(value)->value();
     } else if (value->isInstanceOf(jni::JBoolean::javaClassStatic())) {
-      body[name] = jni::static_ref_cast<jni::JBoolean>(value)->value();
+      auto booleanValue = jni::static_ref_cast<jni::JBoolean>(value)->value();
+
+      if (booleanValue) {
+        body[name] = true;
+      } else {
+        body[name] = false;
+      }
     }
   }
 
-  audioEventHandlerRegistry_->invokeHandlerWithEventBody(
-      eventName->toStdString(), body);
+  if (audioEventHandlerRegistry_ != nullptr) {
+    audioEventHandlerRegistry_->invokeHandlerWithEventBody(
+        eventName->toStdString(), body);
+  }
 }
 } // namespace audioapi

package/android/src/main/java/com/swmansion/audioapi/AudioAPIModule.kt

@@ -60,7 +60,7 @@ class AudioAPIModule(
     enabled: Boolean,
     promise: Promise?,
   ) {
-    // noting to do here
+    promise?.resolve(true)
   }
 
   override fun setAudioSessionOptions(

package/android/src/main/java/com/swmansion/audioapi/system/AudioFocusListener.kt

@@ -13,7 +13,7 @@ class AudioFocusListener(
   private val audioAPIModule: WeakReference<AudioAPIModule>,
   private val lockScreenManager: WeakReference<LockScreenManager>,
 ) : AudioManager.OnAudioFocusChangeListener {
-  private var playOnAudioFocus = false
+  private var playOnAudioFocus: Boolean = false
   private var focusRequest: AudioFocusRequest? = null
 
   override fun onAudioFocusChange(focusChange: Int) {
@@ -23,7 +23,7 @@ class AudioFocusListener(
         playOnAudioFocus = false
         val body =
           HashMap<String, Any>().apply {
-            put("value", "began")
+            put("type", "began")
             put("shouldResume", false)
           }
         audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("interruption", body)
@@ -32,7 +32,7 @@ class AudioFocusListener(
         playOnAudioFocus = lockScreenManager.get()?.isPlaying == true
         val body =
           HashMap<String, Any>().apply {
-            put("value", "began")
+            put("type", "began")
             put("shouldResume", playOnAudioFocus)
           }
         audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("interruption", body)
@@ -41,14 +41,14 @@ class AudioFocusListener(
         if (playOnAudioFocus) {
           val body =
             HashMap<String, Any>().apply {
-              put("value", "ended")
+              put("type", "ended")
               put("shouldResume", true)
             }
           audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("interruption", body)
         } else {
           val body =
             HashMap<String, Any>().apply {
-              put("value", "ended")
+              put("type", "ended")
               put("shouldResume", false)
             }
           audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("interruption", body)

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

@@ -18,7 +18,8 @@ class AudioBufferBaseSourceNodeHostObject
             : AudioScheduledSourceNodeHostObject(node) {
         addGetters(
                 JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, detune),
-                JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, playbackRate));
+                JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, playbackRate),
+                JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, onPositionChangedInterval));
 
         addSetters(
                 JSI_EXPORT_PROPERTY_SETTER(AudioBufferBaseSourceNodeHostObject, onPositionChanged),
@@ -49,6 +50,12 @@ class AudioBufferBaseSourceNodeHostObject
         sourceNode->setOnPositionChangedCallbackId(std::stoull(value.getString(runtime).utf8(runtime)));
     }
 
+    JSI_PROPERTY_GETTER(onPositionChangedInterval) {
+        auto sourceNode =
+                std::static_pointer_cast<AudioBufferBaseSourceNode>(node_);
+        return jsi::Value(sourceNode->getOnPositionChangedInterval());
+    }
+
     JSI_PROPERTY_SETTER(onPositionChangedInterval) {
         auto sourceNode =
                 std::static_pointer_cast<AudioBufferBaseSourceNode>(node_);

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

@@ -17,11 +17,10 @@ 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/inputs/AudioRecorder.cpp

@@ -36,8 +36,10 @@ void AudioRecorder::invokeOnAudioReadyCallback(
   body.insert({"numFrames", numFrames});
   body.insert({"when", when});
 
-  audioEventHandlerRegistry_->invokeHandlerWithEventBody(
-      "audioReady", onAudioReadyCallbackId_, body);
+  if (audioEventHandlerRegistry_ != nullptr) {
+    audioEventHandlerRegistry_->invokeHandlerWithEventBody(
+        "audioReady", onAudioReadyCallbackId_, body);
+  }
 }
 
 void AudioRecorder::sendRemainingData() {

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

@@ -23,6 +23,15 @@ AudioBufferBaseSourceNode::AudioBufferBaseSourceNode(BaseAudioContext *context)
       std::make_shared<signalsmith::stretch::SignalsmithStretch<float>>();
 }
 
+AudioBufferBaseSourceNode::~AudioBufferBaseSourceNode() {
+  if (onPositionChangedCallbackId_ != 0 &&
+      context_->audioEventHandlerRegistry_ != nullptr) {
+    context_->audioEventHandlerRegistry_->unregisterHandler(
+        "positionChanged", onPositionChangedCallbackId_);
+    onPositionChangedCallbackId_ = 0;
+  }
+}
+
 std::shared_ptr<AudioParam> AudioBufferBaseSourceNode::getDetuneParam() const {
   return detuneParam_;
 }
@@ -42,13 +51,18 @@ void AudioBufferBaseSourceNode::setOnPositionChangedInterval(int interval) {
       context_->getSampleRate() * static_cast<float>(interval) / 1000);
 }
 
+int AudioBufferBaseSourceNode::getOnPositionChangedInterval() {
+  return onPositionChangedInterval_;
+}
+
 std::mutex &AudioBufferBaseSourceNode::getBufferLock() {
   return bufferLock_;
 }
 
 void AudioBufferBaseSourceNode::sendOnPositionChangedEvent() {
   if (onPositionChangedCallbackId_ != 0 &&
-      onPositionChangedTime_ > onPositionChangedInterval_) {
+      onPositionChangedTime_ > onPositionChangedInterval_ &&
+      context_->audioEventHandlerRegistry_ != nullptr) {
     std::unordered_map<std::string, EventValue> body = {
         {"value", getCurrentPosition()}};
 

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

@@ -13,12 +13,14 @@ class AudioParam;
 class AudioBufferBaseSourceNode : public AudioScheduledSourceNode {
  public:
   explicit AudioBufferBaseSourceNode(BaseAudioContext *context);
+  virtual ~AudioBufferBaseSourceNode();
 
-    [[nodiscard]] std::shared_ptr<AudioParam> getDetuneParam() const;
-    [[nodiscard]] std::shared_ptr<AudioParam> getPlaybackRateParam() const;
+  [[nodiscard]] std::shared_ptr<AudioParam> getDetuneParam() const;
+  [[nodiscard]] std::shared_ptr<AudioParam> getPlaybackRateParam() const;
 
-    void setOnPositionChangedCallbackId(uint64_t callbackId);
-    void setOnPositionChangedInterval(int interval);
+  void setOnPositionChangedCallbackId(uint64_t callbackId);
+  void setOnPositionChangedInterval(int interval);
+  [[nodiscard]] int getOnPositionChangedInterval();
 
  protected:
     std::mutex bufferLock_;

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

@@ -16,6 +16,15 @@ AudioScheduledSourceNode::AudioScheduledSourceNode(BaseAudioContext *context)
   numberOfInputs_ = 0;
 }
 
+AudioScheduledSourceNode::~AudioScheduledSourceNode() {
+  if (onEndedCallbackId_ != 0 &&
+      context_->audioEventHandlerRegistry_ != nullptr) {
+    context_->audioEventHandlerRegistry_->unregisterHandler(
+        "ended", onEndedCallbackId_);
+    onEndedCallbackId_ = 0;
+  }
+}
+
 void AudioScheduledSourceNode::start(double when) {
   playbackState_ = PlaybackState::SCHEDULED;
   startTime_ = when;
@@ -149,8 +158,10 @@ void AudioScheduledSourceNode::updatePlaybackInfo(
 void AudioScheduledSourceNode::disable() {
   AudioNode::disable();
 
-  context_->audioEventHandlerRegistry_->invokeHandlerWithEventBody(
-      "ended", onEndedCallbackId_, {});
+  if (context_->audioEventHandlerRegistry_ != nullptr) {
+    context_->audioEventHandlerRegistry_->invokeHandlerWithEventBody(
+        "ended", onEndedCallbackId_, {});
+  }
 }
 
 void AudioScheduledSourceNode::handleStopScheduled() {

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

@@ -27,6 +27,7 @@ class AudioScheduledSourceNode : public AudioNode {
   // FINISHED: The node has finished playing.
   enum class PlaybackState { UNSCHEDULED, SCHEDULED, PLAYING, STOP_SCHEDULED, FINISHED };
   explicit AudioScheduledSourceNode(BaseAudioContext *context);
+  virtual ~AudioScheduledSourceNode();
 
   void start(double when);
   virtual void stop(double when);

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

@@ -24,57 +24,107 @@ AudioEventHandlerRegistry::~AudioEventHandlerRegistry() {
 uint64_t AudioEventHandlerRegistry::registerHandler(
     const std::string &eventName,
     const std::shared_ptr<jsi::Function> &handler) {
-  static uint64_t LISTENER_ID = 1;
+  uint64_t listenerId = listenerIdCounter_++;
 
-  eventHandlers_[eventName][LISTENER_ID] = handler;
+  if (callInvoker_ == nullptr || runtime_ == nullptr) {
+    // If callInvoker or runtime is not valid, we cannot register the handler
+    return 0;
+  }
+
+  // Modify the eventHandlers_ map only on the main RN thread
+  callInvoker_->invokeAsync([this, eventName, listenerId, handler]() {
+    eventHandlers_[eventName][listenerId] = handler;
+  });
 
-  return LISTENER_ID++;
+  return listenerId;
 }
 
 void AudioEventHandlerRegistry::unregisterHandler(
     const std::string &eventName,
     uint64_t listenerId) {
-  auto it = eventHandlers_.find(eventName);
-  if (it != eventHandlers_.end()) {
-    it->second.erase(listenerId);
+  if (callInvoker_ == nullptr || runtime_ == nullptr) {
+    // If callInvoker or runtime is not valid, we cannot unregister the handler
+    return;
   }
+
+  callInvoker_->invokeAsync([this, eventName, listenerId]() {
+    auto it = eventHandlers_.find(eventName);
+
+    if (it == eventHandlers_.end()) {
+      return;
+    }
+
+    auto &handlersMap = it->second;
+    auto handlerIt = handlersMap.find(listenerId);
+
+    if (handlerIt != handlersMap.end()) {
+      handlersMap.erase(handlerIt);
+    }
+  });
 }
 
 void AudioEventHandlerRegistry::invokeHandlerWithEventBody(
     const std::string &eventName,
     const std::unordered_map<std::string, EventValue> &body) {
-  auto it = eventHandlers_.find(eventName);
-  if (it != eventHandlers_.end()) {
-    for (const auto &pair : it->second) {
+  // callInvoker_ and runtime_ must be valid to invoke handlers
+  // this might happen when react-native is reloaded or the app is closed
+  if (callInvoker_ == nullptr || runtime_ == nullptr) {
+    return;
+  }
+
+  // Do any logic regarding triggering the event on the main RN thread
+  callInvoker_->invokeAsync([this, eventName, body]() {
+    auto it = eventHandlers_.find(eventName);
+
+    if (it == eventHandlers_.end()) {
+      // If the event name is not registered, we can skip invoking handlers
+      return;
+    }
+
+    auto handlersMap = it->second;
+
+    for (const auto &pair : handlersMap) {
       auto handler = pair.second;
-      if (handler) {
-        callInvoker_->invokeAsync([this, handler, body]() {
-          auto eventObject = createEventObject(body);
-          handler->call(*runtime_, eventObject);
-        });
+
+      if (!handler || !handler->isFunction(*runtime_)) {
+        // If the handler is not valid, we can skip it
+        continue;
       }
+
+      auto eventObject = createEventObject(body);
+      handler->call(*runtime_, eventObject);
     }
-  }
+  });
 }
 
 void AudioEventHandlerRegistry::invokeHandlerWithEventBody(
     const std::string &eventName,
     uint64_t listenerId,
     const std::unordered_map<std::string, EventValue> &body) {
-  auto it = eventHandlers_.find(eventName);
-  if (it != eventHandlers_.end()) {
-    auto handlersMap = it->second;
-    auto handlerIt = handlersMap.find(listenerId);
-    if (handlerIt != handlersMap.end()) {
-      auto handler = handlerIt->second;
-      if (handler) {
-        callInvoker_->invokeAsync([this, handler, body]() {
-          auto eventObject = createEventObject(body);
-          handler->call(*runtime_, eventObject);
-        });
-      }
-    }
+  // callInvoker_ and runtime_ must be valid to invoke handlers
+  // this might happen when react-native is reloaded or the app is closed
+  if (callInvoker_ == nullptr || runtime_ == nullptr) {
+    return;
   }
+
+  callInvoker_->invokeAsync([this, eventName, listenerId, body]() {
+    auto it = eventHandlers_.find(eventName);
+
+    if (it == eventHandlers_.end()) {
+      // If the event name is not registered, we can skip invoking handlers
+      return;
+    }
+
+    auto handlerIt = it->second.find(listenerId);
+
+    if (handlerIt == it->second.end()) {
+      // If the listener ID is not registered, we can skip invoking handlers
+      return;
+    }
+
+    auto eventObject = createEventObject(body);
+    handlerIt->second->call(*runtime_, eventObject);
+  });
 }
 
 jsi::Object AudioEventHandlerRegistry::createEventObject(

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

@@ -7,6 +7,7 @@
 #include <array>
 #include <string>
 #include <variant>
+#include <atomic>
 
 namespace audioapi {
 using namespace facebook;
@@ -27,6 +28,8 @@ class AudioEventHandlerRegistry {
   void invokeHandlerWithEventBody(const std::string &eventName, uint64_t listenerId, const std::unordered_map<std::string, EventValue> &body);
 
  private:
+    std::atomic<uint64_t> listenerIdCounter_{1}; // Atomic counter for listener IDs
+
     std::shared_ptr<react::CallInvoker> callInvoker_;
     jsi::Runtime *runtime_;
     std::unordered_map<std::string, std::unordered_map<uint64_t, std::shared_ptr<jsi::Function>>> eventHandlers_;

package/ios/audioapi/ios/AudioAPIModule.mm

@@ -85,9 +85,8 @@ 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");
@@ -97,9 +96,8 @@ RCT_EXPORT_METHOD(
   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];
 }
@@ -129,15 +127,14 @@ 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];
 }
@@ -177,7 +174,9 @@ RCT_EXPORT_METHOD(
     }
   }
 
-  _eventHandler->invokeHandlerWithEventBody(name, body);
+  if (_eventHandler != nullptr) {
+    _eventHandler->invokeHandlerWithEventBody(name, body);
+  }
 }
 
 @end

package/lib/commonjs/core/AudioBufferBaseSourceNode.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _AudioScheduledSourceNode = _interopRequireDefault(require("./AudioScheduledSourceNode"));
 var _AudioParam = _interopRequireDefault(require("./AudioParam"));
+var _AudioScheduledSourceNode = _interopRequireDefault(require("./AudioScheduledSourceNode"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class AudioBufferBaseSourceNode extends _AudioScheduledSourceNode.default {
   constructor(context, node) {
@@ -13,20 +13,24 @@ class AudioBufferBaseSourceNode extends _AudioScheduledSourceNode.default {
     this.detune = new _AudioParam.default(node.detune, context);
     this.playbackRate = new _AudioParam.default(node.playbackRate, context);
   }
-
-  // eslint-disable-next-line accessor-pairs
+  get onPositionChanged() {
+    return this.positionChangedCallback;
+  }
   set onPositionChanged(callback) {
     if (!callback) {
+      this.node.onPositionChanged = '0';
       this.positionChangedSubscription?.remove();
       this.positionChangedSubscription = undefined;
-      this.node.onPositionChanged = '0';
+      this.positionChangedCallback = undefined;
       return;
     }
+    this.positionChangedCallback = callback;
     this.positionChangedSubscription = this.audioEventEmitter.addAudioEventListener('positionChanged', callback);
     this.node.onPositionChanged = this.positionChangedSubscription.subscriptionId;
   }
-
-  // eslint-disable-next-line accessor-pairs
+  get onPositionChangedInterval() {
+    return this.node.onPositionChangedInterval;
+  }
   set onPositionChangedInterval(value) {
     this.node.onPositionChangedInterval = value;
   }

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

@@ -1 +1 @@
-{"version":3,"names":["_AudioScheduledSourceNode","_interopRequireDefault","require","_AudioParam","e","__esModule","default","AudioBufferBaseSourceNode","AudioScheduledSourceNode","constructor","context","node","detune","AudioParam","playbackRate","onPositionChanged","callback","positionChangedSubscription","remove","undefined","audioEventEmitter","addAudioEventListener","subscriptionId","onPositionChangedInterval","value","exports"],"sourceRoot":"../../../src","sources":["core/AudioBufferBaseSourceNode.ts"],"mappings":";;;;;;AACA,IAAAA,yBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAF,sBAAA,CAAAC,OAAA;AAAsC,SAAAD,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAIvB,MAAMG,yBAAyB,SAASC,iCAAwB,CAAC;EAK9EC,WAAWA,CAACC,OAAyB,EAAEC,IAAgC,EAAE;IACvE,KAAK,CAACD,OAAO,EAAEC,IAAI,CAAC;IAEpB,IAAI,CAACC,MAAM,GAAG,IAAIC,mBAAU,CAACF,IAAI,CAACC,MAAM,EAAEF,OAAO,CAAC;IAClD,IAAI,CAACI,YAAY,GAAG,IAAID,mBAAU,CAACF,IAAI,CAACG,YAAY,EAAEJ,OAAO,CAAC;EAChE;;EAEA;EACA,IAAWK,iBAAiBA,CAC1BC,QAAsD,EACtD;IACA,IAAI,CAACA,QAAQ,EAAE;MACb,IAAI,CAACC,2BAA2B,EAAEC,MAAM,CAAC,CAAC;MAC1C,IAAI,CAACD,2BAA2B,GAAGE,SAAS;MAC3C,IAAI,CAACR,IAAI,CAAgCI,iBAAiB,GAAG,GAAG;MACjE;IACF;IACA,IAAI,CAACE,2BAA2B,GAC9B,IAAI,CAACG,iBAAiB,CAACC,qBAAqB,CAAC,iBAAiB,EAAEL,QAAQ,CAAC;IAE1E,IAAI,CAACL,IAAI,CAAgCI,iBAAiB,GACzD,IAAI,CAACE,2BAA2B,CAACK,cAAc;EACnD;;EAEA;EACA,IAAWC,yBAAyBA,CAACC,KAAa,EAAE;IACjD,IAAI,CAACb,IAAI,CAAgCY,yBAAyB,GAAGC,KAAK;EAC7E;AACF;AAACC,OAAA,CAAAnB,OAAA,GAAAC,yBAAA","ignoreList":[]}
+{"version":3,"names":["_AudioParam","_interopRequireDefault","require","_AudioScheduledSourceNode","e","__esModule","default","AudioBufferBaseSourceNode","AudioScheduledSourceNode","constructor","context","node","detune","AudioParam","playbackRate","onPositionChanged","positionChangedCallback","callback","positionChangedSubscription","remove","undefined","audioEventEmitter","addAudioEventListener","subscriptionId","onPositionChangedInterval","value","exports"],"sourceRoot":"../../../src","sources":["core/AudioBufferBaseSourceNode.ts"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AAKA,IAAAC,yBAAA,GAAAF,sBAAA,CAAAC,OAAA;AAAkE,SAAAD,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEnD,MAAMG,yBAAyB,SAASC,iCAAwB,CAAC;EAM9EC,WAAWA,CAACC,OAAyB,EAAEC,IAAgC,EAAE;IACvE,KAAK,CAACD,OAAO,EAAEC,IAAI,CAAC;IAEpB,IAAI,CAACC,MAAM,GAAG,IAAIC,mBAAU,CAACF,IAAI,CAACC,MAAM,EAAEF,OAAO,CAAC;IAClD,IAAI,CAACI,YAAY,GAAG,IAAID,mBAAU,CAACF,IAAI,CAACG,YAAY,EAAEJ,OAAO,CAAC;EAChE;EAEA,IAAWK,iBAAiBA,CAAA,EAEd;IACZ,OAAO,IAAI,CAACC,uBAAuB;EACrC;EAEA,IAAWD,iBAAiBA,CAC1BE,QAAsD,EACtD;IACA,IAAI,CAACA,QAAQ,EAAE;MACZ,IAAI,CAACN,IAAI,CAAgCI,iBAAiB,GAAG,GAAG;MACjE,IAAI,CAACG,2BAA2B,EAAEC,MAAM,CAAC,CAAC;MAC1C,IAAI,CAACD,2BAA2B,GAAGE,SAAS;MAC5C,IAAI,CAACJ,uBAAuB,GAAGI,SAAS;MAExC;IACF;IAEA,IAAI,CAACJ,uBAAuB,GAAGC,QAAQ;IACvC,IAAI,CAACC,2BAA2B,GAC9B,IAAI,CAACG,iBAAiB,CAACC,qBAAqB,CAAC,iBAAiB,EAAEL,QAAQ,CAAC;IAE1E,IAAI,CAACN,IAAI,CAAgCI,iBAAiB,GACzD,IAAI,CAACG,2BAA2B,CAACK,cAAc;EACnD;EAEA,IAAWC,yBAAyBA,CAAA,EAAW;IAC7C,OAAQ,IAAI,CAACb,IAAI,CAAgCa,yBAAyB;EAC5E;EAEA,IAAWA,yBAAyBA,CAACC,KAAa,EAAE;IACjD,IAAI,CAACd,IAAI,CAAgCa,yBAAyB,GAAGC,KAAK;EAC7E;AACF;AAACC,OAAA,CAAApB,OAAA,GAAAC,yBAAA","ignoreList":[]}

package/lib/commonjs/core/AudioScheduledSourceNode.js

@@ -30,14 +30,18 @@ class AudioScheduledSourceNode extends _AudioNode.default {
     }
     this.node.stop(when);
   }
-
-  // eslint-disable-next-line accessor-pairs
+  get onended() {
+    return this.onEndedCallback;
+  }
   set onended(callback) {
     if (!callback) {
+      this.node.onended = '0';
       this.onendedSubscription?.remove();
       this.onendedSubscription = undefined;
+      this.onEndedCallback = undefined;
       return;
     }
+    this.onEndedCallback = callback;
     this.onendedSubscription = this.audioEventEmitter.addAudioEventListener('ended', callback);
     this.node.onended = this.onendedSubscription.subscriptionId;
   }

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","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;EAIME,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;EACA,IAAWK,OAAOA,CAACC,QAAkD,EAAE;IACrE,IAAI,CAACA,QAAQ,EAAE;MACb,IAAI,CAACC,mBAAmB,EAAEC,MAAM,CAAC,CAAC;MAClC,IAAI,CAACD,mBAAmB,GAAGE,SAAS;MACpC;IACF;IACA,IAAI,CAACF,mBAAmB,GAAG,IAAI,CAACX,iBAAiB,CAACc,qBAAqB,CACrE,OAAO,EACPJ,QACF,CAAC;IAEA,IAAI,CAACH,IAAI,CAA+BE,OAAO,GAC9C,IAAI,CAACE,mBAAmB,CAACI,cAAc;EAC3C;AACF;AAACC,OAAA,CAAApB,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":[]}

package/lib/module/core/AudioBufferBaseSourceNode.js

@@ -1,27 +1,31 @@
 "use strict";
 
-import AudioScheduledSourceNode from "./AudioScheduledSourceNode.js";
 import AudioParam from "./AudioParam.js";
+import AudioScheduledSourceNode from "./AudioScheduledSourceNode.js";
 export default class AudioBufferBaseSourceNode extends AudioScheduledSourceNode {
   constructor(context, node) {
     super(context, node);
     this.detune = new AudioParam(node.detune, context);
     this.playbackRate = new AudioParam(node.playbackRate, context);
   }
-
-  // eslint-disable-next-line accessor-pairs
+  get onPositionChanged() {
+    return this.positionChangedCallback;
+  }
   set onPositionChanged(callback) {
     if (!callback) {
+      this.node.onPositionChanged = '0';
       this.positionChangedSubscription?.remove();
       this.positionChangedSubscription = undefined;
-      this.node.onPositionChanged = '0';
+      this.positionChangedCallback = undefined;
       return;
     }
+    this.positionChangedCallback = callback;
     this.positionChangedSubscription = this.audioEventEmitter.addAudioEventListener('positionChanged', callback);
     this.node.onPositionChanged = this.positionChangedSubscription.subscriptionId;
   }
-
-  // eslint-disable-next-line accessor-pairs
+  get onPositionChangedInterval() {
+    return this.node.onPositionChangedInterval;
+  }
   set onPositionChangedInterval(value) {
     this.node.onPositionChangedInterval = value;
   }

package/lib/module/core/AudioBufferBaseSourceNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["AudioScheduledSourceNode","AudioParam","AudioBufferBaseSourceNode","constructor","context","node","detune","playbackRate","onPositionChanged","callback","positionChangedSubscription","remove","undefined","audioEventEmitter","addAudioEventListener","subscriptionId","onPositionChangedInterval","value"],"sourceRoot":"../../../src","sources":["core/AudioBufferBaseSourceNode.ts"],"mappings":";;AACA,OAAOA,wBAAwB,MAAM,+BAA4B;AAEjE,OAAOC,UAAU,MAAM,iBAAc;AAIrC,eAAe,MAAMC,yBAAyB,SAASF,wBAAwB,CAAC;EAK9EG,WAAWA,CAACC,OAAyB,EAAEC,IAAgC,EAAE;IACvE,KAAK,CAACD,OAAO,EAAEC,IAAI,CAAC;IAEpB,IAAI,CAACC,MAAM,GAAG,IAAIL,UAAU,CAACI,IAAI,CAACC,MAAM,EAAEF,OAAO,CAAC;IAClD,IAAI,CAACG,YAAY,GAAG,IAAIN,UAAU,CAACI,IAAI,CAACE,YAAY,EAAEH,OAAO,CAAC;EAChE;;EAEA;EACA,IAAWI,iBAAiBA,CAC1BC,QAAsD,EACtD;IACA,IAAI,CAACA,QAAQ,EAAE;MACb,IAAI,CAACC,2BAA2B,EAAEC,MAAM,CAAC,CAAC;MAC1C,IAAI,CAACD,2BAA2B,GAAGE,SAAS;MAC3C,IAAI,CAACP,IAAI,CAAgCG,iBAAiB,GAAG,GAAG;MACjE;IACF;IACA,IAAI,CAACE,2BAA2B,GAC9B,IAAI,CAACG,iBAAiB,CAACC,qBAAqB,CAAC,iBAAiB,EAAEL,QAAQ,CAAC;IAE1E,IAAI,CAACJ,IAAI,CAAgCG,iBAAiB,GACzD,IAAI,CAACE,2BAA2B,CAACK,cAAc;EACnD;;EAEA;EACA,IAAWC,yBAAyBA,CAACC,KAAa,EAAE;IACjD,IAAI,CAACZ,IAAI,CAAgCW,yBAAyB,GAAGC,KAAK;EAC7E;AACF","ignoreList":[]}
+{"version":3,"names":["AudioParam","AudioScheduledSourceNode","AudioBufferBaseSourceNode","constructor","context","node","detune","playbackRate","onPositionChanged","positionChangedCallback","callback","positionChangedSubscription","remove","undefined","audioEventEmitter","addAudioEventListener","subscriptionId","onPositionChangedInterval","value"],"sourceRoot":"../../../src","sources":["core/AudioBufferBaseSourceNode.ts"],"mappings":";;AAAA,OAAOA,UAAU,MAAM,iBAAc;AAKrC,OAAOC,wBAAwB,MAAM,+BAA4B;AAEjE,eAAe,MAAMC,yBAAyB,SAASD,wBAAwB,CAAC;EAM9EE,WAAWA,CAACC,OAAyB,EAAEC,IAAgC,EAAE;IACvE,KAAK,CAACD,OAAO,EAAEC,IAAI,CAAC;IAEpB,IAAI,CAACC,MAAM,GAAG,IAAIN,UAAU,CAACK,IAAI,CAACC,MAAM,EAAEF,OAAO,CAAC;IAClD,IAAI,CAACG,YAAY,GAAG,IAAIP,UAAU,CAACK,IAAI,CAACE,YAAY,EAAEH,OAAO,CAAC;EAChE;EAEA,IAAWI,iBAAiBA,CAAA,EAEd;IACZ,OAAO,IAAI,CAACC,uBAAuB;EACrC;EAEA,IAAWD,iBAAiBA,CAC1BE,QAAsD,EACtD;IACA,IAAI,CAACA,QAAQ,EAAE;MACZ,IAAI,CAACL,IAAI,CAAgCG,iBAAiB,GAAG,GAAG;MACjE,IAAI,CAACG,2BAA2B,EAAEC,MAAM,CAAC,CAAC;MAC1C,IAAI,CAACD,2BAA2B,GAAGE,SAAS;MAC5C,IAAI,CAACJ,uBAAuB,GAAGI,SAAS;MAExC;IACF;IAEA,IAAI,CAACJ,uBAAuB,GAAGC,QAAQ;IACvC,IAAI,CAACC,2BAA2B,GAC9B,IAAI,CAACG,iBAAiB,CAACC,qBAAqB,CAAC,iBAAiB,EAAEL,QAAQ,CAAC;IAE1E,IAAI,CAACL,IAAI,CAAgCG,iBAAiB,GACzD,IAAI,CAACG,2BAA2B,CAACK,cAAc;EACnD;EAEA,IAAWC,yBAAyBA,CAAA,EAAW;IAC7C,OAAQ,IAAI,CAACZ,IAAI,CAAgCY,yBAAyB;EAC5E;EAEA,IAAWA,yBAAyBA,CAACC,KAAa,EAAE;IACjD,IAAI,CAACb,IAAI,CAAgCY,yBAAyB,GAAGC,KAAK;EAC7E;AACF","ignoreList":[]}

package/lib/module/core/AudioScheduledSourceNode.js

@@ -25,14 +25,18 @@ export default class AudioScheduledSourceNode extends AudioNode {
     }
     this.node.stop(when);
   }
-
-  // eslint-disable-next-line accessor-pairs
+  get onended() {
+    return this.onEndedCallback;
+  }
   set onended(callback) {
     if (!callback) {
+      this.node.onended = '0';
       this.onendedSubscription?.remove();
       this.onendedSubscription = undefined;
+      this.onEndedCallback = undefined;
       return;
     }
+    this.onEndedCallback = callback;
     this.onendedSubscription = this.audioEventEmitter.addAudioEventListener('ended', callback);
     this.node.onended = this.onendedSubscription.subscriptionId;
   }

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

@@ -1 +1 @@
-{"version":3,"names":["AudioNode","InvalidStateError","RangeError","AudioEventEmitter","AudioScheduledSourceNode","hasBeenStarted","audioEventEmitter","global","start","when","node","stop","onended","callback","onendedSubscription","remove","undefined","addAudioEventListener","subscriptionId"],"sourceRoot":"../../../src","sources":["core/AudioScheduledSourceNode.ts"],"mappings":";;AACA,OAAOA,SAAS,MAAM,gBAAa;AACnC,SAASC,iBAAiB,EAAEC,UAAU,QAAQ,oBAAW;AAEzD,SAASC,iBAAiB,QAAgC,oBAAW;AAErE,eAAe,MAAMC,wBAAwB,SAASJ,SAAS,CAAC;EACpDK,cAAc,GAAY,KAAK;EACtBC,iBAAiB,GAAG,IAAIH,iBAAiB,CAC1DI,MAAM,CAACJ,iBACT,CAAC;EAIMK,KAAKA,CAACC,IAAY,GAAG,CAAC,EAAQ;IACnC,IAAIA,IAAI,GAAG,CAAC,EAAE;MACZ,MAAM,IAAIP,UAAU,CAClB,8CAA8CO,IAAI,EACpD,CAAC;IACH;IAEA,IAAI,IAAI,CAACJ,cAAc,EAAE;MACvB,MAAM,IAAIJ,iBAAiB,CAAC,kCAAkC,CAAC;IACjE;IAEA,IAAI,CAACI,cAAc,GAAG,IAAI;IACzB,IAAI,CAACK,IAAI,CAA+BF,KAAK,CAACC,IAAI,CAAC;EACtD;EAEOE,IAAIA,CAACF,IAAY,GAAG,CAAC,EAAQ;IAClC,IAAIA,IAAI,GAAG,CAAC,EAAE;MACZ,MAAM,IAAIP,UAAU,CAClB,8CAA8CO,IAAI,EACpD,CAAC;IACH;IAEA,IAAI,CAAC,IAAI,CAACJ,cAAc,EAAE;MACxB,MAAM,IAAIJ,iBAAiB,CACzB,8CACF,CAAC;IACH;IAEC,IAAI,CAACS,IAAI,CAA+BC,IAAI,CAACF,IAAI,CAAC;EACrD;;EAEA;EACA,IAAWG,OAAOA,CAACC,QAAkD,EAAE;IACrE,IAAI,CAACA,QAAQ,EAAE;MACb,IAAI,CAACC,mBAAmB,EAAEC,MAAM,CAAC,CAAC;MAClC,IAAI,CAACD,mBAAmB,GAAGE,SAAS;MACpC;IACF;IACA,IAAI,CAACF,mBAAmB,GAAG,IAAI,CAACR,iBAAiB,CAACW,qBAAqB,CACrE,OAAO,EACPJ,QACF,CAAC;IAEA,IAAI,CAACH,IAAI,CAA+BE,OAAO,GAC9C,IAAI,CAACE,mBAAmB,CAACI,cAAc;EAC3C;AACF","ignoreList":[]}
+{"version":3,"names":["AudioNode","InvalidStateError","RangeError","AudioEventEmitter","AudioScheduledSourceNode","hasBeenStarted","audioEventEmitter","global","start","when","node","stop","onended","onEndedCallback","callback","onendedSubscription","remove","undefined","addAudioEventListener","subscriptionId"],"sourceRoot":"../../../src","sources":["core/AudioScheduledSourceNode.ts"],"mappings":";;AACA,OAAOA,SAAS,MAAM,gBAAa;AACnC,SAASC,iBAAiB,EAAEC,UAAU,QAAQ,oBAAW;AAEzD,SAASC,iBAAiB,QAAgC,oBAAW;AAErE,eAAe,MAAMC,wBAAwB,SAASJ,SAAS,CAAC;EACpDK,cAAc,GAAY,KAAK;EACtBC,iBAAiB,GAAG,IAAIH,iBAAiB,CAC1DI,MAAM,CAACJ,iBACT,CAAC;EAKMK,KAAKA,CAACC,IAAY,GAAG,CAAC,EAAQ;IACnC,IAAIA,IAAI,GAAG,CAAC,EAAE;MACZ,MAAM,IAAIP,UAAU,CAClB,8CAA8CO,IAAI,EACpD,CAAC;IACH;IAEA,IAAI,IAAI,CAACJ,cAAc,EAAE;MACvB,MAAM,IAAIJ,iBAAiB,CAAC,kCAAkC,CAAC;IACjE;IAEA,IAAI,CAACI,cAAc,GAAG,IAAI;IACzB,IAAI,CAACK,IAAI,CAA+BF,KAAK,CAACC,IAAI,CAAC;EACtD;EAEOE,IAAIA,CAACF,IAAY,GAAG,CAAC,EAAQ;IAClC,IAAIA,IAAI,GAAG,CAAC,EAAE;MACZ,MAAM,IAAIP,UAAU,CAClB,8CAA8CO,IAAI,EACpD,CAAC;IACH;IAEA,IAAI,CAAC,IAAI,CAACJ,cAAc,EAAE;MACxB,MAAM,IAAIJ,iBAAiB,CACzB,8CACF,CAAC;IACH;IAEC,IAAI,CAACS,IAAI,CAA+BC,IAAI,CAACF,IAAI,CAAC;EACrD;EAEA,IAAWG,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,CAACT,iBAAiB,CAACY,qBAAqB,CACrE,OAAO,EACPJ,QACF,CAAC;IAEA,IAAI,CAACJ,IAAI,CAA+BE,OAAO,GAC9C,IAAI,CAACG,mBAAmB,CAACI,cAAc;EAC3C;AACF","ignoreList":[]}

package/lib/typescript/core/AudioBufferBaseSourceNode.d.ts

@@ -1,14 +1,17 @@
-import { IAudioBufferBaseSourceNode } from '../interfaces';
-import AudioScheduledSourceNode from './AudioScheduledSourceNode';
-import BaseAudioContext from './BaseAudioContext';
 import AudioParam from './AudioParam';
+import BaseAudioContext from './BaseAudioContext';
 import { EventTypeWithValue } from '../events/types';
+import { IAudioBufferBaseSourceNode } from '../interfaces';
+import AudioScheduledSourceNode from './AudioScheduledSourceNode';
 export default class AudioBufferBaseSourceNode extends AudioScheduledSourceNode {
     readonly playbackRate: AudioParam;
     readonly detune: AudioParam;
     private positionChangedSubscription?;
+    private positionChangedCallback?;
     constructor(context: BaseAudioContext, node: IAudioBufferBaseSourceNode);
+    get onPositionChanged(): ((event: EventTypeWithValue) => void) | undefined;
     set onPositionChanged(callback: ((event: EventTypeWithValue) => void) | null);
+    get onPositionChangedInterval(): number;
     set onPositionChangedInterval(value: number);
 }
 //# sourceMappingURL=AudioBufferBaseSourceNode.d.ts.map

package/lib/typescript/core/AudioBufferBaseSourceNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AudioBufferBaseSourceNode.d.ts","sourceRoot":"","sources":["../../../src/core/AudioBufferBaseSourceNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrD,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,wBAAwB;IAC7E,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,OAAO,CAAC,2BAA2B,CAAC,CAAyB;gBAEjD,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,0BAA0B;IAQvE,IAAW,iBAAiB,CAC1B,QAAQ,EAAE,CAAC,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC,GAAG,IAAI,EAavD;IAGD,IAAW,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAEjD;CACF"}
+{"version":3,"file":"AudioBufferBaseSourceNode.d.ts","sourceRoot":"","sources":["../../../src/core/AudioBufferBaseSourceNode.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,wBAAwB;IAC7E,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,OAAO,CAAC,2BAA2B,CAAC,CAAyB;IAC7D,OAAO,CAAC,uBAAuB,CAAC,CAAsC;gBAE1D,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,0BAA0B;IAOvE,IAAW,iBAAiB,IACxB,CAAC,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC,GACrC,SAAS,CAEZ;IAED,IAAW,iBAAiB,CAC1B,QAAQ,EAAE,CAAC,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC,GAAG,IAAI,EAiBvD;IAED,IAAW,yBAAyB,IAAI,MAAM,CAE7C;IAED,IAAW,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAEjD;CACF"}

package/lib/typescript/core/AudioScheduledSourceNode.d.ts

@@ -5,8 +5,10 @@ export default class AudioScheduledSourceNode extends AudioNode {
     protected hasBeenStarted: boolean;
     protected readonly audioEventEmitter: AudioEventEmitter;
     private onendedSubscription?;
+    private onEndedCallback?;
     start(when?: number): void;
     stop(when?: number): void;
+    get onended(): ((event: EventEmptyType) => void) | undefined;
     set onended(callback: ((event: EventEmptyType) => void) | null);
 }
 //# sourceMappingURL=AudioScheduledSourceNode.d.ts.map

package/lib/typescript/core/AudioScheduledSourceNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AudioScheduledSourceNode.d.ts","sourceRoot":"","sources":["../../../src/core/AudioScheduledSourceNode.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAA0B,MAAM,WAAW,CAAC;AAEtE,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,SAAS;IAC7D,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAC1C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,oBAElC;IAEF,OAAO,CAAC,mBAAmB,CAAC,CAAyB;IAE9C,KAAK,CAAC,IAAI,GAAE,MAAU,GAAG,IAAI;IAe7B,IAAI,CAAC,IAAI,GAAE,MAAU,GAAG,IAAI;IAiBnC,IAAW,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC,GAAG,IAAI,EAapE;CACF"}
+{"version":3,"file":"AudioScheduledSourceNode.d.ts","sourceRoot":"","sources":["../../../src/core/AudioScheduledSourceNode.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAA0B,MAAM,WAAW,CAAC;AAEtE,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,SAAS;IAC7D,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAC1C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,oBAElC;IAEF,OAAO,CAAC,mBAAmB,CAAC,CAAyB;IACrD,OAAO,CAAC,eAAe,CAAC,CAAkC;IAEnD,KAAK,CAAC,IAAI,GAAE,MAAU,GAAG,IAAI;IAe7B,IAAI,CAAC,IAAI,GAAE,MAAU,GAAG,IAAI;IAgBnC,IAAW,OAAO,IAAI,CAAC,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC,GAAG,SAAS,CAElE;IAED,IAAW,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC,GAAG,IAAI,EAiBpE;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-api",
-  "version": "0.6.4",
+  "version": "0.6.5-rc.1",
   "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"

package/src/core/AudioBufferBaseSourceNode.ts

@@ -1,14 +1,15 @@
-import { IAudioBufferBaseSourceNode } from '../interfaces';
-import AudioScheduledSourceNode from './AudioScheduledSourceNode';
-import BaseAudioContext from './BaseAudioContext';
 import AudioParam from './AudioParam';
-import { EventTypeWithValue } from '../events/types';
+import BaseAudioContext from './BaseAudioContext';
 import { AudioEventSubscription } from '../events';
+import { EventTypeWithValue } from '../events/types';
+import { IAudioBufferBaseSourceNode } from '../interfaces';
+import AudioScheduledSourceNode from './AudioScheduledSourceNode';
 
 export default class AudioBufferBaseSourceNode extends AudioScheduledSourceNode {
   readonly playbackRate: AudioParam;
   readonly detune: AudioParam;
   private positionChangedSubscription?: AudioEventSubscription;
+  private positionChangedCallback?: (event: EventTypeWithValue) => void;
 
   constructor(context: BaseAudioContext, node: IAudioBufferBaseSourceNode) {
     super(context, node);
@@ -17,16 +18,25 @@ export default class AudioBufferBaseSourceNode extends AudioScheduledSourceNode
     this.playbackRate = new AudioParam(node.playbackRate, context);
   }
 
-  // eslint-disable-next-line accessor-pairs
+  public get onPositionChanged():
+    | ((event: EventTypeWithValue) => void)
+    | undefined {
+    return this.positionChangedCallback;
+  }
+
   public set onPositionChanged(
     callback: ((event: EventTypeWithValue) => void) | null
   ) {
     if (!callback) {
+      (this.node as IAudioBufferBaseSourceNode).onPositionChanged = '0';
       this.positionChangedSubscription?.remove();
       this.positionChangedSubscription = undefined;
-      (this.node as IAudioBufferBaseSourceNode).onPositionChanged = '0';
+      this.positionChangedCallback = undefined;
+
       return;
     }
+
+    this.positionChangedCallback = callback;
     this.positionChangedSubscription =
       this.audioEventEmitter.addAudioEventListener('positionChanged', callback);
 
@@ -34,7 +44,10 @@ export default class AudioBufferBaseSourceNode extends AudioScheduledSourceNode
       this.positionChangedSubscription.subscriptionId;
   }
 
-  // eslint-disable-next-line accessor-pairs
+  public get onPositionChangedInterval(): number {
+    return (this.node as IAudioBufferBaseSourceNode).onPositionChangedInterval;
+  }
+
   public set onPositionChangedInterval(value: number) {
     (this.node as IAudioBufferBaseSourceNode).onPositionChangedInterval = value;
   }

package/src/core/AudioScheduledSourceNode.ts

@@ -11,6 +11,7 @@ export default class AudioScheduledSourceNode extends AudioNode {
   );
 
   private onendedSubscription?: AudioEventSubscription;
+  private onEndedCallback?: (event: EventEmptyType) => void;
 
   public start(when: number = 0): void {
     if (when < 0) {
@@ -43,13 +44,20 @@ export default class AudioScheduledSourceNode extends AudioNode {
     (this.node as IAudioScheduledSourceNode).stop(when);
   }
 
-  // eslint-disable-next-line accessor-pairs
+  public get onended(): ((event: EventEmptyType) => void) | undefined {
+    return this.onEndedCallback;
+  }
+
   public set onended(callback: ((event: EventEmptyType) => void) | null) {
     if (!callback) {
+      (this.node as IAudioScheduledSourceNode).onended = '0';
       this.onendedSubscription?.remove();
       this.onendedSubscription = undefined;
+      this.onEndedCallback = undefined;
       return;
     }
+
+    this.onEndedCallback = callback;
     this.onendedSubscription = this.audioEventEmitter.addAudioEventListener(
       'ended',
       callback