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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
2 changes: 1 addition & 1 deletion Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ let package = Package(
.library(
name: "GraphQLWS",
targets: ["GraphQLWS"]
),
)
],
dependencies: [
.package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "3.0.0"),
Expand Down
38 changes: 30 additions & 8 deletions Sources/GraphQLWS/Client.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,14 @@ public actor Client<InitPayload: Equatable & Codable> {
/// - onComplete: The callback run on receipt of a `complete` message
public init(
messenger: Messenger,
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = { _, _ in },
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in },
onConnectionKeepAlive: @escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = {
_,
_ in
},
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in
},
onConnectionKeepAlive:
@escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onData: @escaping (DataResponse, Client) async throws -> Void = { _, _ in },
onError: @escaping (ErrorResponse, Client) async throws -> Void = { _, _ in },
onComplete: @escaping (CompleteResponse, Client) async throws -> Void = { _, _ in }
Expand All@@ -45,7 +50,8 @@ public actor Client<InitPayload: Equatable & Codable> {

/// Listen and react to the provided async sequence of server messages. This function will block until the stream is completed.
/// - Parameter incoming: The server message sequence that the client should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -68,19 +74,34 @@ public actor Client<InitPayload: Equatable & Codable> {

switch response.type {
case .GQL_CONNECTION_ERROR:
guard let connectionErrorResponse = try? decoder.decode(ConnectionErrorResponse.self, from: json) else {
guard
let connectionErrorResponse = try? decoder.decode(
ConnectionErrorResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionError(connectionErrorResponse, self)
case .GQL_CONNECTION_ACK:
guard let connectionAckResponse = try? decoder.decode(ConnectionAckResponse.self, from: json) else {
guard
let connectionAckResponse = try? decoder.decode(
ConnectionAckResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionAck(connectionAckResponse, self)
case .GQL_CONNECTION_KEEP_ALIVE:
guard let connectionKeepAliveResponse = try? decoder.decode(ConnectionKeepAliveResponse.self, from: json) else {
guard
let connectionKeepAliveResponse = try? decoder.decode(
ConnectionKeepAliveResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_KEEP_ALIVE))
return
}
Expand All@@ -98,7 +119,8 @@ public actor Client<InitPayload: Equatable & Codable> {
}
try await onError(errorResponse, self)
case .GQL_COMPLETE:
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json) else {
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json)
else {
try await error(.invalidResponseFormat(messageType: .GQL_COMPLETE))
return
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/GraphQLWS/Messenger.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import Foundation
public protocol Messenger: Sendable {
/// Send a message through this messenger
/// - Parameter message: The message to send
func send<S: Sendable & Collection>(_ message: S) async throws -> Void where S.Element == Character
func send<S: Sendable & Collection>(_ message: S) async throws where S.Element == Character

/// Close the messenger
func close() async throws
Expand Down
48 changes: 30 additions & 18 deletions Sources/GraphQLWS/Requests.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionInitRequest<InitPayload: Codable & Equatable>: Equatable
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_INIT {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
)
)
}
payload = try container.decode(InitPayload.self, forKey: .payload)
}
Expand All@@ -41,10 +44,12 @@ public struct StartRequest: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_START {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
)
)
}
payload = try container.decode(GraphQLRequest.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -62,11 +67,14 @@ public struct StopRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand All@@ -80,11 +88,15 @@ public struct ConnectionTerminateRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
)
)
}
}
}
Expand Down
67 changes: 42 additions & 25 deletions Sources/GraphQLWS/Responses.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionAckResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ACK {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -39,10 +42,13 @@ public struct ConnectionErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -59,11 +65,16 @@ public struct ConnectionKeepAliveResponse: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_KEEP_ALIVE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
))
if try container.decode(ResponseMessageType.self, forKey: .type)
!= .GQL_CONNECTION_KEEP_ALIVE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -83,10 +94,12 @@ public struct DataResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_DATA {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
)
)
}
payload = try container.decodeIfPresent(GraphQLResult.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -105,10 +118,12 @@ public struct CompleteResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_COMPLETE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand DownExpand Up@@ -136,10 +151,12 @@ public struct ErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
)
)
}
payload = try container.decode([GraphQLError].self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand Down
32 changes: 25 additions & 7 deletions Sources/GraphQLWS/Server.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ public actor Server<
InitPayload: Equatable & Codable & Sendable,
InitPayloadResult: Sendable,
SubscriptionSequenceType: AsyncSequence & Sendable
> where
>
where
SubscriptionSequenceType.Element == GraphQLResult
{
let messenger: Messenger
Expand DownExpand Up@@ -39,7 +40,8 @@ public actor Server<
messenger: Messenger,
onInit: @escaping (InitPayload) async throws -> InitPayloadResult,
onExecute: @escaping (GraphQLRequest, InitPayloadResult) async throws -> GraphQLResult,
onSubscribe: @escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onSubscribe:
@escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onOperationComplete: @escaping (String) async throws -> Void = { _ in },
onOperationError: @escaping (String, [Error]) async throws -> Void = { _, _ in }
) {
Expand All@@ -53,7 +55,8 @@ public actor Server<

/// Listen and react to the provided async sequence of client messages. This function will block until the stream is completed.
/// - Parameter incoming: The client message sequence that the server should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -77,7 +80,12 @@ public actor Server<
// handle incoming message
switch request.type {
case .GQL_CONNECTION_INIT:
guard let connectionInitRequest = try? decoder.decode(ConnectionInitRequest<InitPayload>.self, from: json) else {
guard
let connectionInitRequest = try? decoder.decode(
ConnectionInitRequest<InitPayload>.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_INIT))
return
}
Expand All@@ -95,7 +103,12 @@ public actor Server<
}
try await onStop(stopRequest)
case .GQL_CONNECTION_TERMINATE:
guard let connectionTerminateRequest = try? decoder.decode(ConnectionTerminateRequest.self, from: json) else {
guard
let connectionTerminateRequest = try? decoder.decode(
ConnectionTerminateRequest.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_TERMINATE))
return
}
Expand All@@ -110,7 +123,10 @@ public actor Server<
subscriptionTasks.values.forEach { $0.cancel() }
}

