Add Sendable conformance (#116)

* added Sendable conformance * added LossyArray sendable conformance * updated request failure delegate * fixed concurrency warnings * small conformance additions * finished conformance via the main actor additions * returned removed Sendable in closure * removed un-needed isolation flag * self warnings solved * updated based on convo with nigel --------- Co-authored-by: Amy <[email protected]>
steamclock · Feb 6, 2023 · efdd8df · efdd8df
1 parent 6912b93
commit efdd8df
Show file tree

Hide file tree

Showing 18 changed files with 54 additions and 184 deletions.
diff --git a/Netable/Example/Models/User.swift b/Netable/Example/Models/User.swift
@@ -9,7 +9,7 @@
 import Foundation
 import Netable
 
-struct User: Decodable {
+struct User: Decodable, Sendable {
     let firstName: String
     let lastName: String
     let location: String

diff --git a/Netable/Example/Services/AuthNetworkService.swift b/Netable/Example/Services/AuthNetworkService.swift
@@ -11,7 +11,7 @@ import Foundation
 import Netable
 
 class AuthNetworkService {
-    static var shared = AuthNetworkService()
+    static let shared = AuthNetworkService()
 
     private let unauthNetable: Netable
 
@@ -65,13 +65,13 @@ class AuthNetworkService {
         try await netable.request(GetPostsRequest())
     }
 
-    func createPost(title: String, content: String) {
+    @MainActor func createPost(title: String, content: String) {
         // this request is deliberately failing. Since there is a retry configuration set to the authNetable request,
         //  we are going to make use of `cancel()` to cancel the task after sending it so it doesn't try again.
 
        let createRequest = Task {
             do {
-               let result = try await netable.request(CreatePostRequest(parameters: CreatePostParameters(title: title, content: content)))
+               try await netable.request(CreatePostRequest(parameters: CreatePostParameters(title: title, content: content)))
             } catch {
                 print("Create request error: \(error)")
             }

diff --git a/Netable/Example/Services/ErrorService.swift b/Netable/Example/Services/ErrorService.swift
@@ -10,17 +10,21 @@ import Combine
 import Foundation
 import Netable
 
-class ErrorService {
-    static var shared = ErrorService()
+@MainActor
+final class ErrorService {
+    static let shared = ErrorService()
 
-    var errors = PassthroughSubject<NetableError?, Never>()
+    let errors = PassthroughSubject<NetableError?, Never>()
 }
 
+
 extension ErrorService: RequestFailureDelegate {
-    func requestDidFail<T>(_ request: T, error: NetableError) {
+    nonisolated func requestDidFail<T>(_ request: T, error: NetableError) {
         if case let NetableError.httpError(statusCode, _) = error, statusCode == 401 {
             return
         }
-        errors.send(error)
+        Task { @MainActor in
+            errors.send(error)
+        }
     }
 }
diff --git a/Netable/Example/Services/GraphQLNetworkService.swift b/Netable/Example/Services/GraphQLNetworkService.swift
@@ -10,7 +10,7 @@ import Foundation
 import Netable
 
 class GraphQLNetworkService {
-    static var shared = GraphQLNetworkService()
+    static let shared = GraphQLNetworkService()
 
     private let netable = Netable(baseURL: URL(string: "http://localhost:8080/graphql")!)
 

diff --git a/Netable/Example/Services/NetworkService.swift b/Netable/Example/Services/NetworkService.swift
@@ -11,17 +11,11 @@ import Foundation
 import Netable
 
 class SimpleNetworkService {
-    static var shared = SimpleNetworkService()
+    static let shared = SimpleNetworkService()
 
     private let netable = Netable(baseURL: URL(string: "http://localhost:8080/")!)
 
-    func getVersion() {
-        Task {
-            do {
-                let version = try await netable.request(GetVersionRequest())
-            } catch {
-                print(error)
-            }
-        }
+    func getVersion() async throws {
+        try await netable.request(GetVersionRequest())
     }
 }
diff --git a/Netable/Example/ViewModels/GraphQLVM.swift b/Netable/Example/ViewModels/GraphQLVM.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 
+@MainActor
 class GraphQLVM: ObservableObject {
     @Published var posts: [Post]?
     @Published var title: String = ""

diff --git a/Netable/Example/ViewModels/HomeVM.swift b/Netable/Example/ViewModels/HomeVM.swift
@@ -9,6 +9,7 @@
 import Foundation
 import Netable
 
+@MainActor
 class HomeVM: ObservableVM {
     @Published var title: String = ""
     @Published var content: String = ""

diff --git a/Netable/Example/ViewModels/LoginVM.swift b/Netable/Example/ViewModels/LoginVM.swift
@@ -9,6 +9,7 @@
 import Combine
 import Foundation
 
+@MainActor
 class LoginVM: ObservableVM {
     @Published var user: User?
     @Published var username: String = ""

diff --git a/Netable/Example/ViewModels/ObservableVM.swift b/Netable/Example/ViewModels/ObservableVM.swift
@@ -10,6 +10,7 @@ import Combine
 import Foundation
 import Netable
 
+@MainActor
 class ObservableVM: ObservableObject {
 
     var cancellables: [AnyCancellable] = []

diff --git a/Netable/Example/ViewModels/RootVM.swift b/Netable/Example/ViewModels/RootVM.swift
@@ -44,7 +44,9 @@ class RootVM: ObservableVM {
     }
 
     func getVersion() {
-        SimpleNetworkService.shared.getVersion()
+        Task {
+            try await SimpleNetworkService.shared.getVersion()
+        }
     }
 
     func clearError() {