react-native-audio-api 0.11.0-alpha.1 → 0.11.0-alpha.3

package/ios/audioapi/ios/system/AudioEngine.mm

@@ -10,29 +10,25 @@ static AudioEngine *_sharedInstance = nil;
   return _sharedInstance;
 }
 
-- (instancetype)initWithAudioSessionManager:(AudioSessionManager *)sessionManager
+- (instancetype)init
 {
   if (self = [super init]) {
-    self.isInterrupted = false;
-    self.isSupposedToBeRunning = true;
+    self.state = AudioEngineState::AudioEngineStateIdle;
     self.audioEngine = [[AVAudioEngine alloc] init];
     self.inputNode = nil;
 
     self.sourceNodes = [[NSMutableDictionary alloc] init];
     self.sourceFormats = [[NSMutableDictionary alloc] init];
-    self.sourceStates = [[NSMutableDictionary alloc] init];
 
-    self.sessionManager = sessionManager;
+    self.sessionManager = [AudioSessionManager sharedInstance];
   }
 
   _sharedInstance = self;
-
   return self;
 }
 
 - (void)cleanup
 {
-  NSLog(@"[AudioEngine] cleanup");
   if ([self.audioEngine isRunning]) {
     [self.audioEngine stop];
   }
@@ -40,212 +36,186 @@ static AudioEngine *_sharedInstance = nil;
   self.audioEngine = nil;
   self.sourceNodes = nil;
   self.sourceFormats = nil;
-  self.sourceStates = nil;
   self.inputNode = nil;
 
   [self.sessionManager setActive:false];
   self.sessionManager = nil;
 }
 
-- (void)rebuildAudioEngine
+- (NSString *)attachSourceNode:(AVAudioSourceNode *)sourceNode format:(AVAudioFormat *)format
 {
-  for (id sourceNodeId in self.sourceNodes) {
-    AVAudioSourceNode *sourceNode = [self.sourceNodes valueForKey:sourceNodeId];
-    AVAudioFormat *format = [self.sourceFormats valueForKey:sourceNodeId];
-
-    [self.audioEngine attachNode:sourceNode];
-    [self.audioEngine connect:sourceNode to:self.audioEngine.mainMixerNode format:format];
-  }
-
-  if (self.inputNode) {
-    [self.audioEngine attachNode:self.inputNode];
-    [self.audioEngine connect:self.audioEngine.inputNode to:self.inputNode format:nil];
-  }
-}
+  NSString *sourceNodeId = [[NSUUID UUID] UUIDString];
 
-- (bool)rebuildAudioEngineAndStartIfNecessary
-{
-  [self rebuildAudioEngine];
-  return [self startIfNecessary];
-}
+  [self.sourceNodes setValue:sourceNode forKey:sourceNodeId];
+  [self.sourceFormats setValue:format forKey:sourceNodeId];
 
-- (bool)restartAudioEngine
-{
-  if ([self.audioEngine isRunning]) {
-    [self.audioEngine stop];
-  }
+  [self.audioEngine attachNode:sourceNode];
+  [self.audioEngine connect:sourceNode to:self.audioEngine.mainMixerNode format:format];
 
-  self.audioEngine = [[AVAudioEngine alloc] init];
-  return [self rebuildAudioEngineAndStartIfNecessary];
+  return sourceNodeId;
 }
 
