chore: kickoff release

AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient.swift

@@ -54,6 +54,10 @@ actor AppSyncRealTimeClient: AppSyncRealTimeClientProtocol {
  self.state.value == .connected
  }
 
+ internal var numberOfSubscriptions: Int {
+ self.subscriptions.count
+ }
+
  /**
  Creates a new AppSyncRealTimeClient with endpoint, requestInterceptor and webSocketClient.
  - Parameters:

AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift

@@ -44,6 +44,9 @@ public class AWSGraphQLSubscriptionTaskRunner<R: Decodable>: InternalTaskRunner,
  self.apiAuthProviderFactory = apiAuthProviderFactory
  }
 
+ /// When the top-level AmplifyThrowingSequence is canceled, this cancel method is invoked.
+ /// In this situation, we need to send the disconnected event because
+ /// the top-level AmplifyThrowingSequence is terminated immediately upon cancellation.
  public func cancel() {
  self.send(GraphQLSubscriptionEvent<R>.connection(.disconnected))
  Task {
@@ -210,12 +213,7 @@ final public class AWSGraphQLSubscriptionOperation<R: Decodable>: GraphQLSubscri
 
  override public func cancel() {
  super.cancel()
-
- Task { [weak self] in
- guard let self else {
- return
- }
-
+ Task {
  guard let appSyncRealTimeClient = self.appSyncRealTimeClient else {
  return
  }

AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/GraphQLModelBasedTests.swift

@@ -448,6 +448,65 @@ class GraphQLModelBasedTests: XCTestCase {
  await fulfillment(of: [progressInvoked], timeout: TestCommonConstants.networkTimeout)
  }
 
+
+ /// Given: Several subscriptions with Amplify API plugin
+ /// When: Cancel subscriptions
+ /// Then: AppSync real time client automatically unsubscribe and remove the subscription
+ func testCancelledSubscription_automaticallyUnsubscribeAndRemoved() async throws {
+ let numberOfSubscription = 5
+ let allSubscribedExpectation = expectation(description: "All subscriptions are subscribed")
+ allSubscribedExpectation.expectedFulfillmentCount = numberOfSubscription
+
+ let subscriptions = (0..<5).map { _ in
+ Amplify.API.subscribe(request: .subscription(of: Comment.self, type: .onCreate))
+ }
+ subscriptions.forEach { subscription in
+ Task {
+ do {
+ for try await subscriptionEvent in subscription {
+ switch subscriptionEvent {
+ case .connection(let state):
+ switch state {
+ case .connecting:
+ break
+ case .connected:
+ allSubscribedExpectation.fulfill()
+ case .disconnected:
+ break
+ }
+ case .data(let result):
+ switch result {
+ case .success: break
+ case .failure(let error):
+ XCTFail("\(error)")
+ }
+ }
+ }
+ } catch {
+ XCTFail("Unexpected subscription failure")
+ }
+ }
+ }
+
+ await fulfillment(of: [allSubscribedExpectation], timeout: 3)
+ if let appSyncRealTimeClientFactory =
+ getUnderlyingAPIPlugin()?.appSyncRealTimeClientFactory as? AppSyncRealTimeClientFactory,
+ let appSyncRealTimeClient =
+ await appSyncRealTimeClientFactory.apiToClientCache.values.first as? AppSyncRealTimeClient
+ {
+ var appSyncSubscriptions = await appSyncRealTimeClient.numberOfSubscriptions
+ XCTAssertEqual(appSyncSubscriptions, numberOfSubscription)
+
+ subscriptions.forEach { $0.cancel() }
+ try await Task.sleep(seconds: 2)
+ appSyncSubscriptions = await appSyncRealTimeClient.numberOfSubscriptions
+ XCTAssertEqual(appSyncSubscriptions, 0)
+
+ } else {
+ XCTFail("There should be at least one AppSyncRealTimeClient instance")
+ }
+ }
+
  // MARK: Helpers
 
  func createPost(id: String, title: String) async throws -> Post? {
@@ -499,4 +558,8 @@ class GraphQLModelBasedTests: XCTestCase {
  throw error
  }
  }
+
+ func getUnderlyingAPIPlugin() -> AWSAPIPlugin? {
+ return Amplify.API.plugins["awsAPIPlugin"] as? AWSAPIPlugin
+ }
 }

AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessEvent.swift

@@ -52,6 +52,7 @@ public enum LivenessEventKind {
  public static let serviceQuotaExceeded = Self(rawValue: "ServiceQuotaExceededException")
  public static let serviceUnavailable = Self(rawValue: "ServiceUnavailableException")
  public static let sessionNotFound = Self(rawValue: "SessionNotFoundException")
+ public static let invalidSignature = Self(rawValue: "InvalidSignatureException")
  }
 }
 

AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/SPI/AWSPredictionsPlugin+Liveness.swift

@@ -66,6 +66,7 @@ public struct FaceLivenessSessionError: Swift.Error, Equatable {
  public static let accessDenied = Self(code: 7)
  public static let invalidRegion = Self(code: 8)
  public static let invalidURL = Self(code: 9)
+ public static let invalidSignature = Self(code: 10)
 }
 
 extension FaceLivenessSessionError {
@@ -85,6 +86,8 @@ extension FaceLivenessSessionError {
  self = .serviceUnavailable
  case .sessionNotFound:
  self = .sessionNotFound
+ case .invalidSignature:
+ self = .invalidSignature
  default:
  self = .unknown
  }