Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Examples/HelloWorld/Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 7 additions & 16 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -33,6 +33,7 @@ let package = Package(
.product(name: "GraphQLWS", package: "GraphQLWS"),
.product(name: "Hummingbird", package: "hummingbird"),
.product(name: "HummingbirdWebSocket", package: "hummingbird-websocket"),
.product(name: "NIOFoundationCompat", package: "swift-nio"),
]
),
.testTarget(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
11 changes: 8 additions & 3 deletions Sources/GraphQLHummingbird/WebSocket/WebSocketMessenger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import GraphQLWS
import HummingbirdWebSocket
import Logging
import NIOCore
import NIOFoundationCompat

import struct Foundation.Data

/// Messenger wrapper for WebSockets
class WebSocketMessenger: GraphQLTransportWS.Messenger, GraphQLWS.Messenger, @unchecked Sendable {
Expand All @@ -17,9 +20,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 {
Expand Down
Loading