Work in progress: Sendable

Signed-off-by: Iva Horn <iva.horn@nextcloud.com>

Author: i2h3

Sources/NextcloudFileProviderKit/Enumeration/RemoteChangeObserver.swift

@@ -397,7 +397,7 @@ extension RemoteChangeObserver: URLSessionWebSocketDelegate {
 // MARK: - NextcloudKitDelegate methods
 
 extension RemoteChangeObserver: NextcloudKitDelegate {
-    nonisolated public func authenticationChallenge(_: URLSession, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
+    nonisolated public func authenticationChallenge(_: URLSession, didReceive challenge: URLAuthenticationChallenge, completionHandler: @Sendable @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         Task { [weak self] in
             guard let self else {
                 return
@@ -411,12 +411,7 @@ extension RemoteChangeObserver: NextcloudKitDelegate {
             logger.debug("Received auth challenge with method: \(authMethod)")
 
             if authMethod == NSURLAuthenticationMethodHTTPBasic {
-                let credential = URLCredential(
-                    user: account.username,
-                    password: account.password,
-                    persistence: .forSession
-                )
-
+                let credential = URLCredential(user: account.username, password: account.password, persistence: .forSession)
                 completionHandler(.useCredential, credential)
             } else if authMethod == NSURLAuthenticationMethodServerTrust {
                 // TODO: Validate the server trust

Sources/NextcloudFileProviderKit/Extensions/RandomAccessCollection+Extensions.swift

@@ -31,22 +31,21 @@ extension RandomAccessCollection {
     }
 
     /// Performs an asynchronous `forEach` operation on the collection in concurrent chunks.
-    func concurrentChunkedForEach(into size: Int = defaultChunkSize, operation: @escaping (Element) async -> Void) async {
+    func concurrentChunkedForEach(into size: Int = defaultChunkSize, operation: @escaping @Sendable (Element) async -> Void) async where Element: Sendable {
         await withTaskGroup(of: Void.self) { group in
             for chunk in chunked(into: size) {
-                let chunkArray = Array(chunk) // Convert to Array to ensure Sendable
-
-                group.addTask {
+                let chunkArray = Array(chunk)
+                group.addTask(operation: { @Sendable in
                     for element in chunkArray {
                         await operation(element)
                     }
-                }
+                })
             }
         }
     }
 
     /// Performs an asynchronous `compactMap` operation on the collection in concurrent chunks.
-    func concurrentChunkedCompactMap<T>(into size: Int = defaultChunkSize, transform: @escaping (Element) throws -> T?) async throws -> [T] where T: Sendable {
+    func concurrentChunkedCompactMap<T>(into size: Int = defaultChunkSize, transform: @escaping @Sendable (Element) throws -> T?) async throws -> [T] where T: Sendable, Element: Sendable {
         try await withThrowingTaskGroup(of: [T].self) { group in
             var results = [T]()
             // Reserving capacity is still a good optimization, though we can't know the exact final count.
@@ -55,11 +54,11 @@ extension RandomAccessCollection {
             for chunk in chunked(into: size) {
                 let chunkArray = Array(chunk) // Convert to Array to ensure Sendable
 
-                group.addTask {
+                group.addTask(operation: { @Sendable in
                     try chunkArray.compactMap {
                         try transform($0)
                     }
-                }
+                })
             }
 
             for try await chunkResult in group {

Sources/NextcloudFileProviderKit/Interface/FileProviderChangeNotificationInterface.swift

@@ -1,10 +1,10 @@
 //  SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
 //  SPDX-License-Identifier: GPL-2.0-or-later
 
-import FileProvider
+@preconcurrency import FileProvider
 import Foundation
 
-public class FileProviderChangeNotificationInterface: ChangeNotificationInterface {
+public final class FileProviderChangeNotificationInterface: ChangeNotificationInterface {
     let domain: NSFileProviderDomain
     let logger: FileProviderLogger
 

Sources/NextcloudFileProviderKit/Interface/RemoteInterface.swift

@@ -162,8 +162,7 @@ public extension RemoteInterface {
     ) async -> (account: String, capabilities: Capabilities?, data: Data?, error: NKError) {
         let ncKitAccount = account.ncKitAccount
         await RetrievedCapabilitiesActor.shared.awaitFetchCompletion(forAccount: ncKitAccount)
-        guard let lastRetrieval = await RetrievedCapabilitiesActor.shared.data[ncKitAccount],
-              lastRetrieval.retrievedAt.timeIntervalSince(Date()) > -CapabilitiesFetchInterval
+        guard let lastRetrieval = await RetrievedCapabilitiesActor.shared.getCapabilities(for: ncKitAccount), lastRetrieval.retrievedAt.timeIntervalSince(Date()) > -CapabilitiesFetchInterval
         else {
             return await fetchCapabilities(
                 account: account, options: options, taskHandler: taskHandler

Sources/NextcloudFileProviderKit/Utilities/RetrievedCapabilitiesActor.swift

@@ -7,21 +7,18 @@ import NextcloudCapabilitiesKit
 let CapabilitiesFetchInterval: TimeInterval = 30 * 60 // 30mins
 
 actor RetrievedCapabilitiesActor {
-    static let shared: RetrievedCapabilitiesActor = {
-        let instance = RetrievedCapabilitiesActor()
-        return instance
-    }()
+    static let shared = RetrievedCapabilitiesActor()
 
     var ongoingFetches: Set<String> = []
-    var data: [String: (capabilities: Capabilities, retrievedAt: Date)] = [:]
+    private var data: [String: (capabilities: Capabilities, retrievedAt: Date)] = [:]
 
     private var ongoingFetchContinuations: [String: [CheckedContinuation<Void, Never>]] = [:]
 
-    func setCapabilities(
-        forAccount account: String,
-        capabilities: Capabilities,
-        retrievedAt: Date = Date()
-    ) {
+    func getCapabilities(for account: String) -> (capabilities: Capabilities, retrievedAt: Date)? {
+        data[account]
+    }
+
+    func setCapabilities(forAccount account: String, capabilities: Capabilities, retrievedAt: Date = Date()) {
         data[account] = (capabilities: capabilities, retrievedAt: retrievedAt)
     }