Skip to content

Commit 6c99824

Browse files
5d5d
committed
move AppSyncRTC back to API category package
1 parent f616f3b commit 6c99824

13 files changed

+48
-51
lines changed

‎AmplifyPlugins/Internal/Sources/Network/AppSyncRealTimeClient/AppSyncRealTimeClient+HandleRequest.swift renamed to ‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient+HandleRequest.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import Foundation
1010
import Combine
1111
import Amplify
1212

13-
@_spi(AppSyncRTC)
1413
extension AppSyncRealTimeClient {
1514
/**
1615
Submit an AppSync request to real-time server.

‎AmplifyPlugins/Internal/Sources/Network/AppSyncRealTimeClient/AppSyncRealTimeClient.swift renamed to ‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient.swift

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import Foundation
1010
import Combine
1111
import Amplify
12+
@_spi(WebSocket) import AmplifyNetwork
1213

13-
@_spi(AppSyncRTC)
14-
public protocol AppSyncRealTimeClientProtocol {
14+
protocol AppSyncRealTimeClientProtocol {
1515
func connect() async throws
1616
func disconnectWhenIdel() async
1717
func disconnect() async
@@ -23,8 +23,7 @@ public protocol AppSyncRealTimeClientProtocol {
2323
The AppSyncRealTimeClient conforms to the AppSync real-time WebSocket protocol.
2424
ref: https://docs.aws.amazon.com/appsync/latest/devguide/real-time-websocket-client.html
2525
*/
26-
@_spi(AppSyncRTC)
27-
public actor AppSyncRealTimeClient: AppSyncRealTimeClientProtocol {
26+
actor AppSyncRealTimeClient: AppSyncRealTimeClientProtocol {
2827

2928
static let jsonEncoder = JSONEncoder()
3029
static let jsonDecoder = JSONDecoder()
@@ -59,7 +58,7 @@ public actor AppSyncRealTimeClient: AppSyncRealTimeClientProtocol {
5958
/// Writable data stream convert WebSocketEvent to AppSyncRealTimeResponse
6059
internal let subject = PassthroughSubject<AppSyncRealTimeResponse, Never>()
6160

62-
public var isConnected: Bool {
61+
var isConnected: Bool {
6362
self.state.value == .connected
6463
}
6564

@@ -70,7 +69,7 @@ public actor AppSyncRealTimeClient: AppSyncRealTimeClientProtocol {
7069
- requestInterceptor: Interceptor for decocating AppSyncRealTimeRequest
7170
- webSocketClient: WebSocketClient for reading/writing to connection
7271
*/
73-
public init(
72+
init(
7473
endpoint: URL,
7574
requestInterceptor: AppSyncRequestInterceptor,
7675
webSocketClient: AppSyncWebSocketClientProtocol
@@ -93,7 +92,7 @@ public actor AppSyncRealTimeClient: AppSyncRealTimeClientProtocol {
9392
/**
9493
Connecting to remote AppSync real-time server.
9594
*/
96-
public func connect() async throws {
95+
func connect() async throws {
9796
switch self.state.value {
9897
case .connecting, .connected:
9998
log.debug("[AppSyncRealTimeClient] client is already connecting or connected")
@@ -125,7 +124,7 @@ public actor AppSyncRealTimeClient: AppSyncRealTimeClientProtocol {
125124
/**
126125
Disconnect only when there are no subscriptions exist.
127126
*/
128-
public func disconnectWhenIdel() async {
127+
func disconnectWhenIdel() async {
129128
if self.subscriptions.isEmpty {
130129
log.debug("[AppSyncRealTimeClient] no subscription exist, client is trying to disconnect")
131130
await disconnect()
@@ -137,7 +136,7 @@ public actor AppSyncRealTimeClient: AppSyncRealTimeClientProtocol {
137136
/**
138137
Disconnect from AppSync real-time server.
139138
*/
140-
public func disconnect() async {
139+
func disconnect() async {
141140
guard self.state.value != .disconnecting else {
142141
log.debug("[AppSyncRealTimeClient] client already disconnecting")
143142
return
@@ -161,7 +160,7 @@ public actor AppSyncRealTimeClient: AppSyncRealTimeClientProtocol {
161160
- Returns:
162161
A never fail data stream for AppSyncSubscriptionEvent.
163162
*/
164-
public func subscribe(id: String, query: String) async throws -> AnyPublisher<AppSyncSubscriptionEvent, Never> {
163+
func subscribe(id: String, query: String) async throws -> AnyPublisher<AppSyncSubscriptionEvent, Never> {
165164
log.debug("[AppSyncRealTimeClient] Received subscription request id: \(id), query: \(query)")
166165
let subscription = AppSyncRealTimeSubscription(id: id, query: query, appSyncRealTimeClient: self)
167166
subscriptions[id] = subscription

‎AmplifyPlugins/Internal/Sources/Network/AppSyncRealTimeClient/AppSyncRealTimeRequest.swift renamed to ‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeRequest.swift

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@
99
import Foundation
1010
import Amplify
1111

12-
@_spi(AppSyncRTC)
13-
public enum AppSyncRealTimeRequest {
12+
enum AppSyncRealTimeRequest {
1413
case connectionInit
1514
case start(StartRequest)
1615
case stop(String)
1716

18-
public struct StartRequest {
19-
public let id: String
20-
public let data: String
21-
public let auth: AppSyncRealTimeRequestAuth?
17+
struct StartRequest {
18+
let id: String
19+
let data: String
20+
let auth: AppSyncRealTimeRequestAuth?
2221

23-
public init(id: String, data: String, auth: AppSyncRealTimeRequestAuth?) {
22+
init(id: String, data: String, auth: AppSyncRealTimeRequestAuth?) {
2423
self.id = id
2524
self.data = data
2625
self.auth = auth

‎AmplifyPlugins/Internal/Sources/Network/AppSyncRealTimeClient/AppSyncRealTimeRequestAuth.swift renamed to ‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeRequestAuth.swift

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,58 +8,57 @@
88

99
import Foundation
1010

11-
@_spi(AppSyncRTC)
12-
public enum AppSyncRealTimeRequestAuth {
11+
enum AppSyncRealTimeRequestAuth {
1312
case authToken(AuthToken)
1413
case apiKey(ApiKey)
1514
case iam(IAM)
1615

17-
public struct AuthToken {
16+
struct AuthToken {
1817
let host: String
1918
let authToken: String
2019

21-
public init(host: String, authToken: String) {
20+
init(host: String, authToken: String) {
2221
self.host = host
2322
self.authToken = authToken
2423
}
2524
}
2625

27-
public struct ApiKey {
26+
struct ApiKey {
2827
let host: String
2928
let apiKey: String
3029
let amzDate: String
3130

32-
public init(host: String, apiKey: String, amzDate: String) {
31+
init(host: String, apiKey: String, amzDate: String) {
3332
self.host = host
3433
self.apiKey = apiKey
3534
self.amzDate = amzDate
3635
}
3736
}
3837

39-
public struct IAM {
38+
struct IAM {
4039
let host: String
4140
let authToken: String
4241
let securityToken: String
4342
let amzDate: String
4443

45-
public init(host: String, authToken: String, securityToken: String, amzDate: String) {
44+
init(host: String, authToken: String, securityToken: String, amzDate: String) {
4645
self.host = host
4746
self.authToken = authToken
4847
self.securityToken = securityToken
4948
self.amzDate = amzDate
5049
}
5150
}
5251

53-
public struct URLQuery {
52+
struct URLQuery {
5453
let header: AppSyncRealTimeRequestAuth
5554
let payload: String
5655

57-
public init(header: AppSyncRealTimeRequestAuth, payload: String = "{}") {
56+
init(header: AppSyncRealTimeRequestAuth, payload: String = "{}") {
5857
self.header = header
5958
self.payload = payload
6059
}
6160

62-
public func withBaseURL(_ url: URL, encoder: JSONEncoder? = nil) -> URL {
61+
func withBaseURL(_ url: URL, encoder: JSONEncoder? = nil) -> URL {
6362
let jsonEncoder: JSONEncoder = encoder ?? JSONEncoder()
6463
guard let headerJsonData = try? jsonEncoder.encode(header) else {
6564
return url

‎AmplifyPlugins/Internal/Sources/Network/AppSyncRealTimeClient/AppSyncRealTimeResponse.swift renamed to ‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeResponse.swift

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
import Foundation
99
import Amplify
1010

11-
@_spi(AppSyncRTC)
12-
public struct AppSyncRealTimeResponse {
11+
struct AppSyncRealTimeResponse {
1312

14-
public let id: String?
15-
public let payload: JSONValue?
16-
public let type: EventType
13+
let id: String?
14+
let payload: JSONValue?
15+
let type: EventType
1716

18-
public enum EventType: String, Codable {
17+
enum EventType: String, Codable {
1918
case connectionAck = "connection_ack"
2019
case startAck = "start_ack"
2120
case stopAck = "complete"

‎AmplifyPlugins/Internal/Sources/Network/AppSyncRealTimeClient/AppSyncRealTimeSubscription.swift renamed to ‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeSubscription.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
import Foundation
1010
import Combine
1111
import Amplify
12+
@_spi(WebSocket) import AmplifyNetwork
1213

1314
/**
1415
AppSyncRealTimeSubscription reprensents one realtime subscription to AppSync realtime server.
1516
*/
16-
@_spi(AppSyncRTC)
17-
public actor AppSyncRealTimeSubscription {
17+
actor AppSyncRealTimeSubscription {
1818
static let jsonEncoder = JSONEncoder()
1919

20-
public enum State {
20+
enum State {
2121
case none
2222
case subscribing
2323
case subscribed
@@ -36,8 +36,8 @@ public actor AppSyncRealTimeSubscription {
3636

3737
private weak var appSyncRealTimeClient: AppSyncRealTimeClient?
3838

39-
public let id: String
40-
public let query: String
39+
let id: String
40+
let query: String
4141

4242

4343
init(id: String, query: String, appSyncRealTimeClient: AppSyncRealTimeClient) {

‎AmplifyPlugins/Internal/Sources/Network/AppSyncRealTimeClient/AppSyncRequestInterceptor.swift renamed to ‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRequestInterceptor.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import Foundation
1010

11-
@_spi(AppSyncRTC)
12-
public protocol AppSyncRequestInterceptor {
11+
protocol AppSyncRequestInterceptor {
1312
func interceptRequest(event: AppSyncRealTimeRequest, url: URL) async -> AppSyncRealTimeRequest
1413
}

‎AmplifyPlugins/Internal/Sources/Network/AppSyncRealTimeClient/AppSyncSubscriptionEvent.swift renamed to ‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncSubscriptionEvent.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
import Foundation
1010
import Amplify
1111

12-
@_spi(AppSyncRTC)
13-
public enum AppSyncSubscriptionEvent {
12+
enum AppSyncSubscriptionEvent {
1413
case subscribing
1514
case subscribed
1615
case data(JSONValue)

‎AmplifyPlugins/Internal/Sources/Network/AppSyncRealTimeClient/AppSyncWebSocketClientProtocol.swift renamed to ‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncWebSocketClientProtocol.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
import Foundation
1010
import Combine
11+
@_spi(WebSocket) import AmplifyNetwork
1112

12-
@_spi(AppSyncRTC)
13-
public protocol AppSyncWebSocketClientProtocol: AnyObject {
13+
protocol AppSyncWebSocketClientProtocol: AnyObject {
1414
var isConnected: Bool { get async }
1515
var publisher: AnyPublisher<WebSocketEvent, Never> { get async }
1616

‎AmplifyPlugins/Internal/Sources/Network/AppSyncRealTimeClient/README.md renamed to ‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/README.md

File renamed without changes.

0 commit comments

Comments
 (0)