private func onConnectionInit(_ connectionInitRequest: ConnectionInitRequest<InitPayload>, _: Messenger) async throws {
private func onConnectionInit(
_ connectionInitRequest: ConnectionInitRequest<InitPayload>,
_: Messenger
) async throws {
guard !initialized else {
try await error(.tooManyInitializations())
return
Expand DownExpand Up@@ -189,7 +205,9 @@ public actor Server<
try await onOperationComplete(id)
}

private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger) async throws {
private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger)
async throws
{
for (_, subscriptionTask) in subscriptionTasks {
subscriptionTask.cancel()
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
2 changes: 1 addition & 1 deletion Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ let package = Package(
.library(
name: "GraphQLWS",
targets: ["GraphQLWS"]
),
)
],
dependencies: [
.package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "3.0.0"),
Expand Down
38 changes: 30 additions & 8 deletions Sources/GraphQLWS/Client.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,14 @@ public actor Client<InitPayload: Equatable & Codable> {
/// - onComplete: The callback run on receipt of a `complete` message
public init(
messenger: Messenger,
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = { _, _ in },
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in },
onConnectionKeepAlive: @escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = {
_,
_ in
},
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in
},
onConnectionKeepAlive:
@escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onData: @escaping (DataResponse, Client) async throws -> Void = { _, _ in },
onError: @escaping (ErrorResponse, Client) async throws -> Void = { _, _ in },
onComplete: @escaping (CompleteResponse, Client) async throws -> Void = { _, _ in }
Expand All@@ -45,7 +50,8 @@ public actor Client<InitPayload: Equatable & Codable> {

/// Listen and react to the provided async sequence of server messages. This function will block until the stream is completed.
/// - Parameter incoming: The server message sequence that the client should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -68,19 +74,34 @@ public actor Client<InitPayload: Equatable & Codable> {

switch response.type {
case .GQL_CONNECTION_ERROR:
guard let connectionErrorResponse = try? decoder.decode(ConnectionErrorResponse.self, from: json) else {
guard
let connectionErrorResponse = try? decoder.decode(
ConnectionErrorResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionError(connectionErrorResponse, self)
case .GQL_CONNECTION_ACK:
guard let connectionAckResponse = try? decoder.decode(ConnectionAckResponse.self, from: json) else {
guard
let connectionAckResponse = try? decoder.decode(
ConnectionAckResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionAck(connectionAckResponse, self)
case .GQL_CONNECTION_KEEP_ALIVE:
guard let connectionKeepAliveResponse = try? decoder.decode(ConnectionKeepAliveResponse.self, from: json) else {
guard
let connectionKeepAliveResponse = try? decoder.decode(
ConnectionKeepAliveResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_KEEP_ALIVE))
return
}
Expand All@@ -98,7 +119,8 @@ public actor Client<InitPayload: Equatable & Codable> {
}
try await onError(errorResponse, self)
case .GQL_COMPLETE:
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json) else {
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json)
else {
try await error(.invalidResponseFormat(messageType: .GQL_COMPLETE))
return
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/GraphQLWS/Messenger.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import Foundation
public protocol Messenger: Sendable {
/// Send a message through this messenger
/// - Parameter message: The message to send
func send<S: Sendable & Collection>(_ message: S) async throws -> Void where S.Element == Character
func send<S: Sendable & Collection>(_ message: S) async throws where S.Element == Character

/// Close the messenger
func close() async throws
Expand Down
48 changes: 30 additions & 18 deletions Sources/GraphQLWS/Requests.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionInitRequest<InitPayload: Codable & Equatable>: Equatable
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_INIT {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
)
)
}
payload = try container.decode(InitPayload.self, forKey: .payload)
}
Expand All@@ -41,10 +44,12 @@ public struct StartRequest: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_START {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
)
)
}
payload = try container.decode(GraphQLRequest.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -62,11 +67,14 @@ public struct StopRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand All@@ -80,11 +88,15 @@ public struct ConnectionTerminateRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
)
)
}
}
}
Expand Down
67 changes: 42 additions & 25 deletions Sources/GraphQLWS/Responses.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionAckResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ACK {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -39,10 +42,13 @@ public struct ConnectionErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -59,11 +65,16 @@ public struct ConnectionKeepAliveResponse: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_KEEP_ALIVE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
))
if try container.decode(ResponseMessageType.self, forKey: .type)
!= .GQL_CONNECTION_KEEP_ALIVE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -83,10 +94,12 @@ public struct DataResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_DATA {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
)
)
}
payload = try container.decodeIfPresent(GraphQLResult.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -105,10 +118,12 @@ public struct CompleteResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_COMPLETE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand DownExpand Up@@ -136,10 +151,12 @@ public struct ErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
)
)
}
payload = try container.decode([GraphQLError].self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand Down
32 changes: 25 additions & 7 deletions Sources/GraphQLWS/Server.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ public actor Server<
InitPayload: Equatable & Codable & Sendable,
InitPayloadResult: Sendable,
SubscriptionSequenceType: AsyncSequence & Sendable
> where
>
where
SubscriptionSequenceType.Element == GraphQLResult
{
let messenger: Messenger
Expand DownExpand Up@@ -39,7 +40,8 @@ public actor Server<
messenger: Messenger,
onInit: @escaping (InitPayload) async throws -> InitPayloadResult,
onExecute: @escaping (GraphQLRequest, InitPayloadResult) async throws -> GraphQLResult,
onSubscribe: @escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onSubscribe:
@escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onOperationComplete: @escaping (String) async throws -> Void = { _ in },
onOperationError: @escaping (String, [Error]) async throws -> Void = { _, _ in }
) {
Expand All@@ -53,7 +55,8 @@ public actor Server<

/// Listen and react to the provided async sequence of client messages. This function will block until the stream is completed.
/// - Parameter incoming: The client message sequence that the server should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -77,7 +80,12 @@ public actor Server<
// handle incoming message
switch request.type {
case .GQL_CONNECTION_INIT:
guard let connectionInitRequest = try? decoder.decode(ConnectionInitRequest<InitPayload>.self, from: json) else {
guard
let connectionInitRequest = try? decoder.decode(
ConnectionInitRequest<InitPayload>.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_INIT))
return
}
Expand All@@ -95,7 +103,12 @@ public actor Server<
}
try await onStop(stopRequest)
case .GQL_CONNECTION_TERMINATE:
guard let connectionTerminateRequest = try? decoder.decode(ConnectionTerminateRequest.self, from: json) else {
guard
let connectionTerminateRequest = try? decoder.decode(
ConnectionTerminateRequest.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_TERMINATE))
return
}
Expand All@@ -110,7 +123,10 @@ public actor Server<
subscriptionTasks.values.forEach { $0.cancel() }
}

