Skip to content
Open
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
9 changes: 9 additions & 0 deletions Package.resolved

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

4 changes: 3 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@ let package = Package(
.package(
url: "https://github.com/apollographql/apollo-ios.git",
exact: "1.17.0" // Do not forget to download related to this version Apollo CLI and include it with package
)
),
.package(url: "https://github.com/futuredapp/FTNetworkTracer", from: "0.2.0")
],
targets: [
.target(
name: "GraphQLAPIKit",
dependencies: [
.product(name: "Apollo", package: "apollo-ios"),
.product(name: "FTNetworkTracer", package: "FTNetworkTracer")
]
)
]
Expand Down
115 changes: 98 additions & 17 deletions Sources/GraphQLAPIKit/GraphQLAPIAdapter.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Apollo
import ApolloAPI
import Foundation
import FTNetworkTracer

public protocol GraphQLAPIAdapterProtocol: AnyObject {
/// Fetches a query from the server
Expand All @@ -18,7 +19,7 @@ public protocol GraphQLAPIAdapterProtocol: AnyObject {
queue: DispatchQueue,
resultHandler: @escaping (Result<Query.Data, GraphQLAPIAdapterError>) -> Void
) -> Cancellable

/// Performs a mutation by sending it to the server.
///
/// - Parameters:
Expand All @@ -37,11 +38,14 @@ public protocol GraphQLAPIAdapterProtocol: AnyObject {

public final class GraphQLAPIAdapter: GraphQLAPIAdapterProtocol {
private let apollo: ApolloClientProtocol
private let networkTracer: FTNetworkTracer?
private let url: URL

public init(
url: URL,
urlSessionConfiguration: URLSessionConfiguration = .default,
defaultHeaders: [String: String] = [:]
defaultHeaders: [String: String] = [:],
networkTracer: FTNetworkTracer? = nil
) {
let provider = NetworkInterceptorProvider(
client: URLSessionClient(sessionConfiguration: urlSessionConfiguration),
Expand All @@ -57,32 +61,73 @@ public final class GraphQLAPIAdapter: GraphQLAPIAdapterProtocol {
networkTransport: networkTransport,
store: ApolloStore()
)

self.networkTracer = networkTracer
self.url = url
}

public func fetch<Query>(
query: Query,
context: RequestHeaders?,
queue: DispatchQueue,
resultHandler: @escaping (Result<Query.Data, GraphQLAPIAdapterError>) -> Void
) -> Cancellable where Query : GraphQLQuery {
apollo.fetch(
) -> Cancellable where Query: GraphQLQuery {
let requestId = UUID().uuidString
let startTime = Date()

// Log and track request
networkTracer?.logAndTrackRequest(
url: url.absoluteString,
operationName: Query.operationName,
query: Query.definition?.queryDocument ?? "",
variables: query.__variables,
headers: context?.additionalHeaders,
requestId: requestId
)

return apollo.fetch(
query: query,
cachePolicy: .fetchIgnoringCacheCompletely,
contextIdentifier: nil,
context: context,
queue: queue
) { result in
) { [weak self] result in
guard let self = self else { return }

switch result {
case .success(let result):
case let .success(result):
// Log and track response
self.networkTracer?.logAndTrackResponse(
url: self.url.absoluteString,
operationName: Query.operationName,
statusCode: nil, // We don't have access to status code here
requestId: requestId,
startTime: startTime
)

if let errors = result.errors {
resultHandler(.failure(GraphQLAPIAdapterError(error: ApolloError(errors: errors))))
let error = GraphQLAPIAdapterError(error: ApolloError(errors: errors))
self.networkTracer?.logAndTrackError(
url: self.url.absoluteString,
operationName: Query.operationName,
error: error,
requestId: requestId
)
resultHandler(.failure(error))
} else if let data = result.data {
resultHandler(.success(data))
} else {
assertionFailure("Did not receive no data nor errors")
}
case .failure(let error):
resultHandler(.failure(GraphQLAPIAdapterError(error: error)))
case let .failure(error):
let adaptedError = GraphQLAPIAdapterError(error: error)
self.networkTracer?.logAndTrackError(
url: self.url.absoluteString,
operationName: Query.operationName,
error: adaptedError,
requestId: requestId
)
resultHandler(.failure(adaptedError))
}
}
}
Expand All @@ -92,24 +137,62 @@ public final class GraphQLAPIAdapter: GraphQLAPIAdapterProtocol {
context: RequestHeaders?,
queue: DispatchQueue,
resultHandler: @escaping (Result<Mutation.Data, GraphQLAPIAdapterError>) -> Void
) -> Cancellable where Mutation : GraphQLMutation {
apollo.perform(
) -> Cancellable where Mutation: GraphQLMutation {
let requestId = UUID().uuidString
let startTime = Date()

// Log and track request
networkTracer?.logAndTrackRequest(
url: url.absoluteString,
operationName: Mutation.operationName,
query: Mutation.definition?.queryDocument ?? "",
variables: mutation.__variables,
headers: context?.additionalHeaders,
requestId: requestId
)

return apollo.perform(
mutation: mutation,
publishResultToStore: false,
context: context,
queue: queue
) { result in
) { [weak self] result in
guard let self = self else { return }

switch result {
case .success(let result):
case let .success(result):
// Log and track response
self.networkTracer?.logAndTrackResponse(
url: self.url.absoluteString,
operationName: Mutation.operationName,
statusCode: nil, // We don't have access to status code here
requestId: requestId,
startTime: startTime
)

if let errors = result.errors {
resultHandler(.failure(GraphQLAPIAdapterError(error: ApolloError(errors: errors))))
let error = GraphQLAPIAdapterError(error: ApolloError(errors: errors))
self.networkTracer?.logAndTrackError(
url: self.url.absoluteString,
operationName: Mutation.operationName,
error: error,
requestId: requestId
)
resultHandler(.failure(error))
} else if let data = result.data {
resultHandler(.success(data))
} else {
assertionFailure("Did not receive no data nor errors")
}
case .failure(let error):
resultHandler(.failure(GraphQLAPIAdapterError(error: error)))
let adaptedError = GraphQLAPIAdapterError(error: error)
self.networkTracer?.logAndTrackError(
url: self.url.absoluteString,
operationName: Mutation.operationName,
error: adaptedError,
requestId: requestId
)
resultHandler(.failure(adaptedError))
}
}
}
Expand Down Expand Up @@ -159,5 +242,3 @@ private struct RequestHeaderInterceptor: ApolloInterceptor {
chain.proceedAsync(request: request, response: response, interceptor: self, completion: completion)
}
}