Merge pull request #3 from GraphQLSwift/refactor/negotiateSubProtocol

Breaks out WebSocket subprotocol negotiation

Author: NeedleInAJayStack

Sources/GraphQLVapor/GraphQLHandler.swift

@@ -9,16 +9,4 @@ struct GraphQLHandler<
     let rootValue: any Sendable
     let config: GraphQLConfig<WebSocketInit>
     let computeContext: @Sendable (Request) async throws -> Context
-
-    init(
-        schema: GraphQLSchema,
-        rootValue: any Sendable,
-        config: GraphQLConfig<WebSocketInit>,
-        computeContext: @Sendable @escaping (Request) async throws -> Context
-    ) {
-        self.schema = schema
-        self.rootValue = rootValue
-        self.config = config
-        self.computeContext = computeContext
-    }
 }

Sources/GraphQLVapor/WebSocket/GraphQLHandler+handleWebSocket.swift

@@ -8,25 +8,7 @@ extension GraphQLHandler {
     func handleWebSocket(
         request: Request
     ) async throws -> Response {
-        var subProtocol: WebSocketSubProtocol?
-        let requestedSubProtocols = request.headers["Sec-WebSocket-Protocol"]
-        if requestedSubProtocols.isEmpty {
-            // Default
-            subProtocol = .graphqlTransportWs
-        } else {
-            // Choose highest client preference that we understand
-            for requestedSubProtocol in requestedSubProtocols {
-                if let selectedSubProtocol = WebSocketSubProtocol(rawValue: requestedSubProtocol) {
-                    subProtocol = selectedSubProtocol
-                    break
-                }
-            }
-        }
-        guard let subProtocol = subProtocol else {
-            // If they provided options but none matched, fail
-            throw Abort(.badRequest, reason: "Unable to negotiate subprotocol. \(WebSocketSubProtocol.allCases) are supported.")
-        }
-
+        let subProtocol = try negotiateSubProtocol(request: request)
         let context = try await computeContext(request)
         let response = Response(status: .switchingProtocols)
         response.upgrader = WebSocketUpgrader(
@@ -96,4 +78,26 @@ extension GraphQLHandler {
         )
         return response
     }
+
+    func negotiateSubProtocol(request: Request) throws -> WebSocketSubProtocol {
+        var subProtocol: WebSocketSubProtocol?
+        let requestedSubProtocols = request.headers["Sec-WebSocket-Protocol"]
+        if requestedSubProtocols.isEmpty {
+            // Default
+            subProtocol = .graphqlTransportWs
+        } else {
+            // Choose highest client preference that we understand
+            for requestedSubProtocol in requestedSubProtocols {
+                if let selectedSubProtocol = WebSocketSubProtocol(rawValue: requestedSubProtocol) {
+                    subProtocol = selectedSubProtocol
+                    break
+                }
+            }
+        }
+        guard let subProtocol = subProtocol else {
+            // If they provided options but none matched, fail
+            throw Abort(.badRequest, reason: "Unable to negotiate subprotocol. \(WebSocketSubProtocol.allCases) are supported.")
+        }
+        return subProtocol
+    }
 }

Tests/GraphQLVaporTests/HTTPTests.swift

@@ -223,7 +223,7 @@ struct HTTPTests {
                 EmptyContext()
             }
 
-            try await app.test(.GET, "/graphql?query=%7Btest%7D", headers: defaultHeaders) { _ in
+            try await app.test(.GET, "/graphql?query=%7Bhello%7D", headers: defaultHeaders) { _ in
             } afterResponse: { response in
                 #expect(response.status == .methodNotAllowed)
             }