bump version to 1.0.2

Author: thisisabhash

.github/scripts/group-commit-message.awk

@@ -0,0 +1,25 @@
+#!/usr/bin/awk -f
+
+function add_to_group(key, value) {
+    groups[key] = groups[key] "- " value "\n"
+}
+
+{
+    if (NF > 0) {  # Skip empty lines
+        if (tolower($1) == "feat:") {
+            add_to_group("Features:", substr($0, index($0, $2)))
+        } else if (tolower($1) == "fix:") {
+            add_to_group("Fixes:", substr($0, index($0, $2)))
+        } else {
+            next
+        }
+    }
+}
+
+END {
+    for (group in groups) {
+        print "\n### " group
+        print groups[group]
+    }
+    print "\n"
+}

.github/workflows/kick-off-release.yaml

@@ -43,7 +43,7 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
-          ref: main
+          fetch-depth: 0
 
       - name: Bump versions to ${{ env.RELEASE_VERSION }}
         run: |
@@ -56,6 +56,34 @@ jobs:
           git push origin HEAD
         shell: bash
 
+      - name: Generate CHANGELOG
+        env:
+          RELEASE_VERSION: ${{ github.event.inputs.release-version }}
+        shell: bash
+        run: |
+          LOGS=$(git log --pretty=format:%s origin/release..HEAD | awk -F '\n' '{print $1}')
+          GROUPED_LOGS=$(echo $LOGS | ./.github/scripts/group-commit-message.awk)
+          awk -v date=$(date +"%Y-%m-%d") \
+            -v version="$RELEASE_VERSION" '
+            NR == 2 {
+                print "\n"
+                print "## " version " - (" date ")"
+                while (getline line < "/dev/stdin") {
+                    print line
+                }
+                next
+            }
+            {print}
+          ' CHANGELOG.md < <(echo "$GROUPED_LOGS") > temp && mv temp CHANGELOG.md
+
+      - name: Create CHANGELOG commit
+        env:
+          RELEASE_VERSION: ${{ github.event.inputs.release-version }}
+        run: |
+          git add CHANGELOG.md
+          git commit -m "chore: update CHANGELOG for $RELEASE_VERSION"
+          git push origin HEAD
+
       - name: Create Pull Request
         env:
           GH_TOKEN: ${{ github.token }}

CHANGELOG.md

@@ -1,12 +1,23 @@
 # Changelog
 
