@edkimmel/expo-audio-stream 0.3.2-beta.2 → 0.4.0

package/ios/ExpoPlayAudioStreamModule.swift

@@ -3,17 +3,14 @@ import AVFoundation
 import ExpoModulesCore
 
 let audioDataEvent: String = "AudioData"
-let soundIsPlayedEvent: String = "SoundChunkPlayed"
-let soundIsStartedEvent: String = "SoundStarted"
 let deviceReconnectedEvent: String = "DeviceReconnected"
 
 
-public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPlayerDelegate, PipelineEventSender {
+public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, PipelineEventSender {
     private var _microphone: Microphone?
-    private var _soundPlayer: SoundPlayer?
     private var _pipelineIntegration: PipelineIntegration?
 
-    /// Single shared AVAudioEngine used by both SoundPlayer and AudioPipeline.
+    /// Single shared AVAudioEngine used by AudioPipeline.
     private let sharedAudioEngine = SharedAudioEngine()
 
     private var microphone: Microphone {
@@ -24,15 +21,6 @@ public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPla
         return _microphone!
     }
 
-    private var soundPlayer: SoundPlayer {
-        if _soundPlayer == nil {
-            _soundPlayer = SoundPlayer()
-            _soundPlayer?.delegate = self
-            _soundPlayer?.setSharedEngine(sharedAudioEngine)
-        }
-        return _soundPlayer!
-    }
-
     private var pipelineIntegration: PipelineIntegration {
         if _pipelineIntegration == nil {
             _pipelineIntegration = PipelineIntegration(eventSender: self, sharedEngine: sharedAudioEngine)
@@ -53,8 +41,6 @@ public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPla
         // Defines event names that the module can send to JavaScript.
         Events([
             audioDataEvent,
-            soundIsPlayedEvent,
-            soundIsStartedEvent,
             deviceReconnectedEvent,
             PipelineIntegration.EVENT_STATE_CHANGED,
             PipelineIntegration.EVENT_PLAYBACK_STARTED,
@@ -67,7 +53,7 @@ public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPla
             PipelineIntegration.EVENT_FREQUENCY_BANDS,
         ])
 
-        Function("destroy") {
+        AsyncFunction("destroy") { (promise: Promise) in
             self._pipelineIntegration?.destroy()
             self._pipelineIntegration = nil
             self.sharedAudioEngine.teardown()
@@ -77,7 +63,7 @@ public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPla
                 self.isAudioSessionInitialized = false
             }
             self._microphone = nil
-            self._soundPlayer = nil
+            promise.resolve(nil)
         }
 
         /// Prompts the user to select the microphone mode.
@@ -108,55 +94,12 @@ public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPla
             ])
         }
 
-        AsyncFunction("playSound") { (base64Chunk: String, turnId: String, encoding: String?, promise: Promise) in
-            Logger.debug("Play sound")
-            do {
-                if !isAudioSessionInitialized {
-                    try ensureAudioSessionInitialized()
-                }
-
-                // Ensure shared engine is configured (playSound may be called without setSoundConfig)
-                if !self.sharedAudioEngine.isConfigured {
-                    try self.sharedAudioEngine.configure(playbackMode: .regular)
-                    self.sharedAudioEngine.addDelegate(self.soundPlayer)
-                }
-
-                // Determine the audio format based on the encoding parameter
-                let commonFormat: AVAudioCommonFormat
-                switch encoding {
-                case "pcm_f32le":
-                    commonFormat = .pcmFormatFloat32
-                case "pcm_s16le", nil:
-                    commonFormat = .pcmFormatInt16
-                default:
-                    Logger.debug("[ExpoPlayAudioStreamModule] Unsupported encoding: \(encoding ?? "nil"), defaulting to PCM_S16LE")
-                    commonFormat = .pcmFormatInt16
-                }
-
-                try soundPlayer.play(audioChunk: base64Chunk, turnId: turnId, resolver: {
-                    _ in promise.resolve(nil)
-                }, rejecter: {code, message, error in
-                    promise.reject(code ?? "ERR_UNKNOWN", message ?? "Unknown error")
-                }, commonFormat: commonFormat)
-            } catch {
-                print("Error enqueuing audio: \(error.localizedDescription)")
-            }
-        }
-
-        AsyncFunction("stopSound") { (promise: Promise) in
-            soundPlayer.stop(promise)
-        }
-
-        AsyncFunction("clearSoundQueueByTurnId") { (turnId: String, promise: Promise) in
-            soundPlayer.clearSoundQueue(turnIdToClear: turnId, resolver: promise)
-        }
-
         AsyncFunction("startMicrophone") { (options: [String: Any], promise: Promise) in
             // Create recording settings
             // Extract settings from provided options, using default values if necessary
-            let sampleRate = options["sampleRate"] as? Double ?? 16000.0 // it fails if not 48000, why?
-            let numberOfChannels = options["channelConfig"] as? Int ?? 1 // Mono channel configuration
-            let bitDepth = options["audioFormat"] as? Int ?? 16 // 16bits
+            let sampleRate = options["sampleRate"] as? Double ?? 16000.0
+            let numberOfChannels = options["channelConfig"] as? Int ?? 1
+            let bitDepth = options["audioFormat"] as? Int ?? 16
             let interval = options["interval"] as? Int ?? 1000
 
             let fbConfigDict = options["frequencyBandConfig"] as? [String: Any]
@@ -203,11 +146,6 @@ public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPla
             }
         }
 
