@aws-amplify/pubsub 4.4.9 → 4.4.10-next.20

package/lib/Providers/AWSAppSyncRealTimeProvider/index.js

@@ -1,91 +1,6 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
 /*
  * Copyright 2017-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
@@ -98,18 +13,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
+var zen_observable_ts_1 = tslib_1.__importDefault(require("zen-observable-ts"));
 var graphql_1 = require("graphql");
-var url = __importStar(require("url"));
+var url = tslib_1.__importStar(require("url"));
 var uuid_1 = require("uuid");
 var buffer_1 = require("buffer");
 var core_1 = require("@aws-amplify/core");
-var cache_1 = __importDefault(require("@aws-amplify/cache"));
-var auth_1 = __importDefault(require("@aws-amplify/auth"));
+var cache_1 = tslib_1.__importDefault(require("@aws-amplify/cache"));
+var auth_1 = tslib_1.__importDefault(require("@aws-amplify/auth"));
 var PubSubProvider_1 = require("../PubSubProvider");
-var index_1 = require("../../index");
-var constants_1 = require("./constants");
+var PubSub_1 = require("../../types/PubSub");
+var constants_1 = require("../constants");
 var ConnectionStateMonitor_1 = require("../../utils/ConnectionStateMonitor");
+var ReconnectionMonitor_1 = require("../../utils/ReconnectionMonitor");
 var logger = new core_1.Logger('AWSAppSyncRealTimeProvider');
 var dispatchApiEvent = function (event, data, message) {
     core_1.Hub.dispatch('api', { event: event, data: data, message: message }, 'PubSub', constants_1.AMPLIFY_SYMBOL);
@@ -117,7 +33,7 @@ var dispatchApiEvent = function (event, data, message) {
 var standardDomainPattern = /^https:\/\/\w{26}\.appsync\-api\.\w{2}(?:(?:\-\w{2,})+)\-\d\.amazonaws.com\/graphql$/i;
 var customDomainPath = '/realtime';
 var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
-    __extends(AWSAppSyncRealTimeProvider, _super);
+    tslib_1.__extends(AWSAppSyncRealTimeProvider, _super);
     function AWSAppSyncRealTimeProvider(options) {
         if (options === void 0) { options = {}; }
         var _this = _super.call(this, options) || this;
@@ -126,15 +42,47 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
         _this.subscriptionObserverMap = new Map();
         _this.promiseArray = [];
         _this.connectionStateMonitor = new ConnectionStateMonitor_1.ConnectionStateMonitor();
+        _this.reconnectionMonitor = new ReconnectionMonitor_1.ReconnectionMonitor();
         // Monitor the connection state and pass changes along to Hub
-        _this.connectionStateMonitor.connectionStateObservable.subscribe(function (ConnectionState) {
-            dispatchApiEvent(index_1.CONNECTION_STATE_CHANGE, {
-                provider: _this,
-                connectionState: ConnectionState,
-            }, "Connection state is " + ConnectionState);
-        });
+        _this.connectionStateMonitorSubscription =
+            _this.connectionStateMonitor.connectionStateObservable.subscribe(function (connectionState) {
+                dispatchApiEvent(constants_1.CONNECTION_STATE_CHANGE, {
+                    provider: _this,
+                    connectionState: connectionState,
+                }, "Connection state is " + connectionState);
+                _this.connectionState = connectionState;
+                // Trigger START_RECONNECT when the connection is disrupted
+                if (connectionState === PubSub_1.ConnectionState.ConnectionDisrupted) {
+                    _this.reconnectionMonitor.record(ReconnectionMonitor_1.ReconnectEvent.START_RECONNECT);
+                }
+                // Trigger HALT_RECONNECT to halt reconnection attempts when the state is anything other than
+                //   ConnectionDisrupted or Connecting
+                if ([
+                    PubSub_1.ConnectionState.Connected,
+                    PubSub_1.ConnectionState.ConnectedPendingDisconnect,
+                    PubSub_1.ConnectionState.ConnectedPendingKeepAlive,
+                    PubSub_1.ConnectionState.ConnectedPendingNetwork,
+                    PubSub_1.ConnectionState.ConnectedPendingNetwork,
+                    PubSub_1.ConnectionState.ConnectionDisruptedPendingNetwork,
+                    PubSub_1.ConnectionState.Disconnected,
+                ].includes(connectionState)) {
+                    _this.reconnectionMonitor.record(ReconnectionMonitor_1.ReconnectEvent.HALT_RECONNECT);
+                }
+            });
         return _this;
     }
+    /**
+     * Mark the socket closed and release all active listeners
+     */
+    AWSAppSyncRealTimeProvider.prototype.close = function () {
+        // Mark the socket closed both in status and the connection monitor
+        this.socketStatus = constants_1.SOCKET_STATUS.CLOSED;
+        this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CONNECTION_FAILED);
+        // Turn off the subscription monitor Hub publishing
+        this.connectionStateMonitorSubscription.unsubscribe();
+        // Complete all reconnect observers
+        this.reconnectionMonitor.close();
+    };
     AWSAppSyncRealTimeProvider.prototype.getNewWebSocket = function (url, protocol) {
         return new WebSocket(url, protocol);
     };