-- (bool)startEngine
+- (void)detachSourceNodeWithId:(NSString *)sourceNodeId
 {
-  NSLog(@"[AudioEngine] startEngine");
-  NSError *error = nil;
-  self.isSupposedToBeRunning = true;
+  NSLog(@"[AudioEngine] detaching source node with ID: %@", sourceNodeId);
 
-  if ([self.audioEngine isRunning] && ![self isInterrupted]) {
-    NSLog(@"[AudioEngine] Engine is already running");
-    return true;
-  }
+  AVAudioSourceNode *sourceNode = [self.sourceNodes valueForKey:sourceNodeId];
 
-  if (![self.sessionManager setActive:true]) {
-    return false;
+  if (sourceNode == nil) {
+    NSLog(@"[AudioEngine] No source node found with ID: %@", sourceNodeId);
+    return;
   }
 
-  if ([self isInterrupted]) {
-    NSLog(@"[AudioEngine] rebuilding after interruption");
-    [self.audioEngine stop];
-    [self.audioEngine reset];
+  [self.audioEngine detachNode:sourceNode];
 
-    [self rebuildAudioEngine];
+  [self.sourceNodes removeObjectForKey:sourceNodeId];
+  [self.sourceFormats removeObjectForKey:sourceNodeId];
+}
 
-    self.isInterrupted = false;
-  }
+- (void)attachInputNode:(AVAudioSinkNode *)inputNode
+{
+  self.inputNode = inputNode;
 
-  [self.audioEngine prepare];
-  [self.audioEngine startAndReturnError:&error];
+  AVAudioFormat *format = [self.audioEngine.inputNode inputFormatForBus:0];
 
-  if (error != nil) {
-    NSLog(@"Error while starting the audio engine: %@", [error debugDescription]);
-    return false;
-  }
-
-  return true;
+  [self.audioEngine attachNode:inputNode];
+  [self.audioEngine connect:self.audioEngine.inputNode to:inputNode format:format];
 }
 
-- (void)stopEngine
+- (void)detachInputNode
 {
-  NSLog(@"[AudioEngine] stopEngine");
-  //  if (![self.audioEngine isRunning]) {
-  //    return;
-  //  }
+  if (self.inputNode == nil) {
+    return;
+  }
 
-  self.isSupposedToBeRunning = false;
-  [self.audioEngine stop];
+  [self.audioEngine detachNode:self.inputNode];
+  self.inputNode = nil;
 }
 
-- (void)pauseEngine:(NSString *)sourceNodeId
+- (void)onInterruptionBegin
 {
-  NSLog(@"[AudioEngine] pauseEngine");
-  self.isSupposedToBeRunning = false;
-
-  if (![self.audioEngine isRunning]) {
+  if (self.state != AudioEngineState::AudioEngineStateRunning) {
+    // If engine was not active, do nothing
     return;
   }
 
-  [self.sourceStates setValue:@false forKey:sourceNodeId];
-  [self pauseIfNecessary];
+  // If engine was active or paused (or interrupted :)) mark as interrupted
+  self.state = AudioEngineState::AudioEngineStateInterrupted;
 }
 
-- (bool)isRunning
+- (void)onInterruptionEnd:(bool)shouldResume
 {
-  return [self.audioEngine isRunning] && !self.isInterrupted;
-}
+  if (self.state != AudioEngineState::AudioEngineStateInterrupted) {
+    return;
+  }
 
-- (void)markAsInterrupted
-{
-  self.isInterrupted = true;
-  self.isSupposedToBeRunning = false;
+  // TODO: try to recover
 }
 
-- (void)unmarkAsInterrupted
+- (AudioEngineState)getState
 {
-  self.isInterrupted = false;
+  return self.state;
 }
 
-- (NSString *)attachSourceNode:(AVAudioSourceNode *)sourceNode format:(AVAudioFormat *)format
+- (void)rebuildAudioEngine
 {
-  NSString *sourceNodeId = [[NSUUID UUID] UUIDString];
-  NSLog(@"[AudioEngine] attaching new source node with ID: %@", sourceNodeId);
+  self.audioEngine = [[AVAudioEngine alloc] init];
 
-  [self.sourceNodes setValue:sourceNode forKey:sourceNodeId];
-  [self.sourceFormats setValue:format forKey:sourceNodeId];
-  [self.sourceStates setValue:@true forKey:sourceNodeId];
+  for (id sourceNodeId in self.sourceNodes) {
+    AVAudioSourceNode *sourceNode = [self.sourceNodes valueForKey:sourceNodeId];
+    AVAudioFormat *format = [self.sourceFormats valueForKey:sourceNodeId];
 
-  [self.audioEngine attachNode:sourceNode];
-  [self.audioEngine connect:sourceNode to:self.audioEngine.mainMixerNode format:format];
+    [self.audioEngine attachNode:sourceNode];
+    [self.audioEngine connect:sourceNode to:self.audioEngine.mainMixerNode format:format];
+  }
 
-  return sourceNodeId;
+  if (self.inputNode) {
+    [self.audioEngine attachNode:self.inputNode];
+    [self.audioEngine connect:self.audioEngine.inputNode to:self.inputNode format:nil];
+  }
 }
 
-- (void)detachSourceNodeWithId:(NSString *)sourceNodeId
+- (bool)startEngine
 {
-  NSLog(@"[AudioEngine] detaching source node with ID: %@", sourceNodeId);
+  NSError *error = nil;
 
-  AVAudioSourceNode *sourceNode = [self.sourceNodes valueForKey:sourceNodeId];
+  if ([self.audioEngine isRunning] && self.state == AudioEngineState::AudioEngineStateRunning) {
+    return true;
+  }
 
-  if (sourceNode == nil) {
-    NSLog(@"[AudioEngine] No source node found with ID: %@", sourceNodeId);
-    return;
+  if (![self.sessionManager setActive:true]) {
+    return false;
   }
 
-  [self.audioEngine detachNode:sourceNode];
+  if (self.state == AudioEngineState::AudioEngineStateInterrupted) {
+    NSLog(@"[AudioEngine] rebuilding after interruption");
+    [self.audioEngine stop];
+    [self.audioEngine reset];
+    [self rebuildAudioEngine];
+  }
 
-  [self.sourceNodes removeObjectForKey:sourceNodeId];
-  [self.sourceFormats removeObjectForKey:sourceNodeId];
-  [self.sourceStates removeObjectForKey:sourceNodeId];
-}
+  [self.audioEngine prepare];
+  [self.audioEngine startAndReturnError:&error];
 
-- (void)attachInputNode:(AVAudioSinkNode *)inputNode
-{
-  self.inputNode = inputNode;
+  if (error != nil) {
+    NSLog(@"Error while starting the audio engine: %@", [error debugDescription]);
+    return false;
+  }
 
-  [self.audioEngine attachNode:inputNode];
-  [self.audioEngine connect:self.audioEngine.inputNode to:inputNode format:nil];
+  self.state = AudioEngineState::AudioEngineStateRunning;
+  return true;
 }
 
-- (void)detachInputNode
+- (void)stopEngine
 {
-  if (self.inputNode == nil) {
+  if (self.state == AudioEngineState::AudioEngineStateIdle) {
     return;
   }
 
-  [self.audioEngine detachNode:self.inputNode];
-  self.inputNode = nil;
-  [self restartAudioEngine];
+  [self.audioEngine stop];
+  self.state = AudioEngineState::AudioEngineStateIdle;
 }
 
 - (bool)startIfNecessary
 {
-  if ([self isRunning]) {
+  if (self.state == AudioEngineState::AudioEngineStateRunning) {
     return true;
   }
 
-  if ([self.sourceNodes count] > 0 || self.inputNode != nil) {
+  if (([self.sourceNodes count] > 0) || self.inputNode != nil) {
     return [self startEngine];
   }
 
   return false;
 }
 
-- (void)stopIfNecessary
+- (void)pauseIfNecessary
 {
-  if (![self isRunning]) {
+  if (self.state == AudioEngineState::AudioEngineStatePaused) {
     return;
   }
 
-  if ([self.sourceNodes count] == 0 && self.inputNode == nil) {
-    [self stopEngine];
-  }
+  [self.audioEngine pause];
+  self.state = AudioEngineState::AudioEngineStatePaused;
 }
 
-- (void)pauseIfNecessary
+- (void)stopIfNecessary
 {
-  if (![self isRunning]) {
+  if (self.state == AudioEngineState::AudioEngineStateIdle) {
     return;
   }
 
-  for (NSString *sourceId in self.sourceStates) {
-    if ([self.sourceStates[sourceId] boolValue]) {
-      NSLog(@"state %@", self.sourceStates[sourceId]);
-      return;
-    }
+  [self stopEngine];
+}
+
+- (void)restartAudioEngine
+{
+  if ([self.audioEngine isRunning]) {
+    [self.audioEngine stop];
   }
 
-  NSLog(@"[AudioEngine] pauseEngine");
-  [self.audioEngine pause];
+  self.audioEngine = [[AVAudioEngine alloc] init];
+  [self rebuildAudioEngine];
 }
 
 - (void)logAudioEngineState
@@ -256,7 +226,9 @@ static AudioEngine *_sharedInstance = nil;
 
   // AVAudioEngine state
   NSLog(@"➡️ engine.isRunning: %@", self.audioEngine.isRunning ? @"YES" : @"NO");
-  NSLog(@"➡️ engine.isInManualRenderingMode: %@", self.audioEngine.isInManualRenderingMode ? @"YES" : @"NO");
+  NSLog(
+      @"➡️ engine.isInManualRenderingMode: %@",
+      self.audioEngine.isInManualRenderingMode ? @"YES" : @"NO");
 
   // Session state
   NSLog(@"🎚️ Session category: %@", session.category);
@@ -284,9 +256,4 @@ static AudioEngine *_sharedInstance = nil;
   NSLog(@"=======================================================");
 }
 
-- (bool)isSupposedToRun
-{
-  return self.isSupposedToBeRunning;
-}
-
 @end

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

@@ -8,30 +8,44 @@
 
 @property (nonatomic, weak) AVAudioSession *audioSession;
 
+// State tracking
 @property (nonatomic, assign) bool isActive;
-@property (nonatomic, assign) bool hasDirtySettings;
-@property (nonatomic, assign) AVAudioSessionMode sessionMode;
-@property (nonatomic, assign) AVAudioSessionCategory sessionCategory;
-@property (nonatomic, assign) AVAudioSessionCategoryOptions sessionOptions;
-@property (nonatomic, assign) bool allowHapticsAndSystemSoundsDuringRecording;
+@property (nonatomic, assign) bool shouldManageSession;
+
+// Session configuration options (desired by user)
+@property (nonatomic, assign) AVAudioSessionMode desiredMode;
+@property (nonatomic, assign) AVAudioSessionCategory desiredCategory;
+@property (nonatomic, assign) AVAudioSessionCategoryOptions desiredOptions;
+@property (nonatomic, assign) bool allowHapticsAndSounds;
 
 - (instancetype)init;
++ (instancetype)sharedInstance;
+
 - (void)cleanup;
-- (bool)configureAudioSession;
-- (bool)reconfigureAudioSession;
-- (void)markSettingsAsDirty;
 
-- (NSNumber *)getDevicePreferredSampleRate;
 - (void)setAudioSessionOptions:(NSString *)category
                           mode:(NSString *)mode
                        options:(NSArray *)options
                   allowHaptics:(BOOL)allowHaptics;
+
 - (bool)setActive:(bool)active;
+- (void)markInactive;
+- (void)disableSessionManagement;
 
-- (void)requestRecordingPermissions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject;
-- (void)checkRecordingPermissions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject;
+- (NSNumber *)getDevicePreferredSampleRate;
+- (NSNumber *)getDevicePreferredInputChannelCount;
+
+- (void)requestRecordingPermissions:(RCTPromiseResolveBlock)resolve
+                             reject:(RCTPromiseRejectBlock)reject;
+- (NSString *)requestRecordingPermissions;
+
+- (void)checkRecordingPermissions:(RCTPromiseResolveBlock)resolve
+                           reject:(RCTPromiseRejectBlock)reject;
+- (NSString *)checkRecordingPermissions;
 
 - (void)getDevicesInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject;
 - (NSArray<NSDictionary *> *)parseDeviceList:(NSArray<AVAudioSessionPortDescription *> *)devices;
 
+- (bool)isSessionActive;
+
 @end