private func onConnectionInit(_ connectionInitRequest: ConnectionInitRequest<InitPayload>, _: Messenger) async throws {
private func onConnectionInit(
_ connectionInitRequest: ConnectionInitRequest<InitPayload>,
_: Messenger
) async throws {
guard !initialized else {
try await error(.tooManyInitializations())
return
Expand DownExpand Up@@ -189,7 +205,9 @@ public actor Server<
try await onOperationComplete(id)
}

private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger) async throws {
private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger)
async throws
{
for (_, subscriptionTask) in subscriptionTasks {
subscriptionTask.cancel()
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
2 changes: 1 addition & 1 deletion Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ let package = Package(
.library(
name: "GraphQLWS",
targets: ["GraphQLWS"]
),
)
],
dependencies: [
.package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "3.0.0"),
Expand Down
38 changes: 30 additions & 8 deletions Sources/GraphQLWS/Client.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,14 @@ public actor Client<InitPayload: Equatable & Codable> {
/// - onComplete: The callback run on receipt of a `complete` message
public init(
messenger: Messenger,
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = { _, _ in },
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in },
onConnectionKeepAlive: @escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = {
_,
_ in
},
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in
},
onConnectionKeepAlive:
@escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onData: @escaping (DataResponse, Client) async throws -> Void = { _, _ in },
onError: @escaping (ErrorResponse, Client) async throws -> Void = { _, _ in },
onComplete: @escaping (CompleteResponse, Client) async throws -> Void = { _, _ in }
Expand All@@ -45,7 +50,8 @@ public actor Client<InitPayload: Equatable & Codable> {

/// Listen and react to the provided async sequence of server messages. This function will block until the stream is completed.
/// - Parameter incoming: The server message sequence that the client should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -68,19 +74,34 @@ public actor Client<InitPayload: Equatable & Codable> {

switch response.type {
case .GQL_CONNECTION_ERROR:
guard let connectionErrorResponse = try? decoder.decode(ConnectionErrorResponse.self, from: json) else {
guard
let connectionErrorResponse = try? decoder.decode(
ConnectionErrorResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionError(connectionErrorResponse, self)
case .GQL_CONNECTION_ACK:
guard let connectionAckResponse = try? decoder.decode(ConnectionAckResponse.self, from: json) else {
guard
let connectionAckResponse = try? decoder.decode(
ConnectionAckResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionAck(connectionAckResponse, self)
case .GQL_CONNECTION_KEEP_ALIVE:
guard let connectionKeepAliveResponse = try? decoder.decode(ConnectionKeepAliveResponse.self, from: json) else {
guard
let connectionKeepAliveResponse = try? decoder.decode(
ConnectionKeepAliveResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_KEEP_ALIVE))
return
}
Expand All@@ -98,7 +119,8 @@ public actor Client<InitPayload: Equatable & Codable> {
}
try await onError(errorResponse, self)
case .GQL_COMPLETE:
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json) else {
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json)
else {
try await error(.invalidResponseFormat(messageType: .GQL_COMPLETE))
return
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/GraphQLWS/Messenger.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import Foundation
public protocol Messenger: Sendable {
/// Send a message through this messenger
/// - Parameter message: The message to send
func send<S: Sendable & Collection>(_ message: S) async throws -> Void where S.Element == Character
func send<S: Sendable & Collection>(_ message: S) async throws where S.Element == Character

/// Close the messenger
func close() async throws
Expand Down
48 changes: 30 additions & 18 deletions Sources/GraphQLWS/Requests.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionInitRequest<InitPayload: Codable & Equatable>: Equatable
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_INIT {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
)
)
}
payload = try container.decode(InitPayload.self, forKey: .payload)
}
Expand All@@ -41,10 +44,12 @@ public struct StartRequest: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_START {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
)
)
}
payload = try container.decode(GraphQLRequest.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -62,11 +67,14 @@ public struct StopRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand All@@ -80,11 +88,15 @@ public struct ConnectionTerminateRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
)
)
}
}
}
Expand Down
67 changes: 42 additions & 25 deletions Sources/GraphQLWS/Responses.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionAckResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ACK {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -39,10 +42,13 @@ public struct ConnectionErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -59,11 +65,16 @@ public struct ConnectionKeepAliveResponse: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_KEEP_ALIVE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
))
if try container.decode(ResponseMessageType.self, forKey: .type)
!= .GQL_CONNECTION_KEEP_ALIVE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -83,10 +94,12 @@ public struct DataResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_DATA {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
)
)
}
payload = try container.decodeIfPresent(GraphQLResult.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -105,10 +118,12 @@ public struct CompleteResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_COMPLETE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand DownExpand Up@@ -136,10 +151,12 @@ public struct ErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
)
)
}
payload = try container.decode([GraphQLError].self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand Down
32 changes: 25 additions & 7 deletions Sources/GraphQLWS/Server.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ public actor Server<
InitPayload: Equatable & Codable & Sendable,
InitPayloadResult: Sendable,
SubscriptionSequenceType: AsyncSequence & Sendable
> where
>
where
SubscriptionSequenceType.Element == GraphQLResult
{
let messenger: Messenger
Expand DownExpand Up@@ -39,7 +40,8 @@ public actor Server<
messenger: Messenger,
onInit: @escaping (InitPayload) async throws -> InitPayloadResult,
onExecute: @escaping (GraphQLRequest, InitPayloadResult) async throws -> GraphQLResult,
onSubscribe: @escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onSubscribe:
@escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onOperationComplete: @escaping (String) async throws -> Void = { _ in },
onOperationError: @escaping (String, [Error]) async throws -> Void = { _, _ in }
) {
Expand All@@ -53,7 +55,8 @@ public actor Server<

/// Listen and react to the provided async sequence of client messages. This function will block until the stream is completed.
/// - Parameter incoming: The client message sequence that the server should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -77,7 +80,12 @@ public actor Server<
// handle incoming message
switch request.type {
case .GQL_CONNECTION_INIT:
guard let connectionInitRequest = try? decoder.decode(ConnectionInitRequest<InitPayload>.self, from: json) else {
guard
let connectionInitRequest = try? decoder.decode(
ConnectionInitRequest<InitPayload>.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_INIT))
return
}
Expand All@@ -95,7 +103,12 @@ public actor Server<
}
try await onStop(stopRequest)
case .GQL_CONNECTION_TERMINATE:
guard let connectionTerminateRequest = try? decoder.decode(ConnectionTerminateRequest.self, from: json) else {
guard
let connectionTerminateRequest = try? decoder.decode(
ConnectionTerminateRequest.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_TERMINATE))
return
}
Expand All@@ -110,7 +123,10 @@ public actor Server<
subscriptionTasks.values.forEach { $0.cancel() }
}