@@ -145,8 +93,8 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
         throw new Error('Not used here');
     };
     AWSAppSyncRealTimeProvider.prototype.publish = function (_topics, _msg, _options) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
                 throw new Error('Operation not supported');
             });
         });
@@ -162,35 +110,51 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
             if (!options || !appSyncGraphqlEndpoint) {
                 observer.error({
                     errors: [
-                        __assign({}, new graphql_1.GraphQLError("Subscribe only available for AWS AppSync endpoint")),
+                        tslib_1.__assign({}, new graphql_1.GraphQLError("Subscribe only available for AWS AppSync endpoint")),
                     ],
                 });
                 observer.complete();
             }
             else {
+                var subscriptionStartActive_1 = false;
                 var subscriptionId_1 = uuid_1.v4();
-                _this._startSubscriptionWithAWSAppSyncRealTime({
-                    options: options,
-                    observer: observer,
-                    subscriptionId: subscriptionId_1,
-                }).catch(function (err) {
-                    observer.error({
-                        errors: [
-                            __assign({}, new graphql_1.GraphQLError(index_1.CONTROL_MSG.REALTIME_SUBSCRIPTION_INIT_ERROR + ": " + err)),
-                        ],
-                    });
-                    _this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
-                    observer.complete();
+                var startSubscription_1 = function () {
+                    if (!subscriptionStartActive_1) {
+                        subscriptionStartActive_1 = true;
+                        var startSubscriptionPromise = _this._startSubscriptionWithAWSAppSyncRealTime({
+                            options: options,
+                            observer: observer,
+                            subscriptionId: subscriptionId_1,
+                        }).catch(function (err) {
+                            logger.debug(PubSub_1.CONTROL_MSG.REALTIME_SUBSCRIPTION_INIT_ERROR + ": " + err);
+                            _this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
+                        });
+                        startSubscriptionPromise.finally(function () {
+                            subscriptionStartActive_1 = false;
+                        });
+                    }
+                };
+                var reconnectSubscription_1;
+                // Add an observable to the reconnection list to manage reconnection for this subscription
+                reconnectSubscription_1 = new zen_observable_ts_1.default(function (observer) {
+                    _this.reconnectionMonitor.addObserver(observer);
+                }).subscribe(function () {
+                    startSubscription_1();
                 });
-                return function () { return __awaiter(_this, void 0, void 0, function () {
+                startSubscription_1();
+                return function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                     var subscriptionState, err_1;
-                    return __generator(this, function (_a) {
+                    return tslib_1.__generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                _a.trys.push([0, 2, 3, 4]);
+                                // Cleanup reconnection subscription
+                                reconnectSubscription_1 === null || reconnectSubscription_1 === void 0 ? void 0 : reconnectSubscription_1.unsubscribe();
+                                _a.label = 1;
+                            case 1:
+                                _a.trys.push([1, 3, 4, 5]);
                                 // Waiting that subscription has been connected before trying to unsubscribe
                                 return [4 /*yield*/, this._waitForSubscriptionToBeConnected(subscriptionId_1)];
-                            case 1:
+                            case 2:
                                 // Waiting that subscription has been connected before trying to unsubscribe
                                 _a.sent();
                                 subscriptionState = (this.subscriptionObserverMap.get(subscriptionId_1) || {}).subscriptionState;
@@ -204,15 +168,15 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                                 else {
                                     throw new Error('Subscription never connected');
                                 }
-                                return [3 /*break*/, 4];
-                            case 2:
+                                return [3 /*break*/, 5];
+                            case 3:
                                 err_1 = _a.sent();
                                 logger.debug("Error while unsubscribing " + err_1);
-                                return [3 /*break*/, 4];
-                            case 3:
+                                return [3 /*break*/, 5];
+                            case 4:
                                 this._removeSubscriptionObserver(subscriptionId_1);
                                 return [7 /*endfinally*/];
-                            case 4: return [2 /*return*/];
+                            case 5: return [2 /*return*/];
                         }
                     });
                 }); };
@@ -229,15 +193,15 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
     });
     AWSAppSyncRealTimeProvider.prototype._startSubscriptionWithAWSAppSyncRealTime = function (_a) {
         var options = _a.options, observer = _a.observer, subscriptionId = _a.subscriptionId;
-        var _b, _c;
-        return __awaiter(this, void 0, void 0, function () {
-            var appSyncGraphqlEndpoint, authenticationType, query, variables, apiKey, region, _d, graphql_headers, _e, additionalHeaders, subscriptionState, data, dataString, headerObj, _f, _g, subscriptionMessage, stringToAWSRealTime, err_2, message, subscriptionFailedCallback_1, _h, subscriptionFailedCallback, subscriptionReadyCallback;
-            var _j;
+        var _b;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var appSyncGraphqlEndpoint, authenticationType, query, variables, apiKey, region, _c, graphql_headers, _d, additionalHeaders, subscriptionState, data, dataString, headerObj, _e, _f, subscriptionMessage, stringToAWSRealTime, err_2, _g, subscriptionFailedCallback, subscriptionReadyCallback;
+            var _h;
             var _this = this;
-            return __generator(this, function (_k) {
-                switch (_k.label) {
+            return tslib_1.__generator(this, function (_j) {
+                switch (_j.label) {
                     case 0:
-                        appSyncGraphqlEndpoint = options.appSyncGraphqlEndpoint, authenticationType = options.authenticationType, query = options.query, variables = options.variables, apiKey = options.apiKey, region = options.region, _d = options.graphql_headers, graphql_headers = _d === void 0 ? function () { return ({}); } : _d, _e = options.additionalHeaders, additionalHeaders = _e === void 0 ? {} : _e;
+                        appSyncGraphqlEndpoint = options.appSyncGraphqlEndpoint, authenticationType = options.authenticationType, query = options.query, variables = options.variables, apiKey = options.apiKey, region = options.region, _c = options.graphql_headers, graphql_headers = _c === void 0 ? function () { return ({}); } : _c, _d = options.additionalHeaders, additionalHeaders = _d === void 0 ? {} : _d;
                         subscriptionState = constants_1.SUBSCRIPTION_STATUS.PENDING;
                         data = {
                             query: query,
@@ -252,7 +216,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                             startAckTimeoutId: undefined,
                         });
                         dataString = JSON.stringify(data);
-                        _f = [{}];
+                        _e = [{}];
                         return [4 /*yield*/, this._awsRealTimeHeaderBasedAuth({
                                 apiKey: apiKey,
                                 appSyncGraphqlEndpoint: appSyncGraphqlEndpoint,
@@ -263,24 +227,24 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                                 additionalHeaders: additionalHeaders,
                             })];
                     case 1:
-                        _g = [__assign.apply(void 0, _f.concat([(_k.sent())]))];
+                        _f = [tslib_1.__assign.apply(void 0, _e.concat([(_j.sent())]))];
                         return [4 /*yield*/, graphql_headers()];
                     case 2:
-                        headerObj = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), additionalHeaders]), (_j = {}, _j[core_1.USER_AGENT_HEADER] = core_1.Constants.userAgent, _j)]);
+                        headerObj = tslib_1.__assign.apply(void 0, [tslib_1.__assign.apply(void 0, [tslib_1.__assign.apply(void 0, _f.concat([(_j.sent())])), additionalHeaders]), (_h = {}, _h[core_1.USER_AGENT_HEADER] = core_1.Constants.userAgent, _h)]);
                         subscriptionMessage = {
                             id: subscriptionId,
                             payload: {
                                 data: dataString,
                                 extensions: {
-                                    authorization: __assign({}, headerObj),
+                                    authorization: tslib_1.__assign({}, headerObj),
                                 },
                             },
                             type: constants_1.MESSAGE_TYPES.GQL_START,
                         };
                         stringToAWSRealTime = JSON.stringify(subscriptionMessage);
-                        _k.label = 3;
+                        _j.label = 3;
                     case 3:
-                        _k.trys.push([3, 5, , 6]);
+                        _j.trys.push([3, 5, , 6]);
                         this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.OPENING_CONNECTION);
                         return [4 /*yield*/, this._initializeWebSocketConnection({
                                 apiKey: apiKey,
@@ -290,27 +254,14 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                                 additionalHeaders: additionalHeaders,
                             })];
                     case 4:
-                        _k.sent();
+                        _j.sent();
                         return [3 /*break*/, 6];
                     case 5:
-                        err_2 = _k.sent();
-                        logger.debug({ err: err_2 });
-                        message = (_b = err_2['message']) !== null && _b !== void 0 ? _b : '';
-                        this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
-                        observer.error({
-                            errors: [
-                                __assign({}, new graphql_1.GraphQLError(index_1.CONTROL_MSG.CONNECTION_FAILED + ": " + message)),
-                            ],
-                        });
-                        observer.complete();
-                        subscriptionFailedCallback_1 = (this.subscriptionObserverMap.get(subscriptionId) || {}).subscriptionFailedCallback;
-                        // Notify concurrent unsubscription
-                        if (typeof subscriptionFailedCallback_1 === 'function') {
-                            subscriptionFailedCallback_1();
-                        }
+                        err_2 = _j.sent();
+                        this._logStartSubscriptionError(subscriptionId, observer, err_2);
                         return [2 /*return*/];
                     case 6:
-                        _h = (_c = this.subscriptionObserverMap.get(subscriptionId)) !== null && _c !== void 0 ? _c : {}, subscriptionFailedCallback = _h.subscriptionFailedCallback, subscriptionReadyCallback = _h.subscriptionReadyCallback;
+                        _g = (_b = this.subscriptionObserverMap.get(subscriptionId)) !== null && _b !== void 0 ? _b : {}, subscriptionFailedCallback = _g.subscriptionFailedCallback, subscriptionReadyCallback = _g.subscriptionReadyCallback;
                         // This must be done before sending the message in order to be listening immediately
                         this.subscriptionObserverMap.set(subscriptionId, {
                             observer: observer,
@@ -331,12 +282,39 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
             });
         });
     };
