Migrate concurrency and errors

Author: laevandus

DemoApp/Extensions/StreamCore+Extensions.swift

@@ -0,0 +1,3 @@
+//
+// Copyright © 2025 Stream.io Inc. All rights reserved.
+//

Sources/StreamChat/APIClient/RequestEncoder.swift

@@ -304,7 +304,6 @@ protocol ConnectionDetailsProviderDelegate: AnyObject {
 }
 
 public extension ClientError {
-    final class InvalidURL: ClientError, @unchecked Sendable {}
     final class InvalidJSON: ClientError, @unchecked Sendable {}
     final class MissingConnectionId: ClientError, @unchecked Sendable {}
 }

Sources/StreamChat/Config/ChatClientConfig.swift

@@ -227,21 +227,3 @@ extension ChatClientConfig {
         public var latestMessagesLimit = 5
     }
 }
-
-/// A struct representing an API key of the chat app.
-///
-/// An API key can be obtained by registering on [our website](https://getstream.io/chat/trial/\).
-///
-public struct APIKey: Equatable, Sendable {
-    /// The string representation of the API key
-    public let apiKeyString: String
-
-    /// Creates a new `APIKey` from the provided string. Fails, if the string is empty.
-    ///
-    /// - Warning: The `apiKeyString` must be a non-empty value, otherwise an assertion failure is raised.
-    ///
-    public init(_ apiKeyString: String) {
-        log.assert(apiKeyString.isEmpty == false, "APIKey can't be initialize with an empty string.")
-        self.apiKeyString = apiKeyString
-    }
-}

Sources/StreamChat/Config/Token.swift

@@ -72,10 +72,6 @@ public extension Token {
     }
 }
 
-extension ClientError {
-    public final class InvalidToken: ClientError, @unchecked Sendable {}
-}
-
 private extension String {
     var jwtPayload: [String: Any]? {
         let parts = split(separator: ".")

Sources/StreamChat/Controllers/PollController/PollVoteListController.swift

@@ -170,8 +170,14 @@ public class PollVoteListController: DataController, DelegateCallable, DataStore
                 vote = event.vote
             }
             guard let vote else { return }
-            if vote.isAnswer == true && self.query.pollId == vote.pollId && self.query.optionId == nil {
-                self.pollsRepository.link(pollVote: vote, to: query)
+            if vote.isAnswer == true
+                && query.pollId == vote.pollId
+                && query.optionId == nil {
+                pollsRepository.link(pollVote: vote, to: query)
+            } else if vote.isAnswer == false
+                && query.pollId == vote.pollId
+                && query.optionId == vote.optionId {
+                pollsRepository.link(pollVote: vote, to: query)
             }
         }
     }
@@ -270,24 +276,3 @@ extension PollVoteListController {
         }
     }
 }
-
-extension PollVoteListController: EventsControllerDelegate {
-    public func eventsController(_ controller: EventsController, didReceiveEvent event: any Event) {
-        var vote: PollVote?
-        if let event = event as? PollVoteCastedEvent {
-            vote = event.vote
-        } else if let event = event as? PollVoteChangedEvent {
-            vote = event.vote
-        }
-        guard let vote else { return }
-        if vote.isAnswer == true
-            && query.pollId == vote.pollId
-            && query.optionId == nil {
-            pollsRepository.link(pollVote: vote, to: query)
-        } else if vote.isAnswer == false
-            && query.pollId == vote.pollId
-            && query.optionId == vote.optionId {
-            pollsRepository.link(pollVote: vote, to: query)
-        }
-    }
-}

Sources/StreamChat/Errors/ClientError.swift

@@ -4,73 +4,6 @@
 
 import Foundation
 
-/// A Client error.
-public class ClientError: Error, CustomStringConvertible, @unchecked Sendable {
-    public struct Location: Equatable {
-        public let file: String
-        public let line: Int
-    }
-
-    /// The file and line number which emitted the error.
-    public let location: Location?
-
-    public let message: String?
-
-    /// An underlying error.
-    public let underlyingError: Error?
-
-    public var errorDescription: String? { underlyingError.map(String.init(describing:)) }
-
-    /// The error payload if the underlying error comes from a server error.
-    public var errorPayload: ErrorPayload? { underlyingError as? ErrorPayload }
-
-    /// Retrieve the localized description for this error.
-    public var localizedDescription: String { message ?? errorDescription ?? "" }
-
-    public private(set) lazy var description = "Error \(type(of: self)) in \(location?.file ?? ""):\(location?.line ?? 0)"
-        + (localizedDescription.isEmpty ? "" : " -> ")
-        + localizedDescription
-
-    /// A client error based on an external general error.
-    /// - Parameters:
-    ///   - error: an external error.
-    ///   - file: a file name source of an error.
-    ///   - line: a line source of an error.
-    public init(with error: Error? = nil, _ file: StaticString = #file, _ line: UInt = #line) {
-        message = nil
-        underlyingError = error
-        location = .init(file: "\(file)", line: Int(line))
-    }
-
-    /// An error based on a message.
-    /// - Parameters:
-    ///   - message: an error message.
-    ///   - file: a file name source of an error.
-    ///   - line: a line source of an error.
-    public init(_ message: String, _ file: StaticString = #file, _ line: UInt = #line) {
-        self.message = message
-        location = .init(file: "\(file)", line: Int(line))
-        underlyingError = nil
-    }
-}
-
-extension ClientError {
-    /// An unexpected error.
-    public final class Unexpected: ClientError, @unchecked Sendable {}
-
-    /// An unknown error.
-    public final class Unknown: ClientError, @unchecked Sendable {}
-}
-
-// This should probably live only in the test target since it's not "true" equatable
-extension ClientError: Equatable {
-    public static func == (lhs: ClientError, rhs: ClientError) -> Bool {
-        type(of: lhs) == type(of: rhs)
-            && String(describing: lhs.underlyingError) == String(describing: rhs.underlyingError)
-            && String(describing: lhs.localizedDescription) == String(describing: rhs.localizedDescription)
-    }
-}
-
 extension ClientError {
     /// Returns `true` the stream code determines that the token is expired.
     var isExpiredTokenError: Bool {
@@ -81,4 +14,7 @@ extension ClientError {
     var isInvalidTokenError: Bool {
         (underlyingError as? ErrorPayload)?.isInvalidTokenError == true
     }
+    
+    /// The error payload if the underlying error comes from a server error.
+    public var errorPayload: ErrorPayload? { underlyingError as? ErrorPayload }
 }