Merge pull request #10 from GraphQLSwift/chore/update-websocket-protocols

chore: Update WebSocket subprotocols

Author: NeedleInAJayStack

Examples/HelloWorld/Package.resolved

@@ -15,8 +15,8 @@ let package = Package(
     ],
     dependencies: [
         .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/vapor/vapor.git", from: "4.0.0"),
     ],
     targets: [

Package.resolved

@@ -22,9 +22,13 @@ extension GraphQLHandler {
                 }
             },
             onUpgrade: { websocket in
-                let messageStream = AsyncThrowingStream<String, Error> { continuation in
+                let messageStream = AsyncThrowingStream<Data, Error> { continuation in
+                    // By subprotocol specs, messages must be `text` and UTF8
                     websocket.onText { _, text in
-                        continuation.yield(text)
+                        guard let data = text.data(using: .utf8) else {
+                            return
+                        }
+                        continuation.yield(data)
                     }
                     websocket.onClose.whenComplete { result in
                         switch result {

Package.swift

@@ -2,12 +2,14 @@ import GraphQLTransportWS
 import GraphQLWS
 import WebSocketKit
 
+import struct Foundation.Data
+
 /// Messenger wrapper for WebSockets
 struct WebSocketMessenger: GraphQLTransportWS.Messenger, GraphQLWS.Messenger {
     let websocket: WebSocket
 
-    func send<S: Collection>(_ message: S) async throws where S.Element == Character {
-        try await websocket.send(message)
+    func send(_ message: Data) async throws {
+        try await websocket.send(String(decoding: message, as: UTF8.self))
     }
 
     func error(_ message: String, code: Int) async throws {