+    // Log logic for start subscription failures
+    AWSAppSyncRealTimeProvider.prototype._logStartSubscriptionError = function (subscriptionId, observer, err) {
+        var _a;
+        logger.debug({ err: err });
+        var message = (_a = err['message']) !== null && _a !== void 0 ? _a : '';
+        // Resolving to give the state observer time to propogate the update
+        Promise.resolve(this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED));
+        // Capture the error only when the network didn't cause disruption
+        if (this.connectionState !== PubSub_1.ConnectionState.ConnectionDisruptedPendingNetwork) {
+            // When the error is non-retriable, error out the observable
+            if (core_1.isNonRetryableError(err)) {
+                observer.error({
+                    errors: [
+                        tslib_1.__assign({}, new graphql_1.GraphQLError(PubSub_1.CONTROL_MSG.CONNECTION_FAILED + ": " + message)),
+                    ],
+                });
+            }
+            else {
+                logger.debug(PubSub_1.CONTROL_MSG.CONNECTION_FAILED + ": " + message);
+            }
+            var subscriptionFailedCallback = (this.subscriptionObserverMap.get(subscriptionId) || {}).subscriptionFailedCallback;
+            // Notify concurrent unsubscription
+            if (typeof subscriptionFailedCallback === 'function') {
+                subscriptionFailedCallback();
+            }
+        }
+    };
     // Waiting that subscription has been connected before trying to unsubscribe
     AWSAppSyncRealTimeProvider.prototype._waitForSubscriptionToBeConnected = function (subscriptionId) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var subscriptionObserver, subscriptionState;
             var _this = this;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 subscriptionObserver = this.subscriptionObserverMap.get(subscriptionId);
                 if (subscriptionObserver) {
                     subscriptionState = subscriptionObserver.subscriptionState;
@@ -437,7 +415,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
             }
             if (startAckTimeoutId)
                 clearTimeout(startAckTimeoutId);