-        /// Stops the microphone recording and releases associated resources
-        /// - Parameter promise: A promise to resolve when microphone recording is stopped
-        /// - Note: This method stops the active recording session, processes any remaining audio data,
-        ///         and releases hardware resources. It should be called when the app no longer needs
-        ///         microphone access to conserve battery and system resources.
         AsyncFunction("stopMicrophone") { (promise: Promise) in
             microphone.stopRecording(resolver: promise)
         }
@@ -216,62 +154,6 @@ public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPla
             microphone.toggleSilence(isSilent: isSilent)
         }
 
-        /// Sets the sound player configuration
-        /// - Parameters:
-        ///   - config: A dictionary containing configuration options:
-        ///     - `sampleRate`: The sample rate for audio playback (default is 16000.0).
-        ///     - `playbackMode`: The playback mode ("regular", "voiceProcessing", or "conversation").
-        ///     - `useDefault`: When true, resets to default configuration regardless of other parameters.
-        ///   - promise: A promise to resolve when configuration is updated or reject with an error.
-        AsyncFunction("setSoundConfig") { (config: [String: Any], promise: Promise) in
-            // Check if we should use default configuration
-            let useDefault = config["useDefault"] as? Bool ?? false
-
-            do {
-                if !isAudioSessionInitialized {
-                    try ensureAudioSessionInitialized()
-                }
-
-                if useDefault {
-                    // Reset to default configuration — configure engine for regular mode
-                    Logger.debug("[ExpoPlayAudioStreamModule] Resetting sound configuration to default values")
-                    try self.sharedAudioEngine.configure(playbackMode: .regular)
-                    self.sharedAudioEngine.addDelegate(self.soundPlayer)
-                    try soundPlayer.resetConfigToDefault()
-                } else {
-                    // Extract configuration values from the provided dictionary
-                    let sampleRate = config["sampleRate"] as? Double ?? 16000.0
-                    let playbackModeString = config["playbackMode"] as? String ?? "regular"
-
-                    // Convert string playback mode to enum
-                    let playbackMode: PlaybackMode
-                    switch playbackModeString {
-                    case "voiceProcessing":
-                        playbackMode = .voiceProcessing
-                    case "conversation":
-                        playbackMode = .conversation
-                    default:
-                        playbackMode = .regular
-                    }
-
-                    // Configure shared engine first (handles voice processing)
-                    try self.sharedAudioEngine.configure(playbackMode: playbackMode)
-                    self.sharedAudioEngine.addDelegate(self.soundPlayer)
-
-                    // Create a new SoundConfig object
-                    let soundConfig = SoundConfig(sampleRate: sampleRate, playbackMode: playbackMode)
-
-                    // Update the sound player configuration (attaches node to shared engine)
-                    Logger.debug("[ExpoPlayAudioStreamModule] Setting sound configuration - sampleRate: \(sampleRate), playbackMode: \(playbackModeString)")
-                    try soundPlayer.updateConfig(soundConfig)
-                }
-
-                promise.resolve(nil)
-            } catch {
-                promise.reject("ERROR_CONFIG_UPDATE", "Failed to set sound configuration: \(error.localizedDescription)")
-            }
-        }
-
         // ── Pipeline functions ────────────────────────────────────────────
 
         AsyncFunction("connectPipeline") { (options: [String: Any], promise: Promise) in
@@ -352,10 +234,8 @@ public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPla
             options: [.defaultToSpeaker, .allowBluetooth, .allowBluetoothA2DP])
         if let settings = recordingSettings {
             try audioSession.setPreferredSampleRate(settings.sampleRate)
-            // Set IO buffer duration short enough to support the desired emission interval.
-            // Use the hardware sample rate (not the desired rate) since this is a hardware-level setting.
             let hwSampleRate = audioSession.sampleRate > 0 ? audioSession.sampleRate : 48000.0
-            let preferredDuration = 512.0 / hwSampleRate  // ~10.7ms at 48kHz
+            let preferredDuration = 512.0 / hwSampleRate
             try audioSession.setPreferredIOBufferDuration(preferredDuration)
         }
         try audioSession.setActive(true)
