Fix concurrently mutating warnings

laevandus · laevandus · commit 4acec4f85cd0 · 2025-12-18T15:19:41.000+02:00
diff --git a/Sources/StreamChat/APIClient/CDNClient/CDNClient.swift b/Sources/StreamChat/APIClient/CDNClient/CDNClient.swift
@@ -58,7 +58,7 @@ public protocol CDNClient: Sendable {
     ///   - completion: Returns an error in case the delete operation fails.
     func deleteAttachment(
         remoteUrl: URL,
-        completion: @escaping (Error?) -> Void
+        completion: @escaping @Sendable (Error?) -> Void
     )
 }
 
@@ -159,7 +159,7 @@ final class StreamCDNClient: CDNClient, @unchecked Sendable {
 
     func deleteAttachment(
         remoteUrl: URL,
-        completion: @escaping (Error?) -> Void
+        completion: @escaping @Sendable (Error?) -> Void
     ) {
         let isImage = AttachmentFileType(ext: remoteUrl.pathExtension).isImage
         let endpoint = Endpoint<EmptyResponse>
diff --git a/Sources/StreamChat/ChatClient.swift b/Sources/StreamChat/ChatClient.swift
@@ -677,8 +677,8 @@ public class ChatClient: @unchecked Sendable {
     ///  - completion: called when the attachment is uploaded.
     public func uploadAttachment(
         localUrl: URL,
-        progress: ((Double) -> Void)?,
-        completion: @escaping (Result<UploadedFile, Error>) -> Void
+        progress: (@Sendable (Double) -> Void)?,
+        completion: @escaping @Sendable (Result<UploadedFile, Error>) -> Void
     ) {
         let uploadingState: AttachmentUploadingState
 
@@ -713,7 +713,7 @@ public class ChatClient: @unchecked Sendable {
     ///   - completion: Returns an error in case the delete operation fails.
     public func deleteAttachment(
         remoteUrl: URL,
-        completion: @escaping (Error?) -> Void
+        completion: @escaping @Sendable (Error?) -> Void
     ) {
         apiClient.cdnClient.deleteAttachment(
             remoteUrl: remoteUrl,
diff --git a/Sources/StreamChat/Controllers/ChannelController/ChannelController.swift b/Sources/StreamChat/Controllers/ChannelController/ChannelController.swift
@@ -1361,7 +1361,7 @@ public class ChatChannelController: DataController, DelegateCallable, DataStoreP
     /// - Parameters:
     ///   - timestamp: The timestamp used to find the first message to mark as unread. All messages created after this timestamp will be marked as unread.
     ///   - completion: The completion handler to be called after marking messages as unread. Called with a `Result` containing the updated `ChatChannel` on success, or an `Error` on failure.
-    public func markUnread(from timestamp: Date, completion: ((Result<ChatChannel, Error>) -> Void)? = nil) {
+    public func markUnread(from timestamp: Date, completion: (@Sendable (Result<ChatChannel, Error>) -> Void)? = nil) {
         /// Perform action only if channel is already created on backend side and have a valid `cid`.
         guard let channel = channel else {
             let error = ClientError.ChannelNotCreatedYet()
diff --git a/Sources/StreamChat/Database/DatabaseSession.swift b/Sources/StreamChat/Database/DatabaseSession.swift
@@ -8,7 +8,7 @@ extension NSManagedObjectContext: DatabaseSession {
     private static let chatClientConfigKey = "io.getStream.StreamChat.config.key"
 
     var chatClientConfig: ChatClientConfig? {
-        var config: ChatClientConfig?
+        nonisolated(unsafe) var config: ChatClientConfig?
         performAndWait {
             config = userInfo[Self.chatClientConfigKey] as? ChatClientConfig
         }
diff --git a/Sources/StreamChat/Repositories/AuthenticationRepository.swift b/Sources/StreamChat/Repositories/AuthenticationRepository.swift
@@ -117,7 +117,7 @@ class AuthenticationRepository: @unchecked Sendable {
 
     /// Fetches the user saved in the database, if exists
     func fetchCurrentUser() {
-        var currentUserId: UserId?
+        nonisolated(unsafe) var currentUserId: UserId?
 
         databaseContainer.backgroundReadOnlyContext.performAndWait {
             currentUserId = databaseContainer.backgroundReadOnlyContext.currentUser?.user.id
diff --git a/Sources/StreamChat/Repositories/SyncRepository.swift b/Sources/StreamChat/Repositories/SyncRepository.swift
@@ -264,8 +264,8 @@ class SyncRepository: @unchecked Sendable {
         )
     }
 
-    private func getUser(completion: @escaping (CurrentUserDTO?) -> Void) {
-        var user: CurrentUserDTO?
+    private func getUser(completion: @escaping @Sendable (CurrentUserDTO?) -> Void) {
+        nonisolated(unsafe) var user: CurrentUserDTO?
         database.backgroundReadOnlyContext.perform {
             user = self.database.backgroundReadOnlyContext.currentUser
             completion(user)
diff --git a/Sources/StreamChat/WebSocketClient/Events/Event.swift b/Sources/StreamChat/WebSocketClient/Events/Event.swift
@@ -41,7 +41,6 @@ public protocol HasUnreadCount: Event {
 
 /// A protocol for any `MemberEvent` where it has a `member`, and `channel` payload.
 public protocol MemberEvent: Event {
-    var memberUserId: UserId { get }
     var cid: ChannelId { get }
 }
 
diff --git a/Sources/StreamChat/WebSocketClient/Events/UserEvents.swift b/Sources/StreamChat/WebSocketClient/Events/UserEvents.swift
@@ -148,7 +148,7 @@ public final class UserGloballyBannedEvent: Event {
     }
 }
 
-class UserGloballyBannedEventDTO: EventDTO {
+final class UserGloballyBannedEventDTO: EventDTO {
     let user: UserPayload
     let createdAt: Date
     let payload: EventPayload
@@ -253,7 +253,7 @@ public final class UserGloballyUnbannedEvent: Event {
     }
 }
 
-class UserGloballyUnbannedEventDTO: EventDTO {
+final class UserGloballyUnbannedEventDTO: EventDTO {
     let user: UserPayload
     let createdAt: Date
     let payload: EventPayload
diff --git a/Sources/StreamChat/Workers/Background/MessageSender.swift b/Sources/StreamChat/Workers/Background/MessageSender.swift
@@ -73,7 +73,7 @@ class MessageSender: Worker, @unchecked Sendable {
 
     func handleChanges(changes: [ListChange<MessageDTO>]) {
         // Convert changes to a dictionary of requests by their cid
-        var newRequests: [ChannelId: [MessageSendingQueue.SendRequest]] = [:]
+        nonisolated(unsafe) var newRequests: [ChannelId: [MessageSendingQueue.SendRequest]] = [:]
         changes.forEach { change in
             switch change {
             case .insert(let dto, index: _), .update(let dto, index: _):
diff --git a/TestTools/StreamChatTestTools/Mocks/StreamChat/ChatClient_Mock.swift b/TestTools/StreamChatTestTools/Mocks/StreamChat/ChatClient_Mock.swift
@@ -146,7 +146,8 @@ extension ChatClient {
                         requestEncoder: $1,
                         requestDecoder: $2,
                         attachmentDownloader: $3,
-                        attachmentUploader: $4
+                        attachmentUploader: $4,
+                        cdnClient: $5
                     )
                 },
                 webSocketClientBuilder: {
@@ -296,7 +297,8 @@ extension ChatClient.Environment {
                     requestEncoder: $1,
                     requestDecoder: $2,
                     attachmentDownloader: $3,
-                    attachmentUploader: $4
+                    attachmentUploader: $4,
+                    cdnClient: $5
                 )
             },
             webSocketClientBuilder: {
diff --git a/Tests/StreamChatTests/APIClient/StreamAttachmentUploader_Tests.swift b/Tests/StreamChatTests/APIClient/StreamAttachmentUploader_Tests.swift
@@ -70,7 +70,7 @@ final class StreamAttachmentUploader_Tests: XCTestCase {
 
         let data = try! Data(contentsOf: expectedUrl)
         let mockedAttachment = StreamAttachment.mock(payload: data)
-        let mockProgress: ((Double) -> Void) = {
+        let mockProgress: (@Sendable (Double) -> Void) = {
             XCTAssertEqual($0, expectedProgress)
             expProgressCalled.fulfill()
         }
diff --git a/Tests/StreamChatTests/Controllers/ChannelController/ChannelController_Tests.swift b/Tests/StreamChatTests/Controllers/ChannelController/ChannelController_Tests.swift
@@ -3642,8 +3642,7 @@ final class ChannelController_Tests: XCTestCase {
             members,
             hideHistory: false,
             hideHistoryBefore: hideHistoryBefore
-        ) { [callbackQueueID] error in
-            AssertTestQueue(withId: callbackQueueID)
+        ) { error in
             XCTAssertNil(error)
         }
 
@@ -4269,7 +4268,7 @@ final class ChannelController_Tests: XCTestCase {
     }
 
     func test_markUnread_whenChannelDoesNotExist_messageTimestamp() {
-        var receivedError: Error?
+        nonisolated(unsafe) var receivedError: Error?
         let expectation = self.expectation(description: "Mark Unread completes")
         controller.markUnread(from: Date()) { result in
             receivedError = result.error
@@ -4290,7 +4289,7 @@ final class ChannelController_Tests: XCTestCase {
             try session.saveChannel(payload: channel)
         }
 
-        var receivedError: Error?
+        nonisolated(unsafe) var receivedError: Error?
         let expectation = self.expectation(description: "Mark Unread completes")
         controller.markUnread(from: Date()) { result in
             receivedError = result.error
@@ -4315,7 +4314,7 @@ final class ChannelController_Tests: XCTestCase {
         client.setToken(token: .unique(userId: currentUserId))
         try simulateMarkingAsRead(userId: currentUserId)
 
-        var receivedError: Error?
+        nonisolated(unsafe) var receivedError: Error?
         let expectation = self.expectation(description: "Mark Unread completes")
         controller.markUnread(from: Date()) { result in
             receivedError = result.error
@@ -4336,7 +4335,7 @@ final class ChannelController_Tests: XCTestCase {
             try session.saveChannel(payload: channel)
         }
 
-        var receivedError: Error?
+        nonisolated(unsafe) var receivedError: Error?
         let expectation = self.expectation(description: "Mark Unread completes")
         controller.markUnread(from: Date()) { result in
             receivedError = result.error
@@ -5710,7 +5709,7 @@ final class ChannelController_Tests: XCTestCase {
         )
 
         // WHEN
-        var completionResult: Result<PushPreference, Error>?
+        nonisolated(unsafe) var completionResult: Result<PushPreference, Error>?
         controller.setPushPreference(level: level) { result in
             completionResult = result
         }
@@ -5728,7 +5727,7 @@ final class ChannelController_Tests: XCTestCase {
         let expectedError = TestError()
 
         // WHEN
-        var completionResult: Result<PushPreference, Error>?
+        nonisolated(unsafe) var completionResult: Result<PushPreference, Error>?
         controller.setPushPreference(level: level) { result in
             completionResult = result
         }
@@ -5770,7 +5769,7 @@ final class ChannelController_Tests: XCTestCase {
         )
 
         // WHEN
-        var completionResult: Result<PushPreference, Error>?
+        nonisolated(unsafe) var completionResult: Result<PushPreference, Error>?
         controller.snoozePushNotifications(until: date) { result in
             completionResult = result
         }
@@ -5788,7 +5787,7 @@ final class ChannelController_Tests: XCTestCase {
         let expectedError = TestError()
 
         // WHEN
-        var completionResult: Result<PushPreference, Error>?
+        nonisolated(unsafe) var completionResult: Result<PushPreference, Error>?
         controller.snoozePushNotifications(until: date) { result in
             completionResult = result
         }
diff --git a/Tests/StreamChatTests/Controllers/CurrentUserController/CurrentUserController_Tests.swift b/Tests/StreamChatTests/Controllers/CurrentUserController/CurrentUserController_Tests.swift
@@ -879,7 +879,7 @@ final class CurrentUserController_Tests: XCTestCase {
         )
 
         // WHEN
-        var completionResult: Result<PushPreference, Error>?
+        nonisolated(unsafe) var completionResult: Result<PushPreference, Error>?
         controller.setPushPreference(level: level) { result in
             completionResult = result
         }
@@ -897,7 +897,7 @@ final class CurrentUserController_Tests: XCTestCase {
         let expectedError = TestError()
 
         // WHEN
-        var completionResult: Result<PushPreference, Error>?
+        nonisolated(unsafe) var completionResult: Result<PushPreference, Error>?
         controller.setPushPreference(level: level) { result in
             completionResult = result
         }
@@ -937,7 +937,7 @@ final class CurrentUserController_Tests: XCTestCase {
         )
 
         // WHEN
-        var completionResult: Result<PushPreference, Error>?
+        nonisolated(unsafe) var completionResult: Result<PushPreference, Error>?
         controller.snoozePushNotifications(until: date) { result in
             completionResult = result
         }
@@ -955,7 +955,7 @@ final class CurrentUserController_Tests: XCTestCase {
         let expectedError = TestError()
 
         // WHEN
-        var completionResult: Result<PushPreference, Error>?
+        nonisolated(unsafe) var completionResult: Result<PushPreference, Error>?
         controller.snoozePushNotifications(until: date) { result in
             completionResult = result
         }
diff --git a/Tests/StreamChatTests/Controllers/PollsControllers/PollVoteListController+Combine_Tests.swift b/Tests/StreamChatTests/Controllers/PollsControllers/PollVoteListController+Combine_Tests.swift
@@ -91,7 +91,7 @@ final class PollVoteListController_Combine_Tests: iOS13TestCase {
             .store(in: &cancellables)
 
         // Keep only the weak reference to the controller. The existing publisher should keep it alive.
-        weak var controller: PollVoteListController? = voteListController
+        nonisolated(unsafe) weak var controller: PollVoteListController? = voteListController
         voteListController = nil
 
         let poll: Poll = .unique
diff --git a/Tests/StreamChatTests/Repositories/ChannelRepository_Tests.swift b/Tests/StreamChatTests/Repositories/ChannelRepository_Tests.swift
@@ -121,7 +121,7 @@ final class ChannelRepository_Tests: XCTestCase {
         database.writeSessionCounter = 0
 
         let expectation = self.expectation(description: "markUnread completes")
-        var receivedError: Error?
+        nonisolated(unsafe) var receivedError: Error?
         repository.markUnread(for: cid, userId: userId, from: .messageId(messageId), lastReadMessageId: .unique) { result in
             receivedError = result.error
             expectation.fulfill()
@@ -142,7 +142,7 @@ final class ChannelRepository_Tests: XCTestCase {
         let messageId = MessageId.unique
 
         let expectation = self.expectation(description: "markUnread completes")
-        var receivedError: Error?
+        nonisolated(unsafe) var receivedError: Error?
         repository.markUnread(for: cid, userId: userId, from: .messageId(messageId), lastReadMessageId: .unique) { result in
             receivedError = result.error
             expectation.fulfill()
diff --git a/Tests/StreamChatTests/Repositories/MessageRepository_Tests.swift b/Tests/StreamChatTests/Repositories/MessageRepository_Tests.swift
@@ -738,7 +738,7 @@ final class MessageRepositoryTests: XCTestCase {
         try database.createChannel(cid: cid)
         
         let expectation = self.expectation(description: "getActiveLiveLocationMessages completes")
-        var receivedError: Error?
+        nonisolated(unsafe) var receivedError: Error?
         
         repository.getCurrentUserActiveLiveLocationMessages(for: cid) { result in
             if case .failure(let error) = result {
@@ -797,7 +797,7 @@ final class MessageRepositoryTests: XCTestCase {
         )
         
         let expectation = self.expectation(description: "getActiveLiveLocationMessages completes")
-        var receivedMessages: [ChatMessage]?
+        nonisolated(unsafe) var receivedMessages: [ChatMessage]?
         
         repository.getCurrentUserActiveLiveLocationMessages(for: cid) { result in
             if case .success(let messages) = result {
diff --git a/Tests/StreamChatTests/Utils/EventBatcher_Tests.swift b/Tests/StreamChatTests/Utils/EventBatcher_Tests.swift
@@ -23,7 +23,7 @@ final class Batch_Tests: XCTestCase {
 
     func test_append() {
         // Create batcher for test events and keep track of handler calls
-        var handlerCalls = [[TestEvent]]()
+        nonisolated(unsafe) var handlerCalls = [[TestEvent]]()
         let batcher = Batcher<TestEvent>(period: 10, timerType: VirtualTimeTimer.self) { events, _ in
             handlerCalls.append(events)
         }
@@ -71,8 +71,8 @@ final class Batch_Tests: XCTestCase {
 
     func test_processImmidiately() {
         // Create batcher with long period and keep track of handler calls
-        var handlerCalls = [[TestEvent]]()
-        var handlerCompletion: (() -> Void)?
+        nonisolated(unsafe) var handlerCalls = [[TestEvent]]()
+        nonisolated(unsafe) var handlerCompletion: (() -> Void)?
         let batcher = Batcher<TestEvent>(period: 20, timerType: VirtualTimeTimer.self) { events, completion in
             handlerCalls.append(events)
             handlerCompletion = completion
diff --git a/Tests/StreamChatTests/WebSocketClient/EventMiddlewares/UserChannelBanEventsMiddleware_Tests.swift b/Tests/StreamChatTests/WebSocketClient/EventMiddlewares/UserChannelBanEventsMiddleware_Tests.swift
@@ -220,7 +220,7 @@ final class UserChannelBanEventsMiddleware_Tests: XCTestCase {
         try database.createMessage(id: messageId2, authorId: userId, cid: eventPayload.cid!)
 
         // Verify user and messages exist
-        let userDTO = try XCTUnwrap(database.viewContext.user(id: userId))
+        _ = try XCTUnwrap(database.viewContext.user(id: userId))
         let message1 = try XCTUnwrap(database.viewContext.message(id: messageId1))
         let message2 = try XCTUnwrap(database.viewContext.message(id: messageId2))
         
@@ -267,7 +267,7 @@ final class UserChannelBanEventsMiddleware_Tests: XCTestCase {
         try database.createMessage(id: messageId2, authorId: userId, cid: eventPayload.cid!)
 
         // Verify user and messages exist
-        let userDTO = try XCTUnwrap(database.viewContext.user(id: userId))
+        _ = try XCTUnwrap(database.viewContext.user(id: userId))
         let message1 = try XCTUnwrap(database.viewContext.message(id: messageId1))
         let message2 = try XCTUnwrap(database.viewContext.message(id: messageId2))
         
diff --git a/Tests/StreamChatTests/Workers/ChannelUpdater_Tests.swift b/Tests/StreamChatTests/Workers/ChannelUpdater_Tests.swift
@@ -100,7 +100,7 @@ final class ChannelUpdater_Tests: XCTestCase {
         // Simulate `update(channelQuery:)` call with no pagination
         let query = ChannelQuery(channelPayload: .unique)
         let expectation = self.expectation(description: "Update completes")
-        var updateResult: Result<ChannelPayload, Error>!
+        nonisolated(unsafe) var updateResult: Result<ChannelPayload, Error>!
         channelUpdater.update(channelQuery: query, isInRecoveryMode: false, completion: { result in
             updateResult = result
             expectation.fulfill()
@@ -1867,7 +1867,7 @@ final class ChannelUpdater_Tests: XCTestCase {
     }
 
     func test_disableSlowMode_successfulResponse_isPropagatedToCompletion() {
-        var completionCalled = false
+        nonisolated(unsafe) var completionCalled = false
         channelUpdater.disableSlowMode(cid: .unique) { error in
             XCTAssertNil(error)
             completionCalled = true
@@ -1881,7 +1881,7 @@ final class ChannelUpdater_Tests: XCTestCase {
     }
 
     func test_disableSlowMode_errorResponse_isPropagatedToCompletion() {
-        var completionCalledError: Error?
+        nonisolated(unsafe) var completionCalledError: Error?
         channelUpdater.disableSlowMode(cid: .unique) { completionCalledError = $0 }
 
         let error = TestError()
@@ -2337,7 +2337,7 @@ final class ChannelUpdater_Tests: XCTestCase {
         )
 
         // WHEN
-        var completionCalled = false
+        nonisolated(unsafe) var completionCalled = false
         channelUpdater.setPushPreference(preference, cid: cid) { result in
             XCTAssertNil(result.error)
             completionCalled = true
@@ -2360,7 +2360,7 @@ final class ChannelUpdater_Tests: XCTestCase {
         )
 
         // WHEN
-        var completionError: Error?
+        nonisolated(unsafe) var completionError: Error?
         channelUpdater.setPushPreference(preference, cid: cid) { result in
             if case let .failure(error) = result {
                 completionError = error
@@ -2390,7 +2390,7 @@ final class ChannelUpdater_Tests: XCTestCase {
         )
 
         // WHEN
-        var completionError: Error?
+        nonisolated(unsafe) var completionError: Error?
         channelUpdater.setPushPreference(preference, cid: cid) { result in
             if case let .failure(error) = result {
                 completionError = error
diff --git a/Tests/StreamChatTests/Workers/ChannelWatcherHandler_Tests.swift b/Tests/StreamChatTests/Workers/ChannelWatcherHandler_Tests.swift
diff --git a/Tests/StreamChatTests/Workers/CurrentUserUpdater_Tests.swift b/Tests/StreamChatTests/Workers/CurrentUserUpdater_Tests.swift
diff --git a/Tests/StreamChatTests/Workers/ManualEventHandler_Tests.swift b/Tests/StreamChatTests/Workers/ManualEventHandler_Tests.swift

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ extension NSManagedObjectContext: DatabaseSession {`
`8`	`8`	`private static let chatClientConfigKey = "io.getStream.StreamChat.config.key"`
`9`	`9`
`10`	`10`	`var chatClientConfig: ChatClientConfig? {`
`11`		`- var config: ChatClientConfig?`
	`11`	`+ nonisolated(unsafe) var config: ChatClientConfig?`
`12`	`12`	`performAndWait {`
`13`	`13`	`config = userInfo[Self.chatClientConfigKey] as? ChatClientConfig`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,8 +264,8 @@ class SyncRepository: @unchecked Sendable {`
`264`	`264`	`)`
`265`	`265`	`}`
`266`	`266`
`267`		`- private func getUser(completion: @escaping (CurrentUserDTO?) -> Void) {`
`268`		`- var user: CurrentUserDTO?`
	`267`	`+ private func getUser(completion: @escaping @Sendable (CurrentUserDTO?) -> Void) {`
	`268`	`+ nonisolated(unsafe) var user: CurrentUserDTO?`
`269`	`269`	`database.backgroundReadOnlyContext.perform {`
`270`	`270`	`user = self.database.backgroundReadOnlyContext.currentUser`
`271`	`271`	`completion(user)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ public protocol HasUnreadCount: Event {`
`41`	`41`
`42`	`42`	/// A protocol for any `MemberEvent` where it has a `member`, and `channel` payload.
`43`	`43`	`public protocol MemberEvent: Event {`
`44`		`- var memberUserId: UserId { get }`
`45`	`44`	`var cid: ChannelId { get }`
`46`	`45`	`}`
`47`	`46`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public final class UserGloballyBannedEvent: Event {`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
`151`		`-class UserGloballyBannedEventDTO: EventDTO {`
	`151`	`+final class UserGloballyBannedEventDTO: EventDTO {`
`152`	`152`	`let user: UserPayload`
`153`	`153`	`let createdAt: Date`
`154`	`154`	`let payload: EventPayload`
`@@ -253,7 +253,7 @@ public final class UserGloballyUnbannedEvent: Event {`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`
`256`		`-class UserGloballyUnbannedEventDTO: EventDTO {`
	`256`	`+final class UserGloballyUnbannedEventDTO: EventDTO {`
`257`	`257`	`let user: UserPayload`
`258`	`258`	`let createdAt: Date`
`259`	`259`	`let payload: EventPayload`