chore: Update WebSocket subprotocols

Author: NeedleInAJayStack

Examples/HelloWorld/Package.resolved

@@ -16,8 +16,8 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"),
         .package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "4.0.0"),
-        .package(url: "https://github.com/GraphQLSwift/GraphQLTransportWS.git", from: "1.0.0"),
-        .package(url: "https://github.com/GraphQLSwift/GraphQLWS.git", from: "1.0.0"),
+        .package(url: "https://github.com/GraphQLSwift/GraphQLTransportWS.git", from: "2.0.0"),
+        .package(url: "https://github.com/GraphQLSwift/GraphQLWS.git", from: "2.0.0"),
         .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0"),
         .package(
             url: "https://github.com/hummingbird-project/hummingbird-websocket.git",

Package.resolved

@@ -3,6 +3,7 @@ import Hummingbird
 import HummingbirdWebSocket
 import Logging
 
+import struct Foundation.Data
 import struct GraphQLTransportWS.EmptyInitPayload
 import class GraphQLTransportWS.Server
 import class GraphQLWS.Server
@@ -17,15 +18,16 @@ extension GraphQLHandler where Context: WebSocketRequestContext {
     ) async throws {
         let messenger = WebSocketMessenger(outbound: outbound, logger: logger)
 
-        let messageStream = inbound.messages(maxSize: context.requestContext.maxUploadSize)
-            .compactMap { message -> String? in
-                // TODO: Add binary support
-                guard case .text(let text) = message else {
-                    return nil
-                }
-                logger.trace("GraphQL server received: \(message)")
-                return text
+        let messageStream = inbound.messages(
+            maxSize: context.requestContext.maxUploadSize
+        ).compactMap { message -> Data? in
+            // By subprotocol specs, messages must be `text` and UTF8
+            guard case .text(let text) = message else {
+                return nil
             }
+            logger.trace("GraphQL server received: \(text)")
+            return text.data(using: .utf8)
+        }
 
         switch subProtocol {
         case .graphqlTransportWs:

Package.swift

@@ -4,6 +4,8 @@ import HummingbirdWebSocket
 import Logging
 import NIOCore
 
+import struct Foundation.Data
+
 /// Messenger wrapper for WebSockets
 class WebSocketMessenger: GraphQLTransportWS.Messenger, GraphQLWS.Messenger, @unchecked Sendable {
     private let outbound: WebSocketOutboundWriter
@@ -17,9 +19,11 @@ class WebSocketMessenger: GraphQLTransportWS.Messenger, GraphQLWS.Messenger, @un
         self.logger = logger
     }
 
-    func send<S: Collection>(_ message: S) async throws where S.Element == Character {
-        logger.trace("GraphQL server sent: \(String(message))")
-        try await outbound.write(.text(String(message)))
+    func send(_ message: Data) async throws {
+        try await outbound.withTextMessageWriter { writer in
+            try await writer.callAsFunction(ByteBuffer(data: message))
+        }
+        logger.trace("GraphQL server sent: \(String(decoding: message, as: UTF8.self))")
     }
 
     func error(_ message: String, code: Int) async throws {