-            dispatchApiEvent(index_1.CONTROL_MSG.SUBSCRIPTION_ACK, { query: query, variables: variables }, 'Connection established for subscription');
+            dispatchApiEvent(PubSub_1.CONTROL_MSG.SUBSCRIPTION_ACK, { query: query, variables: variables }, 'Connection established for subscription');
             var subscriptionState = constants_1.SUBSCRIPTION_STATUS.CONNECTED;
             if (observer) {
                 this.subscriptionObserverMap.set(id, {
@@ -458,7 +436,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                 clearTimeout(this.keepAliveTimeoutId);
             if (this.keepAliveAlertTimeoutId)
                 clearTimeout(this.keepAliveAlertTimeoutId);
-            this.keepAliveTimeoutId = setTimeout(function () { return _this._errorDisconnect(index_1.CONTROL_MSG.TIMEOUT_DISCONNECT); }, this.keepAliveTimeout);
+            this.keepAliveTimeoutId = setTimeout(function () { return _this._errorDisconnect(PubSub_1.CONTROL_MSG.TIMEOUT_DISCONNECT); }, this.keepAliveTimeout);
             this.keepAliveAlertTimeoutId = setTimeout(function () {
                 _this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.KEEP_ALIVE_MISSED);
             }, constants_1.DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT);
@@ -477,14 +455,14 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                     subscriptionFailedCallback: subscriptionFailedCallback,
                     subscriptionState: subscriptionState,
                 });
