feat: added error and null handling to AudioBufferSourceNode

Author: Maciej Makowski

packages/react-native-audio-api/common/cpp/HostObjects/AudioBufferSourceNodeHostObject.cpp

@@ -18,6 +18,7 @@ std::vector<jsi::PropNameID> AudioBufferSourceNodeHostObject::getPropertyNames(
       AudioScheduledSourceNodeHostObject::getPropertyNames(runtime);
   propertyNames.push_back(jsi::PropNameID::forAscii(runtime, "loop"));
   propertyNames.push_back(jsi::PropNameID::forAscii(runtime, "buffer"));
+  propertyNames.push_back(jsi::PropNameID::forAscii(runtime, "resetBuffer"));
   return propertyNames;
 }
 
@@ -33,10 +34,14 @@ jsi::Value AudioBufferSourceNodeHostObject::get(
   }
 
   if (propName == "buffer") {
-    auto wrapper = getAudioBufferSourceNodeWrapperFromAudioNodeWrapper();
-    auto buffer = wrapper->getBuffer();
-    auto bufferHostObject = AudioBufferHostObject::createFromWrapper(buffer);
-    return jsi::Object::createFromHostObject(runtime, bufferHostObject);
+      try {
+            auto wrapper = getAudioBufferSourceNodeWrapperFromAudioNodeWrapper();
+            auto buffer = wrapper->getBuffer();
+            auto bufferHostObject = AudioBufferHostObject::createFromWrapper(buffer);
+            return jsi::Object::createFromHostObject(runtime, bufferHostObject);
+        } catch (const std::runtime_error &e) {
+            return jsi::Value::null();
+      }
   }
 
   return AudioScheduledSourceNodeHostObject::get(runtime, propNameId);
@@ -55,9 +60,13 @@ void AudioBufferSourceNodeHostObject::set(
   }
 
   if (propName == "buffer") {
+      auto wrapper = getAudioBufferSourceNodeWrapperFromAudioNodeWrapper();
+      if (value.isNull()) {
+          wrapper->resetBuffer();
+          return;
+      }
     auto bufferHostObject =
         value.getObject(runtime).asHostObject<AudioBufferHostObject>(runtime);
-    auto wrapper = getAudioBufferSourceNodeWrapperFromAudioNodeWrapper();
     wrapper->setBuffer(bufferHostObject->wrapper_);
     return;
   }

packages/react-native-audio-api/common/cpp/core/AudioBufferSourceNode.cpp

@@ -30,6 +30,10 @@ void AudioBufferSourceNode::setBuffer(
   buffer_ = buffer->mix(channelCount_);
 }
 
+void AudioBufferSourceNode::resetBuffer() {
+    buffer_ = std::nullopt;
+}
+
 bool AudioBufferSourceNode::processAudio(float *audioData, int32_t numFrames) {
   if (!isPlaying_ || !buffer_.has_value()) {
     return false;

packages/react-native-audio-api/common/cpp/core/AudioBufferSourceNode.h

@@ -16,6 +16,7 @@ class AudioBufferSourceNode : public AudioScheduledSourceNode {
   [[nodiscard]] std::shared_ptr<AudioBuffer> getBuffer() const;
   void setLoop(bool loop);
   void setBuffer(const std::shared_ptr<AudioBuffer> &buffer);
+  void resetBuffer();
   [[nodiscard]] bool processAudio(float *audioData, int32_t numFrames) override;
 
  private:

packages/react-native-audio-api/common/cpp/wrappers/AudioBufferSourceNodeWrapper.cpp

@@ -22,14 +22,23 @@ void AudioBufferSourceNodeWrapper::setLoop(bool loop) {
 }
 
 std::shared_ptr<AudioBufferWrapper> AudioBufferSourceNodeWrapper::getBuffer() {
-  auto audioBufferSourceNode = getAudioBufferSourceNodeFromAudioNode();
-  auto buffer = audioBufferSourceNode->getBuffer();
-  return std::make_shared<AudioBufferWrapper>(buffer);
+    try {
+        auto audioBufferSourceNode = getAudioBufferSourceNodeFromAudioNode();
+        auto buffer = audioBufferSourceNode->getBuffer();
+        return std::make_shared<AudioBufferWrapper>(buffer);
+    } catch (const std::runtime_error &e) {
+        throw std::runtime_error("Buffer is not set");
+    }
 }
 
 void AudioBufferSourceNodeWrapper::setBuffer(
     const std::shared_ptr<AudioBufferWrapper> &buffer) {
   auto audioBufferSourceNode = getAudioBufferSourceNodeFromAudioNode();
   audioBufferSourceNode->setBuffer(buffer->audioBuffer_);
 }
+
+void AudioBufferSourceNodeWrapper::resetBuffer() {
+    auto audioBufferSourceNode = getAudioBufferSourceNodeFromAudioNode();
+    audioBufferSourceNode->resetBuffer();
+}
 } // namespace audioapi

packages/react-native-audio-api/common/cpp/wrappers/AudioBufferSourceNodeWrapper.h

@@ -17,6 +17,7 @@ class AudioBufferSourceNodeWrapper : public AudioScheduledSourceNodeWrapper {
   [[nodiscard]] bool getLoop();
   [[nodiscard]] std::shared_ptr<AudioBufferWrapper> getBuffer();
   void setBuffer(const std::shared_ptr<AudioBufferWrapper> &buffer);
+  void resetBuffer();
 
  private:
   std::shared_ptr<AudioBufferSourceNode>

packages/react-native-audio-api/src/core/AudioBufferSourceNode.ts

@@ -8,11 +8,20 @@ export default class AudioBufferSourceNode extends AudioScheduledSourceNode {
     super(context, node);
   }
 
-  public get buffer(): AudioBuffer {
-    return new AudioBuffer((this.node as IAudioBufferSourceNode).buffer);
+  public get buffer(): AudioBuffer | null {
+    const buffer = (this.node as IAudioBufferSourceNode).buffer;
+    if (!buffer) {
+      return null;
+    }
+    return new AudioBuffer(buffer);
   }
 
-  public set buffer(buffer: AudioBuffer) {
+  public set buffer(buffer: AudioBuffer | null) {
+    if (!buffer) {
+      (this.node as IAudioBufferSourceNode).buffer = null;
+      return;
+    }
+
     (this.node as IAudioBufferSourceNode).buffer = buffer.buffer;
   }
 

packages/react-native-audio-api/src/interfaces.ts

@@ -68,7 +68,7 @@ export interface IOscillatorNode extends IAudioScheduledSourceNode {
 }
 
 export interface IAudioBufferSourceNode extends IAudioScheduledSourceNode {
-  buffer: IAudioBuffer;
+  buffer: IAudioBuffer | null;
   loop: boolean;
 }