react-native-audio-api 0.12.0-nightly-3254662-20260127 → 0.12.0-nightly-1a3c43b-20260128

package/android/src/main/cpp/audioapi/CMakeLists.txt

@@ -103,12 +103,6 @@ set(RN_VERSION_LINK_LIBRARIES
   ReactAndroid::reactnative
 )
 
-target_compile_options(
-  react-native-audio-api
-  PRIVATE
-  -Wno-mismatched-tags
-)
-
 if(RN_AUDIO_API_WORKLETS_ENABLED)
   target_compile_definitions(
     react-native-audio-api

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

@@ -64,7 +64,7 @@ void AudioAPIModule::injectJSIBindings() {
 }
 
 void AudioAPIModule::invokeHandlerWithEventNameAndEventBody(
-    jni::alias_ref<jni::JString> eventName,
+    jint eventOrdinal,
     jni::alias_ref<jni::JMap<jstring, jobject>> eventBody) {
   std::unordered_map<std::string, EventValue> body = {};
 
@@ -92,7 +92,8 @@ void AudioAPIModule::invokeHandlerWithEventNameAndEventBody(
   }
 
   if (audioEventHandlerRegistry_ != nullptr) {
-    audioEventHandlerRegistry_->invokeHandlerWithEventBody(eventName->toStdString(), body);
+    audioEventHandlerRegistry_->invokeHandlerWithEventBody(
+        static_cast<audioapi::AudioEvent>(eventOrdinal), body);
   }
 }
 } // namespace audioapi

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

@@ -33,7 +33,7 @@ class AudioAPIModule : public jni::HybridClass<AudioAPIModule> {
   static void registerNatives();
 
   void injectJSIBindings();
-  void invokeHandlerWithEventNameAndEventBody(jni::alias_ref<jni::JString> eventName, jni::alias_ref<jni::JMap<jstring, jobject>> eventBody);
+  void invokeHandlerWithEventNameAndEventBody(jint eventOrdinal, jni::alias_ref<jni::JMap<jstring, jobject>> eventBody);
 
  private:
   friend HybridBase;

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

@@ -431,7 +431,7 @@ void AndroidAudioRecorder::onErrorAfterClose(oboe::AudioStream *stream, oboe::Re
       std::string message = "Android recorder error: " + streamResult.unwrap_err();
       std::unordered_map<std::string, EventValue> eventPayload{{"message", std::move(message)}};
       audioEventHandlerRegistry_->invokeHandlerWithEventBody(
-          "recorderError", callbackId, eventPayload);
+          AudioEvent::RECORDER_ERROR, callbackId, eventPayload);
       return;
     }
 

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

@@ -1,6 +1,8 @@
 package com.swmansion.audioapi
 
 import android.media.AudioManager
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.annotation.RequiresPermission
 import com.facebook.jni.HybridData
 import com.facebook.react.bridge.Arguments
@@ -41,7 +43,7 @@ class AudioAPIModule(
   private external fun injectJSIBindings()
 
   external fun invokeHandlerWithEventNameAndEventBody(
-    eventName: String,
+    eventOrdinal: Int,
     eventBody: Map<String, Any>,
   )
 
@@ -108,6 +110,7 @@ class AudioAPIModule(
     mode: String?,
     options: ReadableArray?,
     allowHaptics: Boolean,
+    notifyOthersOnDeactivation: Boolean,
   ) {
     // noting to do here
   }
@@ -159,6 +162,7 @@ class AudioAPIModule(
     promise.resolve(MediaSessionManager.checkNotificationPermissions())
   }
 
+  @RequiresApi(Build.VERSION_CODES.O)
   override fun getDevicesInfo(promise: Promise) {
     promise.resolve(MediaSessionManager.getDevicesInfo())
   }

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

@@ -0,0 +1,28 @@
+package com.swmansion.audioapi.system
+
+// should be kept in sync with AudioEvent.h
+enum class AudioEvent {
+  PLAYBACK_NOTIFICATION_PLAY,
+  PLAYBACK_NOTIFICATION_PAUSE,
+  PLAYBACK_NOTIFICATION_STOP,
+  PLAYBACK_NOTIFICATION_NEXT_TRACK,
+  PLAYBACK_NOTIFICATION_PREVIOUS_TRACK,
+  PLAYBACK_NOTIFICATION_SKIP_FORWARD,
+  PLAYBACK_NOTIFICATION_SKIP_BACKWARD,
+  PLAYBACK_NOTIFICATION_SEEK_FORWARD,
+  PLAYBACK_NOTIFICATION_SEEK_BACKWARD,
+  PLAYBACK_NOTIFICATION_SEEK_TO,
+  PLAYBACK_NOTIFICATION_DISMISSED,
+  RECORDING_NOTIFICATION_RESUME,
+  RECORDING_NOTIFICATION_PAUSE,
+  ROUTE_CHANGE,
+  INTERRUPTION,
+  VOLUME_CHANGE,
+  DUCK,
+  ENDED,
+  LOOP_ENDED,
+  AUDIO_READY,
+  POSITION_CHANGED,
+  BUFFER_ENDED,
+  RECORDER_ERROR,
+}

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

@@ -25,7 +25,7 @@ class AudioFocusListener(
             put("shouldResume", false)
             isTransientLoss = false
           }
-        audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("interruption", body)
+        audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.INTERRUPTION.ordinal, body)
       }
 
       AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