+                logger.debug(PubSub_1.CONTROL_MSG.CONNECTION_FAILED + ": " + JSON.stringify(payload));
                 observer.error({
                     errors: [
-                        __assign({}, new graphql_1.GraphQLError(index_1.CONTROL_MSG.CONNECTION_FAILED + ": " + JSON.stringify(payload))),
+                        tslib_1.__assign({}, new graphql_1.GraphQLError(PubSub_1.CONTROL_MSG.CONNECTION_FAILED + ": " + JSON.stringify(payload))),
                     ],
                 });
                 if (startAckTimeoutId)
                     clearTimeout(startAckTimeoutId);
-                observer.complete();
                 if (typeof subscriptionFailedCallback === 'function') {
                     subscriptionFailedCallback();
                 }
@@ -493,15 +471,6 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
     };
     AWSAppSyncRealTimeProvider.prototype._errorDisconnect = function (msg) {
         logger.debug("Disconnect error: " + msg);
-        this.subscriptionObserverMap.forEach(function (_a) {
-            var observer = _a.observer;
-            if (observer && !observer.closed) {
-                observer.error({
-                    errors: [__assign({}, new graphql_1.GraphQLError(msg))],
-                });
-            }
-        });
-        this.subscriptionObserverMap.clear();
         if (this.awsRealTimeSocket) {
             this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
             this.awsRealTimeSocket.close();
@@ -521,18 +490,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                 variables: variables,
                 subscriptionState: constants_1.SUBSCRIPTION_STATUS.FAILED,
             });