-## 1.0.0 - (2024-08-26)
+
+## 1.0.2 - (2025-06-10)
+
+## 1.0.1 (2024-09-27)
+
+## Fixes
+
+- inject auth info to appsync handshake headers ([#22](https://github.com/aws-amplify/aws-appsync-apollo-extensions-swift/pull/22))
+
+## 1.0.0 (2024-09-10)
 
 ### Features
+
 - Add heart beat monitor to AppSyncRTC. ([#1](https://github.com/aws-amplify/aws-appsync-apollo-extensions-swift/pull/1))
 - Add user-agent header to GraphQL requests. ([#2](https://github.com/aws-amplify/aws-appsync-apollo-extensions-swift/pull/2))
 - Initial implementation and tests.
 
 ### Fixes
+
 - Rename to Extensions. ([#3](https://github.com/aws-amplify/aws-appsync-apollo-extensions-swift/pull/3))
 - Add more info to user-agent header. ([#5](https://github.com/aws-amplify/aws-appsync-apollo-extensions-swift/pull/5))

Sources/AWSAppSyncApolloExtensions/Utilities/PackageInfo.swift

@@ -21,7 +21,7 @@ import AppKit
 
 class PackageInfo {
 
-    private static let version = "1.0.1"
+    private static let version = "1.0.2"
 
     @MainActor
     private static var os: (name: String, version: String) = {

Sources/AWSAppSyncApolloExtensions/Websocket/AppSyncWebSocketClient.swift

@@ -79,36 +79,46 @@ public class AppSyncWebSocketClient: NSObject, ApolloWebSocket.WebSocketClient,
     }
 
     public func connect() {
-        AppSyncApolloLogger.debug("Calling Connect")
-        guard connection?.state != .running else {
-            AppSyncApolloLogger.debug("[AppSyncWebSocketClient] WebSocket is already in connecting state")
-            return
-        }
-
-        subscribeToAppSyncResponse()
-
-        Task {
+        taskQueue.async { [weak self] in
+            guard let self else { return }
+            AppSyncApolloLogger.debug("Calling Connect")
+            guard connection?.state != .running else {
+                AppSyncApolloLogger.debug("[AppSyncWebSocketClient] WebSocket is already in connecting state")
+                return
+            }
+            
+            subscribeToAppSyncResponse()
+            
             AppSyncApolloLogger.debug("[AppSyncWebSocketClient] Creating new connection and starting read")
-            self.connection = try await createWebSocketConnection()
+            self.connection = try await self.createWebSocketConnection()
+            
             // Perform reading from a WebSocket in a separate task recursively to avoid blocking the execution.
-            Task { await self.startReadMessage() }
+            Task {
+                await self.startReadMessage()
+            }
+            
             self.connection?.resume()
         }
     }
 
     public func disconnect(forceTimeout: TimeInterval?) {
-        AppSyncApolloLogger.debug("Calling Disconnect")
-        heartBeatMonitorCancellable?.cancel()
-        guard connection?.state == .running else {
-            AppSyncApolloLogger.debug("[AppSyncWebSocketClient] client should be in connected state to trigger disconnect")
-            return
+        taskQueue.async { [weak self] in
+            guard let self else { return }
+            AppSyncApolloLogger.debug("Calling Disconnect")
+            heartBeatMonitorCancellable?.cancel()
+            guard connection?.state == .running else {
+                AppSyncApolloLogger.debug("[AppSyncWebSocketClient] client should be in connected state to trigger disconnect")
+                return
+            }
+            
+            connection?.cancel(with: .goingAway, reason: nil)
         }
-
-        connection?.cancel(with: .goingAway, reason: nil)
     }
 
     public func write(ping: Data, completion: (() -> Void)?) {
-        AppSyncApolloLogger.debug("Not called, not implemented.")
+        taskQueue.async {
+            AppSyncApolloLogger.debug("Not called, not implemented.")
+        }
     }
 
     public func write(string: String) {

Tests/AWSAppSyncApolloExtensionsTests/Websocket/AppSyncWebSocketClientTests.swift

@@ -39,6 +39,31 @@ final class AppSyncWebSocketClientTests: XCTestCase {
         let webSocketClient = AppSyncWebSocketClient(endpointURL: endpoint, authorizer: MockAppSyncAuthorizer())
         await verifyConnected(webSocketClient)
     }
+    
+    func testConnect_ConcurrentInvoke() async throws {
+        guard let endpoint = try localWebSocketServer?.start() else {
+            XCTFail("Local WebSocket server failed to start")
+            return
+        }
+        let webSocketClient = AppSyncWebSocketClient(endpointURL: endpoint, authorizer: MockAppSyncAuthorizer())
+        let connectedExpectation = expectation(description: "WebSocket should received connected event only once")
+        connectedExpectation.expectedFulfillmentCount = 1
+        let sink = webSocketClient.publisher.sink { event in
+            switch event {
+            case .connected:
+                connectedExpectation.fulfill()
+            default:
+                XCTFail("No other type of event should be received")
+            }
+        }
+        
+        for _ in 1...100 {
+            let task = Task {
+                webSocketClient.connect()
+            }
+        }
+        await fulfillment(of: [connectedExpectation], timeout: 5)
+    }
 
     func testDisconnect_didDisconnectFromRemote() async throws {
         var cancellables = Set<AnyCancellable>()

Tests/IntegrationTestApp/IntegrationTestAppTests/APIKeyTests.swift

@@ -138,6 +138,9 @@ final class APIKeyTests: IntegrationTestBase {
     }
 
     func testMaxSubscriptionReached() async throws {
+        let subscriptionLimit = 200
+        let failedSubscriptionCount = 5
+        
         let configuration = try AWSAppSyncConfiguration(with: .amplifyOutputs)
         let store = ApolloStore(cache: InMemoryNormalizedCache())
         let authorizer = APIKeyAuthorizer(apiKey: configuration.apiKey ?? "")
@@ -148,8 +151,11 @@ final class APIKeyTests: IntegrationTestBase {
         let websocket = AppSyncWebSocketClient(endpointURL: configuration.endpoint,
                                                authorizer: authorizer)
         let receivedConnection = expectation(description: "received connection")
+        receivedConnection.expectedFulfillmentCount = subscriptionLimit
+        
         let receivedMaxSubscriptionsReachedError = expectation(description: "received MaxSubscriptionsReachedError")
-        receivedConnection.expectedFulfillmentCount = 100
+        receivedMaxSubscriptionsReachedError.expectedFulfillmentCount = failedSubscriptionCount
+        
         let sink = websocket.publisher.sink { event in
             if case .string(let message) = event {
                 if message.contains("start_ack") {
@@ -167,13 +173,18 @@ final class APIKeyTests: IntegrationTestBase {
             webSocketNetworkTransport: webSocketTransport
         )
         let client = ApolloClient(networkTransport: splitTransport, store: store)
-
-        for _ in 1...101 {
-            _ = client.subscribe(subscription: OnCreateSubscription()) { _ in
-            }
+        
+        try await Task.sleep(nanoseconds: 5 * 1_000_000_000) // 5 seconds
+        
+        var cancellables = [Cancellable]()
+        for _ in 1...subscriptionLimit + failedSubscriptionCount {
+            cancellables.append(client.subscribe(subscription: OnCreateSubscription()) { _ in })
         }
-
+        
         await fulfillment(of: [receivedConnection, receivedMaxSubscriptionsReachedError], timeout: 10)
+        
+        for cancellable in cancellables {
+            cancellable.cancel()
+        }
     }
-
 }

Tests/IntegrationTestApp/IntegrationTestAppTests/AuthTokenTests.swift

@@ -90,7 +90,7 @@ final class AuthTokenTests: IntegrationTestBase {
         let receivedDisconnectError = expectation(description: "received disconnect")
         receivedDisconnectError.assertForOverFulfill = false
         let sink = websocket.publisher.sink { event in
-            if case .error(let error) = event, error.localizedDescription.contains("Socket is not connected") {
+            if case .disconnected(_, _) = event {
                 receivedDisconnectError.fulfill()
             }
         }
@@ -99,8 +99,10 @@ final class AuthTokenTests: IntegrationTestBase {
             uploadingNetworkTransport: transport,
             webSocketNetworkTransport: webSocketTransport
         )
+        
         let apolloCUPInvalidToken = ApolloClient(networkTransport: splitTransport, store: store)
 
+        try await Task.sleep(nanoseconds: 5 * 1_000_000_000) // 5 seconds
         await fulfillment(of: [receivedDisconnectError], timeout: 10)
     }