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>
199 lines
8.0 KiB
Swift
199 lines
8.0 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 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 Combine
|
|
import Foundation
|
|
import MatrixRustSDK
|
|
|
|
class SpaceServiceProxy: SpaceServiceProxyProtocol {
|
|
private let spaceService: SpaceServiceProtocol
|
|
|
|
private var topLevelSpacesHandle: TaskHandle?
|
|
private let spacesSubject = CurrentValueSubject<[SpaceServiceRoom], Never>([])
|
|
var topLevelSpacesPublisher: CurrentValuePublisher<[SpaceServiceRoom], Never> {
|
|
spacesSubject.asCurrentValuePublisher()
|
|
}
|
|
|
|
private var spaceFilterHandle: TaskHandle?
|
|
private let spaceFilterSubject = CurrentValueSubject<[SpaceServiceFilter], Never>([])
|
|
var spaceFilterPublisher: CurrentValuePublisher<[SpaceServiceFilter], Never> {
|
|
spaceFilterSubject.asCurrentValuePublisher()
|
|
}
|
|
|
|
// Bridges from the SDK's synchronous callbacks into Swift Concurrency. Yielding is safe from
|
|
// any thread; single long-lived `for await` consumers (set up in `init`) apply the updates on
|
|
// the main actor in FIFO order, guaranteeing one in-flight update at a time.
|
|
private let spaceListUpdatesContinuation: AsyncStream<[SpaceListUpdate]>.Continuation
|
|
private let spaceFilterUpdatesContinuation: AsyncStream<[SpaceFilterUpdate]>.Continuation
|
|
|
|
deinit {
|
|
spaceListUpdatesContinuation.finish()
|
|
spaceFilterUpdatesContinuation.finish()
|
|
}
|
|
|
|
init(spaceService: SpaceServiceProtocol) {
|
|
self.spaceService = spaceService
|
|
|
|
let (spaceListUpdates, spaceListUpdatesContinuation) = AsyncStream<[SpaceListUpdate]>.makeStream()
|
|
self.spaceListUpdatesContinuation = spaceListUpdatesContinuation
|
|
|
|
let (spaceFilterUpdates, spaceFilterUpdatesContinuation) = AsyncStream<[SpaceFilterUpdate]>.makeStream()
|
|
self.spaceFilterUpdatesContinuation = spaceFilterUpdatesContinuation
|
|
|
|
Task { [weak self] in
|
|
for await updates in spaceListUpdates {
|
|
self?.handleSpaceListUpdates(updates)
|
|
}
|
|
}
|
|
|
|
Task { [weak self] in
|
|
for await updates in spaceFilterUpdates {
|
|
self?.handleSpaceFilterUpdates(updates)
|
|
}
|
|
}
|
|
|
|
Task { await setupSubscriptions() }
|
|
}
|
|
|
|
private func setupSubscriptions() async {
|
|
topLevelSpacesHandle = await spaceService.subscribeToTopLevelJoinedSpaces(listener: SDKListener { [spaceListUpdatesContinuation] updates in
|
|
spaceListUpdatesContinuation.yield(updates)
|
|
})
|
|
|
|
spaceFilterHandle = await spaceService.subscribeToSpaceFilters(listener: SDKListener { [spaceFilterUpdatesContinuation] updates in
|
|
spaceFilterUpdatesContinuation.yield(updates)
|
|
})
|
|
}
|
|
|
|
func spaceRoomList(spaceID: String) async -> Result<SpaceRoomListProxyProtocol, SpaceServiceProxyError> {
|
|
do {
|
|
return try await .success(SpaceRoomListProxy(spaceService.spaceRoomList(spaceId: spaceID)))
|
|
} catch {
|
|
MXLog.error("Failed creating space room list for \(spaceID): \(error)")
|
|
return .failure(.sdkError(error))
|
|
}
|
|
}
|
|
|
|
func spaceForIdentifier(spaceID: String) async -> Result<SpaceServiceRoom?, SpaceServiceProxyError> {
|
|
do {
|
|
return try await .success(spaceService.getSpaceRoom(roomId: spaceID).map(SpaceServiceRoom.init))
|
|
} catch {
|
|
MXLog.error("Failed getting space room for \(spaceID): \(error)")
|
|
return .failure(.sdkError(error))
|
|
}
|
|
}
|
|
|
|
func leaveSpace(spaceID: String) async -> Result<LeaveSpaceHandleProxy, SpaceServiceProxyError> {
|
|
do {
|
|
return try await .success(.init(spaceID: spaceID, leaveHandle: spaceService.leaveSpace(spaceId: spaceID)))
|
|
} catch {
|
|
MXLog.error("Failed to get leave handle for \(spaceID): \(error)")
|
|
return .failure(.sdkError(error))
|
|
}
|
|
}
|
|
|
|
func joinedParents(childID: String) async -> Result<[SpaceServiceRoom], SpaceServiceProxyError> {
|
|
do {
|
|
return try await .success(spaceService.joinedParentsOfChild(childId: childID).map(SpaceServiceRoom.init))
|
|
} catch {
|
|
MXLog.error("Failed to get joined parents for \(childID): \(error)")
|
|
return .failure(.sdkError(error))
|
|
}
|
|
}
|
|
|
|
func editableSpaces() async -> [SpaceServiceRoom] {
|
|
await spaceService.editableSpaces().map(SpaceServiceRoom.init)
|
|
}
|
|
|
|
func addChild(_ childID: String, to spaceID: String) async -> Result<Void, SpaceServiceProxyError> {
|
|
do {
|
|
return try await .success(spaceService.addChildToSpace(childId: childID, spaceId: spaceID))
|
|
} catch {
|
|
MXLog.error("Failed to add child \(childID) to space \(spaceID): \(error)")
|
|
return .failure(.sdkError(error))
|
|
}
|
|
}
|
|
|
|
func removeChild(_ childID: String, from spaceID: String) async -> Result<Void, SpaceServiceProxyError> {
|
|
do {
|
|
return try await .success(spaceService.removeChildFromSpace(childId: childID, spaceId: spaceID))
|
|
} catch {
|
|
MXLog.error("Failed to remove child \(childID) to space \(spaceID): \(error)")
|
|
return .failure(.sdkError(error))
|
|
}
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
private func handleSpaceListUpdates(_ updates: [SpaceListUpdate]) {
|
|
var spaces = spacesSubject.value
|
|
|
|
for update in updates {
|
|
switch update {
|
|
case .append(let spaceRooms):
|
|
spaces.append(contentsOf: spaceRooms.map(SpaceServiceRoom.init))
|
|
case .clear:
|
|
spaces.removeAll()
|
|
case .pushFront(let spaceRoom):
|
|
spaces.insert(SpaceServiceRoom(spaceRoom: spaceRoom), at: 0)
|
|
case .pushBack(let spaceRoom):
|
|
spaces.append(SpaceServiceRoom(spaceRoom: spaceRoom))
|
|
case .popFront:
|
|
spaces.removeFirst()
|
|
case .popBack:
|
|
spaces.removeLast()
|
|
case .insert(let index, let spaceRoom):
|
|
spaces.insert(SpaceServiceRoom(spaceRoom: spaceRoom), at: Int(index))
|
|
case .set(let index, let spaceRoom):
|
|
spaces[Int(index)] = SpaceServiceRoom(spaceRoom: spaceRoom)
|
|
case .remove(let index):
|
|
spaces.remove(at: Int(index))
|
|
case .truncate(let length):
|
|
spaces.removeSubrange(Int(length)..<spaces.count)
|
|
case .reset(let spaceRooms):
|
|
spaces = spaceRooms.map(SpaceServiceRoom.init)
|
|
}
|
|
}
|
|
|
|
spacesSubject.send(spaces)
|
|
}
|
|
|
|
private func handleSpaceFilterUpdates(_ updates: [SpaceFilterUpdate]) {
|
|
var filters = spaceFilterSubject.value
|
|
|
|
for update in updates {
|
|
switch update {
|
|
case .append(let spaceFilters):
|
|
filters.append(contentsOf: spaceFilters.map(SpaceServiceFilter.init))
|
|
case .clear:
|
|
filters.removeAll()
|
|
case .pushFront(let filter):
|
|
filters.insert(SpaceServiceFilter(filter: filter), at: 0)
|
|
case .pushBack(let filter):
|
|
filters.append(SpaceServiceFilter(filter: filter))
|
|
case .popFront:
|
|
filters.removeFirst()
|
|
case .popBack:
|
|
filters.removeLast()
|
|
case .insert(let index, let filter):
|
|
filters.insert(SpaceServiceFilter(filter: filter), at: Int(index))
|
|
case .set(let index, let filter):
|
|
filters[Int(index)] = SpaceServiceFilter(filter: filter)
|
|
case .remove(let index):
|
|
filters.remove(at: Int(index))
|
|
case .truncate(let length):
|
|
filters.removeSubrange(Int(length)..<filters.count)
|
|
case .reset(let spaceFilters):
|
|
filters = spaceFilters.map(SpaceServiceFilter.init)
|
|
}
|
|
}
|
|
|
|
spaceFilterSubject.send(filters)
|
|
}
|
|
}
|