-            if (observer && !observer.closed) {
-                observer.error({
-                    errors: [
-                        __assign({}, new graphql_1.GraphQLError("Subscription timeout " + JSON.stringify({
-                            query: query,
-                            variables: variables,
-                        }))),
-                    ],
-                });
-                // Cleanup will be automatically executed
-                observer.complete();
-            }
+            this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
             logger.debug('timeoutStartSubscription', JSON.stringify({ query: query, variables: variables }));
         }
     };
@@ -542,9 +500,9 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
         if (this.socketStatus === constants_1.SOCKET_STATUS.READY) {
             return;
         }
-        return new Promise(function (res, rej) { return __awaiter(_this, void 0, void 0, function () {
+        return new Promise(function (res, rej) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var payloadString, headerString, _a, _b, headerQs, payloadQs, discoverableEndpoint, protocol, awsRealTimeUrl, err_3;
-            return __generator(this, function (_c) {
+            return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         this.promiseArray.push({ res: res, rej: rej });
@@ -596,6 +554,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                         return [3 /*break*/, 5];
                     case 4:
                         err_3 = _c.sent();
+                        logger.debug('Connection exited with', err_3);
                         this.promiseArray.forEach(function (_a) {
                             var rej = _a.rej;
                             return rej(err_3);
@@ -614,8 +573,8 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
         }); });
     };
     AWSAppSyncRealTimeProvider.prototype._initializeRetryableHandshake = function (awsRealTimeUrl) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         logger.debug("Initializaling retryable Handshake");
@@ -628,10 +587,10 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
         });
     };
     AWSAppSyncRealTimeProvider.prototype._initializeHandshake = function (awsRealTimeUrl) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var err_4, _a, errorType, errorCode;
             var _this = this;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         logger.debug("Initializing handshake " + awsRealTimeUrl);
@@ -645,7 +604,6 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                                         logger.debug("WebSocket connection error");
                                     };
                                     newSocket.onclose = function () {
-                                        _this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CONNECTION_FAILED);
                                         rej(new Error('Connection handshake error'));
                                     };
                                     newSocket.onopen = function () {
@@ -680,18 +638,18 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                                                         _this._handleIncomingSubscriptionMessage.bind(_this);
                                                     _this.awsRealTimeSocket.onerror = function (err) {
                                                         logger.debug(err);
-                                                        _this._errorDisconnect(index_1.CONTROL_MSG.CONNECTION_CLOSED);
+                                                        _this._errorDisconnect(PubSub_1.CONTROL_MSG.CONNECTION_CLOSED);
                                                     };
                                                     _this.awsRealTimeSocket.onclose = function (event) {
                                                         logger.debug("WebSocket closed " + event.reason);
-                                                        _this._errorDisconnect(index_1.CONTROL_MSG.CONNECTION_CLOSED);
+                                                        _this._errorDisconnect(PubSub_1.CONTROL_MSG.CONNECTION_CLOSED);
                                                     };
                                                 }
                                                 res('Cool, connected to AWS AppSyncRealTime');
                                                 return;
                                             }
                                             if (type === constants_1.MESSAGE_TYPES.GQL_CONNECTION_ERROR) {
-                                                var _c = data.payload, _d = (_c === void 0 ? {} : _c).errors, _e = __read(_d === void 0 ? [] : _d, 1), _f = _e[0], _g = _f === void 0 ? {} : _f, _h = _g.errorType, errorType = _h === void 0 ? '' : _h, _j = _g.errorCode, errorCode = _j === void 0 ? 0 : _j;
+                                                var _c = data.payload, _d = (_c === void 0 ? {} : _c).errors, _e = tslib_1.__read(_d === void 0 ? [] : _d, 1), _f = _e[0], _g = _f === void 0 ? {} : _f, _h = _g.errorType, errorType = _h === void 0 ? '' : _h, _j = _g.errorCode, errorCode = _j === void 0 ? 0 : _j;
                                                 rej({ errorType: errorType, errorCode: errorCode });
                                             }
                                         };