@@ -395,7 +275,6 @@ public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPla
 
     func onMicrophoneData(_ microphoneData: Data, _ soundLevel: Float?, _ frequencyBands: FrequencyBands?) {
         let encodedData = microphoneData.base64EncodedString()
-        // Construct the event payload similar to Android
         var eventBody: [String: Any] = [
             "fileUri": "",
             "lastEmittedSize": 0,
@@ -413,7 +292,6 @@ public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPla
                 "high": bands.high
             ]
         }
-        // Emit the event to JavaScript
         sendEvent(audioDataEvent, eventBody)
     }
 
@@ -441,12 +319,4 @@ public class ExpoPlayAudioStreamModule: Module, MicrophoneDataDelegate, SoundPla
 
         sendEvent(deviceReconnectedEvent, ["reason": reasonString])
     }
-
-    func onSoundChunkPlayed(_ isFinal: Bool) {
-        sendEvent(soundIsPlayedEvent, ["isFinal": isFinal])
-    }
-
-    func onSoundStartedPlaying() {
-        sendEvent(soundIsStartedEvent)
-    }
 }

package/ios/SharedAudioEngine.swift

@@ -1,7 +1,7 @@
 import AVFoundation
 
 /// Delegate for receiving engine lifecycle events.
-/// Both SoundPlayer and AudioPipeline implement this
+/// Both AudioPipeline consumers implement this
 /// to handle route changes and interruptions.
 protocol SharedAudioEngineDelegate: AnyObject {
     /// Called after the engine has been restarted due to a route change.
@@ -27,7 +27,7 @@ protocol SharedAudioEngineDelegate: AnyObject {
     func engineDidDie(reason: String)
 }
 
-/// Owns the single AVAudioEngine shared between SoundPlayer and AudioPipeline.
+/// Owns the single AVAudioEngine shared between AudioPipeline consumers.
 ///
 /// Responsibilities:
 ///   - Engine lifecycle (create, start, stop, teardown)
@@ -38,9 +38,15 @@ protocol SharedAudioEngineDelegate: AnyObject {
 /// Consumers attach their own AVAudioPlayerNode via `attachNode(_:format:)`.
 /// The mixer handles sample-rate conversion from each node's format to the
 /// hardware output format automatically.
+///
+/// All public methods are serialized on an internal queue to prevent races
+/// between Expo async-function calls, notification handlers, and teardown.
 class SharedAudioEngine {
     private static let TAG = "SharedAudioEngine"
 
+    /// Serial queue that protects all engine / node / state mutations.
+    private let queue = DispatchQueue(label: "expo.audio.SharedAudioEngine")
+
     // ── Engine state ─────────────────────────────────────────────────────
     private(set) var engine: AVAudioEngine?
     private(set) var playbackMode: PlaybackMode = .regular
@@ -51,13 +57,11 @@ class SharedAudioEngine {
     private let delegates = NSHashTable<AnyObject>.weakObjects()
 
     func addDelegate(_ d: SharedAudioEngineDelegate) {
-        if !delegates.contains(d as AnyObject) {
-            delegates.add(d as AnyObject)
-        }
+        queue.sync { delegates.add(d as AnyObject) }
     }
 
     func removeDelegate(_ d: SharedAudioEngineDelegate) {
-        delegates.remove(d as AnyObject)
+        queue.sync { delegates.remove(d as AnyObject) }
     }
 
     private func notifyDelegates(_ block: (SharedAudioEngineDelegate) -> Void) {
@@ -86,6 +90,10 @@ class SharedAudioEngine {
     ///
     /// - Parameter playbackMode: Determines whether voice processing is enabled.
     func configure(playbackMode: PlaybackMode) throws {
+        try queue.sync { try _configure(playbackMode: playbackMode) }
+    }
+
+    private func _configure(playbackMode: PlaybackMode) throws {
         if isConfigured && self.playbackMode == playbackMode && engine?.isRunning == true {
             Logger.debug("[\(SharedAudioEngine.TAG)] Already configured for \(playbackMode) and engine running, skipping")
             return
@@ -97,7 +105,7 @@ class SharedAudioEngine {
 
         // Tear down existing engine (keeps attachedNodes info for re-attach)
         let previousNodes = attachedNodes
-        teardown()
+        _teardown()
 
         Logger.debug("[\(SharedAudioEngine.TAG)] Configuring engine — playbackMode=\(playbackMode)")
 
@@ -111,10 +119,12 @@ class SharedAudioEngine {
             Logger.debug("[\(SharedAudioEngine.TAG)] Voice processing enabled")
         }
 
-        // Do NOT explicitly connect mainMixerNode → outputNode.
-        // The engine auto-negotiates the hardware format for that hop,
-        // avoiding IsFormatSampleRateAndChannelCountValid crashes when
-        // the consumer's format doesn't match the hardware sample rate.
+        // Force the output node (and implicitly the graph) to be created
+        // before starting. inputNode/outputNode are lazy — if neither is
+        // accessed, the graph has zero nodes and Initialize crashes with
+        // "inputNode != nullptr || outputNode != nullptr".
+        // The VP path above already accesses both; this covers regular mode.
+        _ = engine.mainMixerNode
 
         try engine.start()
 
@@ -132,7 +142,7 @@ class SharedAudioEngine {
 
         // Re-attach any nodes that were connected before reconfiguration
         for info in previousNodes {
-            attachNode(info.node, format: info.format)
+            _attachNode(info.node, format: info.format)
             info.node.play()
         }
 
@@ -152,6 +162,10 @@ class SharedAudioEngine {
     /// Connects `node → mainMixerNode` with the given format.
     /// The mixer handles sample-rate conversion to hardware output.
     func attachNode(_ node: AVAudioPlayerNode, format: AVAudioFormat) {
+        queue.sync { _attachNode(node, format: format) }
+    }
+
+    private func _attachNode(_ node: AVAudioPlayerNode, format: AVAudioFormat) {
         guard let engine = engine else {
             Logger.debug("[\(SharedAudioEngine.TAG)] attachNode called but engine is nil")
             return
@@ -166,21 +180,25 @@ class SharedAudioEngine {
 
     /// Detach a consumer's player node from the shared engine.
     func detachNode(_ node: AVAudioPlayerNode) {
-        guard let engine = engine else { return }
+        queue.sync { _detachNode(node) }
+    }
 
-        node.pause()
-        node.stop()
+    private func _detachNode(_ node: AVAudioPlayerNode) {
+        guard let engine = engine else { return }
 
-        // Only disconnect/detach if the node is still attached to this engine.
-        // The node may already have been removed (e.g. engine died, concurrent
-        // teardown, or duplicate disconnect call).
         if node.engine === engine {
             engine.disconnectNodeOutput(node)
             engine.detach(node)
         }
         attachedNodes.removeAll { $0.node === node }
 
-        Logger.debug("[\(SharedAudioEngine.TAG)] Node detached")
+        // Stop the engine if no nodes remain — no reason to keep it running.
+        if attachedNodes.isEmpty && engine.isRunning {
+            engine.stop()
+            Logger.debug("[\(SharedAudioEngine.TAG)] Node detached, engine stopped (no remaining nodes)")
+        } else {
+            Logger.debug("[\(SharedAudioEngine.TAG)] Node detached")
+        }
     }
 
     // ════════════════════════════════════════════════════════════════════
@@ -189,19 +207,31 @@ class SharedAudioEngine {
 
     /// Tear down the engine completely. Called on reconfigure or module destroy.
     func teardown() {
+        queue.sync { _teardown() }
+    }
+
+    private func _teardown() {
         // Remove observers
         NotificationCenter.default.removeObserver(
             self, name: AVAudioSession.routeChangeNotification, object: nil)
         NotificationCenter.default.removeObserver(
             self, name: AVAudioSession.interruptionNotification, object: nil)
 
-        // Detach all tracked nodes
+        // Disable voice processing BEFORE stopping so the system begins
+        // swapping VoiceProcessingIO back to RemoteIO while we clean up.
+        // Without this, a new engine created immediately after teardown can
+        // crash in Initialize (inputNode/outputNode both nil) because the
+        // IO unit is still mid-swap.
+        if playbackMode == .conversation || playbackMode == .voiceProcessing {
+            if let engine = engine {
+                try? engine.inputNode.setVoiceProcessingEnabled(false)
+                try? engine.outputNode.setVoiceProcessingEnabled(false)
+            }
+        }
+
+        engine?.stop()
         if let engine = engine {
             for info in attachedNodes {
-                info.node.pause()
-                info.node.stop()
-                // Guard against nodes already removed from engine (e.g. engine
-                // died or node was detached by a concurrent disconnect call).
                 if info.node.engine === engine {
                     engine.disconnectNodeOutput(info.node)
                     engine.detach(info.node)
@@ -210,15 +240,6 @@ class SharedAudioEngine {
         }
         attachedNodes.removeAll()
 
-        // Disable voice processing before stopping
-        if playbackMode == .conversation || playbackMode == .voiceProcessing {
-            if let engine = engine {
-                try? engine.inputNode.setVoiceProcessingEnabled(false)
-                try? engine.outputNode.setVoiceProcessingEnabled(false)
-            }
-        }
-
-        engine?.stop()
         engine = nil
         isConfigured = false
 
@@ -239,6 +260,12 @@ class SharedAudioEngine {
             return
         }
 
+        queue.async { [weak self] in
+            self?._handleRouteChange(reason: reason)
+        }
+    }
+
+    private func _handleRouteChange(reason: AVAudioSession.RouteChangeReason) {
         let routeDescription = AVAudioSession.sharedInstance().currentRoute.outputs
             .map { "\($0.portName) (\($0.portType.rawValue))" }
             .joined(separator: ", ")
@@ -258,14 +285,7 @@ class SharedAudioEngine {
             // Suppress completion handlers from node.stop() re-entering the scheduling loop
             isRebuildingForRouteChange = true
 
-            // 1. Stop all attached nodes (completion handlers fire but are gated)
-            for info in attachedNodes {
-                Logger.debug("[\(SharedAudioEngine.TAG)] Stopping node — isPlaying=\(info.node.isPlaying)")
-                info.node.pause()
-                info.node.stop()
-            }
-
-            // 2. Stop engine
+            // 1. Stop engine
             if engine.isRunning {
                 engine.stop()
                 Logger.debug("[\(SharedAudioEngine.TAG)] Engine stopped")
@@ -273,7 +293,7 @@ class SharedAudioEngine {
                 Logger.debug("[\(SharedAudioEngine.TAG)] Engine was already stopped")
             }
 
-            // 3. Detach all nodes
+            // 2. Detach all nodes
             for info in attachedNodes {
                 if info.node.engine === engine {
                     engine.disconnectNodeOutput(info.node)
@@ -282,7 +302,7 @@ class SharedAudioEngine {
             }
             Logger.debug("[\(SharedAudioEngine.TAG)] Nodes detached (\(attachedNodes.count))")
 
-            // 4. Re-enable voice processing (resets after engine stop)
+            // 3. Re-enable voice processing (resets after engine stop)
             if playbackMode == .conversation || playbackMode == .voiceProcessing {
                 do {
                     try engine.inputNode.setVoiceProcessingEnabled(true)
@@ -292,14 +312,14 @@ class SharedAudioEngine {
                 }
             }
 
-            // 5. Re-attach all nodes
+            // 4. Re-attach all nodes
             for info in attachedNodes {
                 engine.attach(info.node)
                 engine.connect(info.node, to: engine.mainMixerNode, format: info.format)
             }
             Logger.debug("[\(SharedAudioEngine.TAG)] Nodes re-attached (\(attachedNodes.count))")
 
-            // 6. Reactivate session and restart engine with retry.
+            // 5. Reactivate session and restart engine with retry.
             // Voice processing mode switches the underlying audio unit (RemoteIO ↔
             // VoiceProcessingIO). This swap completes asynchronously — if we call
             // engine.start() immediately, the engine appears to start (isRunning=true)
@@ -310,7 +330,7 @@ class SharedAudioEngine {
                 ? [0.15, 0.3, 0.6]   // 150ms, 300ms, 600ms pre-start delay for VP mode (+100ms post-start verify)
                 : [0.0, 0.1, 0.25]   // immediate, then backoff for non-VP (+50ms post-start verify)
 
-            self.attemptRestart(engine: engine, retryDelays: retryDelays, attempt: 0)
+            _attemptRestart(engine: engine, retryDelays: retryDelays, attempt: 0)
 
         case .categoryChange:
             Logger.debug("[\(SharedAudioEngine.TAG)] Audio session category changed")
@@ -323,12 +343,14 @@ class SharedAudioEngine {
     /// is truly running and nodes are playing before declaring success.
     /// On final failure, falls back to a full rebuild. If that also fails,
     /// tears down everything and notifies delegates via `engineDidDie`.
-    private func attemptRestart(engine: AVAudioEngine, retryDelays: [TimeInterval], attempt: Int) {
+    ///
+    /// Must be called on `queue`.
+    private func _attemptRestart(engine: AVAudioEngine, retryDelays: [TimeInterval], attempt: Int) {
         guard attempt < retryDelays.count else {
             // Exhausted in-place retries — try a full rebuild as last resort
             Logger.debug("[\(SharedAudioEngine.TAG)] All \(retryDelays.count) restart attempts failed — attempting full rebuild")
             isRebuildingForRouteChange = false
-            rebuildEngine()
+            _rebuildEngine()
             return
         }
 
@@ -359,7 +381,7 @@ class SharedAudioEngine {
                 }
             } catch {
                 Logger.debug("[\(SharedAudioEngine.TAG)] engine.start() threw on attempt \(attempt + 1): \(error)")
-                self.attemptRestart(engine: engine, retryDelays: retryDelays, attempt: attempt + 1)
+                self._attemptRestart(engine: engine, retryDelays: retryDelays, attempt: attempt + 1)
                 return
             }
 
@@ -378,14 +400,14 @@ class SharedAudioEngine {
                 // Failed immediately — no point waiting, retry now
                 Logger.debug("[\(SharedAudioEngine.TAG)] Restart attempt \(attempt + 1) failed immediately")
                 if engine.isRunning { engine.stop() }
-                self.attemptRestart(engine: engine, retryDelays: retryDelays, attempt: attempt + 1)
+                self._attemptRestart(engine: engine, retryDelays: retryDelays, attempt: attempt + 1)
                 return
             }
 
             // Voice processing can cause the engine to die asynchronously after
-            // appearing to start. Wait 100ms then re-verify before declaring success.
+            // appearing to start. Wait then re-verify before declaring success.
             let verifyDelay: TimeInterval = (self.playbackMode == .conversation || self.playbackMode == .voiceProcessing) ? 0.1 : 0.05
-            DispatchQueue.main.asyncAfter(deadline: .now() + verifyDelay) { [weak self] in
+            self.queue.asyncAfter(deadline: .now() + verifyDelay) { [weak self] in
                 guard let self = self, let engine = self.engine else {
                     self?.isRebuildingForRouteChange = false
                     return
@@ -414,9 +436,9 @@ class SharedAudioEngine {
                     if isVP {
                         Logger.debug("[\(SharedAudioEngine.TAG)] VP mode — skipping remaining in-place retries, going to full rebuild")
                         self.isRebuildingForRouteChange = false
-                        self.rebuildEngine()
+                        self._rebuildEngine()
                     } else {
-                        self.attemptRestart(engine: engine, retryDelays: retryDelays, attempt: attempt + 1)
+                        self._attemptRestart(engine: engine, retryDelays: retryDelays, attempt: attempt + 1)
                     }
                 }
             }
@@ -424,7 +446,7 @@ class SharedAudioEngine {
 
         if delay > 0 {
             Logger.debug("[\(SharedAudioEngine.TAG)] Waiting \(Int(delay * 1000))ms before attempt \(attempt + 1)")
-            DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: work)
+            queue.asyncAfter(deadline: .now() + delay, execute: work)
         } else {
             work()
         }
@@ -437,15 +459,17 @@ class SharedAudioEngine {
     ///
     /// If this also fails, declare the engine dead, tear down all state, and
     /// notify delegates so they can report the failure to JS.
-    private func rebuildEngine() {
+    ///
+    /// Must be called on `queue`.
+    private func _rebuildEngine() {
         Logger.debug("[\(SharedAudioEngine.TAG)] rebuildEngine — creating fresh engine (old nodes will NOT be reused)")
         let savedMode = playbackMode
 
         // Full teardown (clears attachedNodes, stops engine, nils it)
-        teardown()
+        _teardown()
 
         do {
-            try configure(playbackMode: savedMode)
+            try _configure(playbackMode: savedMode)
             // Do NOT re-attach old nodes. The VP IO swap can leave old
             // AVAudioPlayerNode instances in a broken state. Delegates must
             // create fresh nodes in their engineDidRebuild() callback.
@@ -454,7 +478,7 @@ class SharedAudioEngine {
         } catch {
             Logger.debug("[\(SharedAudioEngine.TAG)] rebuildEngine FAILED — engine is dead: \(error)")
             // Ensure everything is torn down so a future connect() starts clean
-            teardown()
+            _teardown()
             let reason = "Route change recovery failed after all retries: \(error.localizedDescription)"
             notifyDelegates { $0.engineDidDie(reason: reason) }
         }
@@ -469,6 +493,12 @@ class SharedAudioEngine {
               let typeValue = info[AVAudioSessionInterruptionTypeKey] as? UInt,
               let type = AVAudioSession.InterruptionType(rawValue: typeValue) else { return }
 
+        queue.async { [weak self] in
+            self?._handleInterruption(type: type)
+        }
+    }
+
+    private func _handleInterruption(type: AVAudioSession.InterruptionType) {
         if type == .began {
             Logger.debug("[\(SharedAudioEngine.TAG)] Audio session interruption began")
             notifyDelegates { $0.audioSessionInterruptionBegan() }
@@ -491,6 +521,6 @@ class SharedAudioEngine {
     }
 
     deinit {
-        teardown()
+        _teardown()
     }
 }

package/ios/SoundConfig.swift

@@ -2,44 +2,10 @@
 public enum PlaybackMode {
     /// Regular playback mode for standard audio playback
     case regular
-    
+
     /// Conversation mode optimized for speech
     case conversation
-    
+
     /// Voice processing mode with enhanced voice quality and automatic engine cleanup
     case voiceProcessing
 }
-
-/// Configuration for audio playback settings
-public struct SoundConfig {
-    /// The sample rate for audio playback in Hz
-    public var sampleRate: Double
-    
-    /// The playback mode (regular, conversation, or voiceProcessing)
-    public var playbackMode: PlaybackMode
-    
-    /// Default configuration with standard settings
-    public static let defaultConfig = SoundConfig(
-        sampleRate: 44100.0,
-        playbackMode: .regular
-    )
-    
-    /// Creates a new sound configuration with the specified settings
-    /// - Parameters:
-    ///   - sampleRate: The sample rate in Hz (default: 44100.0)
-    ///   - playbackMode: The playback mode (default: .regular)
-    public init(
-        sampleRate: Double = 44100.0,
-        playbackMode: PlaybackMode = .regular
-    ) {
-        self.sampleRate = sampleRate
-        self.playbackMode = playbackMode
-    }
-    
-    /// Resets the configuration to default values
-    /// - Returns: The updated configuration with default values
-    public mutating func resetToDefault() -> SoundConfig {
-        self = SoundConfig.defaultConfig
-        return self
-    }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edkimmel/expo-audio-stream",
-  "version": "0.3.2-beta.2",
+  "version": "0.4.0",
   "description": "Expo Play Audio Stream module",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -45,6 +45,5 @@
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
-  },
-  "stableVersion": "0.3.1"
+  }
 }