fix: add ID parameter for completion/error callbacks

Author: Garrett Moseke

Sources/GraphQLTransportWS/Server.swift

@@ -6,7 +6,7 @@ import GraphQLRxSwift
 import NIO
 import RxSwift
 
-/// Server implements the server-side portion of the protocol, allowing a few callbacks for customization. 0 or 1 subscriptions per connection and no more.
+/// Server implements the server-side portion of the protocol, allowing a few callbacks for customization.
 ///
 /// By default, there are no authorization checks
 public class Server<InitPayload: Equatable & Codable> {
@@ -18,8 +18,8 @@ public class Server<InitPayload: Equatable & Codable> {
 
     var auth: (InitPayload) throws -> Void = { _ in }
     var onExit: () -> Void = { }
-    var onOperationComplete: () -> Void = {}
-    var onOperationError: () -> Void = {}
+    var onOperationComplete: (String) -> Void = { _ in }
+    var onOperationError: (String) -> Void = { _ in }
     var onMessage: (String) -> Void = { _ in }
 
     var initialized = false
@@ -66,7 +66,7 @@ public class Server<InitPayload: Equatable & Codable> {
                 return
             }
 
-            // handle incoing message
+            // handle incoming message
             switch request.type {
                 case .connectionInit:
                     guard let connectionInitRequest = try? self.decoder.decode(ConnectionInitRequest<InitPayload>.self, from: data) else {
@@ -85,15 +85,16 @@ public class Server<InitPayload: Equatable & Codable> {
                         self.error(.invalidRequestFormat(messageType: .complete))
                         return
                     }
-                    self.onSubscribeComplete(completeRequest)
+                self.onOperationComplete(completeRequest.id)
                 case .unknown:
                     self.error(.invalidType())
             }
         }
     }
 
     /// Define the callback run during `connection_init` resolution that allows authorization using the `payload`.
-    /// Throw to indicate that authorization has failed.    /// - Parameter callback: The callback to assign
+    /// Throw to indicate that authorization has failed.
+    ///  - Parameter callback: The callback to assign
     public func auth(_ callback: @escaping (InitPayload) throws -> Void) {
         self.auth = callback
     }
@@ -111,14 +112,14 @@ public class Server<InitPayload: Equatable & Codable> {
     }
 
     /// Define the callback run on the completion a full operation (query/mutation, end of subscription)
-    /// - Parameter callback: The callback to assign
-    public func onOperationComplete(_ callback: @escaping () -> Void) {
+    /// - Parameter callback: The callback to assign,  taking a string parameter for the ID of the operation
+    public func onOperationComplete(_ callback: @escaping (String) -> Void) {
         self.onOperationComplete = callback
     }
 
     /// Define the callback to run on error of any full operation (failed query, interrupted subscription)
-    /// - Parameter callback: The callback to assign
-    public func onOperationError(_ callback: @escaping () -> Void) {
+    /// - Parameter callback: The callback to assign, taking a string parameter for the ID of the operation
+    public func onOperationError(_ callback: @escaping (String) -> Void) {
         self.onOperationError = callback
     }
 
@@ -208,14 +209,6 @@ public class Server<InitPayload: Equatable & Codable> {
         }
     }
 
-    private func onSubscribeComplete(_: CompleteRequest) {
-        guard initialized else {
-            self.error(.notInitialized())
-            return
-        }
-        onOperationComplete()
-    }
-    
     /// Send a `connection_ack` response through the messenger
     private func sendConnectionAck(_ payload: [String: Map]? = nil) {
         guard let messenger = messenger else { return }
@@ -243,7 +236,7 @@ public class Server<InitPayload: Equatable & Codable> {
                 id: id
             ).toJSON(encoder)
         )
-        self.onOperationComplete()
+        self.onOperationComplete(id)
     }
 
     /// Send an `error` response through the messenger
@@ -255,7 +248,7 @@ public class Server<InitPayload: Equatable & Codable> {
                 id: id
             ).toJSON(encoder)
         )
-        self.onOperationError()
+        self.onOperationError(id)
     }
 
     /// Send an `error` response through the messenger