mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 03:06:37 +00:00
a520d94760
* Enable Swift 6.2 with default main actor isolation for the app target Turn on SWIFT_VERSION 6.2, SWIFT_APPROACHABLE_CONCURRENCY and SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor for the ElementX target, matching the NSE and Share Extension (which already use 6.2 without the main actor default). # Conflicts: # ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved * Update the code generation templates for Swift 6 Emit nonisolated/@unchecked Sendable mocks and nonisolated string enums, and mark async mock methods @concurrent so they keep suspending like the real implementations (otherwise intermediate states are unobservable in tests). Includes the regenerated mocks and strings. # Conflicts: # ElementX/Sources/Mocks/Generated/GeneratedMocks.swift * Make the data layer and services nonisolated and Sendable Annotate the value-type models, Rust SDK proxy wrappers, timeline item graph, settings, logging and NSE-shared types as nonisolated, and conform the service protocols to Sendable so their existentials can cross isolation boundaries. These types run off the main actor and no longer inherit the target's default main actor isolation. * Adopt the new isolation across call sites, mocks and signatures Update call sites, closure signatures and mock configuration helpers to match the nonisolated/Sendable data layer, including the main actor isolated mock inits and the @Sendable filter on recentlyVisitedRooms. ^ Conflicts: ^ ElementX/Sources/Services/SecureBackup/SecureBackupController.swift * Remove redundant @MainActor annotations With the app target defaulting to main actor isolation, the explicit @MainActor on view models, coordinators, views and their protocols is no longer required. * Fix concurrency hotspots surfaced by the migration Resolve the room summary main-thread deadlock by moving diff processing onto AsyncStreams, add the SDKListener.onMainActor FIFO bridge for SDK callbacks, hop KVO/timer/UIKit callbacks to the main actor via assumeIsolated, add isolated deinits, and apply the few justified nonisolated(unsafe) escapes for queue-confined Apple APIs. * Fix the unit tests for Swift 6 concurrency Hop the waitForConfirmation body onto the caller's actor (Swift Testing runs confirmation closures off-actor), and adjust the affected suites and async signatures. * offload diffs on concurrent threads instead of main actor * make room info protocols sendable * use a task group for fetching data so that everything runs concurrently in the TextRoomTimelineView when getting the preview. * use the generic onMainActor implementation, which already makes a stream and send the continuation on the main actor. * small pr comments issues being addressed * update enterprise * Update StaticCode to 1.1.0 and specify the required Swift isolation. * fix ElementCallServiceTests * update enterprise * re-generate mocks * update enterprise * enterprise new code conformed to swift 6 --------- Co-authored-by: Doug <douglase@element.io>
266 lines
8.0 KiB
Swift
266 lines
8.0 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2023-2025 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
import AVFoundation
|
|
import Combine
|
|
import Foundation
|
|
import UIKit
|
|
|
|
private enum InternalAudioPlayerState {
|
|
case none
|
|
case loading
|
|
case readyToPlay
|
|
case playing
|
|
case paused
|
|
case stopped
|
|
case finishedPlaying
|
|
case error(Error)
|
|
}
|
|
|
|
class AudioPlayer: NSObject, AudioPlayerProtocol {
|
|
var sourceURL: URL?
|
|
|
|
private var playerItem: AVPlayerItem?
|
|
private var internalAudioPlayer: AVQueuePlayer?
|
|
|
|
private var cancellables = Set<AnyCancellable>()
|
|
private let actionsSubject: PassthroughSubject<AudioPlayerAction, Never> = .init()
|
|
var actions: AnyPublisher<AudioPlayerAction, Never> {
|
|
actionsSubject.eraseToAnyPublisher()
|
|
}
|
|
|
|
private var internalState = InternalAudioPlayerState.none
|
|
|
|
private var statusObserver: NSKeyValueObservation?
|
|
private var rateObserver: NSKeyValueObservation?
|
|
private var autoplay = false
|
|
|
|
private let audioSession = AVAudioSession.sharedInstance()
|
|
|
|
// periphery:ignore - when set to nil is automatically cancelled
|
|
@CancellableTask private var releaseAudioSessionTask: Task<Void, Never>?
|
|
|
|
private let releaseAudioSessionTimeoutInterval = 5.0
|
|
|
|
private(set) var playbackURL: URL?
|
|
private(set) var playbackSpeed: Float = 1.0
|
|
|
|
private var deinitInProgress = false
|
|
|
|
var duration: TimeInterval {
|
|
abs(CMTimeGetSeconds(internalAudioPlayer?.currentItem?.duration ?? .zero))
|
|
}
|
|
|
|
var currentTime: TimeInterval {
|
|
let currentTime = abs(CMTimeGetSeconds(internalAudioPlayer?.currentTime() ?? .zero))
|
|
return currentTime.isFinite ? currentTime : .zero
|
|
}
|
|
|
|
var state: MediaPlayerState {
|
|
if case .loading = internalState {
|
|
return .loading
|
|
}
|
|
if case .stopped = internalState {
|
|
return .stopped
|
|
}
|
|
if case .playing = internalState {
|
|
return .playing
|
|
}
|
|
if case .paused = internalState {
|
|
return .paused
|
|
}
|
|
if case .error = internalState {
|
|
return .error
|
|
}
|
|
return .stopped
|
|
}
|
|
|
|
private var isStopped = true
|
|
|
|
isolated deinit {
|
|
deinitInProgress = true
|
|
stop()
|
|
unloadContent()
|
|
}
|
|
|
|
func load(sourceURL: URL, playbackURL: URL, autoplay: Bool) {
|
|
unloadContent()
|
|
setInternalState(.loading)
|
|
self.sourceURL = sourceURL
|
|
self.playbackURL = playbackURL
|
|
self.autoplay = autoplay
|
|
playerItem = AVPlayerItem(url: playbackURL)
|
|
internalAudioPlayer = AVQueuePlayer(playerItem: playerItem)
|
|
addObservers()
|
|
}
|
|
|
|
func reset() {
|
|
stop()
|
|
unloadContent()
|
|
}
|
|
|
|
func play() {
|
|
isStopped = false
|
|
setupAudioSession()
|
|
internalAudioPlayer?.rate = playbackSpeed
|
|
}
|
|
|
|
func pause() {
|
|
guard case .playing = internalState else { return }
|
|
internalAudioPlayer?.pause()
|
|
releaseAudioSession(after: releaseAudioSessionTimeoutInterval)
|
|
}
|
|
|
|
func stop() {
|
|
guard !isStopped else { return }
|
|
isStopped = true
|
|
internalAudioPlayer?.pause()
|
|
internalAudioPlayer?.seek(to: .zero)
|
|
releaseAudioSession(after: releaseAudioSessionTimeoutInterval)
|
|
}
|
|
|
|
func seek(to progress: Double) async {
|
|
guard let internalAudioPlayer else { return }
|
|
let time = progress * duration
|
|
await internalAudioPlayer.seek(to: CMTime(seconds: time, preferredTimescale: 60))
|
|
}
|
|
|
|
func setPlaybackSpeed(_ speed: Float) {
|
|
playbackSpeed = speed
|
|
if state == .playing {
|
|
internalAudioPlayer?.rate = speed
|
|
}
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
private func setupAudioSession() {
|
|
releaseAudioSessionTask = nil
|
|
do {
|
|
try audioSession.setCategory(.playback)
|
|
try audioSession.setActive(true)
|
|
} catch {
|
|
MXLog.error("Could not redirect audio playback to speakers.")
|
|
}
|
|
}
|
|
|
|
private func releaseAudioSession(after timeInterval: TimeInterval) {
|
|
guard !deinitInProgress else {
|
|
releaseAudioSession()
|
|
return
|
|
}
|
|
releaseAudioSessionTask = Task { [weak self] in
|
|
try? await Task.sleep(for: .seconds(timeInterval))
|
|
guard !Task.isCancelled else { return }
|
|
|
|
self?.releaseAudioSession()
|
|
}
|
|
}
|
|
|
|
private func releaseAudioSession() {
|
|
releaseAudioSessionTask = nil
|
|
if audioSession.category == .playback, !audioSession.isOtherAudioPlaying {
|
|
MXLog.info("releasing audio session")
|
|
try? audioSession.setActive(false, options: .notifyOthersOnDeactivation)
|
|
}
|
|
}
|
|
|
|
private func unloadContent() {
|
|
sourceURL = nil
|
|
playbackURL = nil
|
|
internalAudioPlayer?.replaceCurrentItem(with: nil)
|
|
internalAudioPlayer = nil
|
|
playerItem = nil
|
|
removeObservers()
|
|
}
|
|
|
|
private func addObservers() {
|
|
guard let internalAudioPlayer, let playerItem else {
|
|
return
|
|
}
|
|
|
|
statusObserver = playerItem.observe(\.status, options: [.old, .new]) { [weak self] item, _ in
|
|
// KVO fires on an arbitrary thread, hop to the main actor with the values we need.
|
|
let status = item.status
|
|
let error = item.error
|
|
Task { @MainActor [weak self] in
|
|
guard let self else { return }
|
|
|
|
switch status {
|
|
case .failed:
|
|
setInternalState(.error(error ?? AudioPlayerError.genericError))
|
|
case .readyToPlay:
|
|
guard state == .loading else { return }
|
|
setInternalState(.readyToPlay)
|
|
default:
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
rateObserver = internalAudioPlayer.observe(\.rate, options: [.old, .new]) { [weak self] player, _ in
|
|
// KVO fires on an arbitrary thread, hop to the main actor with the values we need.
|
|
let rate = player.rate
|
|
Task { @MainActor [weak self] in
|
|
guard let self else { return }
|
|
|
|
if rate == 0 {
|
|
if isStopped {
|
|
setInternalState(.stopped)
|
|
} else {
|
|
setInternalState(.paused)
|
|
}
|
|
} else {
|
|
setInternalState(.playing)
|
|
}
|
|
}
|
|
}
|
|
|
|
NotificationCenter.default.publisher(for: Notification.Name.AVPlayerItemDidPlayToEndTime)
|
|
.sink { [weak self] _ in
|
|
guard let self else { return }
|
|
setInternalState(.finishedPlaying)
|
|
}
|
|
.store(in: &cancellables)
|
|
}
|
|
|
|
private func removeObservers() {
|
|
statusObserver?.invalidate()
|
|
rateObserver?.invalidate()
|
|
cancellables.removeAll()
|
|
}
|
|
|
|
private func setInternalState(_ state: InternalAudioPlayerState) {
|
|
internalState = state
|
|
switch state {
|
|
case .none:
|
|
break
|
|
case .loading:
|
|
actionsSubject.send(.didStartLoading)
|
|
case .readyToPlay:
|
|
actionsSubject.send(.didFinishLoading)
|
|
if autoplay {
|
|
autoplay = false
|
|
play()
|
|
}
|
|
case .playing:
|
|
actionsSubject.send(.didStartPlaying)
|
|
case .paused:
|
|
actionsSubject.send(.didPausePlaying)
|
|
case .stopped:
|
|
actionsSubject.send(.didStopPlaying)
|
|
case .finishedPlaying:
|
|
actionsSubject.send(.didFinishPlaying)
|
|
unloadContent()
|
|
case .error(let error):
|
|
MXLog.error("audio player did fail. \(error)")
|
|
actionsSubject.send(.didFailWithError(error: error))
|
|
}
|
|
}
|
|
}
|