private func onConnectionInit(_ connectionInitRequest: ConnectionInitRequest<InitPayload>, _: Messenger) async throws {
private func onConnectionInit(
_ connectionInitRequest: ConnectionInitRequest<InitPayload>,
_: Messenger
) async throws {
guard !initialized else {
try await error(.tooManyInitializations())
return
Expand DownExpand Up@@ -189,7 +205,9 @@ public actor Server<
try await onOperationComplete(id)
}

private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger) async throws {
private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger)
async throws
{
for (_, subscriptionTask) in subscriptionTasks {
subscriptionTask.cancel()
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
2 changes: 1 addition & 1 deletion Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ let package = Package(
.library(
name: "GraphQLWS",
targets: ["GraphQLWS"]
),
)
],
dependencies: [
.package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "3.0.0"),
Expand Down
38 changes: 30 additions & 8 deletions Sources/GraphQLWS/Client.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,14 @@ public actor Client<InitPayload: Equatable & Codable> {
/// - onComplete: The callback run on receipt of a `complete` message
public init(
messenger: Messenger,
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = { _, _ in },
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in },
onConnectionKeepAlive: @escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = {
_,
_ in
},
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in
},
onConnectionKeepAlive:
@escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onData: @escaping (DataResponse, Client) async throws -> Void = { _, _ in },
onError: @escaping (ErrorResponse, Client) async throws -> Void = { _, _ in },
onComplete: @escaping (CompleteResponse, Client) async throws -> Void = { _, _ in }
Expand All@@ -45,7 +50,8 @@ public actor Client<InitPayload: Equatable & Codable> {

/// Listen and react to the provided async sequence of server messages. This function will block until the stream is completed.
/// - Parameter incoming: The server message sequence that the client should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -68,19 +74,34 @@ public actor Client<InitPayload: Equatable & Codable> {

switch response.type {
case .GQL_CONNECTION_ERROR:
guard let connectionErrorResponse = try? decoder.decode(ConnectionErrorResponse.self, from: json) else {
guard
let connectionErrorResponse = try? decoder.decode(
ConnectionErrorResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionError(connectionErrorResponse, self)
case .GQL_CONNECTION_ACK:
guard let connectionAckResponse = try? decoder.decode(ConnectionAckResponse.self, from: json) else {
guard
let connectionAckResponse = try? decoder.decode(
ConnectionAckResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionAck(connectionAckResponse, self)
case .GQL_CONNECTION_KEEP_ALIVE:
guard let connectionKeepAliveResponse = try? decoder.decode(ConnectionKeepAliveResponse.self, from: json) else {
guard
let connectionKeepAliveResponse = try? decoder.decode(
ConnectionKeepAliveResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_KEEP_ALIVE))
return
}
Expand All@@ -98,7 +119,8 @@ public actor Client<InitPayload: Equatable & Codable> {
}
try await onError(errorResponse, self)
case .GQL_COMPLETE:
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json) else {
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json)
else {
try await error(.invalidResponseFormat(messageType: .GQL_COMPLETE))
return
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/GraphQLWS/Messenger.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import Foundation
public protocol Messenger: Sendable {
/// Send a message through this messenger
/// - Parameter message: The message to send
func send<S: Sendable & Collection>(_ message: S) async throws -> Void where S.Element == Character
func send<S: Sendable & Collection>(_ message: S) async throws where S.Element == Character

/// Close the messenger
func close() async throws
Expand Down
48 changes: 30 additions & 18 deletions Sources/GraphQLWS/Requests.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionInitRequest<InitPayload: Codable & Equatable>: Equatable
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_INIT {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
)
)
}
payload = try container.decode(InitPayload.self, forKey: .payload)
}
Expand All@@ -41,10 +44,12 @@ public struct StartRequest: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_START {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
)
)
}
payload = try container.decode(GraphQLRequest.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -62,11 +67,14 @@ public struct StopRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand All@@ -80,11 +88,15 @@ public struct ConnectionTerminateRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
)
)
}
}
}
Expand Down
67 changes: 42 additions & 25 deletions Sources/GraphQLWS/Responses.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionAckResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ACK {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -39,10 +42,13 @@ public struct ConnectionErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -59,11 +65,16 @@ public struct ConnectionKeepAliveResponse: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_KEEP_ALIVE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
))
if try container.decode(ResponseMessageType.self, forKey: .type)
!= .GQL_CONNECTION_KEEP_ALIVE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -83,10 +94,12 @@ public struct DataResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_DATA {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
)
)
}
payload = try container.decodeIfPresent(GraphQLResult.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -105,10 +118,12 @@ public struct CompleteResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_COMPLETE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand DownExpand Up@@ -136,10 +151,12 @@ public struct ErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
)
)
}
payload = try container.decode([GraphQLError].self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand Down
32 changes: 25 additions & 7 deletions Sources/GraphQLWS/Server.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ public actor Server<
InitPayload: Equatable & Codable & Sendable,
InitPayloadResult: Sendable,
SubscriptionSequenceType: AsyncSequence & Sendable
> where
>
where
SubscriptionSequenceType.Element == GraphQLResult
{
let messenger: Messenger
Expand DownExpand Up@@ -39,7 +40,8 @@ public actor Server<
messenger: Messenger,
onInit: @escaping (InitPayload) async throws -> InitPayloadResult,
onExecute: @escaping (GraphQLRequest, InitPayloadResult) async throws -> GraphQLResult,
onSubscribe: @escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onSubscribe:
@escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onOperationComplete: @escaping (String) async throws -> Void = { _ in },
onOperationError: @escaping (String, [Error]) async throws -> Void = { _, _ in }
) {
Expand All@@ -53,7 +55,8 @@ public actor Server<

/// Listen and react to the provided async sequence of client messages. This function will block until the stream is completed.
/// - Parameter incoming: The client message sequence that the server should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -77,7 +80,12 @@ public actor Server<
// handle incoming message
switch request.type {
case .GQL_CONNECTION_INIT:
guard let connectionInitRequest = try? decoder.decode(ConnectionInitRequest<InitPayload>.self, from: json) else {
guard
let connectionInitRequest = try? decoder.decode(
ConnectionInitRequest<InitPayload>.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_INIT))
return
}
Expand All@@ -95,7 +103,12 @@ public actor Server<
}
try await onStop(stopRequest)
case .GQL_CONNECTION_TERMINATE:
guard let connectionTerminateRequest = try? decoder.decode(ConnectionTerminateRequest.self, from: json) else {
guard
let connectionTerminateRequest = try? decoder.decode(
ConnectionTerminateRequest.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_TERMINATE))
return
}
Expand All@@ -110,7 +123,10 @@ public actor Server<
subscriptionTasks.values.forEach { $0.cancel() }
}

