Skip to content

[none]: refactor connection #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tayloraswift wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[none]: refactor connection #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b3e20d
refactor connection
tayloraswift Apr 30, 2026
e921d6a
feedback
tayloraswift Apr 30, 2026
6bd1628
status
tayloraswift Apr 30, 2026
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
178 changes: 83 additions & 95 deletions Sources/GitHubClient/GitHub.Client.Connection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
public import GitHubAPI
public import HTTPClient
public import JSON
import NIOCore
public import NIOCore
public import NIOHPACK
public import UnixTime

Expand All @@ -22,55 +22,81 @@ extension GitHub.Client {
}
}
}
extension GitHub.Client<Void>.Connection {
/// Run a GraphQL API request.
///
/// The request will be charged to the user associated with the stored token. It is not
/// possible to run a GraphQL API request without a token.
@inlinable public func post<T>(
query: String,
expecting _: T.Type = T.self,
with authorization: GitHub.ClientAuthorization
) async throws -> GraphQL.Response<T>
where T: JSONDecodable {
let request: HTTP.Client2.Request = .init(
headers: [
":method": "POST",
":scheme": "https",
":authority": self.http2.remote,
":path": "/graphql",
extension GitHub.Client.Connection {
@inlinable func fetch(
Comment thread
tayloraswift marked this conversation as resolved.
Comment thread
tayloraswift marked this conversation as resolved.
from endpoint: String,
with authorization: GitHub.ClientAuthorization,
method: String,
body: ByteBuffer?
) async throws -> JSON {
var endpoint: String = endpoint
var status: UInt? = nil

"authorization": authorization.header,
following:
for _: Int in 0 ... 1 {
let request: HTTP.Client2.Request = .init(
headers: [
":method": method,
":scheme": "https",
":authority": self.http2.remote,
":path": endpoint,

"authorization": authorization.header,
// GitHub will reject the API request if the user-agent is not set.
"user-agent": self.agent,
"accept": "application/vnd.github+json"
],
body: body
)

// GitHub will reject the API request if the user-agent is not set.
"user-agent": self.agent,
"accept": "application/vnd.github+json"
],
body: self.http2.buffer(string: query)
)
let response: HTTP.Client2.Facet = try await self.http2.fetch(request)
Comment thread
tayloraswift marked this conversation as resolved.
status = response.status

/// GraphQL should never return redirects.
let response: HTTP.Client2.Facet = try await self.http2.fetch(request)
// TODO: support If-None-Match
switch response.status {
case 200?:
return JSON.init(utf8: response.body[...])

switch response.status {
case 200?:
let json: JSON = .init(utf8: response.body[...])
return try json.decode()

case 403?:
if let second: String = response.headers?["x-ratelimit-reset"].first,
let second: Int64 = .init(second) {
throw GitHub.Client<Application>.RateLimitError.init(until: .second(second))
} else {
fallthrough
case 301?:
if let location: String = response.headers?["location"].first {
endpoint = .init(location.trimmingPrefix("https://\(self.http2.remote)"))
continue following
}

case 403?:
if let second: String = response.headers?["x-ratelimit-reset"].first,
let second: Int64 = .init(second) {
throw GitHub.Client<Application>.RateLimitError.init(
until: .second(second)
)
}

case _:
break
}

case _:
throw HTTP.StatusError.init(code: response.status)
break following
}

throw HTTP.StatusError.init(code: status)
}
}
extension GitHub.Client.Connection {
/// Run a REST API request with the given credentials, following up to one redirect.
@inlinable public func get<Response>(
expecting _: Response.Type = Response.self,
from endpoint: String,
with authorization: GitHub.ClientAuthorization
) async throws -> Response where Response: JSONDecodable {
let json: JSON = try await self.fetch(
from: endpoint,
with: authorization,
method: "GET",
body: nil
)
return try json.decode()
}

@discardableResult
@inlinable public func post(
to endpoint: String,
Expand Down Expand Up @@ -135,62 +161,24 @@ extension GitHub.Client.Connection {
return (status, try json.decode())
}
}

/// Run a REST API request with the given credentials, following up to one redirect.
@inlinable public func get<Response>(
expecting _: Response.Type = Response.self,
from endpoint: String,
}
extension GitHub.Client<()>.Connection {
Comment thread
tayloraswift marked this conversation as resolved.
/// Run a GraphQL API request.
///
/// The request will be charged to the user associated with the stored token. It is not
/// possible to run a GraphQL API request without a token.
@inlinable public func post<T>(
query: String,
expecting _: T.Type = T.self,
with authorization: GitHub.ClientAuthorization
) async throws -> Response
where Response: JSONDecodable {
var endpoint: String = endpoint
var status: UInt? = nil

following:
for _: Int in 0 ... 1 {
let request: HPACKHeaders = [
":method": "GET",
":scheme": "https",
":authority": self.http2.remote,
":path": endpoint,

"authorization": authorization.header,
// GitHub will reject the API request if the user-agent is not set.
"user-agent": self.agent,
"accept": "application/vnd.github+json"
]

let response: HTTP.Client2.Facet = try await self.http2.fetch(request)

// TODO: support If-None-Match
switch response.status {
case 200?:
let json: JSON = .init(utf8: response.body[...])
return try json.decode()

case 301?:
if let location: String = response.headers?["location"].first {
endpoint = .init(location.trimmingPrefix("https://\(self.http2.remote)"))
continue following
}

case 403?:
if let second: String = response.headers?["x-ratelimit-reset"].first,
let second: Int64 = .init(second) {
throw GitHub.Client<GitHub.OAuth>.RateLimitError.init(
until: .second(second)
)
}

case _:
break
}

status = response.status
break following
}

throw HTTP.StatusError.init(code: status)
) async throws -> GraphQL.Response<T> where T: JSONDecodable {
let json: JSON = try await self.fetch(
from: "/graphql",
with: authorization,
method: "POST",
body: self.http2.buffer(string: query),
)
Comment thread
tayloraswift marked this conversation as resolved.
return try json.decode()
}
}
extension GitHub.Client<GitHub.OAuth>.Connection {
Expand Down