refactor: Move error to messenger

Author: NeedleInAJayStack

Sources/GraphQLTransportWS/Client.swift

@@ -50,7 +50,7 @@ public actor Client<InitPayload: Equatable & Codable> {
         do {
             response = try decoder.decode(Response.self, from: message)
         } catch {
-            try await self.error(.noType())
+            try await messenger.error(.noType())
             return
         }
 
@@ -62,31 +62,31 @@ public actor Client<InitPayload: Equatable & Codable> {
                     from: message
                 )
             else {
-                try await error(.invalidResponseFormat(messageType: .connectionAck))
+                try await messenger.error(.invalidResponseFormat(messageType: .connectionAck))
                 return
             }
             try await onConnectionAck(connectionAckResponse, self)
         case .next:
             guard let nextResponse = try? decoder.decode(NextResponse.self, from: message) else {
-                try await error(.invalidResponseFormat(messageType: .next))
+                try await messenger.error(.invalidResponseFormat(messageType: .next))
                 return
             }
             try await onNext(nextResponse, self)
         case .error:
             guard let errorResponse = try? decoder.decode(ErrorResponse.self, from: message) else {
-                try await error(.invalidResponseFormat(messageType: .error))
+                try await messenger.error(.invalidResponseFormat(messageType: .error))
                 return
             }
             try await onError(errorResponse, self)
         case .complete:
             guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: message)
             else {
-                try await error(.invalidResponseFormat(messageType: .complete))
+                try await messenger.error(.invalidResponseFormat(messageType: .complete))
                 return
             }
             try await onComplete(completeResponse, self)
         default:
-            try await error(.invalidType())
+            try await messenger.error(.invalidType())
         }
     }
 
@@ -123,9 +123,4 @@ public actor Client<InitPayload: Equatable & Codable> {
             )
         )
     }
-
-    /// Send an error through the messenger and close the connection
-    private func error(_ error: GraphQLTransportWSError) async throws {
-        try await messenger.error(error.message, code: error.code.rawValue)
-    }
 }

Sources/GraphQLTransportWS/Messenger.swift

@@ -15,3 +15,10 @@ public protocol Messenger: Sendable {
     ///   - code: An error code
     func error(_ message: String, code: Int) async throws
 }
+
+extension Messenger {
+    /// Send an error through the messenger and close the connection
+    func error(_ error: GraphQLTransportWSError) async throws {
+        try await self.error(error.message, code: error.code.rawValue)
+    }
+}

Sources/GraphQLTransportWS/Server.swift

@@ -70,7 +70,7 @@ where
         do {
             request = try decoder.decode(Request.self, from: message)
         } catch {
-            try await self.error(.noType())
+            try await messenger.error(.noType())
             return
         }
 
@@ -83,26 +83,26 @@ where
                     from: message
                 )
             else {
-                try await error(.invalidRequestFormat(messageType: .connectionInit))
+                try await messenger.error(.invalidRequestFormat(messageType: .connectionInit))
                 return
             }
             try await onConnectionInit(connectionInitRequest, messenger)
         case .subscribe:
             guard let subscribeRequest = try? decoder.decode(SubscribeRequest.self, from: message)
             else {
-                try await error(.invalidRequestFormat(messageType: .subscribe))
+                try await messenger.error(.invalidRequestFormat(messageType: .subscribe))
                 return
             }
             try await onSubscribe(subscribeRequest)
         case .complete:
             guard let completeRequest = try? decoder.decode(CompleteRequest.self, from: message)
             else {
-                try await error(.invalidRequestFormat(messageType: .complete))
+                try await messenger.error(.invalidRequestFormat(messageType: .complete))
                 return
             }
             try await onOperationComplete(completeRequest)
         default:
-            try await error(.invalidType())
+            try await messenger.error(.invalidType())
         }
     }
 
@@ -111,14 +111,14 @@ where
         _: Messenger
     ) async throws {
         guard !initialized else {
-            try await error(.tooManyInitializations())
+            try await messenger.error(.tooManyInitializations())
             return
         }
 
         do {
             initResult = try await onInit(connectionInitRequest.payload)
         } catch {
-            try await self.error(.forbidden())
+            try await messenger.error(.forbidden())
             return
         }
         initialized = true
@@ -128,7 +128,7 @@ where
 
     private func onSubscribe(_ subscribeRequest: SubscribeRequest) async throws {
         guard initialized, let initResult else {
-            try await error(.notInitialized())
+            try await messenger.error(.notInitialized())
             return
         }
 
@@ -144,7 +144,7 @@ where
         }
 
         guard executionTasks[id] == nil else {
-            try await self.error(.subscriberAlreadyExists(id: id))
+            try await messenger.error(.subscriberAlreadyExists(id: id))
             return
         }
         executionTasks[id] = Task {
@@ -181,7 +181,7 @@ where
 
     private func onOperationComplete(_ completeRequest: CompleteRequest) async throws {
         guard initialized else {
-            try await error(.notInitialized())
+            try await messenger.error(.notInitialized())
             return
         }
 
@@ -243,9 +243,4 @@ where
     private func sendError(_ error: Error, id: String) async throws {
         try await sendError([error], id: id)
     }
-
-    /// Send an error through the messenger and close the connection
-    private func error(_ error: GraphQLTransportWSError) async throws {
-        try await messenger.error(error.message, code: error.code.rawValue)
-    }
 }