chore: cleanup code quality

Author: Garrett Moseke

Sources/GraphQLTransportWS/Client.swift

@@ -36,7 +36,7 @@ public class Client<InitPayload: Equatable & Codable> {
                 return
             }
 
-            guard let json = message.data(using: .utf8) else {
+            guard let json = Data(message.utf8) else {
                 self.error(.invalidEncoding())
                 return
             }
@@ -142,6 +142,8 @@ public class Client<InitPayload: Equatable & Codable> {
         )
     }
 
+    /// Add an observable object for this client that will fire off `Next` messages to the server as updates happen.
+    /// - Parameter observable: `Observable<EventLoopFuture<GraphQLRequest>>` to subscribe to for changes.
     public func addObservable(observable: Observable<EventLoopFuture<GraphQLRequest>>) {
         observable.subscribe(
             onNext: { [weak self] resultFuture in

Sources/GraphQLTransportWS/InitPayloads.swift

@@ -1,8 +1,8 @@
 /// `connection_init` `payload` that is empty
-public struct EmptyInitPayload: Equatable & Codable {}
+public struct EmptyInitPayload: Equatable, Codable {}
 
 /// `connection_init` `payload` that includes an `authToken` field
-public struct TokenInitPayload: Equatable & Codable {
+public struct TokenInitPayload: Equatable, Codable {
     public let authToken: String
 
     public init(authToken: String) {

Sources/GraphQLTransportWS/Messenger.swift

@@ -7,17 +7,17 @@ public protocol Messenger: AnyObject {
 
     /// Send a message through this messenger
     /// - Parameter message: The message to send
-    func send<S>(_ message: S) -> Void where S: Collection, S.Element == Character
+    func send<S>(_ message: S) where S: Collection, S.Element == Character
 
     /// Set the callback that should be run when a message is recieved
-    func onReceive(callback: @escaping (String) -> Void) -> Void
+    func onReceive(callback: @escaping (String) -> Void)
 
     /// Close the messenger
-    func close() -> Void
+    func close()
 
     /// Indicate that the messenger experienced an error.
     /// - Parameters:
     ///   - message: The message describing the error
     ///   - code: An error code
-    func error(_ message: String, code: Int) -> Void
+    func error(_ message: String, code: Int)
 }

Sources/GraphQLTransportWS/Server.swift

@@ -51,7 +51,7 @@ public class Server<InitPayload: Equatable & Codable> {
                 return
             }
 
-            guard let data = message.data(using: .utf8) else {
+            guard let data = Data(message.utf8) else {
                 self.error(.invalidEncoding())
                 return
             }
@@ -197,6 +197,9 @@ public class Server<InitPayload: Equatable & Codable> {
                     self.sendError(result.errors, id: id)
                     return
                 }
+
+                // known safe cast
+                // swiftlint:disable:next force_cast
                 let stream = streamOpt as! ObservableSubscriptionEventStream
                 let observable = stream.observable
 

Tests/GraphQLTransportWSTests/GraphQLTransportWSTests.swift

@@ -6,7 +6,7 @@ import XCTest
 
 @testable import GraphQLTransportWS
 
-class GraphqlTransportWSTests: XCTestCase {
+final class GraphqlTransportWSTests: XCTestCase {
     var clientMessenger: TestMessenger!
     var serverMessenger: TestMessenger!
     var server: Server<TokenInitPayload>!
@@ -174,7 +174,7 @@ class GraphqlTransportWSTests: XCTestCase {
         }
 
         client.onNext { _, _ in
-            dataIndex = dataIndex + 1
+            dataIndex += 1
             if dataIndex <= dataIndexMax {
                 pubsub.onNext("hello \(dataIndex)")
             }
@@ -277,7 +277,7 @@ class GraphqlTransportWSTests: XCTestCase {
         }
 
         client.onNext { _, _ in
-            dataIndex = dataIndex + 1
+            dataIndex += 1
             if dataIndex <= dataIndexMax {
                 pubsub.onNext("hello \(dataIndex)")
             }

Tests/GraphQLTransportWSTests/Utils/TestAPI.swift

@@ -11,6 +11,8 @@ struct TestAPI: API {
     let resolver = TestResolver()
     let context = TestContext()
 
+    // known valid
+    // swiftlint:disable:next force_try
     let schema = try! Schema<TestResolver, TestContext> {
         Query {
             Field("hello", at: TestResolver.hello)