mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-01 01:03:01 +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>
276 lines
11 KiB
Swift
276 lines
11 KiB
Swift
//
|
||
// Copyright 2025 Element Creations 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 CoreImage.CIFilterBuiltins
|
||
import MatrixRustSDK
|
||
import SwiftUI
|
||
|
||
// sourcery: AutoMockable
|
||
protocol LinkNewDeviceServiceProtocol {
|
||
/// Links a new device by showing it a QR code.
|
||
func linkMobileDevice() -> LinkNewDeviceService.LinkMobileProgressPublisher
|
||
/// Links a new device using a QR code generated by said device.
|
||
func linkDesktopDevice(with scannedQRData: Data) -> LinkNewDeviceService.LinkDesktopProgressPublisher
|
||
}
|
||
|
||
class LinkNewDeviceService: LinkNewDeviceServiceProtocol {
|
||
/// Publishes the progress of linking a new device by showing it a QR code.
|
||
typealias LinkMobileProgressPublisher = CurrentValuePublisher<LinkMobileProgress, QRCodeLoginError>
|
||
/// Publishes the progress of linking a new device by scanning a QR code generated by said device.
|
||
typealias LinkDesktopProgressPublisher = CurrentValuePublisher<LinkDesktopProgress, QRCodeLoginError>
|
||
|
||
/// The progress of linking a new device by showing it a QR code.
|
||
enum LinkMobileProgress: Equatable {
|
||
case starting
|
||
case qrReady(UIImage)
|
||
case qrScanned(CheckCodeSenderProxy)
|
||
case waitingForAuthorisation(verificationURL: URL)
|
||
case syncingSecrets
|
||
case done
|
||
}
|
||
|
||
/// The progress of linking a new device by scanning a QR code generated by said device.
|
||
enum LinkDesktopProgress: Equatable {
|
||
case starting
|
||
case establishingSecureChannel(checkCodeString: String)
|
||
case waitingForAuthorisation(verificationURL: URL)
|
||
case syncingSecrets
|
||
case done
|
||
}
|
||
|
||
private let grantLoginHandler: GrantLoginWithQrCodeHandlerProtocol
|
||
|
||
init(handler: GrantLoginWithQrCodeHandlerProtocol) {
|
||
grantLoginHandler = handler
|
||
}
|
||
|
||
/// Links a new device by showing it a QR code.
|
||
func linkMobileDevice() -> LinkMobileProgressPublisher {
|
||
let progressSubject = CurrentValueSubject<LinkMobileProgress, QRCodeLoginError>(.starting)
|
||
|
||
// Bridge from the SDK's synchronous callback into Swift Concurrency. Yielding is safe from
|
||
// any thread; the single long-lived `for await` consumer forwards the progress updates on
|
||
// the main actor in FIFO order.
|
||
let (progressStream, progressContinuation) = AsyncStream<GrantGeneratedQrLoginProgress>.makeStream()
|
||
|
||
let listener = SDKListener {
|
||
progressContinuation.yield($0)
|
||
}
|
||
|
||
Task {
|
||
for await rustProgress in progressStream {
|
||
do {
|
||
try progressSubject.send(.init(rustProgress: rustProgress))
|
||
} catch {
|
||
MXLog.error("Invalid GenerateProgress")
|
||
progressSubject.send(completion: .failure(.unknown))
|
||
}
|
||
}
|
||
}
|
||
|
||
Task {
|
||
defer { progressContinuation.finish() }
|
||
do {
|
||
// Note: The SDK doesn't provide us with a way to cancel the grant if the user hit the cancel button 🤷♂️
|
||
try await grantLoginHandler.generate(progressListener: listener) // The success state is handled by the listener.
|
||
// We send the .done progress in case the listener didn't get a chance to pass it on from the SDK before being deallocated
|
||
progressSubject.send(LinkMobileProgress.done)
|
||
} catch let error as HumanQrGrantLoginError {
|
||
MXLog.error("QR code reciprocate error: \(error)")
|
||
progressSubject.send(completion: .failure(.init(rustError: error)))
|
||
} catch {
|
||
MXLog.error("QR code reciprocate unknown error: \(error)")
|
||
progressSubject.send(completion: .failure(.unknown))
|
||
}
|
||
}
|
||
|
||
return progressSubject.asCurrentValuePublisher()
|
||
}
|
||
|
||
/// Links a new device using a QR code generated by said device.
|
||
func linkDesktopDevice(with scannedQRData: Data) -> LinkDesktopProgressPublisher {
|
||
let progressSubject = CurrentValueSubject<LinkDesktopProgress, QRCodeLoginError>(.starting)
|
||
|
||
// Same callback bridging as `linkMobileDevice()` above.
|
||
let (progressStream, progressContinuation) = AsyncStream<GrantQrLoginProgress>.makeStream()
|
||
|
||
let listener = SDKListener {
|
||
progressContinuation.yield($0)
|
||
}
|
||
|
||
Task {
|
||
for await rustProgress in progressStream {
|
||
do {
|
||
try progressSubject.send(.init(rustProgress: rustProgress))
|
||
} catch {
|
||
MXLog.error("Invalid ScanProgress")
|
||
progressSubject.send(completion: .failure(.unknown))
|
||
}
|
||
}
|
||
}
|
||
|
||
let qrCodeData: QrCodeData
|
||
do {
|
||
qrCodeData = try QrCodeData.fromBytes(bytes: scannedQRData)
|
||
} catch {
|
||
MXLog.error("QR code decode error: \(error)")
|
||
progressSubject.send(completion: .failure(.invalidQRCode))
|
||
progressContinuation.finish()
|
||
return progressSubject.asCurrentValuePublisher()
|
||
}
|
||
|
||
// At some stage the SDK will have a `qrCodeData.intent` which we should check before continuing here.
|
||
// Note the equivalent check will also happen for sign in with QR code in the AuthenticationService.
|
||
|
||
Task {
|
||
defer { progressContinuation.finish() }
|
||
do {
|
||
// Note: The SDK doesn't provide us with a way to cancel the grant if the user hit the cancel button 🤷♂️
|
||
try await grantLoginHandler.scan(qrCodeData: qrCodeData, progressListener: listener) // The success state is handled by the listener.
|
||
// We send the .done progress in case the listener didn't get a chance to pass it on from the SDK before being deallocated
|
||
progressSubject.send(LinkDesktopProgress.done)
|
||
} catch let error as HumanQrGrantLoginError {
|
||
MXLog.error("QR code reciprocate error: \(error)")
|
||
progressSubject.send(completion: .failure(.init(rustError: error)))
|
||
} catch {
|
||
MXLog.error("QR code reciprocate unknown error: \(error)")
|
||
progressSubject.send(completion: .failure(.unknown))
|
||
}
|
||
}
|
||
|
||
return progressSubject.asCurrentValuePublisher()
|
||
}
|
||
}
|
||
|
||
extension LinkNewDeviceService.LinkMobileProgress: CustomStringConvertible {
|
||
enum Error: Swift.Error {
|
||
case invalidQRCodeData
|
||
case invalidVerificationURI(String)
|
||
}
|
||
|
||
init(rustProgress: GrantGeneratedQrLoginProgress) throws {
|
||
self = switch rustProgress {
|
||
case .starting: .starting
|
||
case .qrReady(let qrCode):
|
||
if let image = UIImage(qrCodeData: qrCode.toBytes()) {
|
||
.qrReady(image)
|
||
} else {
|
||
throw Error.invalidQRCodeData
|
||
}
|
||
case .qrScanned(let checkCodeSender): .qrScanned(.init(underlyingSender: checkCodeSender))
|
||
case .waitingForAuth(let verificationURI):
|
||
// verificationURI is a String; ASWebAuthenticationSession requires a URL.
|
||
if let url = URL(string: verificationURI) {
|
||
.waitingForAuthorisation(verificationURL: url)
|
||
} else {
|
||
throw Error.invalidVerificationURI(verificationURI)
|
||
}
|
||
case .syncingSecrets: .syncingSecrets
|
||
case .done: .done
|
||
}
|
||
}
|
||
|
||
var description: String {
|
||
switch self {
|
||
case .starting: "starting"
|
||
case .qrReady: "qrReady"
|
||
case .qrScanned: "qrScanned"
|
||
case .waitingForAuthorisation: "waitingForAuthorisation"
|
||
case .syncingSecrets: "syncingSecrets"
|
||
case .done: "done"
|
||
}
|
||
}
|
||
}
|
||
|
||
extension LinkNewDeviceService.LinkDesktopProgress: CustomStringConvertible {
|
||
enum Error: Swift.Error { case invalidVerificationURI(String) }
|
||
|
||
init(rustProgress: GrantQrLoginProgress) throws {
|
||
self = switch rustProgress {
|
||
case .starting: .starting
|
||
case .establishingSecureChannel(_, let checkCodeString): .establishingSecureChannel(checkCodeString: checkCodeString)
|
||
case .waitingForAuth(let verificationURI):
|
||
// verificationURI is a String; ASWebAuthenticationSession requires a URL.
|
||
if let url = URL(string: verificationURI) {
|
||
.waitingForAuthorisation(verificationURL: url)
|
||
} else {
|
||
throw Error.invalidVerificationURI(verificationURI)
|
||
}
|
||
case .syncingSecrets: .syncingSecrets
|
||
case .done: .done
|
||
}
|
||
}
|
||
|
||
var description: String {
|
||
switch self {
|
||
case .starting: "starting"
|
||
case .establishingSecureChannel: "establishingSecureChannel"
|
||
case .waitingForAuthorisation: "waitingForAuthorisation"
|
||
case .syncingSecrets: "syncingSecrets"
|
||
case .done: "done"
|
||
}
|
||
}
|
||
}
|
||
|
||
private extension QRCodeLoginError {
|
||
init(rustError: HumanQrGrantLoginError) {
|
||
self = switch rustError {
|
||
case .ConnectionInsecure:
|
||
.connectionInsecure
|
||
case .InvalidCheckCode:
|
||
.invalidCheckCode
|
||
case .UnsupportedProtocol:
|
||
.linkingNotSupported
|
||
case .Expired, .NotFound, .DeviceNotFound:
|
||
.expired
|
||
case .Cancelled:
|
||
.cancelled
|
||
case .OtherDeviceAlreadySignedIn:
|
||
.deviceAlreadySignedIn
|
||
case .UnsupportedQrCodeType:
|
||
.invalidQRCode
|
||
case .Unknown, .MissingSecretsBackup, .DeviceIdAlreadyInUse:
|
||
.unknown
|
||
}
|
||
}
|
||
}
|
||
|
||
nonisolated class CheckCodeSenderProxy: Equatable {
|
||
static func == (lhs: CheckCodeSenderProxy, rhs: CheckCodeSenderProxy) -> Bool {
|
||
lhs.underlyingSender === rhs.underlyingSender
|
||
}
|
||
|
||
let underlyingSender: CheckCodeSenderProtocol
|
||
|
||
init(underlyingSender: CheckCodeSenderProtocol) {
|
||
self.underlyingSender = underlyingSender
|
||
}
|
||
|
||
func send(code: UInt8) async throws {
|
||
try await underlyingSender.send(code: code)
|
||
}
|
||
}
|
||
|
||
extension UIImage {
|
||
convenience init?(qrCodeData: Data) {
|
||
let qrContext = CIContext()
|
||
let qrFilter = CIFilter.qrCodeGenerator()
|
||
|
||
qrFilter.message = qrCodeData
|
||
qrFilter.correctionLevel = "Q"
|
||
|
||
guard let outputImage = qrFilter.outputImage,
|
||
let cgImage = qrContext.createCGImage(outputImage, from: outputImage.extent) else {
|
||
MXLog.error("Failed to generate an image from the supplied QR code data.")
|
||
return nil
|
||
}
|
||
|
||
self.init(cgImage: cgImage)
|
||
}
|
||
}
|