Harden microphone permission resolution

Resolve macOS microphone status without letting undetermined states mask denied access, and retry both app-level and capture-device request paths when permission APIs disagree.

Author: ComputelessComputer

src-tauri/swift-permissions/src/lib.swift

@@ -41,59 +41,42 @@ private func mapAudioApplicationPermission(_ permission: AVAudioApplication.reco
   }
 }
 
-private func currentMicrophonePermissionStatus() -> Int {
-  let captureStatus = mapCaptureMicrophoneStatus(AVCaptureDevice.authorizationStatus(for: .audio))
-
-  if #available(macOS 14.0, *) {
-    let appStatus = mapAudioApplicationPermission(AVAudioApplication.shared.recordPermission)
+private func captureMicrophonePermissionStatus() -> Int {
+  mapCaptureMicrophoneStatus(AVCaptureDevice.authorizationStatus(for: .audio))
+}
 
-    if appStatus == grantedValue || captureStatus == grantedValue {
-      return grantedValue
-    }
+private func combinedMicrophonePermissionStatus(appStatus: Int, captureStatus: Int) -> Int {
+  if appStatus == grantedValue || captureStatus == grantedValue {
+    return grantedValue
+  }
 
-    if appStatus == neverRequestedValue || captureStatus == neverRequestedValue {
-      return neverRequestedValue
-    }
+  if appStatus == errorValue {
+    return captureStatus
+  }
 
-    return appStatus == errorValue ? captureStatus : appStatus
+  if captureStatus == errorValue {
+    return appStatus
   }
 
-  return captureStatus
-}
+  if appStatus == deniedValue || captureStatus == deniedValue {
+    return deniedValue
+  }
 
-@_cdecl("_microphone_permission_status")
-public func _microphone_permission_status() -> Int {
-  currentMicrophonePermissionStatus()
+  return neverRequestedValue
 }
 
-@_cdecl("_request_microphone_permission")
-public func _request_microphone_permission() -> Bool {
-  if currentMicrophonePermissionStatus() == grantedValue {
-    return true
-  }
+private func currentMicrophonePermissionStatus() -> Int {
+  let captureStatus = captureMicrophonePermissionStatus()
 
   if #available(macOS 14.0, *) {
-    switch AVAudioApplication.shared.recordPermission {
-    case .granted:
-      return true
-    case .denied:
-      return currentMicrophonePermissionStatus() == grantedValue
-    case .undetermined:
-      let semaphore = DispatchSemaphore(value: 0)
-      var granted = false
-
-      AVAudioApplication.requestRecordPermission { allowed in
-        granted = allowed
-        semaphore.signal()
-      }
-
-      _ = semaphore.wait(timeout: .now() + .seconds(60))
-      return granted || currentMicrophonePermissionStatus() == grantedValue
-    @unknown default:
-      return currentMicrophonePermissionStatus() == grantedValue
-    }
+    let appStatus = mapAudioApplicationPermission(AVAudioApplication.shared.recordPermission)
+    return combinedMicrophonePermissionStatus(appStatus: appStatus, captureStatus: captureStatus)
   }
 
+  return captureStatus
+}
+
+private func requestCaptureMicrophonePermission() -> Bool {
   let status = AVCaptureDevice.authorizationStatus(for: .audio)
 
   switch status {
@@ -117,6 +100,58 @@ public func _request_microphone_permission() -> Bool {
   }
 }
 
+@available(macOS 14.0, *)
+private func requestAppMicrophonePermission() -> Bool {
+  switch AVAudioApplication.shared.recordPermission {
+  case .granted:
+    return true
+  case .denied:
+    return false
+  case .undetermined:
+    let semaphore = DispatchSemaphore(value: 0)
+    var granted = false
+
+    AVAudioApplication.requestRecordPermission { allowed in
+      granted = allowed
+      semaphore.signal()
+    }
+
+    _ = semaphore.wait(timeout: .now() + .seconds(60))
+    return granted
+  @unknown default:
+    return false
+  }
+}
+
+@_cdecl("_microphone_permission_status")
+public func _microphone_permission_status() -> Int {
+  currentMicrophonePermissionStatus()
+}
+
+@_cdecl("_request_microphone_permission")
+public func _request_microphone_permission() -> Bool {
+  if currentMicrophonePermissionStatus() == grantedValue {
+    return true
+  }
+
+  if #available(macOS 14.0, *) {
+    let appStatus = mapAudioApplicationPermission(AVAudioApplication.shared.recordPermission)
+    if appStatus == neverRequestedValue && requestAppMicrophonePermission() {
+      return true
+    }
+
+    if currentMicrophonePermissionStatus() == grantedValue {
+      return true
+    }
+  }
+
+  if requestCaptureMicrophonePermission() {
+    return true
+  }
+
+  return currentMicrophonePermissionStatus() == grantedValue
+}
+
 @_cdecl("_audio_capture_permission_status")
 public func _audio_capture_permission_status() -> Int {
   guard let tccHandle,