fix(api-graphql): apply WS.close to base class

.github/workflows/push-integ-test.yml

@@ -8,7 +8,7 @@ concurrency:
 on:
   push:
     branches:
-      - replace-with-your-branch
+      - fix-events-close-all
 
 jobs:
   e2e:

packages/api-graphql/src/Providers/AWSAppSyncEventsProvider/index.ts

@@ -53,27 +53,6 @@ export class AWSAppSyncEventProvider extends AWSWebSocketProvider {
 		return PROVIDER_NAME;
 	}
 
-	close() {
-		return new Promise<void>((resolve, reject) => {
-			super.close();
-			if (this.awsRealTimeSocket) {
-				this.awsRealTimeSocket.onclose = (_: CloseEvent) => {
-					this.subscriptionObserverMap = new Map();
-					this.awsRealTimeSocket = undefined;
-					resolve();
-				};
-
-				this.awsRealTimeSocket.onerror = (err: any) => {
-					reject(err);
-				};
-
-				this.awsRealTimeSocket.close();
-			} else {
-				resolve();
-			}
-		});
-	}
-
 	public async connect(options: AWSAppSyncEventProviderOptions) {
 		super.connect(options);
 	}

packages/api-graphql/src/Providers/AWSWebSocketProvider/index.ts

@@ -112,6 +112,24 @@ export abstract class AWSWebSocketProvider {
 		this.connectionStateMonitorSubscription.unsubscribe();
 		// Complete all reconnect observers
 		this.reconnectionMonitor.close();
+
+		return new Promise<void>((resolve, reject) => {
+			if (this.awsRealTimeSocket) {
+				this.awsRealTimeSocket.onclose = (_: CloseEvent) => {
+					this.subscriptionObserverMap = new Map();
+					this.awsRealTimeSocket = undefined;
+					resolve();
+				};
+
+				this.awsRealTimeSocket.onerror = (err: any) => {
+					reject(err);
+				};
+
+				this.awsRealTimeSocket.close();
+			} else {
+				resolve();
+			}
+		});
 	}
 
 	subscribe(