@aws-amplify/api-graphql 4.7.3-unstable.25dbd61.0 → 4.7.3-unstable.86d787b.0

package/src/Providers/AWSWebSocketProvider/index.ts

@@ -23,7 +23,7 @@ import {
 	CONNECTION_INIT_TIMEOUT,
 	CONNECTION_STATE_CHANGE,
 	DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT,
-	DEFAULT_KEEP_ALIVE_HEARTBEAT_TIMEOUT,
+	DEFAULT_KEEP_ALIVE_TIMEOUT,
 	MAX_DELAY_MS,
 	MESSAGE_TYPES,
 	NON_RETRYABLE_CODES,
@@ -83,8 +83,9 @@ export abstract class AWSWebSocketProvider {
 
 	protected awsRealTimeSocket?: WebSocket;
 	private socketStatus: SOCKET_STATUS = SOCKET_STATUS.CLOSED;
-	private keepAliveTimestamp: number = Date.now();
-	private keepAliveHeartbeatIntervalId?: ReturnType<typeof setInterval>;
+	private keepAliveTimeoutId?: ReturnType<typeof setTimeout>;
+	private keepAliveTimeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
+	private keepAliveAlertTimeoutId?: ReturnType<typeof setTimeout>;
 	private promiseArray: { res(): void; rej(reason?: any): void }[] = [];
 	private connectionState: ConnectionState | undefined;
 	private readonly connectionStateMonitor = new ConnectionStateMonitor();
@@ -118,7 +119,6 @@ export abstract class AWSWebSocketProvider {
 		return new Promise<void>((resolve, reject) => {
 			if (this.awsRealTimeSocket) {
 				this.awsRealTimeSocket.onclose = (_: CloseEvent) => {
-					this._closeSocket();
 					this.subscriptionObserverMap = new Map();
 					this.awsRealTimeSocket = undefined;
 					resolve();
@@ -171,7 +171,7 @@ export abstract class AWSWebSocketProvider {
 							this.logger.debug(
 								`${CONTROL_MSG.REALTIME_SUBSCRIPTION_INIT_ERROR}: ${err}`,
 							);
-							this._closeSocket();
+							this.connectionStateMonitor.record(CONNECTION_CHANGE.CLOSED);
 						})
 						.finally(() => {
 							subscriptionStartInProgress = false;
@@ -435,7 +435,7 @@ export abstract class AWSWebSocketProvider {
 		this.logger.debug({ err });
 		const message = String(err.message ?? '');
 		// Resolving to give the state observer time to propogate the update
-		this._closeSocket();
+		this.connectionStateMonitor.record(CONNECTION_CHANGE.CLOSED);
 
 		// Capture the error only when the network didn't cause disruption
 		if (
@@ -544,7 +544,12 @@ export abstract class AWSWebSocketProvider {
 			setTimeout(this._closeSocketIfRequired.bind(this), 1000);
 		} else {
 			this.logger.debug('closing WebSocket...');
-
+			if (this.keepAliveTimeoutId) {
+				clearTimeout(this.keepAliveTimeoutId);
+			}
+			if (this.keepAliveAlertTimeoutId) {
+				clearTimeout(this.keepAliveAlertTimeoutId);
+			}
 			const tempSocket = this.awsRealTimeSocket;
 			// Cleaning callbacks to avoid race condition, socket still exists
 			tempSocket.onclose = null;
@@ -552,7 +557,7 @@ export abstract class AWSWebSocketProvider {
 			tempSocket.close(1000);
 			this.awsRealTimeSocket = undefined;
 			this.socketStatus = SOCKET_STATUS.CLOSED;
-			this._closeSocket();
+			this.connectionStateMonitor.record(CONNECTION_CHANGE.CLOSED);
 		}
 	}
 
@@ -572,40 +577,13 @@ export abstract class AWSWebSocketProvider {
 		errorType: string;
 	};
 
-	private maintainKeepAlive() {
-		this.keepAliveTimestamp = Date.now();
-	}
-
-	private keepAliveHeartbeat(connectionTimeoutMs: number) {
-		const currentTime = Date.now();
-
-		// Check for missed KA message
-		if (
-			currentTime - this.keepAliveTimestamp >
-			DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT
-		) {
-			this.connectionStateMonitor.record(CONNECTION_CHANGE.KEEP_ALIVE_MISSED);
-		} else {
-			this.connectionStateMonitor.record(CONNECTION_CHANGE.KEEP_ALIVE);
-		}
-
-		// Recognize we are disconnected if we haven't seen messages in the keep alive timeout period
-		if (currentTime - this.keepAliveTimestamp > connectionTimeoutMs) {
-			this._errorDisconnect(CONTROL_MSG.TIMEOUT_DISCONNECT);
-		}
-	}
-
 	private _handleIncomingSubscriptionMessage(message: MessageEvent) {
 		if (typeof message.data !== 'string') {
 			return;
 		}
 
 		const [isData, data] = this._handleSubscriptionData(message);
-		if (isData) {
-			this.maintainKeepAlive();
-
-			return;
-		}
+		if (isData) return;
 
 		const { type, id, payload } = data;
 
@@ -654,7 +632,16 @@ export abstract class AWSWebSocketProvider {
 		}
 
 		if (type === MESSAGE_TYPES.GQL_CONNECTION_KEEP_ALIVE) {
-			this.maintainKeepAlive();
+			if (this.keepAliveTimeoutId) clearTimeout(this.keepAliveTimeoutId);
+			if (this.keepAliveAlertTimeoutId)
+				clearTimeout(this.keepAliveAlertTimeoutId);
+			this.keepAliveTimeoutId = setTimeout(() => {
+				this._errorDisconnect(CONTROL_MSG.TIMEOUT_DISCONNECT);
+			}, this.keepAliveTimeout);
+			this.keepAliveAlertTimeoutId = setTimeout(() => {
+				this.connectionStateMonitor.record(CONNECTION_CHANGE.KEEP_ALIVE_MISSED);
+			}, DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT);
+			this.connectionStateMonitor.record(CONNECTION_CHANGE.KEEP_ALIVE);
 
 			return;
 		}
@@ -699,21 +686,13 @@ export abstract class AWSWebSocketProvider {
 		this.logger.debug(`Disconnect error: ${msg}`);
 
 		if (this.awsRealTimeSocket) {
-			this._closeSocket();
+			this.connectionStateMonitor.record(CONNECTION_CHANGE.CLOSED);
 			this.awsRealTimeSocket.close();
 		}
 
 		this.socketStatus = SOCKET_STATUS.CLOSED;
 	}
 
-	private _closeSocket() {
-		if (this.keepAliveHeartbeatIntervalId) {
-			clearInterval(this.keepAliveHeartbeatIntervalId);
-			this.keepAliveHeartbeatIntervalId = undefined;
-		}
-		this.connectionStateMonitor.record(CONNECTION_CHANGE.CLOSED);
-	}
-
 	private _timeoutStartSubscriptionAck(subscriptionId: string) {
 		const subscriptionObserver =
 			this.subscriptionObserverMap.get(subscriptionId);
@@ -729,7 +708,7 @@ export abstract class AWSWebSocketProvider {
 				subscriptionState: SUBSCRIPTION_STATUS.FAILED,
 			});
 
-			this._closeSocket();
+			this.connectionStateMonitor.record(CONNECTION_CHANGE.CLOSED);
 			this.logger.debug(
 				'timeoutStartSubscription',
 				JSON.stringify({ query, variables }),
@@ -841,7 +820,6 @@ export abstract class AWSWebSocketProvider {
 				this.logger.debug(`WebSocket connection error`);
 			};
 			newSocket.onclose = () => {
-				this._closeSocket();
 				reject(new Error('Connection handshake error'));
 			};
 			newSocket.onopen = () => {
@@ -871,7 +849,6 @@ export abstract class AWSWebSocketProvider {
 
 			this.awsRealTimeSocket.onclose = event => {
 				this.logger.debug(`WebSocket closed ${event.reason}`);
-				this._closeSocket();
 				reject(new Error(JSON.stringify(event)));
 			};
 
@@ -935,11 +912,7 @@ export abstract class AWSWebSocketProvider {
 			return;
 		}
 
-		// Set up a keep alive heartbeat for this connection
-		this.keepAliveHeartbeatIntervalId = setInterval(() => {
-			this.keepAliveHeartbeat(connectionTimeoutMs);
-		}, DEFAULT_KEEP_ALIVE_HEARTBEAT_TIMEOUT);
-
+		this.keepAliveTimeout = connectionTimeoutMs;
 		this.awsRealTimeSocket.onmessage =
 			this._handleIncomingSubscriptionMessage.bind(this);
 
@@ -950,7 +923,6 @@ export abstract class AWSWebSocketProvider {
 
 		this.awsRealTimeSocket.onclose = event => {
 			this.logger.debug(`WebSocket closed ${event.reason}`);
-			this._closeSocket();
 			this._errorDisconnect(CONTROL_MSG.CONNECTION_CLOSED);
 		};
 	}

package/src/Providers/constants.ts

@@ -128,11 +128,6 @@ export const START_ACK_TIMEOUT = 15000;
  */
 export const DEFAULT_KEEP_ALIVE_TIMEOUT = 5 * 60 * 1000;
 
-/**
- * Default Time in milleseconds between monitoring checks of keep alive status
- */
-export const DEFAULT_KEEP_ALIVE_HEARTBEAT_TIMEOUT = 5 * 1000;
-
 /**
  * Default Time in milleseconds to alert for missed GQL_CONNECTION_KEEP_ALIVE message
  */