@@ -699,13 +657,13 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                                             type: constants_1.MESSAGE_TYPES.GQL_CONNECTION_INIT,
                                         };
                                         _this.awsRealTimeSocket.send(JSON.stringify(gqlInit));
-                                        setTimeout(checkAckOk.bind(_this, ackOk_1), constants_1.CONNECTION_INIT_TIMEOUT);
-                                    }
-                                    function checkAckOk(ackOk) {
-                                        if (!ackOk) {
-                                            this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CONNECTION_FAILED);
-                                            rej(new Error("Connection timeout: ack from AWSRealTime was not received on " + constants_1.CONNECTION_INIT_TIMEOUT + " ms"));
-                                        }
+                                        var checkAckOk_1 = function (ackOk) {
+                                            if (!ackOk) {
+                                                _this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CONNECTION_FAILED);
+                                                rej(new Error("Connection timeout: ack from AWSAppSyncRealTime was not received after " + constants_1.CONNECTION_INIT_TIMEOUT + " ms"));
+                                            }
+                                        };
+                                        setTimeout(function () { return checkAckOk_1(ackOk_1); }, constants_1.CONNECTION_INIT_TIMEOUT);
                                     }
                                 });
                             })()];
@@ -733,9 +691,9 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
     };
     AWSAppSyncRealTimeProvider.prototype._awsRealTimeHeaderBasedAuth = function (_a) {
         var authenticationType = _a.authenticationType, payload = _a.payload, canonicalUri = _a.canonicalUri, appSyncGraphqlEndpoint = _a.appSyncGraphqlEndpoint, apiKey = _a.apiKey, region = _a.region, additionalHeaders = _a.additionalHeaders;
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var headerHandler, handler, host, result;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         headerHandler = {
@@ -770,9 +728,9 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
     };
     AWSAppSyncRealTimeProvider.prototype._awsRealTimeCUPHeader = function (_a) {
         var host = _a.host;
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var session;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, auth_1.default.currentSession()];
                     case 1:
@@ -787,9 +745,9 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
     };
     AWSAppSyncRealTimeProvider.prototype._awsRealTimeOPENIDHeader = function (_a) {
         var host = _a.host;
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var token, federatedInfo, currentUser;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, cache_1.default.getItem('federatedInfo')];
                     case 1:
@@ -818,9 +776,9 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
     };
     AWSAppSyncRealTimeProvider.prototype._awsRealTimeApiKeyHeader = function (_a) {
         var apiKey = _a.apiKey, host = _a.host;
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var dt, dtStr;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 dt = new Date();
                 dtStr = dt.toISOString().replace(/[:\-]|\.\d{3}/g, '');
                 return [2 /*return*/, {
@@ -833,9 +791,9 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
     };
     AWSAppSyncRealTimeProvider.prototype._awsRealTimeIAMHeader = function (_a) {
         var payload = _a.payload, canonicalUri = _a.canonicalUri, appSyncGraphqlEndpoint = _a.appSyncGraphqlEndpoint, region = _a.region;
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var endpointInfo, credentialsOK, creds, request, signed_params;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         endpointInfo = {
@@ -862,7 +820,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                             url: "" + appSyncGraphqlEndpoint + canonicalUri,
                             data: payload,
                             method: 'POST',
-                            headers: __assign({}, constants_1.AWS_APPSYNC_REALTIME_HEADERS),
+                            headers: tslib_1.__assign({}, constants_1.AWS_APPSYNC_REALTIME_HEADERS),
                         };
                         signed_params = core_1.Signer.sign(request, creds, endpointInfo);
                         return [2 /*return*/, signed_params.headers];