Skip to content

Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more

fix(audio): avoid redundant bluetooth rebuild

altic-devd3f94613cc9b
diff --git a/Sources/Fluid/Services/ASRService.swift b/Sources/Fluid/Services/ASRService.swift
index 47a39c5c..7e5142ac 100644
--- a/Sources/Fluid/Services/ASRService.swift
+++ b/Sources/Fluid/Services/ASRService.swift
@@ -2160,17 +2160,84 @@ final class ASRService: ObservableObject {
private func finishAudioCaptureStart() {
self.isStarting = false
- if let deferredRecovery = self.deferredBluetoothStartupRouteRecovery.take() {
- self.scheduleAudioRouteRecovery(
- reason: "deferred after Bluetooth startup: \(deferredRecovery.reason)",
- requiresIdlePrewarm: deferredRecovery.requiresIdlePrewarm,
- reconcilesInputSelection: deferredRecovery.reconcilesInputSelection
- )
- }
+ let deferredRecovery = self.deferredBluetoothStartupRouteRecovery.take()
self.audioCaptureStateSettledTick &+= 1
let waiters = self.audioCaptureStartWaiters
self.audioCaptureStartWaiters.removeAll(keepingCapacity: false)
waiters.forEach { $0.resume() }
+
+ if let deferredRecovery {
+ Task { @MainActor [weak self] in
+ await self?.processDeferredBluetoothStartupRouteRecovery(deferredRecovery)
+ }
+ }
+ }
+
+ private func processDeferredBluetoothStartupRouteRecovery(
+ _ request: AudioCaptureIdlePolicy.DeferredBluetoothRouteRecovery.Request
+ ) async {
+ do {
+ try await Task.sleep(nanoseconds: self.audioRouteRecoveryDelayNanoseconds)
+ } catch {
+ return
+ }
+ guard self.isTerminating == false else { return }
+
+ let snapshot = await withCheckedContinuation { continuation in
+ DispatchQueue.global(qos: .userInitiated).async {
+ let devices = AudioDevice.listInputDevicesRefreshingLiveness()
+ let defaultInputUID = AudioDevice.getDefaultInputDevice()?.uid
+ continuation.resume(returning: (devices, defaultInputUID))
+ }
+ }
+ guard self.isTerminating == false else { return }
+ if self.isStarting {
+ self.deferredBluetoothStartupRouteRecovery.preserve(
+ reason: request.reason,
+ requiresIdlePrewarm: request.requiresIdlePrewarm,
+ reconcilesInputSelection: request.reconcilesInputSelection
+ )
+ return
+ }
+
+ let microphonePreferenceCoordinator = AppServices.shared.microphonePreferenceCoordinator
+ let resolvedInput: AudioDevice.Device?
+ if request.reconcilesInputSelection {
+ resolvedInput = microphonePreferenceCoordinator.reconcileMicrophoneSelection(
+ availableInputs: snapshot.0,
+ defaultInputUID: snapshot.1
+ )
+ } else {
+ resolvedInput = microphonePreferenceCoordinator.inputDeviceForCapture(
+ availableInputs: snapshot.0,
+ defaultInputUID: snapshot.1
+ )
+ }
+ self.cacheCurrentDeviceList(snapshot.0)
+
+ let activeSnapshot = self.directAudioLifecycleController.snapshot
+ let shouldRecover = AudioCaptureIdlePolicy.shouldRecoverAfterDeferredBluetoothReconciliation(
+ isRunning: self.isRunning,
+ confirmedInputUID: microphonePreferenceCoordinator.confirmedActiveInputUID,
+ activeDeviceID: activeSnapshot.deviceID,
+ resolvedInputUID: resolvedInput?.uid,
+ resolvedDeviceID: resolvedInput?.id,
+ hasPreparedCapture: self.hasPreparedAudioCapture,
+ requiresIdlePrewarm: request.requiresIdlePrewarm
+ )
+ guard shouldRecover else {
+ self.benchmarkLog(
+ "bluetooth_deferred_reconciliation_noop event=\(request.reason) " +
+ "resolvedUID=\(resolvedInput?.uid ?? "none")"
+ )
+ return
+ }
+
+ self.scheduleAudioRouteRecovery(
+ reason: "deferred after Bluetooth startup: \(request.reason)",
+ requiresIdlePrewarm: request.requiresIdlePrewarm,
+ reconcilesInputSelection: false
+ )
}
/// Stops the recording session and returns the transcribed text.
diff --git a/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift b/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift
index 0f3c7336..f6b251cf 100644
--- a/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift
+++ b/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift
@@ -145,4 +145,22 @@ enum AudioCaptureIdlePolicy {
) -> Bool {
directCaptureEnabled && isStarting && isRunning == false && attemptedInputIsBluetooth
}
+
+ static func shouldRecoverAfterDeferredBluetoothReconciliation(
+ isRunning: Bool,
+ confirmedInputUID: String?,
+ activeDeviceID: AudioObjectID?,
+ resolvedInputUID: String?,
+ resolvedDeviceID: AudioObjectID?,
+ hasPreparedCapture: Bool,
+ requiresIdlePrewarm: Bool
+ ) -> Bool {
+ if isRunning {
+ return resolvedInputUID != confirmedInputUID || resolvedDeviceID != activeDeviceID
+ }
+ if hasPreparedCapture {
+ return resolvedDeviceID != activeDeviceID
+ }
+ return requiresIdlePrewarm
+ }
}
diff --git a/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift b/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift
index a6946664..59265781 100644
--- a/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift
+++ b/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift
@@ -730,6 +730,60 @@ final class HotkeyShortcutTests: XCTestCase {
XCTAssertNil(deferredRecovery.take())
}
+ func testDeferredBluetoothReconciliationLeavesMatchingActiveInputUntouched() {
+ XCTAssertFalse(AudioCaptureIdlePolicy.shouldRecoverAfterDeferredBluetoothReconciliation(
+ isRunning: true,
+ confirmedInputUID: "airpods",
+ activeDeviceID: 42,
+ resolvedInputUID: "airpods",
+ resolvedDeviceID: 42,
+ hasPreparedCapture: true,
+ requiresIdlePrewarm: true
+ ))
+ }
+
+ func testDeferredBluetoothReconciliationRecoversChangedSelectionOrIdentity() {
+ XCTAssertTrue(AudioCaptureIdlePolicy.shouldRecoverAfterDeferredBluetoothReconciliation(
+ isRunning: true,
+ confirmedInputUID: "airpods",
+ activeDeviceID: 42,
+ resolvedInputUID: "usb",
+ resolvedDeviceID: 88,
+ hasPreparedCapture: true,
+ requiresIdlePrewarm: true
+ ))
+ XCTAssertTrue(AudioCaptureIdlePolicy.shouldRecoverAfterDeferredBluetoothReconciliation(
+ isRunning: true,
+ confirmedInputUID: "airpods",
+ activeDeviceID: 42,
+ resolvedInputUID: "airpods",
+ resolvedDeviceID: 43,
+ hasPreparedCapture: true,
+ requiresIdlePrewarm: true
+ ))
+ }
+
+ func testDeferredBluetoothReconciliationPreservesIdlePrewarmIntent() {
+ XCTAssertFalse(AudioCaptureIdlePolicy.shouldRecoverAfterDeferredBluetoothReconciliation(
+ isRunning: false,
+ confirmedInputUID: nil,
+ activeDeviceID: 42,
+ resolvedInputUID: "airpods",
+ resolvedDeviceID: 42,
+ hasPreparedCapture: true,
+ requiresIdlePrewarm: true
+ ))
+ XCTAssertTrue(AudioCaptureIdlePolicy.shouldRecoverAfterDeferredBluetoothReconciliation(
+ isRunning: false,
+ confirmedInputUID: nil,
+ activeDeviceID: nil,
+ resolvedInputUID: "airpods",
+ resolvedDeviceID: 42,
+ hasPreparedCapture: false,
+ requiresIdlePrewarm: true
+ ))
+ }
+
func testSilentPCMWatchdogRecoversBuiltInDirectCaptureOnceAfterRealSignal() {
var watchdog = AudioCaptureIdlePolicy.SilentPCMRecoveryWatchdog()