private func onConnectionInit(_ connectionInitRequest: ConnectionInitRequest<InitPayload>, _: Messenger) async throws {
private func onConnectionInit(
_ connectionInitRequest: ConnectionInitRequest<InitPayload>,
_: Messenger
) async throws {
guard !initialized else {
try await error(.tooManyInitializations())
return
Expand DownExpand Up@@ -189,7 +205,9 @@ public actor Server<
try await onOperationComplete(id)
}

private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger) async throws {
private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger)
async throws
{
for (_, subscriptionTask) in subscriptionTasks {
subscriptionTask.cancel()
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
2 changes: 1 addition & 1 deletion Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ let package = Package(
.library(
name: "GraphQLWS",
targets: ["GraphQLWS"]
),
)
],
dependencies: [
.package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "3.0.0"),
Expand Down
38 changes: 30 additions & 8 deletions Sources/GraphQLWS/Client.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,14 @@ public actor Client<InitPayload: Equatable & Codable> {
/// - onComplete: The callback run on receipt of a `complete` message
public init(
messenger: Messenger,
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = { _, _ in },
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in },
onConnectionKeepAlive: @escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = {
_,
_ in
},
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in
},
onConnectionKeepAlive:
@escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onData: @escaping (DataResponse, Client) async throws -> Void = { _, _ in },
onError: @escaping (ErrorResponse, Client) async throws -> Void = { _, _ in },
onComplete: @escaping (CompleteResponse, Client) async throws -> Void = { _, _ in }
Expand All@@ -45,7 +50,8 @@ public actor Client<InitPayload: Equatable & Codable> {

/// Listen and react to the provided async sequence of server messages. This function will block until the stream is completed.
/// - Parameter incoming: The server message sequence that the client should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -68,19 +74,34 @@ public actor Client<InitPayload: Equatable & Codable> {

switch response.type {
case .GQL_CONNECTION_ERROR:
guard let connectionErrorResponse = try? decoder.decode(ConnectionErrorResponse.self, from: json) else {
guard
let connectionErrorResponse = try? decoder.decode(
ConnectionErrorResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionError(connectionErrorResponse, self)
case .GQL_CONNECTION_ACK:
guard let connectionAckResponse = try? decoder.decode(ConnectionAckResponse.self, from: json) else {
guard
let connectionAckResponse = try? decoder.decode(
ConnectionAckResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionAck(connectionAckResponse, self)
case .GQL_CONNECTION_KEEP_ALIVE:
guard let connectionKeepAliveResponse = try? decoder.decode(ConnectionKeepAliveResponse.self, from: json) else {
guard
let connectionKeepAliveResponse = try? decoder.decode(
ConnectionKeepAliveResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_KEEP_ALIVE))
return
}
Expand All@@ -98,7 +119,8 @@ public actor Client<InitPayload: Equatable & Codable> {
}
try await onError(errorResponse, self)
case .GQL_COMPLETE:
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json) else {
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json)
else {
try await error(.invalidResponseFormat(messageType: .GQL_COMPLETE))
return
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/GraphQLWS/Messenger.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import Foundation
public protocol Messenger: Sendable {
/// Send a message through this messenger
/// - Parameter message: The message to send
func send<S: Sendable & Collection>(_ message: S) async throws -> Void where S.Element == Character
func send<S: Sendable & Collection>(_ message: S) async throws where S.Element == Character

/// Close the messenger
func close() async throws
Expand Down
48 changes: 30 additions & 18 deletions Sources/GraphQLWS/Requests.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionInitRequest<InitPayload: Codable & Equatable>: Equatable
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_INIT {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
)
)
}
payload = try container.decode(InitPayload.self, forKey: .payload)
}
Expand All@@ -41,10 +44,12 @@ public struct StartRequest: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_START {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
)
)
}
payload = try container.decode(GraphQLRequest.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -62,11 +67,14 @@ public struct StopRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand All@@ -80,11 +88,15 @@ public struct ConnectionTerminateRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
)
)
}
}
}
Expand Down
67 changes: 42 additions & 25 deletions Sources/GraphQLWS/Responses.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionAckResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ACK {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -39,10 +42,13 @@ public struct ConnectionErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -59,11 +65,16 @@ public struct ConnectionKeepAliveResponse: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_KEEP_ALIVE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
))
if try container.decode(ResponseMessageType.self, forKey: .type)
!= .GQL_CONNECTION_KEEP_ALIVE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -83,10 +94,12 @@ public struct DataResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_DATA {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
)
)
}
payload = try container.decodeIfPresent(GraphQLResult.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -105,10 +118,12 @@ public struct CompleteResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_COMPLETE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand DownExpand Up@@ -136,10 +151,12 @@ public struct ErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
)
)
}
payload = try container.decode([GraphQLError].self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand Down
32 changes: 25 additions & 7 deletions Sources/GraphQLWS/Server.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ public actor Server<
InitPayload: Equatable & Codable & Sendable,
InitPayloadResult: Sendable,
SubscriptionSequenceType: AsyncSequence & Sendable
> where
>
where
SubscriptionSequenceType.Element == GraphQLResult
{
let messenger: Messenger
Expand DownExpand Up@@ -39,7 +40,8 @@ public actor Server<
messenger: Messenger,
onInit: @escaping (InitPayload) async throws -> InitPayloadResult,
onExecute: @escaping (GraphQLRequest, InitPayloadResult) async throws -> GraphQLResult,
onSubscribe: @escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onSubscribe:
@escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onOperationComplete: @escaping (String) async throws -> Void = { _ in },
onOperationError: @escaping (String, [Error]) async throws -> Void = { _, _ in }
) {
Expand All@@ -53,7 +55,8 @@ public actor Server<

/// Listen and react to the provided async sequence of client messages. This function will block until the stream is completed.
/// - Parameter incoming: The client message sequence that the server should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -77,7 +80,12 @@ public actor Server<
// handle incoming message
switch request.type {
case .GQL_CONNECTION_INIT:
guard let connectionInitRequest = try? decoder.decode(ConnectionInitRequest<InitPayload>.self, from: json) else {
guard
let connectionInitRequest = try? decoder.decode(
ConnectionInitRequest<InitPayload>.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_INIT))
return
}
Expand All@@ -95,7 +103,12 @@ public actor Server<
}
try await onStop(stopRequest)
case .GQL_CONNECTION_TERMINATE:
guard let connectionTerminateRequest = try? decoder.decode(ConnectionTerminateRequest.self, from: json) else {
guard
let connectionTerminateRequest = try? decoder.decode(
ConnectionTerminateRequest.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_TERMINATE))
return
}
Expand All@@ -110,7 +123,10 @@ public actor Server<
subscriptionTasks.values.forEach { $0.cancel() }
}

