Update to Swift 6.2

Author: backslash-f

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.2
 
 import PackageDescription
 
@@ -15,13 +15,19 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/backslash-f/toolbox.git", from: "1.0.0")
+        .package(
+            url: "https://github.com/thatfactory/toolbox.git",
+            from: "0.1.0"
+        )
     ],
     targets: [
         .target(
             name: "ObservableWebSocketClient",
             dependencies: [
-                .product(name: "Toolbox", package: "toolbox")
+                .product(
+                    name: "Toolbox",
+                    package: "toolbox"
+                )
             ]
         ),
         .testTarget(

Sources/ObservableWebSocketClient/Interface/ObservableWebSocketClient+Messages.swift

@@ -58,7 +58,7 @@ public extension ObservableWebSocketClient {
     /// ```
     /// {"id": "123e4567-e89b-12d3-a456-426614174000", "type": "ping"}
     /// ```
-    func sendMessageWithGeneratedId(_ idInjector: ((String) -> String)) {
+    func sendMessageWithGeneratedId(_ idInjector: (@Sendable (String) -> String)) {
         let uniqueId = UUID().uuidString
         let messageWithId = idInjector(uniqueId)
         service.send(message: messageWithId)

Sources/ObservableWebSocketClient/Interface/ObservableWebSocketClient.swift

@@ -29,7 +29,7 @@ public final class ObservableWebSocketClient: Identifiable, Equatable, Codable,
     private(set) var pingTimer: Timer?
     private let pingTimerInterval: TimeInterval?
     private let pingMessage: String?
-    private let pingMessageWithGeneratedId: ((String) -> String)?
+    private let pingMessageWithGeneratedId: (@Sendable (String) -> String)?
 
     private(set) var service: ObservableWebSocketService
 
@@ -78,7 +78,7 @@ public final class ObservableWebSocketClient: Identifiable, Equatable, Codable,
                 codableError: CodableError? = nil,
                 pingTimerInterval: TimeInterval? = nil,
                 pingMessage: String? = nil,
-                pingMessageWithGeneratedId: ((String) -> String)? = nil) {
+                pingMessageWithGeneratedId: (@Sendable (String) -> String)? = nil) {
         self.id = id
         self.websocketURL = websocketURL
         self.codableMessage = message
@@ -101,15 +101,21 @@ public final class ObservableWebSocketClient: Identifiable, Equatable, Codable,
 
 private extension ObservableWebSocketClient {
     func startPingTimer() {
-        if let pingTimerInterval,
-           pingMessage?.isEmpty == false || pingMessageWithGeneratedId != nil {
+        guard let pingTimerInterval,
+              pingMessage?.isEmpty == false || pingMessageWithGeneratedId != nil
+        else { return }
+
+        let service = service
+        if let pingMessage, !pingMessage.isEmpty {
+            pingTimer = Timer.scheduledTimer(
+                withTimeInterval: pingTimerInterval, repeats: true) { _ in
+                    service.send(message: pingMessage)
+                }
+        } else if let pingMessageWithGeneratedId {
             pingTimer = Timer.scheduledTimer(
-                withTimeInterval: pingTimerInterval, repeats: true) { [weak self] _ in
-                    if let message = self?.pingMessage {
-                        self?.sendMessage(message)
-                    } else if let messageWithGeneratedId = self?.pingMessageWithGeneratedId {
-                        self?.sendMessageWithGeneratedId(messageWithGeneratedId)
-                    }
+                withTimeInterval: pingTimerInterval, repeats: true) { _ in
+                    let messageWithId = pingMessageWithGeneratedId(UUID().uuidString)
+                    service.send(message: messageWithId)
                 }
         }
     }

Sources/ObservableWebSocketClient/Network/ObservableWebSocketService.swift

@@ -8,7 +8,7 @@
 import Foundation
 import Toolbox
 
-public final class ObservableWebSocketService: ObservableObject {
+public final class ObservableWebSocketService: ObservableObject, @unchecked Sendable {
 
     @Published public var message: URLSessionWebSocketTask.Message?
 
@@ -35,11 +35,11 @@ public extension ObservableWebSocketService {
 
     func send(message: String) {
         let wsMessage = URLSessionWebSocketTask.Message.string(message)
-        webSocketTask?.send(wsMessage) { error in
-            if let error {
-                Task { @MainActor in
-                    self.codableError = .init(error)
-                }
+        webSocketTask?.send(wsMessage) { [weak self] error in
+            guard let self, let error else { return }
+
+            Task { @MainActor in
+                self.codableError = .init(error)
             }
         }
     }
@@ -60,15 +60,18 @@ private extension ObservableWebSocketService {
     }
 
     func receiveMessage() {
-        webSocketTask?.receive { result in
-            switch result {
-            case .success(let message):
-                self.message = message
-                // Listen for the next message.
-                self.receiveMessage()
-
-            case .failure(let error):
-                self.codableError = .init(error)
+        webSocketTask?.receive { [weak self] result in
+            Task { @MainActor [weak self] in
+                guard let self else { return }
+                switch result {
+                case .success(let message):
+                    self.message = message
+                    // Listen for the next message.
+                    self.receiveMessage()
+
+                case .failure(let error):
+                    self.codableError = .init(error)
+                }
             }
         }
     }