stash

aws-amplify · May 23, 2024 · fccd1d9 · fccd1d9
1 parent 63b4c1b
commit fccd1d9
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 19 deletions.
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeRequest.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeRequest.swift
@@ -16,12 +16,12 @@ public enum AppSyncRealTimeRequest {
     case stop(String)
 
     public struct StartRequest {
-        let id: String
+        public let id: String
         let data: String
         let auth: AppSyncRealTimeRequestAuth?
     }
 
-    var id: String? {
+    public var id: String? {
         switch self {
         case let .start(request): return request.id
         case let .stop(id): return id

diff --git a/...ifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRequestInterceptor.swift b/...ifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRequestInterceptor.swift
@@ -8,6 +8,6 @@
 
 import Foundation
 
-protocol AppSyncRequestInterceptor {
+public protocol AppSyncRequestInterceptor {
     func interceptRequest(event: AppSyncRealTimeRequest, url: URL) async -> AppSyncRealTimeRequest
 }
diff --git a/...ugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncWebSocketClientProtocol.swift b/...ugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncWebSocketClientProtocol.swift
@@ -8,9 +8,9 @@
 
 import Foundation
 import Combine
-@_spi(WebSocket) import AWSPluginsCore
+import AWSPluginsCore
 
-protocol AppSyncWebSocketClientProtocol: AnyObject {
+public protocol AppSyncWebSocketClientProtocol: AnyObject {
     var isConnected: Bool { get async }
     var publisher: AnyPublisher<WebSocketEvent, Never> { get async }
 

diff --git a/.../API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptor.swift b/.../API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptor.swift
@@ -10,18 +10,18 @@ import Foundation
 import Amplify
 @_spi(WebSocket) import AWSPluginsCore
 
-class APIKeyAuthInterceptor {
+public class APIKeyAuthInterceptor {
     private let apiKey: String
     private let getAuthHeader = authHeaderBuilder()
 
-    init(apiKey: String) {
+    public init(apiKey: String) {
         self.apiKey = apiKey
     }
 
 }
 
 extension APIKeyAuthInterceptor: WebSocketInterceptor {
-    func interceptConnection(url: URL) async -> URL {
+    public func interceptConnection(url: URL) async -> URL {
         let authHeader = getAuthHeader(apiKey, AppSyncRealTimeClientFactory.appSyncApiEndpoint(url).host!)
         return AppSyncRealTimeRequestAuth.URLQuery(
             header: .apiKey(authHeader)
@@ -30,7 +30,7 @@ extension APIKeyAuthInterceptor: WebSocketInterceptor {
 }
 
 extension APIKeyAuthInterceptor: AppSyncRequestInterceptor {
-    func interceptRequest(event: AppSyncRealTimeRequest, url: URL) async -> AppSyncRealTimeRequest {
+    public func interceptRequest(event: AppSyncRealTimeRequest, url: URL) async -> AppSyncRealTimeRequest {
         let host = AppSyncRealTimeClientFactory.appSyncApiEndpoint(url).host!
         guard case .start(let request) = event else {
             return event

diff --git a/...fyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift b/...fyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift
@@ -130,7 +130,7 @@ extension AppSyncRealTimeClientFactory {
      1. api.example.com/graphql -> api.example.com/graphql/realtime
      2. abc.appsync-api.us-east-1.amazonaws.com/graphql -> abc.appsync-realtime-api.us-east-1.amazonaws.com/graphql
      */
-    static func appSyncRealTimeEndpoint(_ url: URL) -> URL {
+    public static func appSyncRealTimeEndpoint(_ url: URL) -> URL {
         guard let host = url.host else {
             return url
         }

diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Support/Constants/URLRequestConstants.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Support/Constants/URLRequestConstants.swift
@@ -8,17 +8,17 @@
 import Foundation
 
 // TODO: remove this https://github.com/aws-amplify/amplify-ios/issues/75
-struct URLRequestConstants {
+public struct URLRequestConstants {
     static let appSyncServiceName = "appsync"
     static let apiGatewayServiceName = "execute-api"
 
-    struct Header {
+    public struct Header {
         static let xAmzDate = "X-Amz-Date"
         static let contentType = "Content-Type"
-        static let userAgent = "User-Agent"
+        public static let userAgent = "User-Agent"
         static let xApiKey = "x-api-key"
         static let host = "Host"
-        static let webSocketSubprotocols = "Sec-WebSocket-Protocol"
+        public static let webSocketSubprotocols = "Sec-WebSocket-Protocol"
     }
 
     struct ContentType {

diff --git a/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/AmplifyNetworkMonitor.swift b/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/AmplifyNetworkMonitor.swift
@@ -9,7 +9,6 @@
 import Network
 import Combine
 
-@_spi(WebSocket)
 public final class AmplifyNetworkMonitor {
 
     public enum State {

diff --git a/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketClient.swift b/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketClient.swift
@@ -14,7 +14,7 @@ import Combine
  WebSocketClient wraps URLSessionWebSocketTask and offers
  an abstraction of the data stream in the form of WebSocketEvent.
  */
-@_spi(WebSocket)
+
 public final actor WebSocketClient: NSObject {
     public enum Error: Swift.Error {
         case connectionLost

diff --git a/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketEvent.swift b/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketEvent.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-@_spi(WebSocket)
 public enum WebSocketEvent {
     case connected
     case disconnected(URLSessionWebSocketTask.CloseCode, String?)

diff --git a/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketInterceptor.swift b/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketInterceptor.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-@_spi(WebSocket)
 public protocol WebSocketInterceptor {
     func interceptConnection(url: URL) async -> URL
 }
diff --git a/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketNetworkMonitorProtocol.swift b/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketNetworkMonitorProtocol.swift
@@ -9,7 +9,6 @@
 import Foundation
 import Combine
 
-@_spi(WebSocket)
 public protocol WebSocketNetworkMonitorProtocol {
     var publisher: AnyPublisher<(AmplifyNetworkMonitor.State, AmplifyNetworkMonitor.State), Never> { get }
     func updateState(_ nextState: AmplifyNetworkMonitor.State) async