private func onConnectionInit(_ connectionInitRequest: ConnectionInitRequest<InitPayload>, _: Messenger) async throws {
private func onConnectionInit(
_ connectionInitRequest: ConnectionInitRequest<InitPayload>,
_: Messenger
) async throws {
guard !initialized else {
try await error(.tooManyInitializations())
return
Expand DownExpand Up@@ -189,7 +205,9 @@ public actor Server<
try await onOperationComplete(id)
}

private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger) async throws {
private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger)
async throws
{
for (_, subscriptionTask) in subscriptionTasks {
subscriptionTask.cancel()
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
2 changes: 1 addition & 1 deletion Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ let package = Package(
.library(
name: "GraphQLWS",
targets: ["GraphQLWS"]
),
)
],
dependencies: [
.package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "3.0.0"),
Expand Down
38 changes: 30 additions & 8 deletions Sources/GraphQLWS/Client.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,14 @@ public actor Client<InitPayload: Equatable & Codable> {
/// - onComplete: The callback run on receipt of a `complete` message
public init(
messenger: Messenger,
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = { _, _ in },
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in },
onConnectionKeepAlive: @escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = {
_,
_ in
},
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in
},
onConnectionKeepAlive:
@escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onData: @escaping (DataResponse, Client) async throws -> Void = { _, _ in },
onError: @escaping (ErrorResponse, Client) async throws -> Void = { _, _ in },
onComplete: @escaping (CompleteResponse, Client) async throws -> Void = { _, _ in }
Expand All@@ -45,7 +50,8 @@ public actor Client<InitPayload: Equatable & Codable> {

/// Listen and react to the provided async sequence of server messages. This function will block until the stream is completed.
/// - Parameter incoming: The server message sequence that the client should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -68,19 +74,34 @@ public actor Client<InitPayload: Equatable & Codable> {

switch response.type {
case .GQL_CONNECTION_ERROR:
guard let connectionErrorResponse = try? decoder.decode(ConnectionErrorResponse.self, from: json) else {
guard
let connectionErrorResponse = try? decoder.decode(
ConnectionErrorResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionError(connectionErrorResponse, self)
case .GQL_CONNECTION_ACK:
guard let connectionAckResponse = try? decoder.decode(ConnectionAckResponse.self, from: json) else {
guard
let connectionAckResponse = try? decoder.decode(
ConnectionAckResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionAck(connectionAckResponse, self)
case .GQL_CONNECTION_KEEP_ALIVE:
guard let connectionKeepAliveResponse = try? decoder.decode(ConnectionKeepAliveResponse.self, from: json) else {
guard
let connectionKeepAliveResponse = try? decoder.decode(
ConnectionKeepAliveResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_KEEP_ALIVE))
return
}
Expand All@@ -98,7 +119,8 @@ public actor Client<InitPayload: Equatable & Codable> {
}
try await onError(errorResponse, self)
case .GQL_COMPLETE:
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json) else {
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json)
else {
try await error(.invalidResponseFormat(messageType: .GQL_COMPLETE))
return
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/GraphQLWS/Messenger.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import Foundation
public protocol Messenger: Sendable {
/// Send a message through this messenger
/// - Parameter message: The message to send
func send<S: Sendable & Collection>(_ message: S) async throws -> Void where S.Element == Character
func send<S: Sendable & Collection>(_ message: S) async throws where S.Element == Character

/// Close the messenger
func close() async throws
Expand Down
48 changes: 30 additions & 18 deletions Sources/GraphQLWS/Requests.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionInitRequest<InitPayload: Codable & Equatable>: Equatable
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_INIT {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
)
)
}
payload = try container.decode(InitPayload.self, forKey: .payload)
}
Expand All@@ -41,10 +44,12 @@ public struct StartRequest: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_START {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
)
)
}
payload = try container.decode(GraphQLRequest.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -62,11 +67,14 @@ public struct StopRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand All@@ -80,11 +88,15 @@ public struct ConnectionTerminateRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
)
)
}
}
}
Expand Down
67 changes: 42 additions & 25 deletions Sources/GraphQLWS/Responses.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionAckResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ACK {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -39,10 +42,13 @@ public struct ConnectionErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -59,11 +65,16 @@ public struct ConnectionKeepAliveResponse: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_KEEP_ALIVE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
))
if try container.decode(ResponseMessageType.self, forKey: .type)
!= .GQL_CONNECTION_KEEP_ALIVE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -83,10 +94,12 @@ public struct DataResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_DATA {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
)
)
}
payload = try container.decodeIfPresent(GraphQLResult.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -105,10 +118,12 @@ public struct CompleteResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_COMPLETE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand DownExpand Up@@ -136,10 +151,12 @@ public struct ErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
)
)
}
payload = try container.decode([GraphQLError].self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand Down
32 changes: 25 additions & 7 deletions Sources/GraphQLWS/Server.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ public actor Server<
InitPayload: Equatable & Codable & Sendable,
InitPayloadResult: Sendable,
SubscriptionSequenceType: AsyncSequence & Sendable
> where
>
where
SubscriptionSequenceType.Element == GraphQLResult
{
let messenger: Messenger
Expand DownExpand Up@@ -39,7 +40,8 @@ public actor Server<
messenger: Messenger,
onInit: @escaping (InitPayload) async throws -> InitPayloadResult,
onExecute: @escaping (GraphQLRequest, InitPayloadResult) async throws -> GraphQLResult,
onSubscribe: @escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onSubscribe:
@escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onOperationComplete: @escaping (String) async throws -> Void = { _ in },
onOperationError: @escaping (String, [Error]) async throws -> Void = { _, _ in }
) {
Expand All@@ -53,7 +55,8 @@ public actor Server<

/// Listen and react to the provided async sequence of client messages. This function will block until the stream is completed.
/// - Parameter incoming: The client message sequence that the server should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -77,7 +80,12 @@ public actor Server<
// handle incoming message
switch request.type {
case .GQL_CONNECTION_INIT:
guard let connectionInitRequest = try? decoder.decode(ConnectionInitRequest<InitPayload>.self, from: json) else {
guard
let connectionInitRequest = try? decoder.decode(
ConnectionInitRequest<InitPayload>.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_INIT))
return
}
Expand All@@ -95,7 +103,12 @@ public actor Server<
}
try await onStop(stopRequest)
case .GQL_CONNECTION_TERMINATE:
guard let connectionTerminateRequest = try? decoder.decode(ConnectionTerminateRequest.self, from: json) else {
guard
let connectionTerminateRequest = try? decoder.decode(
ConnectionTerminateRequest.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_TERMINATE))
return
}
Expand All@@ -110,7 +123,10 @@ public actor Server<
subscriptionTasks.values.forEach { $0.cancel() }
}

