react-native-audio-api 0.8.1-nightly-2c9c6a6-20250903 → 0.8.1-nightly-fc8149e-20250904

package/README.md

@@ -81,7 +81,7 @@ We are open to new ideas and general feedback. If you want to share your opinion
 
 ## License
 
-react-native-audio-api library is licensed under [The MIT License](./LICENSE). Some of the source code uses implementation directly copied from Webkit and copyrights are held by respective organizations, check [COPYING](./COPYING) file for further details
+react-native-audio-api library is licensed under [The MIT License](./LICENSE). Some of the source code uses implementation directly copied from Webkit and utilizes FFmpeg binaries. Copyrights are held by respective organizations, check [THIRD_PARTY](./THIRD_PARTY.md) file for further details.
 
 ## Credits
 

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

@@ -15,6 +15,8 @@ AudioPlayer::AudioPlayer(
       sampleRate_(sampleRate),
       channelCount_(channelCount) {
   isInitialized_ = openAudioStream();
+
+  nativeAudioPlayer_ = jni::make_global(NativeAudioPlayer::create());
 }
 
 bool AudioPlayer::openAudioStream() {
@@ -47,6 +49,7 @@ bool AudioPlayer::openAudioStream() {
 
 bool AudioPlayer::start() {
   if (mStream_) {
+    nativeAudioPlayer_->start();
     auto result = mStream_->requestStart();
     return result == oboe::Result::OK;
   }
@@ -56,6 +59,7 @@ bool AudioPlayer::start() {
 
 void AudioPlayer::stop() {
   if (mStream_) {
+    nativeAudioPlayer_->stop();
     mStream_->requestStop();
   }
 }

package/android/src/main/cpp/audioapi/android/core/AudioPlayer.h

@@ -5,6 +5,8 @@
 #include <functional>
 #include <memory>
 
+#include <audioapi/android/core/NativeAudioPlayer.hpp>
+
 namespace audioapi {
 
 using namespace oboe;
@@ -19,13 +21,18 @@ class AudioPlayer : public AudioStreamDataCallback, AudioStreamErrorCallback {
       float sampleRate,
       int channelCount);
 
+  ~AudioPlayer() override {
+    nativeAudioPlayer_.release();
+    cleanup();
+  }
+
   bool start();
   void stop();
   bool resume();
   void suspend();
   void cleanup();
 
-  bool isRunning() const;
+  [[nodiscard]] bool isRunning() const;
 
   DataCallbackResult onAudioReady(
       AudioStream *oboeStream,
@@ -44,6 +51,8 @@ class AudioPlayer : public AudioStreamDataCallback, AudioStreamErrorCallback {
   int channelCount_;
 
   bool openAudioStream();
+
+  facebook::jni::global_ref<NativeAudioPlayer> nativeAudioPlayer_;
 };
 
 } // namespace audioapi

package/android/src/main/cpp/audioapi/android/core/NativeAudioPlayer.hpp

@@ -0,0 +1,36 @@
+#pragma once
+
+
+#include <fbjni/fbjni.h>
+#include <react/jni/CxxModuleWrapper.h>
+#include <react/jni/JMessageQueueThread.h>
+#include <memory>
+#include <utility>
+#include <unordered_map>
+
+namespace audioapi {
+
+using namespace facebook;
+using namespace react;
+
+class NativeAudioPlayer : public jni::JavaClass<NativeAudioPlayer> {
+ public:
+  static auto constexpr kJavaDescriptor =
+            "Lcom/swmansion/audioapi/core/NativeAudioPlayer;";
+
+  static jni::local_ref<NativeAudioPlayer> create() {
+    return newInstance();
+  }
+
+    void start() {
+        static const auto method = javaClassStatic()->getMethod<void()>("start");
+        method(self());
+    }
+
+    void stop() {
+        static const auto method = javaClassStatic()->getMethod<void()>("stop");
+        method(self());
+    }
+};
+
+} // namespace audioapi

package/android/src/main/java/com/swmansion/audioapi/core/NativeAudioPlayer.kt

@@ -0,0 +1,24 @@
+package com.swmansion.audioapi.core
+
+import com.facebook.common.internal.DoNotStrip
+import com.swmansion.audioapi.system.MediaSessionManager
+
+@DoNotStrip
+class NativeAudioPlayer {
+  private var sourceNodeId: String? = null
+
+  @DoNotStrip
+  fun start() {
+    this.sourceNodeId = MediaSessionManager.attachAudioPlayer(this)
+    MediaSessionManager.startForegroundServiceIfNecessary()
+  }
+
+  @DoNotStrip
+  fun stop() {
+    this.sourceNodeId?.let {
+      MediaSessionManager.detachAudioPlayer(it)
+      this.sourceNodeId = null
+    }
+    MediaSessionManager.stopForegroundServiceIfNecessary()
+  }
+}

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

@@ -122,7 +122,7 @@ class LockScreenManager(
             )
 
             nb.setLargeIcon(bitmap)
-            mediaNotificationManager.get()?.show(nb, isPlaying)
+            mediaNotificationManager.get()?.updateNotification(nb, isPlaying)
 
             artworkThread = null
           } catch (ex: Exception) {
@@ -167,14 +167,14 @@ class LockScreenManager(
 
     mediaSession.get()?.setMetadata(md.build())
     mediaSession.get()?.setActive(true)
-    mediaNotificationManager.get()?.show(nb, isPlaying)
+    mediaNotificationManager.get()?.updateNotification(nb, isPlaying)
   }
 
   fun resetLockScreenInfo() {
     if (artworkThread != null && artworkThread!!.isAlive) artworkThread!!.interrupt()
     artworkThread = null
 
-    mediaNotificationManager.get()?.hide()
+    mediaNotificationManager.get()?.cancelNotification()
     mediaSession.get()?.setActive(false)
   }
 
@@ -235,7 +235,7 @@ class LockScreenManager(
     updateNotificationMediaStyle()
 
     if (mediaSession.get()?.isActive == true) {
-      mediaNotificationManager.get()?.show(nb, isPlaying)
+      mediaNotificationManager.get()?.updateNotification(nb, isPlaying)
     }
   }
 

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

@@ -1,21 +1,22 @@
 package com.swmansion.audioapi.system
 
+import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Notification
 import android.app.PendingIntent
 import android.app.Service
 import android.content.Intent
+import android.content.pm.ServiceInfo
 import android.content.res.Resources
-import android.os.Binder
 import android.os.Build
 import android.os.IBinder
 import android.provider.ContactsContract
 import android.support.v4.media.session.PlaybackStateCompat
 import android.util.Log
 import android.view.KeyEvent
+import androidx.annotation.RequiresPermission
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
 import com.facebook.react.bridge.ReactApplicationContext
 import com.swmansion.audioapi.R
 import java.lang.ref.WeakReference
@@ -23,7 +24,7 @@ import java.lang.ref.WeakReference
 class MediaNotificationManager(
   private val reactContext: WeakReference<ReactApplicationContext>,
 ) {
-  private var smallIcon: Int = R.drawable.play
+  private var smallIcon: Int = R.drawable.logo
   private var customIcon: Int = 0
 
   private var play: NotificationCompat.Action? = null
@@ -40,6 +41,16 @@ class MediaNotificationManager(
     const val MEDIA_BUTTON: String = "audio_manager_media_button"
   }
 
+  enum class ForegroundAction {
+    START_FOREGROUND,
+    STOP_FOREGROUND,
+    ;
+
+    companion object {
+      fun fromAction(action: String?): ForegroundAction? = entries.firstOrNull { it.name == action }
+    }
+  }
+
   @SuppressLint("RestrictedApi")
   @Synchronized
   fun prepareNotification(
@@ -107,34 +118,20 @@ class MediaNotificationManager(
     return builder.build()
   }
 
-  @SuppressLint("MissingPermission")
+  @RequiresPermission(Manifest.permission.POST_NOTIFICATIONS)
   @Synchronized
-  fun show(
+  fun updateNotification(
     builder: NotificationCompat.Builder?,
     isPlaying: Boolean,
   ) {
     NotificationManagerCompat.from(reactContext.get()!!).notify(
       MediaSessionManager.NOTIFICATION_ID,
-      prepareNotification(
-        builder!!,
-        isPlaying,
-      ),
+      prepareNotification(builder!!, isPlaying),
     )
   }
 
-  fun hide() {
+  fun cancelNotification() {
     NotificationManagerCompat.from(reactContext.get()!!).cancel(MediaSessionManager.NOTIFICATION_ID)
-
-    try {
-      val myIntent =
-        Intent(
-          reactContext.get(),
-          NotificationService::class.java,
-        )
-      reactContext.get()?.stopService(myIntent)
-    } catch (e: java.lang.Exception) {
-      Log.w("AudioManagerModule", "Error stopping service: ${e.message}")
-    }
   }
 
   @Synchronized
@@ -182,45 +179,42 @@ class MediaNotificationManager(
     return NotificationCompat.Action(icon!!, title, i)
   }
 
-  class NotificationService : Service() {
-    private val binder = LocalBinder()
+  class AudioForegroundService : Service() {
     private var notification: Notification? = null
-
-    inner class LocalBinder : Binder() {
-      private var weakService: WeakReference<NotificationService>? = null
-
-      fun onBind(service: NotificationService) {
-        weakService = WeakReference(service)
-      }
-
-      fun getService(): NotificationService? = weakService?.get()
-    }
-
-    override fun onBind(intent: Intent): IBinder {
-      binder.onBind(this)
-      return binder
-    }
-
-    fun forceForeground() {
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        val intent = Intent(this, NotificationService::class.java)
-        ContextCompat.startForegroundService(this, intent)
-        notification =
-          MediaSessionManager.mediaNotificationManager
-            .prepareNotification(NotificationCompat.Builder(this, MediaSessionManager.CHANNEL_ID), false)
-        startForeground(MediaSessionManager.NOTIFICATION_ID, notification)
-      }
-    }
-
-    override fun onCreate() {
-      super.onCreate()
-      try {
-        notification =
-          MediaSessionManager.mediaNotificationManager
-            .prepareNotification(NotificationCompat.Builder(this, MediaSessionManager.CHANNEL_ID), false)
-        startForeground(MediaSessionManager.NOTIFICATION_ID, notification)
-      } catch (ex: Exception) {
-        Log.w("AudioManagerModule", "Error starting service: ${ex.message}")
+    private var isServiceStarted = false
+    private val serviceLock = Any()
+
+    override fun onBind(intent: Intent): IBinder? = null
+
+    private fun startForegroundService() {
+      synchronized(serviceLock) {
+        if (!isServiceStarted) {
+          try {
+            notification =
+              MediaSessionManager.mediaNotificationManager
+                .prepareNotification(
+                  NotificationCompat.Builder(this, MediaSessionManager.CHANNEL_ID),
+                  false,
+                )
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+              startForeground(
+                MediaSessionManager.NOTIFICATION_ID,
+                notification!!,
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST,
+              )
+            } else {
+              startForeground(
+                MediaSessionManager.NOTIFICATION_ID,
+                notification,
+              )
+            }
+            isServiceStarted = true
+          } catch (ex: Exception) {
+            Log.e("AudioManagerModule", "Error starting foreground service: ${ex.message}")
+            stopSelf()
+          }
+        }
       }
     }
 
@@ -229,26 +223,40 @@ class MediaNotificationManager(
       flags: Int,
       startId: Int,
     ): Int {
-      onCreate()
+      val action = ForegroundAction.fromAction(intent?.action)
+
+      when (action) {
+        ForegroundAction.START_FOREGROUND -> startForegroundService()
+        ForegroundAction.STOP_FOREGROUND -> stopForegroundService()
+        else -> startForegroundService()
+      }
+
       return START_NOT_STICKY
     }
 
+    private fun stopForegroundService() {
+      synchronized(serviceLock) {
+        if (isServiceStarted) {
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+          }
+          isServiceStarted = false
+          stopSelf()
+        }
+      }
+    }
+
     override fun onTaskRemoved(rootIntent: Intent?) {
       super.onTaskRemoved(rootIntent)
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        stopForeground(STOP_FOREGROUND_REMOVE)
-      }
-      stopSelf()
+      stopForegroundService()
     }
 
     override fun onDestroy() {
-      super.onDestroy()
-
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        stopForeground(STOP_FOREGROUND_REMOVE)
+      synchronized(serviceLock) {
+        notification = null
+        isServiceStarted = false
       }
-
-      stopSelf()
+      super.onDestroy()
     }
   }
 }

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

@@ -25,7 +25,8 @@ class MediaReceiver(
     if (MediaNotificationManager.REMOVE_NOTIFICATION == action) {
       if (!checkApp(intent)) return
 
-      mediaNotificationManager.get()?.hide()
+      mediaNotificationManager.get()?.cancelNotification()
+      MediaSessionManager.stopForegroundServiceIfNecessary()
       mediaSession.get()?.isActive = false
 
       audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("closeNotification", mapOf()) // add to ts events

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

@@ -1,17 +1,14 @@
 package com.swmansion.audioapi.system
 
-import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.support.v4.media.session.MediaSessionCompat
 import android.util.Log
-import androidx.core.app.NotificationManagerCompat
 import com.swmansion.audioapi.AudioAPIModule
 import java.lang.ref.WeakReference
-import java.util.HashMap
 
 class MediaSessionCallback(
   private val audioAPIModule: WeakReference<AudioAPIModule>,
+  private val mediaNotificationManager: WeakReference<MediaNotificationManager>,
 ) : MediaSessionCompat.Callback() {
   override fun onPlay() {
     audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("remotePlay", mapOf())
@@ -22,13 +19,8 @@ class MediaSessionCallback(
   }
 
   override fun onStop() {
-    val reactContext = audioAPIModule.get()?.reactContext?.get()!!
-    NotificationManagerCompat.from(reactContext).cancel(MediaSessionManager.NOTIFICATION_ID)
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      val myIntent =
-        Intent(reactContext, MediaNotificationManager.NotificationService::class.java)
-      reactContext.stopService(myIntent)
-    }
+    mediaNotificationManager.get()?.cancelNotification()
+    MediaSessionManager.stopForegroundServiceIfNecessary()
 
     audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("remoteStop", mapOf())
   }

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

@@ -3,18 +3,14 @@ package com.swmansion.audioapi.system
 import android.Manifest
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.media.AudioDeviceInfo
 import android.media.AudioManager
 import android.os.Build
-import android.os.IBinder
 import android.support.v4.media.session.MediaSessionCompat
-import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
@@ -24,8 +20,10 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.modules.core.PermissionAwareActivity
 import com.facebook.react.modules.core.PermissionListener
 import com.swmansion.audioapi.AudioAPIModule
+import com.swmansion.audioapi.core.NativeAudioPlayer
 import com.swmansion.audioapi.system.PermissionRequestListener.Companion.RECORDING_REQUEST_CODE
 import java.lang.ref.WeakReference
+import java.util.UUID
 
 object MediaSessionManager {
   private lateinit var audioAPIModule: WeakReference<AudioAPIModule>
@@ -41,31 +39,9 @@ object MediaSessionManager {
   private lateinit var volumeChangeListener: VolumeChangeListener
   private lateinit var mediaReceiver: MediaReceiver
 
-  private val connection =
-    object : ServiceConnection {
-      override fun onServiceConnected(
-        name: ComponentName,
-        service: IBinder,
-      ) {
-        Log.w("MediaSessionManager", "onServiceConnected")
-        val binder = service as MediaNotificationManager.NotificationService.LocalBinder
-        val notificationService = binder.getService()
-        notificationService?.forceForeground()
-        reactContext.get()?.unbindService(this)
-      }
-
-      override fun onServiceDisconnected(name: ComponentName) {
-        Log.w("MediaSessionManager", "Service is disconnected.")
-      }
-
-      override fun onBindingDied(name: ComponentName) {
-        Log.w("MediaSessionManager", "Binding has died.")
-      }
-
-      override fun onNullBinding(name: ComponentName) {
-        Log.w("MediaSessionManager", "Bind was null.")
-      }
-    }
+  private var isServiceRunning = false
+  private val serviceStateLock = Any()
+  private val nativeAudioPlayers = mutableMapOf<String, NativeAudioPlayer>()
 
   fun initialize(
     audioAPIModule: WeakReference<AudioAPIModule>,
@@ -83,8 +59,8 @@ object MediaSessionManager {
     this.mediaNotificationManager = MediaNotificationManager(this.reactContext)
     this.lockScreenManager = LockScreenManager(this.reactContext, WeakReference(this.mediaSession), WeakReference(mediaNotificationManager))
     this.mediaReceiver =
-      MediaReceiver(this.reactContext, WeakReference(this.mediaSession), WeakReference(mediaNotificationManager), this.audioAPIModule)
-    this.mediaSession.setCallback(MediaSessionCallback(this.audioAPIModule))
+      MediaReceiver(this.reactContext, WeakReference(this.mediaSession), WeakReference(this.mediaNotificationManager), this.audioAPIModule)
+    this.mediaSession.setCallback(MediaSessionCallback(this.audioAPIModule, WeakReference(this.mediaNotificationManager)))
 
     val filter = IntentFilter()
     filter.addAction(MediaNotificationManager.REMOVE_NOTIFICATION)
@@ -106,17 +82,59 @@ object MediaSessionManager {
     this.audioFocusListener =
       AudioFocusListener(WeakReference(this.audioManager), this.audioAPIModule, WeakReference(this.lockScreenManager))
     this.volumeChangeListener = VolumeChangeListener(WeakReference(this.audioManager), this.audioAPIModule)
+  }
 
-    val myIntent = Intent(this.reactContext.get(), MediaNotificationManager.NotificationService::class.java)
+  fun attachAudioPlayer(player: NativeAudioPlayer): String {
+    val uuid = UUID.randomUUID().toString()
+    nativeAudioPlayers[uuid] = player
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      try {
-        this.reactContext.get()?.bindService(myIntent, connection, Context.BIND_AUTO_CREATE)
-      } catch (ignored: Exception) {
-        ContextCompat.startForegroundService(this.reactContext.get()!!, myIntent)
+    return uuid
+  }
+
+  fun detachAudioPlayer(uuid: String) {
+    nativeAudioPlayers.remove(uuid)
+  }
+
+  fun startForegroundServiceIfNecessary() {
+    if (nativeAudioPlayers.isNotEmpty()) {
+      startForegroundService()
+    }
+  }
+
+  fun stopForegroundServiceIfNecessary() {
+    if (nativeAudioPlayers.isEmpty()) {
+      stopForegroundService()
+    }
+  }
+
+  private fun startForegroundService() {
+    synchronized(serviceStateLock) {
+      if (isServiceRunning || reactContext.get() == null) {
+        return
       }
-    } else {
-      this.reactContext.get()?.startService(myIntent)
+
+      val intent = Intent(reactContext.get(), MediaNotificationManager.AudioForegroundService::class.java)
+      intent.action = MediaNotificationManager.ForegroundAction.START_FOREGROUND.name
+
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        ContextCompat.startForegroundService(reactContext.get()!!, intent)
+      } else {
+        reactContext.get()!!.startService(intent)
+      }
+      isServiceRunning = true
+    }
+  }
+
+  private fun stopForegroundService() {
+    synchronized(serviceStateLock) {
+      if (!isServiceRunning || reactContext.get() == null) {
+        return
+      }
+
+      val intent = Intent(reactContext.get(), MediaNotificationManager.AudioForegroundService::class.java)
+      intent.action = MediaNotificationManager.ForegroundAction.STOP_FOREGROUND.name
+      reactContext.get()!!.startService(intent)
+      isServiceRunning = false
     }
   }
 

package/android/src/main/res/drawable/logo.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="40dp"
+    android:viewportWidth="36"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M17.397,0C21.203,0.046 23.27,5.296 24.179,8.243C27.21,7.54 32.708,6.626 34.647,9.87C36.595,13.128 33.04,17.387 30.914,19.563C33.119,21.806 36.799,26.046 34.949,29.24C33.109,32.416 27.554,31.459 24.556,30.713C24.255,31.785 23.807,33.136 23.178,34.422H21.299C22.103,32.984 22.632,31.292 22.924,30.254C21.313,29.752 19.606,29.081 17.859,28.265C16.146,29.045 14.486,29.679 12.922,30.146C13.596,32.348 15.113,37.036 17.942,37.07C18.571,37.078 19.137,36.851 19.642,36.47V38.386C19.129,38.609 18.571,38.732 17.967,38.725C14.175,38.679 12.217,33.563 11.307,30.576C8.246,31.289 2.705,32.064 0.751,28.796C-1.189,25.549 2.304,21.448 4.464,19.251C2.234,16.992 -1.343,12.643 0.519,9.426C2.388,6.201 7.879,7.256 10.974,8.06C11.796,5.112 13.607,-0.045 17.397,0ZM29.727,20.706C28.536,21.787 27.16,22.861 25.645,23.896C25.517,25.774 25.284,27.531 24.947,29.115C27.313,29.701 32.09,30.789 33.478,28.394C34.853,26.021 31.341,22.355 29.727,20.706ZM5.689,20.42C4.098,22.039 0.752,25.567 2.199,27.988C3.654,30.42 8.949,29.416 10.864,28.969C10.462,27.348 10.155,25.583 9.952,23.74C8.36,22.649 6.924,21.533 5.689,20.42ZM23.853,25.061C22.536,25.876 21.18,26.632 19.795,27.334C21.007,27.856 22.188,28.299 23.314,28.653C23.546,27.543 23.726,26.339 23.853,25.061ZM11.796,24.948C11.974,26.203 12.204,27.408 12.48,28.536C13.569,28.206 14.713,27.791 15.893,27.296C14.496,26.57 13.13,25.784 11.796,24.948ZM17.621,12.313C15.473,13.304 13.408,14.458 11.446,15.76C11.298,18.111 11.334,20.479 11.55,22.834C13.561,24.165 15.658,25.375 17.827,26.431C19.965,25.413 22.038,24.259 24.01,22.964C24.129,20.623 24.098,18.269 23.896,15.925C21.897,14.57 19.797,13.362 17.621,12.313ZM25.674,17.194C25.764,18.716 25.784,20.24 25.745,21.761C26.751,21.027 27.678,20.279 28.507,19.531C27.645,18.744 26.695,17.96 25.674,17.194ZM9.697,16.982C8.679,17.733 7.733,18.504 6.88,19.278C7.742,20.049 8.71,20.826 9.767,21.597C9.67,20.059 9.646,18.518 9.697,16.982ZM33.199,10.678C31.759,8.27 26.844,9.336 24.623,9.85C25.013,11.441 25.308,13.189 25.5,15.035C27.038,16.117 28.452,17.247 29.696,18.388C31.236,16.81 34.652,13.11 33.199,10.678ZM10.576,9.657C8.293,9.061 3.383,7.868 1.99,10.273C0.597,12.679 4.074,16.508 5.652,18.109C6.881,16.989 8.287,15.88 9.82,14.825C9.967,13 10.222,11.259 10.576,9.657ZM23.003,10.274C21.898,10.596 20.754,10.993 19.591,11.461C20.983,12.18 22.341,12.961 23.66,13.804C23.49,12.558 23.27,11.374 23.003,10.274ZM12.206,10.129C11.965,11.234 11.772,12.41 11.632,13.638C12.925,12.833 14.259,12.088 15.627,11.408C14.459,10.911 13.311,10.482 12.206,10.129ZM17.421,1.655C14.583,1.62 13.266,6.153 12.602,8.53C14.208,9.038 15.893,9.698 17.596,10.484C19.286,9.74 20.959,9.127 22.561,8.665C21.899,6.529 20.262,1.689 17.421,1.655Z"
+      android:fillColor="#919FCF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17.103,14.821L17.181,14.822L17.198,14.822C19.534,14.881 21.403,16.791 21.403,19.131V20.738C21.709,20.669 22.028,20.632 22.356,20.632C22.801,20.632 23.231,20.7 23.636,20.826C24.283,19.264 25.823,18.164 27.624,18.164L27.736,18.165C30.033,18.223 31.88,20.074 31.938,22.362L31.939,22.473V33.581C31.939,35.921 30.07,37.831 27.736,37.89L27.624,37.891C25.823,37.891 24.283,36.791 23.636,35.229C23.231,35.354 22.802,35.423 22.356,35.423C22.028,35.423 21.709,35.386 21.403,35.317V35.69C21.403,38.03 19.534,39.939 17.199,39.999L17.087,40C14.99,40 13.246,38.507 12.855,36.531C12.559,36.604 12.252,36.647 11.936,36.655L11.819,36.657C9.601,36.657 7.778,34.986 7.532,32.842C7.217,32.915 6.888,32.954 6.551,32.954C4.164,32.954 2.236,31.021 2.236,28.645V26.176C2.236,23.799 4.164,21.867 6.551,21.866C6.888,21.866 7.217,21.906 7.532,21.979C7.778,19.834 9.601,18.164 11.819,18.164L11.936,18.166C12.252,18.174 12.559,18.216 12.855,18.289C13.246,16.314 14.99,14.821 17.087,14.821L17.103,14.821Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M29.065,22.473C29.065,21.676 28.418,21.032 27.624,21.032C26.83,21.032 26.184,21.676 26.184,22.473V33.581C26.184,34.379 26.83,35.023 27.624,35.023C28.418,35.023 29.065,34.379 29.065,33.581V22.473ZM22.356,23.501C21.561,23.501 20.915,24.145 20.915,24.942V31.113C20.915,31.91 21.561,32.554 22.356,32.554C23.15,32.554 23.796,31.91 23.796,31.113V24.942C23.796,24.145 23.15,23.501 22.356,23.501ZM5.11,28.645C5.11,29.442 5.756,30.086 6.551,30.086C7.345,30.086 7.991,29.442 7.991,28.645V26.176C7.991,25.379 7.345,24.735 6.551,24.735C5.756,24.735 5.11,25.379 5.11,26.176V28.645ZM10.378,32.347C10.378,33.144 11.025,33.788 11.819,33.788C12.613,33.788 13.26,33.144 13.26,32.347V22.473C13.26,21.676 12.613,21.032 11.819,21.032C11.025,21.032 10.378,21.676 10.378,22.473V32.347ZM18.528,19.131C18.528,18.358 17.922,17.73 17.162,17.691L17.087,17.689C16.293,17.689 15.647,18.333 15.647,19.131V35.69C15.647,36.487 16.293,37.132 17.087,37.132C17.882,37.132 18.528,36.487 18.528,35.69V19.131ZM20.125,22.882C20.68,22.283 21.473,21.907 22.356,21.907C23.238,21.907 24.032,22.283 24.587,22.882V22.473C24.587,20.799 25.945,19.439 27.624,19.439C29.303,19.439 30.662,20.799 30.662,22.473V33.581C30.662,35.256 29.303,36.616 27.624,36.616C25.945,36.616 24.587,35.256 24.587,33.581V33.172C24.032,33.772 23.238,34.148 22.356,34.148C21.473,34.148 20.68,33.772 20.125,33.172V35.69C20.125,37.365 18.766,38.725 17.087,38.725C15.409,38.725 14.05,37.365 14.05,35.69V34.406C13.495,35.006 12.701,35.382 11.819,35.382C10.14,35.382 8.782,34.022 8.782,32.347V30.704C8.227,31.304 7.433,31.679 6.551,31.679C4.872,31.679 3.513,30.319 3.513,28.645V26.176C3.513,24.501 4.872,23.141 6.551,23.141C7.433,23.141 8.227,23.517 8.782,24.117V22.473C8.782,20.799 10.14,19.439 11.819,19.439C12.701,19.439 13.495,19.815 14.05,20.414V19.131C14.05,17.456 15.409,16.096 17.087,16.096L17.166,16.097C18.808,16.138 20.125,17.482 20.125,19.131V22.882Z"
+      android:fillColor="#001A72"/>
+</vector>

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

@@ -25,45 +25,39 @@ class AudioContextHostObject : public BaseAudioContextHostObject {
   }
 
   JSI_HOST_FUNCTION(close) {
-    auto promise = promiseVendor_->createPromise([this](std::shared_ptr<Promise> promise) {
-      std::thread([this, promise = std::move(promise)]() {
-          auto audioContext = std::static_pointer_cast<AudioContext>(context_);
-          audioContext->close();
+    auto audioContext = std::static_pointer_cast<AudioContext>(context_);
+    auto promise = promiseVendor_->createPromise([audioContext](const std::shared_ptr<Promise>& promise) {
+      audioContext->close();
 
-          promise->resolve([](jsi::Runtime &runtime) {
-              return jsi::Value::undefined();
-          });
-      }).detach();
+      promise->resolve([](jsi::Runtime &runtime) {
+          return jsi::Value::undefined();
+      });
     });
 
     return promise;
   }
 
   JSI_HOST_FUNCTION(resume) {
-    auto promise = promiseVendor_->createPromise([this](std::shared_ptr<Promise> promise) {
-      std::thread([this, promise = std::move(promise)]() {
-          auto audioContext = std::static_pointer_cast<AudioContext>(context_);
-          auto result = audioContext->resume();
+    auto audioContext = std::static_pointer_cast<AudioContext>(context_);
+    auto promise = promiseVendor_->createPromise([audioContext](const std::shared_ptr<Promise>& promise) {
+        auto result = audioContext->resume();
 
-          promise->resolve([result](jsi::Runtime &runtime) {
+        promise->resolve([result](jsi::Runtime &runtime) {
             return jsi::Value(result);
-          });
-      }).detach();
+        });
     });
 
     return promise;
   }
 
   JSI_HOST_FUNCTION(suspend) {
-    auto promise = promiseVendor_->createPromise([this](std::shared_ptr<Promise> promise) {
-      std::thread([this, promise = std::move(promise)]() {
-          auto audioContext = std::static_pointer_cast<AudioContext>(context_);
-          auto result = audioContext->suspend();
+    auto audioContext = std::static_pointer_cast<AudioContext>(context_);
+    auto promise = promiseVendor_->createPromise([audioContext](const std::shared_ptr<Promise>& promise) {
+      auto result = audioContext->suspend();
 
-          promise->resolve([result](jsi::Runtime &runtime) {
-            return jsi::Value(result);
-          });
-      }).detach();
+      promise->resolve([result](jsi::Runtime &runtime) {
+        return jsi::Value(result);
+      });
     });
 
     return promise;