aws-appsync-subscription-link 3.0.9 → 3.0.10

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.10"></a>
+## [3.0.10](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@3.0.9...aws-appsync-subscription-link@3.0.10) (2022-03-04)
+
+
+### Bug Fixes
+
+* Port over Amplify fix for subscription race conditions ([#509](https://github.com/awslabs/aws-mobile-appsync-sdk-js/issues/509)) ([#704](https://github.com/awslabs/aws-mobile-appsync-sdk-js/issues/704)) ([92b50c4](https://github.com/awslabs/aws-mobile-appsync-sdk-js/commit/92b50c4))
+
+
+
+
 <a name="3.0.9"></a>
 ## [3.0.9](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@3.0.8...aws-appsync-subscription-link@3.0.9) (2021-09-24)
 

package/lib/realtime-subscription-handshake-link.d.ts

@@ -16,13 +16,11 @@ export declare class AppSyncRealTimeSubscriptionHandshakeLink extends ApolloLink
     private subscriptionObserverMap;
     private promiseArray;
     constructor({ url: theUrl, region: theRegion, auth: theAuth }: UrlInfo);
-    request(operation: Operation): Observable<FetchResult<{
-        [key: string]: any;
-    }, Record<string, any>, Record<string, any>>>;
+    request(operation: Operation): Observable<FetchResult<Record<string, any>, Record<string, any>, Record<string, any>>>;
     private _verifySubscriptionAlreadyStarted;
     private _sendUnsubscriptionMessage;
     private _removeSubscriptionObserver;
-    private _closeSocketWhenFlushed;
+    private _closeSocketIfRequired;
     private _startSubscriptionWithAWSAppSyncRealTime;
     private _initializeWebSocketConnection;
     private _awsRealTimeHeaderBasedAuth;

package/lib/realtime-subscription-handshake-link.js

@@ -220,22 +220,25 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
     };
     AppSyncRealTimeSubscriptionHandshakeLink.prototype._removeSubscriptionObserver = function (subscriptionId) {
         this.subscriptionObserverMap.delete(subscriptionId);
-        if (this.subscriptionObserverMap.size === 0) {
-            // Socket could be sending data to unsubscribe so is required to wait until is flushed
-            this._closeSocketWhenFlushed();
-        }
+        // Verifying for 1000ms after removing subscription in case there are new subscriptions on mount / unmount
+        setTimeout(this._closeSocketIfRequired.bind(this), 1000);
     };
-    AppSyncRealTimeSubscriptionHandshakeLink.prototype._closeSocketWhenFlushed = function () {
-        logger("closing WebSocket...");
-        clearTimeout(this.keepAliveTimeoutId);
+    AppSyncRealTimeSubscriptionHandshakeLink.prototype._closeSocketIfRequired = function () {
+        if (this.subscriptionObserverMap.size > 0) {
+            // There are active subscriptions on the WebSocket
+            return;
+        }
         if (!this.awsRealTimeSocket) {
             this.socketStatus = types_1.SOCKET_STATUS.CLOSED;
             return;
         }
         if (this.awsRealTimeSocket.bufferedAmount > 0) {
-            setTimeout(this._closeSocketWhenFlushed.bind(this), 1000);
+            // There is still data on the WebSocket
+            setTimeout(this._closeSocketIfRequired.bind(this), 1000);
         }
         else {
+            logger("closing WebSocket...");
+            clearTimeout(this.keepAliveTimeoutId);
             var tempSocket = this.awsRealTimeSocket;
             tempSocket.close(1000);
             this.awsRealTimeSocket = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-appsync-subscription-link",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "description": "AWS Mobile AppSync SDK for JavaScript",