private func onConnectionInit(_ connectionInitRequest: ConnectionInitRequest<InitPayload>, _: Messenger) async throws {
private func onConnectionInit(
_ connectionInitRequest: ConnectionInitRequest<InitPayload>,
_: Messenger
) async throws {
guard !initialized else {
try await error(.tooManyInitializations())
return
Expand DownExpand Up@@ -189,7 +205,9 @@ public actor Server<
try await onOperationComplete(id)
}

private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger) async throws {
private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger)
async throws
{
for (_, subscriptionTask) in subscriptionTasks {
subscriptionTask.cancel()
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
2 changes: 1 addition & 1 deletion Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ let package = Package(
.library(
name: "GraphQLWS",
targets: ["GraphQLWS"]
),
)
],
dependencies: [
.package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "3.0.0"),
Expand Down
38 changes: 30 additions & 8 deletions Sources/GraphQLWS/Client.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,14 @@ public actor Client<InitPayload: Equatable & Codable> {
/// - onComplete: The callback run on receipt of a `complete` message
public init(
messenger: Messenger,
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = { _, _ in },
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in },
onConnectionKeepAlive: @escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = {
_,
_ in
},
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in
},
onConnectionKeepAlive:
@escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onData: @escaping (DataResponse, Client) async throws -> Void = { _, _ in },
onError: @escaping (ErrorResponse, Client) async throws -> Void = { _, _ in },
onComplete: @escaping (CompleteResponse, Client) async throws -> Void = { _, _ in }
Expand All@@ -45,7 +50,8 @@ public actor Client<InitPayload: Equatable & Codable> {

/// Listen and react to the provided async sequence of server messages. This function will block until the stream is completed.
/// - Parameter incoming: The server message sequence that the client should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -68,19 +74,34 @@ public actor Client<InitPayload: Equatable & Codable> {

switch response.type {
case .GQL_CONNECTION_ERROR:
guard let connectionErrorResponse = try? decoder.decode(ConnectionErrorResponse.self, from: json) else {
guard
let connectionErrorResponse = try? decoder.decode(
ConnectionErrorResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionError(connectionErrorResponse, self)
case .GQL_CONNECTION_ACK:
guard let connectionAckResponse = try? decoder.decode(ConnectionAckResponse.self, from: json) else {
guard
let connectionAckResponse = try? decoder.decode(
ConnectionAckResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionAck(connectionAckResponse, self)
case .GQL_CONNECTION_KEEP_ALIVE:
guard let connectionKeepAliveResponse = try? decoder.decode(ConnectionKeepAliveResponse.self, from: json) else {
guard
let connectionKeepAliveResponse = try? decoder.decode(
ConnectionKeepAliveResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_KEEP_ALIVE))
return
}
Expand All@@ -98,7 +119,8 @@ public actor Client<InitPayload: Equatable & Codable> {
}
try await onError(errorResponse, self)
case .GQL_COMPLETE:
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json) else {
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json)
else {
try await error(.invalidResponseFormat(messageType: .GQL_COMPLETE))
return
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/GraphQLWS/Messenger.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import Foundation
public protocol Messenger: Sendable {
/// Send a message through this messenger
/// - Parameter message: The message to send
func send<S: Sendable & Collection>(_ message: S) async throws -> Void where S.Element == Character
func send<S: Sendable & Collection>(_ message: S) async throws where S.Element == Character

/// Close the messenger
func close() async throws
Expand Down
48 changes: 30 additions & 18 deletions Sources/GraphQLWS/Requests.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionInitRequest<InitPayload: Codable & Equatable>: Equatable
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_INIT {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
)
)
}
payload = try container.decode(InitPayload.self, forKey: .payload)
}
Expand All@@ -41,10 +44,12 @@ public struct StartRequest: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_START {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
)
)
}
payload = try container.decode(GraphQLRequest.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -62,11 +67,14 @@ public struct StopRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand All@@ -80,11 +88,15 @@ public struct ConnectionTerminateRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
)
)
}
}
}
Expand Down
67 changes: 42 additions & 25 deletions Sources/GraphQLWS/Responses.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionAckResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ACK {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -39,10 +42,13 @@ public struct ConnectionErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -59,11 +65,16 @@ public struct ConnectionKeepAliveResponse: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_KEEP_ALIVE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
))
if try container.decode(ResponseMessageType.self, forKey: .type)
!= .GQL_CONNECTION_KEEP_ALIVE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -83,10 +94,12 @@ public struct DataResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_DATA {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
)
)
}
payload = try container.decodeIfPresent(GraphQLResult.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -105,10 +118,12 @@ public struct CompleteResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_COMPLETE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand DownExpand Up@@ -136,10 +151,12 @@ public struct ErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
)
)
}
payload = try container.decode([GraphQLError].self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand Down
32 changes: 25 additions & 7 deletions Sources/GraphQLWS/Server.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ public actor Server<
InitPayload: Equatable & Codable & Sendable,
InitPayloadResult: Sendable,
SubscriptionSequenceType: AsyncSequence & Sendable
> where
>
where
SubscriptionSequenceType.Element == GraphQLResult
{
let messenger: Messenger
Expand DownExpand Up@@ -39,7 +40,8 @@ public actor Server<
messenger: Messenger,
onInit: @escaping (InitPayload) async throws -> InitPayloadResult,
onExecute: @escaping (GraphQLRequest, InitPayloadResult) async throws -> GraphQLResult,
onSubscribe: @escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onSubscribe:
@escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onOperationComplete: @escaping (String) async throws -> Void = { _ in },
onOperationError: @escaping (String, [Error]) async throws -> Void = { _, _ in }
) {
Expand All@@ -53,7 +55,8 @@ public actor Server<

/// Listen and react to the provided async sequence of client messages. This function will block until the stream is completed.
/// - Parameter incoming: The client message sequence that the server should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -77,7 +80,12 @@ public actor Server<
// handle incoming message
switch request.type {
case .GQL_CONNECTION_INIT:
guard let connectionInitRequest = try? decoder.decode(ConnectionInitRequest<InitPayload>.self, from: json) else {
guard
let connectionInitRequest = try? decoder.decode(
ConnectionInitRequest<InitPayload>.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_INIT))
return
}
Expand All@@ -95,7 +103,12 @@ public actor Server<
}
try await onStop(stopRequest)
case .GQL_CONNECTION_TERMINATE:
guard let connectionTerminateRequest = try? decoder.decode(ConnectionTerminateRequest.self, from: json) else {
guard
let connectionTerminateRequest = try? decoder.decode(
ConnectionTerminateRequest.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_TERMINATE))
return
}
Expand All@@ -110,7 +123,10 @@ public actor Server<
subscriptionTasks.values.forEach { $0.cancel() }
}

