Skip to content

Make AppStoreServerAPIClient an actor #103

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+63 −64
Open

Make AppStoreServerAPIClient an actor #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Sources/AppStoreServerLibrary/AppStoreServerAPIClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import AsyncHTTPClient
import NIOHTTP1
import NIOFoundationCompat

public class AppStoreServerAPIClient {
public actor AppStoreServerAPIClient: Sendable {

public enum ConfigurationError: Error, Hashable, Sendable {
/// Xcode is not a supported environment for an AppStoreServerAPIClient
Expand All @@ -26,6 +26,9 @@ public class AppStoreServerAPIClient {
private let bundleId: String
private let url: String
private let client: HTTPClient
// For testing purposes
private var executeRequestOverride: (@Sendable (HTTPClientRequest, Data?) async throws -> HTTPClientResponse)?

///Create an App Store Server API client
///
///- Parameter signingKey: Your private key downloaded from App Store Connect
Expand All @@ -37,6 +40,7 @@ public class AppStoreServerAPIClient {
self.keyId = keyId
self.issuerId = issuerId
self.bundleId = bundleId
self.executeRequestOverride = nil
switch(environment) {
case .xcode:
throw ConfigurationError.invalidEnvironment
Expand All @@ -56,6 +60,11 @@ public class AppStoreServerAPIClient {
deinit {
try? self.client.syncShutdown()
}

// Test helper method to set request override
internal func setExecuteRequestOverride(_ override: @escaping @Sendable (HTTPClientRequest, Data?) async throws -> HTTPClientResponse) {
self.executeRequestOverride = override
}

private enum RequestBody {
case encodable(any Encodable)
Expand Down Expand Up @@ -138,6 +147,9 @@ public class AppStoreServerAPIClient {

// requestBody passed for testing purposes
internal func executeRequest(_ urlRequest: HTTPClientRequest, _ requestBody: Data?) async throws -> HTTPClientResponse {
if let override = executeRequestOverride {
return try await override(urlRequest, requestBody)
}
return try await self.client.execute(urlRequest, timeout: .seconds(30))
}

Expand Down
Loading