@@ -35,7 +35,7 @@ class AudioFocusListener(
             put("shouldResume", false)
             isTransientLoss = true
           }
-        audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("interruption", body)
+        audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.INTERRUPTION.ordinal, body)
       }
 
       AudioManager.AUDIOFOCUS_GAIN -> {
@@ -45,11 +45,11 @@ class AudioFocusListener(
             put("shouldResume", isTransientLoss)
             isTransientLoss = false
           }
-        audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("interruption", body)
+        audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.INTERRUPTION.ordinal, body)
       }
 
       AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
-        audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("duck", emptyMap())
+        audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.DUCK.ordinal, emptyMap())
       }
     }
   }

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

@@ -21,7 +21,7 @@ class VolumeChangeListener(
     val maxVolume = audioManager.get()?.getStreamMaxVolume(AudioManager.STREAM_MUSIC)?.toDouble()!!
 
     val body = HashMap<String, Any>().apply { put("value", currentVolume / maxVolume) }
-    audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("volumeChange", body)
+    audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.VOLUME_CHANGE.ordinal, body)
   }
 
   fun getIntentFilter(): IntentFilter {

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

@@ -19,6 +19,7 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.swmansion.audioapi.AudioAPIModule
 import com.swmansion.audioapi.R
+import com.swmansion.audioapi.system.AudioEvent
 import java.io.IOException
 import java.lang.ref.WeakReference
 import java.net.URL
@@ -78,34 +79,38 @@ class PlaybackNotification(
     mediaSession?.setCallback(
       object : MediaSessionCompat.Callback() {
         override fun onPlay() {
-          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("playbackNotificationPlay", mapOf())
+          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.PLAYBACK_NOTIFICATION_PLAY.ordinal, mapOf())
         }
 
         override fun onPause() {
-          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("playbackNotificationPause", mapOf())
+          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.PLAYBACK_NOTIFICATION_PAUSE.ordinal, mapOf())
+        }
+
+        override fun onStop() {
+          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.PLAYBACK_NOTIFICATION_STOP.ordinal, mapOf())
         }
 
         override fun onSkipToNext() {
-          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("playbackNotificationNext", mapOf())
+          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.PLAYBACK_NOTIFICATION_NEXT_TRACK.ordinal, mapOf())
         }
 
         override fun onSkipToPrevious() {
-          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("playbackNotificationPrevious", mapOf())
+          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.PLAYBACK_NOTIFICATION_PREVIOUS_TRACK.ordinal, mapOf())
         }
 
         override fun onFastForward() {
           val body = HashMap<String, Any>().apply { put("value", 15) }
-          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("playbackNotificationSkipForward", body)
+          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.PLAYBACK_NOTIFICATION_SKIP_FORWARD.ordinal, body)
         }
 
         override fun onRewind() {
           val body = HashMap<String, Any>().apply { put("value", 15) }
-          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("playbackNotificationSkipBackward", body)
+          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.PLAYBACK_NOTIFICATION_SKIP_BACKWARD.ordinal, body)
         }
 
         override fun onSeekTo(pos: Long) {
           val body = HashMap<String, Any>().apply { put("value", pos / 1000.0) }
-          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("playbackNotificationSeekTo", body)
+          audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody(AudioEvent.PLAYBACK_NOTIFICATION_SEEK_TO.ordinal, body)
         }
 
         override fun onCustomAction(
@@ -292,15 +297,14 @@ class PlaybackNotification(
     if (name == null) return
     var controlValue = 0L
     when (name) {
-      "play", "remotePlay" -> controlValue = PlaybackStateCompat.ACTION_PLAY
-      "pause", "remotePause" -> controlValue = PlaybackStateCompat.ACTION_PAUSE
-      "stop", "remoteStop" -> controlValue = PlaybackStateCompat.ACTION_STOP
-      "togglePlayPause", "remoteTogglePlayPause" -> controlValue = PlaybackStateCompat.ACTION_PLAY_PAUSE
-      "next", "remoteNextTrack" -> controlValue = PlaybackStateCompat.ACTION_SKIP_TO_NEXT
-      "previous", "remotePreviousTrack" -> controlValue = PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
-      "skipForward", "remoteSkipForward" -> controlValue = PlaybackStateCompat.ACTION_FAST_FORWARD
-      "skipBackward", "remoteSkipBackward" -> controlValue = PlaybackStateCompat.ACTION_REWIND
-      "seekTo", "remoteChangePlaybackPosition" -> controlValue = PlaybackStateCompat.ACTION_SEEK_TO
+      "play" -> controlValue = PlaybackStateCompat.ACTION_PLAY
+      "pause" -> controlValue = PlaybackStateCompat.ACTION_PAUSE
+      "stop" -> controlValue = PlaybackStateCompat.ACTION_STOP
+      "nextTrack" -> controlValue = PlaybackStateCompat.ACTION_SKIP_TO_NEXT
+      "previousTrack" -> controlValue = PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
+      "skipForward" -> controlValue = PlaybackStateCompat.ACTION_FAST_FORWARD
+      "skipBackward" -> controlValue = PlaybackStateCompat.ACTION_REWIND
+      "seekTo" -> controlValue = PlaybackStateCompat.ACTION_SEEK_TO
     }
 
     controls =
@@ -366,7 +370,7 @@ class PlaybackNotification(
 
     if (hasControl(PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS)) {
       notificationBuilder?.addAction(
-        createAction("previous", "Previous", android.R.drawable.ic_media_previous, PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS),
+        createAction("previousTrack", "Previous track", android.R.drawable.ic_media_previous, PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS),
       )
       actionsList.add(index++)
     }
@@ -384,6 +388,11 @@ class PlaybackNotification(
           createAction("pause", "Pause", android.R.drawable.ic_media_pause, PlaybackStateCompat.ACTION_PAUSE),
         )
         actionsList.add(index++)
+      } else if (hasControl(PlaybackStateCompat.ACTION_STOP)) {
+        notificationBuilder?.addAction(
+          createAction("stop", "Stop", R.drawable.stop, PlaybackStateCompat.ACTION_STOP),
+        )
+        actionsList.add(index++)
       }
     } else {
       if (hasControl(PlaybackStateCompat.ACTION_PLAY)) {
@@ -401,7 +410,7 @@ class PlaybackNotification(
 
     if (hasControl(PlaybackStateCompat.ACTION_SKIP_TO_NEXT)) {
       notificationBuilder?.addAction(
-        createAction("next", "Next", android.R.drawable.ic_media_next, PlaybackStateCompat.ACTION_SKIP_TO_NEXT),
+        createAction("nextTrack", "Next track", android.R.drawable.ic_media_next, PlaybackStateCompat.ACTION_SKIP_TO_NEXT),
       )
       actionsList.add(index++)
     }

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

@@ -4,6 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.swmansion.audioapi.AudioAPIModule
+import com.swmansion.audioapi.system.AudioEvent
 
 /**
  * Broadcast receiver for handling playback notification dismissal.
@@ -25,14 +26,18 @@ class PlaybackNotificationReceiver : BroadcastReceiver() {
     context: Context?,
     intent: Intent?,
   ) {
-    if (intent?.action == ACTION_NOTIFICATION_DISMISSED) {
-      audioAPIModule?.invokeHandlerWithEventNameAndEventBody("playbackNotificationDismissed", mapOf())
-    } else if (intent?.action == ACTION_SKIP_FORWARD) {
-      val body = HashMap<String, Any>().apply { put("value", 15) }
-      audioAPIModule?.invokeHandlerWithEventNameAndEventBody("playbackNotificationSkipForward", body)
-    } else if (intent?.action == ACTION_SKIP_BACKWARD) {
-      val body = HashMap<String, Any>().apply { put("value", 15) }
-      audioAPIModule?.invokeHandlerWithEventNameAndEventBody("playbackNotificationSkipBackward", body)
+    when (intent?.action) {
+      ACTION_NOTIFICATION_DISMISSED -> {
+        audioAPIModule?.invokeHandlerWithEventNameAndEventBody(AudioEvent.PLAYBACK_NOTIFICATION_DISMISSED.ordinal, mapOf())
+      }
+      ACTION_SKIP_FORWARD -> {
+        val body = HashMap<String, Any>().apply { put("value", 15) }
+        audioAPIModule?.invokeHandlerWithEventNameAndEventBody(AudioEvent.PLAYBACK_NOTIFICATION_SKIP_FORWARD.ordinal, body)
+      }
+      ACTION_SKIP_BACKWARD -> {
+        val body = HashMap<String, Any>().apply { put("value", 15) }
+        audioAPIModule?.invokeHandlerWithEventNameAndEventBody(AudioEvent.PLAYBACK_NOTIFICATION_SKIP_BACKWARD.ordinal, body)
+      }
     }
   }
 }

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.util.Log
 import com.swmansion.audioapi.AudioAPIModule
+import com.swmansion.audioapi.system.AudioEvent
 
 class RecordingNotificationReceiver(
   private val module: AudioAPIModule,
@@ -22,12 +23,12 @@ class RecordingNotificationReceiver(
     when (intent?.action) {
       NOTIFICATION_RECORDING_STOPPED -> {
         Log.d(TAG, "Recording stopped via notification")
-        module.invokeHandlerWithEventNameAndEventBody("recordingNotificationPause", mapOf())
+        module.invokeHandlerWithEventNameAndEventBody(AudioEvent.RECORDING_NOTIFICATION_PAUSE.ordinal, mapOf())
       }
 
       NOTIFICATION_RECORDING_RESUMED -> {
         Log.d(TAG, "Recording resumed via notification")
-        module.invokeHandlerWithEventNameAndEventBody("recordingNotificationResume", mapOf())
+        module.invokeHandlerWithEventNameAndEventBody(AudioEvent.RECORDING_NOTIFICATION_RESUME.ordinal, mapOf())
       }
     }
   }

package/android/src/oldarch/NativeAudioAPIModuleSpec.java

@@ -48,7 +48,7 @@ public abstract class NativeAudioAPIModuleSpec extends ReactContextBaseJavaModul
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setAudioSessionOptions(String category, String mode, ReadableArray options, boolean allowHaptics);
+  public abstract void setAudioSessionOptions(String category, String mode, ReadableArray options, boolean allowHaptics, boolean notifyOthersOnDeactivation);
 
   @ReactMethod
   @DoNotStrip
@@ -56,7 +56,7 @@ public abstract class NativeAudioAPIModuleSpec extends ReactContextBaseJavaModul
 
   @ReactMethod
   @DoNotStrip
-  public abstract void observeAudioInterruptions(boolean enabled);
+  public abstract void observeAudioInterruptions(String focusType, boolean enabled);
 
   @ReactMethod
   @DoNotStrip

package/common/cpp/audioapi/AudioAPIModuleInstaller.h

@@ -69,7 +69,6 @@ class AudioAPIModuleInstaller {
             const jsi::Value &thisValue,
             const jsi::Value *args,
             size_t count) -> jsi::Value {
-          std::shared_ptr<AudioContext> audioContext;
           auto sampleRate = static_cast<float>(args[0].getNumber());
 
 #if RN_AUDIO_API_ENABLE_WORKLETS
@@ -80,12 +79,8 @@ class AudioAPIModuleInstaller {
           auto runtimeRegistry = RuntimeRegistry{};
 #endif
 
-          audioContext = std::make_shared<AudioContext>(
-              sampleRate, audioEventHandlerRegistry, runtimeRegistry);
-          audioContext->initialize();
-
-          auto audioContextHostObject =
-              std::make_shared<AudioContextHostObject>(audioContext, &runtime, jsCallInvoker);
+          auto audioContextHostObject = std::make_shared<AudioContextHostObject>(
+              sampleRate, audioEventHandlerRegistry, runtimeRegistry, &runtime, jsCallInvoker);
 
           return jsi::Object::createFromHostObject(runtime, audioContextHostObject);
         });
@@ -117,12 +112,14 @@ class AudioAPIModuleInstaller {
           auto runtimeRegistry = RuntimeRegistry{};
 #endif
 
-          auto offlineAudioContext = std::make_shared<OfflineAudioContext>(
-              numberOfChannels, length, sampleRate, audioEventHandlerRegistry, runtimeRegistry);
-          offlineAudioContext->initialize();
-
           auto audioContextHostObject = std::make_shared<OfflineAudioContextHostObject>(
-              offlineAudioContext, &runtime, jsCallInvoker);
+              numberOfChannels,
+              length,
+              sampleRate,
+              audioEventHandlerRegistry,
+              runtimeRegistry,
+              &runtime,
+              jsCallInvoker);
 
           return jsi::Object::createFromHostObject(runtime, audioContextHostObject);
         });

package/common/cpp/audioapi/HostObjects/AudioContextHostObject.cpp

@@ -7,10 +7,12 @@
 namespace audioapi {
 
 AudioContextHostObject::AudioContextHostObject(
-    const std::shared_ptr<AudioContext> &audioContext,
+    float sampleRate,
+    const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry,
+    const RuntimeRegistry &runtimeRegistry,
     jsi::Runtime *runtime,
     const std::shared_ptr<react::CallInvoker> &callInvoker)
-    : BaseAudioContextHostObject(audioContext, runtime, callInvoker) {
+    : BaseAudioContextHostObject(std::make_shared<AudioContext>(sampleRate, audioEventHandlerRegistry, runtimeRegistry), runtime, callInvoker) {
   addFunctions(
       JSI_EXPORT_FUNCTION(AudioContextHostObject, close),
       JSI_EXPORT_FUNCTION(AudioContextHostObject, resume),

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

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <audioapi/HostObjects/BaseAudioContextHostObject.h>
+#include <audioapi/core/utils/worklets/SafeIncludes.h>
+#include <audioapi/events/IAudioEventHandlerRegistry.h>
 
 #include <jsi/jsi.h>
 #include <memory>
@@ -15,7 +17,9 @@ class AudioContext;
 class AudioContextHostObject : public BaseAudioContextHostObject {
  public:
   explicit AudioContextHostObject(
-      const std::shared_ptr<AudioContext> &audioContext,
+      float sampleRate,
+      const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry,
+      const RuntimeRegistry &runtimeRegistry,
       jsi::Runtime *runtime,
       const std::shared_ptr<react::CallInvoker> &callInvoker);
 

package/common/cpp/audioapi/HostObjects/BaseAudioContextHostObject.cpp

@@ -1,5 +1,4 @@
 #include <audioapi/HostObjects/BaseAudioContextHostObject.h>
-
 #include <audioapi/HostObjects/WorkletNodeHostObject.h>
 #include <audioapi/HostObjects/WorkletProcessingNodeHostObject.h>
 #include <audioapi/HostObjects/analysis/AnalyserNodeHostObject.h>
@@ -20,9 +19,10 @@
 #include <audioapi/HostObjects/sources/RecorderAdapterNodeHostObject.h>
 #include <audioapi/HostObjects/sources/StreamerNodeHostObject.h>
 #include <audioapi/HostObjects/sources/WorkletSourceNodeHostObject.h>
+#include <audioapi/HostObjects/utils/JsEnumParser.h>
+#include <audioapi/HostObjects/utils/NodeOptionsParser.h>
 #include <audioapi/core/BaseAudioContext.h>
 
-#include <audioapi/HostObjects/utils/NodeOptionsParser.h>
 #include <memory>
 #include <utility>
 #include <vector>
@@ -33,8 +33,11 @@ BaseAudioContextHostObject::BaseAudioContextHostObject(
     const std::shared_ptr<BaseAudioContext> &context,
     jsi::Runtime *runtime,
     const std::shared_ptr<react::CallInvoker> &callInvoker)
-    : context_(context), callInvoker_(callInvoker) {
-  promiseVendor_ = std::make_shared<PromiseVendor>(runtime, callInvoker);
+    : context_(context),
+      promiseVendor_(std::make_shared<PromiseVendor>(runtime, callInvoker)),
+      callInvoker_(callInvoker) {
+  context_->initialize();
+  destination_ = std::make_shared<AudioDestinationNodeHostObject>(context_->getDestination());
 
   addGetters(
       JSI_EXPORT_PROPERTY_GETTER(BaseAudioContextHostObject, destination),
@@ -71,12 +74,11 @@ BaseAudioContextHostObject::BaseAudioContextHostObject(
 BaseAudioContextHostObject::~BaseAudioContextHostObject() = default;
 
 JSI_PROPERTY_GETTER_IMPL(BaseAudioContextHostObject, destination) {
-  auto destination = std::make_shared<AudioDestinationNodeHostObject>(context_->getDestination());
-  return jsi::Object::createFromHostObject(runtime, destination);
+  return jsi::Object::createFromHostObject(runtime, destination_);
 }
 
 JSI_PROPERTY_GETTER_IMPL(BaseAudioContextHostObject, state) {
-  return jsi::String::createFromUtf8(runtime, context_->getState());
+    return jsi::String::createFromUtf8(runtime, js_enum_parser::contextStateToString(context_->getState()));
 }
 
 JSI_PROPERTY_GETTER_IMPL(BaseAudioContextHostObject, sampleRate) {
@@ -169,8 +171,8 @@ JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createRecorderAdapter) {
 JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createOscillator) {
   const auto options = args[0].asObject(runtime);
   const auto oscillatorOptions = audioapi::option_parser::parseOscillatorOptions(runtime, options);
-  auto oscillator = context_->createOscillator(oscillatorOptions);
-  auto oscillatorHostObject = std::make_shared<OscillatorNodeHostObject>(oscillator);
+  auto oscillatorHostObject =
+      std::make_shared<OscillatorNodeHostObject>(context_, oscillatorOptions);
   return jsi::Object::createFromHostObject(runtime, oscillatorHostObject);
 }
 
@@ -181,8 +183,7 @@ JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createStreamer) {
     const auto options = args[0].asObject(runtime);
     streamerOptions = audioapi::option_parser::parseStreamerOptions(runtime, options);
   }
-  auto streamer = context_->createStreamer(streamerOptions);
-  auto streamerHostObject = std::make_shared<StreamerNodeHostObject>(streamer);
+  auto streamerHostObject = std::make_shared<StreamerNodeHostObject>(context_, streamerOptions);
   auto object = jsi::Object::createFromHostObject(runtime, streamerHostObject);
   object.setExternalMemoryPressure(runtime, StreamerNodeHostObject::getSizeInBytes());
   return object;
@@ -195,24 +196,22 @@ JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createConstantSource) {
   const auto options = args[0].asObject(runtime);
   const auto constantSourceOptions =
       audioapi::option_parser::parseConstantSourceOptions(runtime, options);
-  auto constantSource = context_->createConstantSource(constantSourceOptions);
-  auto constantSourceHostObject = std::make_shared<ConstantSourceNodeHostObject>(constantSource);
+  auto constantSourceHostObject =
+      std::make_shared<ConstantSourceNodeHostObject>(context_, constantSourceOptions);
   return jsi::Object::createFromHostObject(runtime, constantSourceHostObject);
 }
 
 JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createGain) {
   const auto options = args[0].asObject(runtime);
   const auto gainOptions = audioapi::option_parser::parseGainOptions(runtime, options);
-  auto gain = context_->createGain(std::move(gainOptions));
-  auto gainHostObject = std::make_shared<GainNodeHostObject>(gain);
+  auto gainHostObject = std::make_shared<GainNodeHostObject>(context_, gainOptions);
   return jsi::Object::createFromHostObject(runtime, gainHostObject);
 }
 
 JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createDelay) {
   const auto options = args[0].asObject(runtime);
   const auto delayOptions = audioapi::option_parser::parseDelayOptions(runtime, options);
-  auto delayNode = context_->createDelay(delayOptions);
-  auto delayNodeHostObject = std::make_shared<DelayNodeHostObject>(delayNode);
+  auto delayNodeHostObject = std::make_shared<DelayNodeHostObject>(context_, delayOptions);
   auto jsiObject = jsi::Object::createFromHostObject(runtime, delayNodeHostObject);
   jsiObject.setExternalMemoryPressure(runtime, delayNodeHostObject->getSizeInBytes());
   return jsiObject;
@@ -220,25 +219,26 @@ JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createDelay) {
 
 JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createStereoPanner) {
   const auto options = args[0].asObject(runtime);
-  const auto stereoPannerOptions = audioapi::option_parser::parseStereoPannerOptions(runtime, options);
-  auto stereoPanner = context_->createStereoPanner(stereoPannerOptions);
-  auto stereoPannerHostObject = std::make_shared<StereoPannerNodeHostObject>(stereoPanner);
+  const auto stereoPannerOptions =
+      audioapi::option_parser::parseStereoPannerOptions(runtime, options);
+  auto stereoPannerHostObject =
+      std::make_shared<StereoPannerNodeHostObject>(context_, stereoPannerOptions);
   return jsi::Object::createFromHostObject(runtime, stereoPannerHostObject);
 }
 
 JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createBiquadFilter) {
   const auto options = args[0].asObject(runtime);
-  const auto biquadFilterOptions = audioapi::option_parser::parseBiquadFilterOptions(runtime, options);
-  auto biquadFilter = context_->createBiquadFilter(biquadFilterOptions);
-  auto biquadFilterHostObject = std::make_shared<BiquadFilterNodeHostObject>(biquadFilter);
+  const auto biquadFilterOptions =
+      audioapi::option_parser::parseBiquadFilterOptions(runtime, options);
+  auto biquadFilterHostObject =
+      std::make_shared<BiquadFilterNodeHostObject>(context_, biquadFilterOptions);
   return jsi::Object::createFromHostObject(runtime, biquadFilterHostObject);
 }
 
 JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createIIRFilter) {
   const auto options = args[0].asObject(runtime);
   const auto iirFilterOptions = audioapi::option_parser::parseIIRFilterOptions(runtime, options);
-  auto iirFilter = context_->createIIRFilter(iirFilterOptions);
-  auto iirFilterHostObject = std::make_shared<IIRFilterNodeHostObject>(iirFilter);
+  auto iirFilterHostObject = std::make_shared<IIRFilterNodeHostObject>(context_, iirFilterOptions);
   return jsi::Object::createFromHostObject(runtime, iirFilterHostObject);
 }
 
@@ -246,8 +246,8 @@ JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createBufferSource) {
   const auto options = args[0].asObject(runtime);
   const auto audioBufferSourceOptions =
       audioapi::option_parser::parseAudioBufferSourceOptions(runtime, options);
-  auto bufferSource = context_->createBufferSource(audioBufferSourceOptions);
-  auto bufferSourceHostObject = std::make_shared<AudioBufferSourceNodeHostObject>(bufferSource);
+  auto bufferSourceHostObject =
+      std::make_shared<AudioBufferSourceNodeHostObject>(context_, audioBufferSourceOptions);
   return jsi::Object::createFromHostObject(runtime, bufferSourceHostObject);
 }
 
@@ -255,15 +255,15 @@ JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createBufferQueueSource) {
   const auto options = args[0].asObject(runtime);
   const auto baseAudioBufferSourceOptions =
       audioapi::option_parser::parseBaseAudioBufferSourceOptions(runtime, options);
-  auto bufferSource = context_->createBufferQueueSource(baseAudioBufferSourceOptions);
-  auto bufferStreamSourceHostObject =
-      std::make_shared<AudioBufferQueueSourceNodeHostObject>(bufferSource);
+  auto bufferStreamSourceHostObject = std::make_shared<AudioBufferQueueSourceNodeHostObject>(
+      context_, baseAudioBufferSourceOptions);
   return jsi::Object::createFromHostObject(runtime, bufferStreamSourceHostObject);
 }
 
 JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createBuffer) {
   const auto options = args[0].asObject(runtime);
-  const auto audioBufferOptions = audioapi::option_parser::parseAudioBufferOptions(runtime, options);
+  const auto audioBufferOptions =
+      audioapi::option_parser::parseAudioBufferOptions(runtime, options);
   auto buffer = BaseAudioContext::createBuffer(audioBufferOptions);
   auto bufferHostObject = std::make_shared<AudioBufferHostObject>(buffer);
 
@@ -300,19 +300,19 @@ JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createPeriodicWave) {
 JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createAnalyser) {
   const auto options = args[0].asObject(runtime);
   const auto analyserOptions = audioapi::option_parser::parseAnalyserOptions(runtime, options);
-  auto analyser = context_->createAnalyser(analyserOptions);
-  auto analyserHostObject = std::make_shared<AnalyserNodeHostObject>(analyser);
+  auto analyserHostObject = std::make_shared<AnalyserNodeHostObject>(context_, analyserOptions);
   return jsi::Object::createFromHostObject(runtime, analyserHostObject);
 }
 
 JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createConvolver) {
   const auto options = args[0].asObject(runtime);
   const auto convolverOptions = audioapi::option_parser::parseConvolverOptions(runtime, options);
-  auto convolver = context_->createConvolver(convolverOptions);
-  auto convolverHostObject = std::make_shared<ConvolverNodeHostObject>(convolver);
+  auto convolverHostObject = std::make_shared<ConvolverNodeHostObject>(context_, convolverOptions);
   auto jsiObject = jsi::Object::createFromHostObject(runtime, convolverHostObject);
   if (convolverOptions.bus != nullptr) {
-    auto bufferHostObject = options.getProperty(runtime, "buffer").getObject(runtime).asHostObject<AudioBufferHostObject>(runtime);
+    auto bufferHostObject = options.getProperty(runtime, "buffer")
+                                .getObject(runtime)
+                                .asHostObject<AudioBufferHostObject>(runtime);
     jsiObject.setExternalMemoryPressure(runtime, bufferHostObject->getSizeInBytes());
   }
   return jsiObject;
@@ -321,8 +321,8 @@ JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createConvolver) {
 JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createWaveShaper) {
   const auto options = args[0].asObject(runtime);
   const auto waveShaperOptions = audioapi::option_parser::parseWaveShaperOptions(runtime, options);
-  auto waveShaper = context_->createWaveShaper(waveShaperOptions);
-  auto waveShaperHostObject = std::make_shared<WaveShaperNodeHostObject>(waveShaper);
+  auto waveShaperHostObject =
+      std::make_shared<WaveShaperNodeHostObject>(context_, waveShaperOptions);
   return jsi::Object::createFromHostObject(runtime, waveShaperHostObject);
 }
 } // namespace audioapi

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

@@ -13,6 +13,7 @@ namespace audioapi {
 using namespace facebook;
 
 class BaseAudioContext;
+class AudioDestinationNodeHostObject;
 
 class BaseAudioContextHostObject : public JsiHostObject {
  public:
@@ -48,10 +49,11 @@ class BaseAudioContextHostObject : public JsiHostObject {
   JSI_HOST_FUNCTION_DECL(createWaveShaper);
   JSI_HOST_FUNCTION_DECL(createDelay);
 
-  std::shared_ptr<BaseAudioContext> context_;
-
  protected:
+  std::shared_ptr<BaseAudioContext> context_;
   std::shared_ptr<PromiseVendor> promiseVendor_;
   std::shared_ptr<react::CallInvoker> callInvoker_;
+
+  std::shared_ptr<AudioDestinationNodeHostObject> destination_;
 };
 } // namespace audioapi