private func onConnectionInit(_ connectionInitRequest: ConnectionInitRequest<InitPayload>, _: Messenger) async throws {
private func onConnectionInit(
_ connectionInitRequest: ConnectionInitRequest<InitPayload>,
_: Messenger
) async throws {
guard !initialized else {
try await error(.tooManyInitializations())
return
Expand DownExpand Up@@ -189,7 +205,9 @@ public actor Server<
try await onOperationComplete(id)
}

private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger) async throws {
private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger)
async throws
{
for (_, subscriptionTask) in subscriptionTasks {
subscriptionTask.cancel()
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
2 changes: 1 addition & 1 deletion Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ let package = Package(
.library(
name: "GraphQLWS",
targets: ["GraphQLWS"]
),
)
],
dependencies: [
.package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "3.0.0"),
Expand Down
38 changes: 30 additions & 8 deletions Sources/GraphQLWS/Client.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,14 @@ public actor Client<InitPayload: Equatable & Codable> {
/// - onComplete: The callback run on receipt of a `complete` message
public init(
messenger: Messenger,
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = { _, _ in },
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in },
onConnectionKeepAlive: @escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onConnectionError: @escaping (ConnectionErrorResponse, Client) async throws -> Void = {
_,
_ in
},
onConnectionAck: @escaping (ConnectionAckResponse, Client) async throws -> Void = { _, _ in
},
onConnectionKeepAlive:
@escaping (ConnectionKeepAliveResponse, Client) async throws -> Void = { _, _ in },
onData: @escaping (DataResponse, Client) async throws -> Void = { _, _ in },
onError: @escaping (ErrorResponse, Client) async throws -> Void = { _, _ in },
onComplete: @escaping (CompleteResponse, Client) async throws -> Void = { _, _ in }
Expand All@@ -45,7 +50,8 @@ public actor Client<InitPayload: Equatable & Codable> {

/// Listen and react to the provided async sequence of server messages. This function will block until the stream is completed.
/// - Parameter incoming: The server message sequence that the client should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -68,19 +74,34 @@ public actor Client<InitPayload: Equatable & Codable> {

switch response.type {
case .GQL_CONNECTION_ERROR:
guard let connectionErrorResponse = try? decoder.decode(ConnectionErrorResponse.self, from: json) else {
guard
let connectionErrorResponse = try? decoder.decode(
ConnectionErrorResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionError(connectionErrorResponse, self)
case .GQL_CONNECTION_ACK:
guard let connectionAckResponse = try? decoder.decode(ConnectionAckResponse.self, from: json) else {
guard
let connectionAckResponse = try? decoder.decode(
ConnectionAckResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_ERROR))
return
}
try await onConnectionAck(connectionAckResponse, self)
case .GQL_CONNECTION_KEEP_ALIVE:
guard let connectionKeepAliveResponse = try? decoder.decode(ConnectionKeepAliveResponse.self, from: json) else {
guard
let connectionKeepAliveResponse = try? decoder.decode(
ConnectionKeepAliveResponse.self,
from: json
)
else {
try await error(.invalidResponseFormat(messageType: .GQL_CONNECTION_KEEP_ALIVE))
return
}
Expand All@@ -98,7 +119,8 @@ public actor Client<InitPayload: Equatable & Codable> {
}
try await onError(errorResponse, self)
case .GQL_COMPLETE:
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json) else {
guard let completeResponse = try? decoder.decode(CompleteResponse.self, from: json)
else {
try await error(.invalidResponseFormat(messageType: .GQL_COMPLETE))
return
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/GraphQLWS/Messenger.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import Foundation
public protocol Messenger: Sendable {
/// Send a message through this messenger
/// - Parameter message: The message to send
func send<S: Sendable & Collection>(_ message: S) async throws -> Void where S.Element == Character
func send<S: Sendable & Collection>(_ message: S) async throws where S.Element == Character

/// Close the messenger
func close() async throws
Expand Down
48 changes: 30 additions & 18 deletions Sources/GraphQLWS/Requests.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionInitRequest<InitPayload: Codable & Equatable>: Equatable
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_INIT {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_INIT.type)`"
)
)
}
payload = try container.decode(InitPayload.self, forKey: .payload)
}
Expand All@@ -41,10 +44,12 @@ public struct StartRequest: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_START {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_START.type)`"
)
)
}
payload = try container.decode(GraphQLRequest.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -62,11 +67,14 @@ public struct StopRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_STOP.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand All@@ -80,11 +88,15 @@ public struct ConnectionTerminateRequest: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
))
if try container.decode(RequestMessageType.self, forKey: .type) != .GQL_CONNECTION_TERMINATE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(RequestMessageType.GQL_CONNECTION_TERMINATE.type)`"
)
)
}
}
}
Expand Down
67 changes: 42 additions & 25 deletions Sources/GraphQLWS/Responses.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,10 +18,13 @@ public struct ConnectionAckResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ACK {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ACK.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -39,10 +42,13 @@ public struct ConnectionErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_ERROR.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -59,11 +65,16 @@ public struct ConnectionKeepAliveResponse: Equatable, JsonEncodable {

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_CONNECTION_KEEP_ALIVE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
))
if try container.decode(ResponseMessageType.self, forKey: .type)
!= .GQL_CONNECTION_KEEP_ALIVE
{
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription:
"type must be `\(ResponseMessageType.GQL_CONNECTION_KEEP_ALIVE.type)`"
)
)
}
payload = try container.decodeIfPresent([String: Map].self, forKey: .payload)
}
Expand All@@ -83,10 +94,12 @@ public struct DataResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_DATA {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_DATA.type)`"
)
)
}
payload = try container.decodeIfPresent(GraphQLResult.self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand All@@ -105,10 +118,12 @@ public struct CompleteResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_COMPLETE {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_COMPLETE.type)`"
)
)
}
id = try container.decode(String.self, forKey: .id)
}
Expand DownExpand Up@@ -136,10 +151,12 @@ public struct ErrorResponse: Equatable, JsonEncodable {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: Self.CodingKeys.self)
if try container.decode(ResponseMessageType.self, forKey: .type) != .GQL_ERROR {
throw DecodingError.dataCorrupted(.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
))
throw DecodingError.dataCorrupted(
.init(
codingPath: decoder.codingPath,
debugDescription: "type must be `\(ResponseMessageType.GQL_ERROR.type)`"
)
)
}
payload = try container.decode([GraphQLError].self, forKey: .payload)
id = try container.decode(String.self, forKey: .id)
Expand Down
32 changes: 25 additions & 7 deletions Sources/GraphQLWS/Server.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ public actor Server<
InitPayload: Equatable & Codable & Sendable,
InitPayloadResult: Sendable,
SubscriptionSequenceType: AsyncSequence & Sendable
> where
>
where
SubscriptionSequenceType.Element == GraphQLResult
{
let messenger: Messenger
Expand DownExpand Up@@ -39,7 +40,8 @@ public actor Server<
messenger: Messenger,
onInit: @escaping (InitPayload) async throws -> InitPayloadResult,
onExecute: @escaping (GraphQLRequest, InitPayloadResult) async throws -> GraphQLResult,
onSubscribe: @escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onSubscribe:
@escaping (GraphQLRequest, InitPayloadResult) async throws -> SubscriptionSequenceType,
onOperationComplete: @escaping (String) async throws -> Void = { _ in },
onOperationError: @escaping (String, [Error]) async throws -> Void = { _, _ in }
) {
Expand All@@ -53,7 +55,8 @@ public actor Server<

/// Listen and react to the provided async sequence of client messages. This function will block until the stream is completed.
/// - Parameter incoming: The client message sequence that the server should react to.
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws -> Void where A.Element == String {
public func listen<A: AsyncSequence & Sendable>(to incoming: A) async throws
where A.Element == String {
for try await message in incoming {
// Detect and ignore error responses.
if message.starts(with: "44") {
Expand All@@ -77,7 +80,12 @@ public actor Server<
// handle incoming message
switch request.type {
case .GQL_CONNECTION_INIT:
guard let connectionInitRequest = try? decoder.decode(ConnectionInitRequest<InitPayload>.self, from: json) else {
guard
let connectionInitRequest = try? decoder.decode(
ConnectionInitRequest<InitPayload>.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_INIT))
return
}
Expand All@@ -95,7 +103,12 @@ public actor Server<
}
try await onStop(stopRequest)
case .GQL_CONNECTION_TERMINATE:
guard let connectionTerminateRequest = try? decoder.decode(ConnectionTerminateRequest.self, from: json) else {
guard
let connectionTerminateRequest = try? decoder.decode(
ConnectionTerminateRequest.self,
from: json
)
else {
try await error(.invalidRequestFormat(messageType: .GQL_CONNECTION_TERMINATE))
return
}
Expand All@@ -110,7 +123,10 @@ public actor Server<
subscriptionTasks.values.forEach { $0.cancel() }
}

private func onConnectionInit(_ connectionInitRequest: ConnectionInitRequest<InitPayload>, _: Messenger) async throws {
private func onConnectionInit(
_ connectionInitRequest: ConnectionInitRequest<InitPayload>,
_: Messenger
) async throws {
guard !initialized else {
try await error(.tooManyInitializations())
return
Expand DownExpand Up@@ -189,7 +205,9 @@ public actor Server<
try await onOperationComplete(id)
}

private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger) async throws {
private func onConnectionTerminate(_: ConnectionTerminateRequest, _ messenger: Messenger)
async throws
{
for (_, subscriptionTask) in subscriptionTasks {
subscriptionTask.cancel()
}
Expand Down
Loading
Loading