@aws-amplify/api 4.0.48 → 4.0.49-next.13

package/dist/aws-amplify-api.js

@@ -10246,8 +10246,8 @@ function () {
     } : _c;
     var authenticationType = defaultAuthenticationType || aws_appsync_authenticationType || 'AWS_IAM';
 
-    if (_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_2__["default"] && typeof _aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_2__["default"].subscribe === 'function') {
-      return _aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_2__["default"].subscribe('', {
+    if (_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_2__["PubSub"] && typeof _aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_2__["PubSub"].subscribe === 'function') {
+      return _aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_2__["PubSub"].subscribe('', {
         provider: _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER"],
         appSyncGraphqlEndpoint: appSyncGraphqlEndpoint,
         authenticationType: authenticationType,
@@ -12135,137 +12135,6 @@ function (_super) {
 
 
 
-/***/ }),
-
-/***/ "../pubsub/lib-esm/Providers/AWSAppSyncRealTimeProvider/constants.js":
-/*!***************************************************************************!*\
-  !*** ../pubsub/lib-esm/Providers/AWSAppSyncRealTimeProvider/constants.js ***!
-  \***************************************************************************/
-/*! exports provided: MAX_DELAY_MS, NON_RETRYABLE_CODES, MESSAGE_TYPES, SUBSCRIPTION_STATUS, SOCKET_STATUS, AMPLIFY_SYMBOL, AWS_APPSYNC_REALTIME_HEADERS, CONNECTION_INIT_TIMEOUT, START_ACK_TIMEOUT, DEFAULT_KEEP_ALIVE_TIMEOUT, DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MAX_DELAY_MS", function() { return MAX_DELAY_MS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NON_RETRYABLE_CODES", function() { return NON_RETRYABLE_CODES; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MESSAGE_TYPES", function() { return MESSAGE_TYPES; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SUBSCRIPTION_STATUS", function() { return SUBSCRIPTION_STATUS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SOCKET_STATUS", function() { return SOCKET_STATUS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AMPLIFY_SYMBOL", function() { return AMPLIFY_SYMBOL; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AWS_APPSYNC_REALTIME_HEADERS", function() { return AWS_APPSYNC_REALTIME_HEADERS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CONNECTION_INIT_TIMEOUT", function() { return CONNECTION_INIT_TIMEOUT; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "START_ACK_TIMEOUT", function() { return START_ACK_TIMEOUT; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DEFAULT_KEEP_ALIVE_TIMEOUT", function() { return DEFAULT_KEEP_ALIVE_TIMEOUT; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT", function() { return DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT; });
-var MAX_DELAY_MS = 5000;
-var NON_RETRYABLE_CODES = [400, 401, 403];
-var MESSAGE_TYPES;
-
-(function (MESSAGE_TYPES) {
-  /**
-   * Client -> Server message.
-   * This message type is the first message after handshake and this will initialize AWS AppSync RealTime communication
-   */
-  MESSAGE_TYPES["GQL_CONNECTION_INIT"] = "connection_init";
-  /**
-   * Server -> Client message
-   * This message type is in case there is an issue with AWS AppSync RealTime when establishing connection
-   */
-
-  MESSAGE_TYPES["GQL_CONNECTION_ERROR"] = "connection_error";
-  /**
-   * Server -> Client message.
-   * This message type is for the ack response from AWS AppSync RealTime for GQL_CONNECTION_INIT message
-   */
-
-  MESSAGE_TYPES["GQL_CONNECTION_ACK"] = "connection_ack";
-  /**
-   * Client -> Server message.
-   * This message type is for register subscriptions with AWS AppSync RealTime
-   */
-
-  MESSAGE_TYPES["GQL_START"] = "start";
-  /**
-   * Server -> Client message.
-   * This message type is for the ack response from AWS AppSync RealTime for GQL_START message
-   */
-
-  MESSAGE_TYPES["GQL_START_ACK"] = "start_ack";
-  /**
-   * Server -> Client message.
-   * This message type is for subscription message from AWS AppSync RealTime
-   */
-
-  MESSAGE_TYPES["GQL_DATA"] = "data";
-  /**
-   * Server -> Client message.
-   * This message type helps the client to know is still receiving messages from AWS AppSync RealTime
-   */
-
-  MESSAGE_TYPES["GQL_CONNECTION_KEEP_ALIVE"] = "ka";
-  /**
-   * Client -> Server message.
-   * This message type is for unregister subscriptions with AWS AppSync RealTime
-   */
-
-  MESSAGE_TYPES["GQL_STOP"] = "stop";
-  /**
-   * Server -> Client message.
-   * This message type is for the ack response from AWS AppSync RealTime for GQL_STOP message
-   */
-
-  MESSAGE_TYPES["GQL_COMPLETE"] = "complete";
-  /**
-   * Server -> Client message.
-   * This message type is for sending error messages from AWS AppSync RealTime to the client
-   */
-
-  MESSAGE_TYPES["GQL_ERROR"] = "error";
-})(MESSAGE_TYPES || (MESSAGE_TYPES = {}));
-
-var SUBSCRIPTION_STATUS;
-
-(function (SUBSCRIPTION_STATUS) {
-  SUBSCRIPTION_STATUS[SUBSCRIPTION_STATUS["PENDING"] = 0] = "PENDING";
-  SUBSCRIPTION_STATUS[SUBSCRIPTION_STATUS["CONNECTED"] = 1] = "CONNECTED";
-  SUBSCRIPTION_STATUS[SUBSCRIPTION_STATUS["FAILED"] = 2] = "FAILED";
-})(SUBSCRIPTION_STATUS || (SUBSCRIPTION_STATUS = {}));
-
-var SOCKET_STATUS;
-
-(function (SOCKET_STATUS) {
-  SOCKET_STATUS[SOCKET_STATUS["CLOSED"] = 0] = "CLOSED";
-  SOCKET_STATUS[SOCKET_STATUS["READY"] = 1] = "READY";
-  SOCKET_STATUS[SOCKET_STATUS["CONNECTING"] = 2] = "CONNECTING";
-})(SOCKET_STATUS || (SOCKET_STATUS = {}));
-
-var AMPLIFY_SYMBOL = typeof Symbol !== 'undefined' && typeof Symbol["for"] === 'function' ? Symbol["for"]('amplify_default') : '@@amplify_default';
-var AWS_APPSYNC_REALTIME_HEADERS = {
-  accept: 'application/json, text/javascript',
-  'content-encoding': 'amz-1.0',
-  'content-type': 'application/json; charset=UTF-8'
-};
-/**
- * Time in milleseconds to wait for GQL_CONNECTION_INIT message
- */
-
-var CONNECTION_INIT_TIMEOUT = 15000;
-/**
- * Time in milleseconds to wait for GQL_START_ACK message
- */
-
-var START_ACK_TIMEOUT = 15000;
-/**
- * Default Time in milleseconds to wait for GQL_CONNECTION_KEEP_ALIVE message
- */
-
-var DEFAULT_KEEP_ALIVE_TIMEOUT = 5 * 60 * 1000;
-/**
- * Default Time in milleseconds to alert for missed GQL_CONNECTION_KEEP_ALIVE message
- */
-
-var DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT = 65 * 1000;
-
 /***/ }),
 
 /***/ "../pubsub/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.js":
@@ -12294,9 +12163,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @aws-amplify/auth */ "@aws-amplify/auth");
 /* harmony import */ var _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_auth__WEBPACK_IMPORTED_MODULE_7__);
 /* harmony import */ var _PubSubProvider__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../PubSubProvider */ "../pubsub/lib-esm/Providers/PubSubProvider.js");
-/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../index */ "../pubsub/lib-esm/index.js");
-/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./constants */ "../pubsub/lib-esm/Providers/AWSAppSyncRealTimeProvider/constants.js");
+/* harmony import */ var _types_PubSub__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../types/PubSub */ "../pubsub/lib-esm/types/PubSub.js");
+/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../constants */ "../pubsub/lib-esm/Providers/constants.js");
 /* harmony import */ var _utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../utils/ConnectionStateMonitor */ "../pubsub/lib-esm/utils/ConnectionStateMonitor.js");
+/* harmony import */ var _utils_ReconnectionMonitor__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../utils/ReconnectionMonitor */ "../pubsub/lib-esm/utils/ReconnectionMonitor.js");
 var __extends = undefined && undefined.__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
     _extendStatics = Object.setPrototypeOf || {
@@ -12534,6 +12404,7 @@ var __read = undefined && undefined.__read || function (o, n) {
 
 
 
+
 var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["Logger"]('AWSAppSyncRealTimeProvider');
 
 var dispatchApiEvent = function dispatchApiEvent(event, data, message) {
@@ -12563,17 +12434,42 @@ function (_super) {
     _this.keepAliveTimeout = _constants__WEBPACK_IMPORTED_MODULE_10__["DEFAULT_KEEP_ALIVE_TIMEOUT"];
     _this.subscriptionObserverMap = new Map();
     _this.promiseArray = [];
-    _this.connectionStateMonitor = new _utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["ConnectionStateMonitor"](); // Monitor the connection state and pass changes along to Hub
+    _this.connectionStateMonitor = new _utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["ConnectionStateMonitor"]();
+    _this.reconnectionMonitor = new _utils_ReconnectionMonitor__WEBPACK_IMPORTED_MODULE_12__["ReconnectionMonitor"](); // Monitor the connection state and pass changes along to Hub
 
-    _this.connectionStateMonitor.connectionStateObservable.subscribe(function (ConnectionState) {
-      dispatchApiEvent(_index__WEBPACK_IMPORTED_MODULE_9__["CONNECTION_STATE_CHANGE"], {
+    _this.connectionStateMonitorSubscription = _this.connectionStateMonitor.connectionStateObservable.subscribe(function (connectionState) {
+      dispatchApiEvent(_constants__WEBPACK_IMPORTED_MODULE_10__["CONNECTION_STATE_CHANGE"], {
         provider: _this,
-        connectionState: ConnectionState
-      }, "Connection state is " + ConnectionState);
-    });
+        connectionState: connectionState
+      }, "Connection state is " + connectionState);
+      _this.connectionState = connectionState; // Trigger START_RECONNECT when the connection is disrupted
 
+      if (connectionState === _types_PubSub__WEBPACK_IMPORTED_MODULE_9__["ConnectionState"].ConnectionDisrupted) {
+        _this.reconnectionMonitor.record(_utils_ReconnectionMonitor__WEBPACK_IMPORTED_MODULE_12__["ReconnectEvent"].START_RECONNECT);
+      } // Trigger HALT_RECONNECT to halt reconnection attempts when the state is anything other than
+      //   ConnectionDisrupted or Connecting
+
+
+      if ([_types_PubSub__WEBPACK_IMPORTED_MODULE_9__["ConnectionState"].Connected, _types_PubSub__WEBPACK_IMPORTED_MODULE_9__["ConnectionState"].ConnectedPendingDisconnect, _types_PubSub__WEBPACK_IMPORTED_MODULE_9__["ConnectionState"].ConnectedPendingKeepAlive, _types_PubSub__WEBPACK_IMPORTED_MODULE_9__["ConnectionState"].ConnectedPendingNetwork, _types_PubSub__WEBPACK_IMPORTED_MODULE_9__["ConnectionState"].ConnectedPendingNetwork, _types_PubSub__WEBPACK_IMPORTED_MODULE_9__["ConnectionState"].ConnectionDisruptedPendingNetwork, _types_PubSub__WEBPACK_IMPORTED_MODULE_9__["ConnectionState"].Disconnected].includes(connectionState)) {
+        _this.reconnectionMonitor.record(_utils_ReconnectionMonitor__WEBPACK_IMPORTED_MODULE_12__["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__WEBPACK_IMPORTED_MODULE_10__["SOCKET_STATUS"].CLOSED;
+    this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["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);
@@ -12611,36 +12507,56 @@ function (_super) {
         });
         observer.complete();
       } else {
+        var subscriptionStartActive_1 = false;
         var subscriptionId_1 = Object(uuid__WEBPACK_IMPORTED_MODULE_3__["v4"])();
 
-        _this._startSubscriptionWithAWSAppSyncRealTime({
-          options: options,
-          observer: observer,
-          subscriptionId: subscriptionId_1
-        })["catch"](function (err) {
-          observer.error({
-            errors: [__assign({}, new graphql__WEBPACK_IMPORTED_MODULE_1__["GraphQLError"](_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].REALTIME_SUBSCRIPTION_INIT_ERROR + ": " + err))]
-          });
+        var startSubscription_1 = function startSubscription_1() {
+          if (!subscriptionStartActive_1) {
+            subscriptionStartActive_1 = true;
 
-          _this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["CONNECTION_CHANGE"].CLOSED);
+            var startSubscriptionPromise = _this._startSubscriptionWithAWSAppSyncRealTime({
+              options: options,
+              observer: observer,
+              subscriptionId: subscriptionId_1
+            })["catch"](function (err) {
+              logger.debug(_types_PubSub__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].REALTIME_SUBSCRIPTION_INIT_ERROR + ": " + err);
 
-          observer.complete();
-        });
+              _this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["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__WEBPACK_IMPORTED_MODULE_0__["default"](function (observer) {
+          _this.reconnectionMonitor.addObserver(observer);
+        }).subscribe(function () {
+          startSubscription_1();
+        });
+        startSubscription_1();
         return function () {
           return __awaiter(_this, void 0, void 0, function () {
             var subscriptionState, err_1;
             return __generator(this, function (_a) {
               switch (_a.label) {
                 case 0:
-                  _a.trys.push([0, 2, 3, 4]); // Waiting that subscription has been connected before trying to unsubscribe
+                  // 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();
 
@@ -12661,23 +12577,23 @@ function (_super) {
 
                   return [3
                   /*break*/
-                  , 4];
+                  , 5];
 
-                case 2:
+                case 3:
                   err_1 = _a.sent();
                   logger.debug("Error while unsubscribing " + err_1);
                   return [3
                   /*break*/
-                  , 4];
+                  , 5];
 
-                case 3:
+                case 4:
                   this._removeSubscriptionObserver(subscriptionId_1);
 
                   return [7
                   /*endfinally*/
                   ];
 
-                case 4:
+                case 5:
                   return [2
                   /*return*/
                   ];
@@ -12702,21 +12618,21 @@ function (_super) {
         observer = _a.observer,
         subscriptionId = _a.subscriptionId;
 
-    var _b, _c;
+    var _b;
 
     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 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 _j;
+      var _h;
 
       var _this = this;
 
-      return __generator(this, function (_k) {
-        switch (_k.label) {
+      return __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 () {
+            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 {};
-            } : _d, _e = options.additionalHeaders, additionalHeaders = _e === void 0 ? {} : _e;
+            } : _c, _d = options.additionalHeaders, additionalHeaders = _d === void 0 ? {} : _d;
             subscriptionState = _constants__WEBPACK_IMPORTED_MODULE_10__["SUBSCRIPTION_STATUS"].PENDING;
             data = {
               query: query,
@@ -12731,7 +12647,7 @@ function (_super) {
               startAckTimeoutId: undefined
             });
             dataString = JSON.stringify(data);
-            _f = [{}];
+            _e = [{}];
             return [4
             /*yield*/
             , this._awsRealTimeHeaderBasedAuth({
@@ -12745,13 +12661,13 @@ function (_super) {
             })];
 
           case 1:
-            _g = [__assign.apply(void 0, _f.concat([_k.sent()]))];
+            _f = [__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[_aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["USER_AGENT_HEADER"]] = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["Constants"].userAgent, _j)]);
+            headerObj = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _f.concat([_j.sent()])), additionalHeaders]), (_h = {}, _h[_aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["USER_AGENT_HEADER"]] = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["Constants"].userAgent, _h)]);
             subscriptionMessage = {
               id: subscriptionId,
               payload: {
@@ -12763,10 +12679,10 @@ function (_super) {
               type: _constants__WEBPACK_IMPORTED_MODULE_10__["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(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["CONNECTION_CHANGE"].OPENING_CONNECTION);
             return [4
@@ -12780,35 +12696,23 @@ function (_super) {
             })];
 
           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(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["CONNECTION_CHANGE"].CLOSED);
-            observer.error({
-              errors: [__assign({}, new graphql__WEBPACK_IMPORTED_MODULE_1__["GraphQLError"](_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_FAILED + ": " + message))]
-            });
-            observer.complete();
-            subscriptionFailedCallback_1 = (this.subscriptionObserverMap.get(subscriptionId) || {}).subscriptionFailedCallback; // Notify concurrent unsubscription
+            err_2 = _j.sent();
 
-            if (typeof subscriptionFailedCallback_1 === 'function') {
-              subscriptionFailedCallback_1();
-            }
+            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; // This must be done before sending the message in order to be listening immediately
+            _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,
@@ -12832,6 +12736,35 @@ 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(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["CONNECTION_CHANGE"].CLOSED)); // Capture the error only when the network didn't cause disruption
+
+    if (this.connectionState !== _types_PubSub__WEBPACK_IMPORTED_MODULE_9__["ConnectionState"].ConnectionDisruptedPendingNetwork) {
+      // When the error is non-retriable, error out the observable
+      if (Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["isNonRetryableError"])(err)) {
+        observer.error({
+          errors: [__assign({}, new graphql__WEBPACK_IMPORTED_MODULE_1__["GraphQLError"](_types_PubSub__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_FAILED + ": " + message))]
+        });
+      } else {
+        logger.debug(_types_PubSub__WEBPACK_IMPORTED_MODULE_9__["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
 
 
@@ -12988,7 +12921,7 @@ function (_super) {
       }
 
       if (startAckTimeoutId) clearTimeout(startAckTimeoutId);
-      dispatchApiEvent(_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].SUBSCRIPTION_ACK, {
+      dispatchApiEvent(_types_PubSub__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].SUBSCRIPTION_ACK, {
         query: query,
         variables: variables
       }, 'Connection established for subscription');
@@ -13014,7 +12947,7 @@ function (_super) {
       if (this.keepAliveTimeoutId) clearTimeout(this.keepAliveTimeoutId);
       if (this.keepAliveAlertTimeoutId) clearTimeout(this.keepAliveAlertTimeoutId);
       this.keepAliveTimeoutId = setTimeout(function () {
-        return _this._errorDisconnect(_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].TIMEOUT_DISCONNECT);
+        return _this._errorDisconnect(_types_PubSub__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].TIMEOUT_DISCONNECT);
       }, this.keepAliveTimeout);
       this.keepAliveAlertTimeoutId = setTimeout(function () {
         _this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["CONNECTION_CHANGE"].KEEP_ALIVE_MISSED);
@@ -13036,11 +12969,11 @@ function (_super) {
           subscriptionFailedCallback: subscriptionFailedCallback,
           subscriptionState: subscriptionState
         });
+        logger.debug(_types_PubSub__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_FAILED + ": " + JSON.stringify(payload));
         observer.error({
-          errors: [__assign({}, new graphql__WEBPACK_IMPORTED_MODULE_1__["GraphQLError"](_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_FAILED + ": " + JSON.stringify(payload)))]
+          errors: [__assign({}, new graphql__WEBPACK_IMPORTED_MODULE_1__["GraphQLError"](_types_PubSub__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_FAILED + ": " + JSON.stringify(payload)))]
         });
         if (startAckTimeoutId) clearTimeout(startAckTimeoutId);
-        observer.complete();
 
         if (typeof subscriptionFailedCallback === 'function') {
           subscriptionFailedCallback();
@@ -13051,16 +12984,6 @@ 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__WEBPACK_IMPORTED_MODULE_1__["GraphQLError"](msg))]
-        });
-      }
-    });
-    this.subscriptionObserverMap.clear();
 
     if (this.awsRealTimeSocket) {
       this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["CONNECTION_CHANGE"].CLOSED);
@@ -13088,18 +13011,7 @@ function (_super) {
         variables: variables,
         subscriptionState: _constants__WEBPACK_IMPORTED_MODULE_10__["SUBSCRIPTION_STATUS"].FAILED
       });
-
-      if (observer && !observer.closed) {
-        observer.error({
-          errors: [__assign({}, new graphql__WEBPACK_IMPORTED_MODULE_1__["GraphQLError"]("Subscription timeout " + JSON.stringify({
-            query: query,
-            variables: variables
-          })))]
-        }); // Cleanup will be automatically executed
-
-        observer.complete();
-      }
-
+      this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["CONNECTION_CHANGE"].CLOSED);
       logger.debug('timeoutStartSubscription', JSON.stringify({
         query: query,
         variables: variables
@@ -13189,6 +13101,7 @@ function (_super) {
 
             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);
@@ -13262,8 +13175,6 @@ function (_super) {
                 };
 
                 newSocket.onclose = function () {
-                  _this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["CONNECTION_CHANGE"].CONNECTION_FAILED);
-
                   rej(new Error('Connection handshake error'));
                 };
 
@@ -13312,13 +13223,13 @@ function (_super) {
                         _this.awsRealTimeSocket.onerror = function (err) {
                           logger.debug(err);
 
-                          _this._errorDisconnect(_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_CLOSED);
+                          _this._errorDisconnect(_types_PubSub__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_CLOSED);
                         };
 
                         _this.awsRealTimeSocket.onclose = function (event) {
                           logger.debug("WebSocket closed " + event.reason);
 
-                          _this._errorDisconnect(_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_CLOSED);
+                          _this._errorDisconnect(_types_PubSub__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_CLOSED);
                         };
                       }
 
@@ -13350,14 +13261,17 @@ function (_super) {
 
                   _this.awsRealTimeSocket.send(JSON.stringify(gqlInit));
 
-                  setTimeout(checkAckOk.bind(_this, ackOk_1), _constants__WEBPACK_IMPORTED_MODULE_10__["CONNECTION_INIT_TIMEOUT"]);
-                }
+                  var checkAckOk_1 = function checkAckOk_1(ackOk) {
+                    if (!ackOk) {
+                      _this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["CONNECTION_CHANGE"].CONNECTION_FAILED);
 
-                function checkAckOk(ackOk) {
-                  if (!ackOk) {
-                    this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_11__["CONNECTION_CHANGE"].CONNECTION_FAILED);
-                    rej(new Error("Connection timeout: ack from AWSRealTime was not received on " + _constants__WEBPACK_IMPORTED_MODULE_10__["CONNECTION_INIT_TIMEOUT"] + " ms"));
-                  }
+                      rej(new Error("Connection timeout: ack from AWSAppSyncRealTime was not received after " + _constants__WEBPACK_IMPORTED_MODULE_10__["CONNECTION_INIT_TIMEOUT"] + " ms"));
+                    }
+                  };
+
+                  setTimeout(function () {
+                    return checkAckOk_1(ackOk_1);
+                  }, _constants__WEBPACK_IMPORTED_MODULE_10__["CONNECTION_INIT_TIMEOUT"]);
                 }
               });
             }()];
@@ -13922,8 +13836,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(uuid__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var zen_observable_ts__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! zen-observable-ts */ "../../node_modules/zen-observable-ts/lib/bundle.esm.js");
 /* harmony import */ var _PubSubProvider__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./PubSubProvider */ "../pubsub/lib-esm/Providers/PubSubProvider.js");
-/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @aws-amplify/core */ "@aws-amplify/core");
-/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _types_PubSub__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../types/PubSub */ "../pubsub/lib-esm/types/PubSub.js");
+/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @aws-amplify/core */ "@aws-amplify/core");
+/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/ConnectionStateMonitor */ "../pubsub/lib-esm/utils/ConnectionStateMonitor.js");
+/* harmony import */ var _utils_ReconnectionMonitor__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/ReconnectionMonitor */ "../pubsub/lib-esm/utils/ReconnectionMonitor.js");
+/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./constants */ "../pubsub/lib-esm/Providers/constants.js");
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
@@ -14150,7 +14068,11 @@ var __rest = undefined && undefined.__rest || function (s, e) {
 
 
 
-var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_4__["ConsoleLogger"]('MqttOverWSProvider');
+
+
+
+
+var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["ConsoleLogger"]('MqttOverWSProvider');
 function mqttTopicMatch(filter, topic) {
   var filterArray = filter.split('/');
   var length = filterArray.length;
@@ -14176,18 +14098,21 @@ function () {
   ClientsQueue.prototype.get = function (clientId, clientFactory) {
     return __awaiter(this, void 0, void 0, function () {
       var cachedPromise, newPromise;
+
+      var _this = this;
+
       return __generator(this, function (_a) {
         cachedPromise = this.promises.get(clientId);
-
-        if (cachedPromise) {
-          return [2
-          /*return*/
-          , cachedPromise];
-        }
+        if (cachedPromise) return [2
+        /*return*/
+        , cachedPromise];
 
         if (clientFactory) {
           newPromise = clientFactory(clientId);
           this.promises.set(clientId, newPromise);
+          newPromise["catch"](function (v) {
+            return _this.promises["delete"](clientId);
+          });
           return [2
           /*return*/
           , newPromise];
@@ -14215,6 +14140,14 @@ function () {
   return ClientsQueue;
 }();
 
+var dispatchPubSubEvent = function dispatchPubSubEvent(event, data, message) {
+  _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["Hub"].dispatch('pubsub', {
+    event: event,
+    data: data,
+    message: message
+  }, 'PubSub', _constants__WEBPACK_IMPORTED_MODULE_8__["AMPLIFY_SYMBOL"]);
+};
+
 var topicSymbol = typeof Symbol !== 'undefined' ? Symbol('topic') : '@@topic';
 
 var MqttOverWSProvider =
@@ -14232,8 +14165,26 @@ function (_super) {
     })) || this;
 
     _this._clientsQueue = new ClientsQueue();
+    _this.connectionStateMonitor = new _utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_6__["ConnectionStateMonitor"]();
+    _this.reconnectionMonitor = new _utils_ReconnectionMonitor__WEBPACK_IMPORTED_MODULE_7__["ReconnectionMonitor"]();
     _this._topicObservers = new Map();
-    _this._clientIdObservers = new Map();
+    _this._clientIdObservers = new Map(); // Monitor the connection health state and pass changes along to Hub
+
+    _this.connectionStateMonitor.connectionStateObservable.subscribe(function (connectionStateChange) {
+      dispatchPubSubEvent(_constants__WEBPACK_IMPORTED_MODULE_8__["CONNECTION_STATE_CHANGE"], {
+        provider: _this,
+        connectionState: connectionStateChange
+      }, "Connection state is " + connectionStateChange);
+      _this.connectionState = connectionStateChange; // Trigger reconnection when the connection is disrupted
+
+      if (connectionStateChange === _types_PubSub__WEBPACK_IMPORTED_MODULE_4__["ConnectionState"].ConnectionDisrupted) {
+        _this.reconnectionMonitor.record(_utils_ReconnectionMonitor__WEBPACK_IMPORTED_MODULE_7__["ReconnectEvent"].START_RECONNECT);
+      } else if (connectionStateChange !== _types_PubSub__WEBPACK_IMPORTED_MODULE_4__["ConnectionState"].Connecting) {
+        // Trigger connected to halt reconnection attempts
+        _this.reconnectionMonitor.record(_utils_ReconnectionMonitor__WEBPACK_IMPORTED_MODULE_7__["ReconnectEvent"].HALT_RECONNECT);
+      }
+    });
+
     return _this;
   }
 
@@ -14275,8 +14226,6 @@ function (_super) {
   };
 
   MqttOverWSProvider.prototype.onDisconnect = function (_a) {
-    var _this = this;
-
     var clientId = _a.clientId,
         errorCode = _a.errorCode,
         args = __rest(_a, ["clientId", "errorCode"]);
@@ -14285,7 +14234,6 @@ function (_super) {
       logger.warn(clientId, JSON.stringify(__assign({
         errorCode: errorCode
       }, args), null, 2));
-      var topicsToDelete_1 = [];
 
       if (!clientId) {
         return;
@@ -14297,24 +14245,7 @@ function (_super) {
         return;
       }
 
-      clientIdObservers.forEach(function (observer) {
-        observer.error('Disconnected, error code: ' + errorCode); // removing observers for disconnected clientId
-
-        _this._topicObservers.forEach(function (observerForTopic, observerTopic) {
-          observerForTopic["delete"](observer);
-
-          if (observerForTopic.size === 0) {
-            topicsToDelete_1.push(observerTopic);
-          }
-        });
-      }); // forgiving any trace of clientId
-
-      this._clientIdObservers["delete"](clientId); // Removing topics that are not listen by an observer
-
-
-      topicsToDelete_1.forEach(function (topic) {
-        _this._topicObservers["delete"](topic);
-      });
+      this.disconnect(clientId);
     }
   };
 
@@ -14322,7 +14253,7 @@ function (_super) {
     var url = _a.url,
         clientId = _a.clientId;
     return __awaiter(this, void 0, void 0, function () {
-      var client;
+      var client, connected;
 
       var _this = this;
 
@@ -14330,7 +14261,8 @@ function (_super) {
         switch (_b.label) {
           case 0:
             logger.debug('Creating new MQTT client', clientId);
-            client = new paho_mqtt__WEBPACK_IMPORTED_MODULE_0__["Client"](url, clientId); // client.trace = (args) => logger.debug(clientId, JSON.stringify(args, null, 2));
+            this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_6__["CONNECTION_CHANGE"].OPENING_CONNECTION);
+            client = new paho_mqtt__WEBPACK_IMPORTED_MODULE_0__["Client"](url, clientId);
 
             client.onMessageArrived = function (_a) {
               var topic = _a.destinationName,
@@ -14347,6 +14279,8 @@ function (_super) {
                 clientId: clientId,
                 errorCode: errorCode
               }, args));
+
+              _this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_6__["CONNECTION_CHANGE"].CLOSED);
             };
 
             return [4
@@ -14356,14 +14290,24 @@ function (_super) {
                 useSSL: _this.isSSLEnabled,
                 mqttVersion: 3,
                 onSuccess: function onSuccess() {
-                  return resolve(client);
+                  return resolve(true);
                 },
-                onFailure: reject
+                onFailure: function onFailure(x) {
+                  if (clientId) _this._clientsQueue.remove(clientId);
+
+                  _this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_6__["CONNECTION_CHANGE"].CLOSED);
+
+                  resolve(false);
+                }
               });
             })];
 
           case 1:
-            _b.sent();
+            connected = _b.sent();
+
+            if (connected) {
+              this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_6__["CONNECTION_CHANGE"].CONNECTION_ESTABLISHED);
+            }
 
             return [2
             /*return*/
@@ -14387,9 +14331,33 @@ function (_super) {
             return [4
             /*yield*/
             , this.clientsQueue.get(clientId, function (clientId) {
-              return _this.newClient(__assign(__assign({}, options), {
-                clientId: clientId
-              }));
+              return __awaiter(_this, void 0, void 0, function () {
+                var client;
+                return __generator(this, function (_a) {
+                  switch (_a.label) {
+                    case 0:
+                      return [4
+                      /*yield*/
+                      , this.newClient(__assign(__assign({}, options), {
+                        clientId: clientId
+                      }))];
+
+                    case 1:
+                      client = _a.sent();
+
+                      if (client) {
+                        // Once connected, subscribe to all topics registered observers
+                        this._topicObservers.forEach(function (_value, key) {
+                          client.subscribe(key);
+                        });
+                      }
+
+                      return [2
+                      /*return*/
+                      , client];
+                  }
+                });
+              });
             })];
 
           case 1:
@@ -14419,6 +14387,7 @@ function (_super) {
             }
 
             this.clientsQueue.remove(clientId);
+            this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_6__["CONNECTION_CHANGE"].CLOSED);
             return [2
             /*return*/
             ];
@@ -14429,7 +14398,7 @@ function (_super) {
 
   MqttOverWSProvider.prototype.publish = function (topics, msg) {
     return __awaiter(this, void 0, void 0, function () {
-      var targetTopics, message, url, client;
+      var targetTopics, message, client;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -14437,22 +14406,20 @@ function (_super) {
             message = JSON.stringify(msg);
             return [4
             /*yield*/
-            , this.endpoint];
+            , this.clientsQueue.get(this.clientId)];
 
           case 1:
-            url = _a.sent();
-            return [4
-            /*yield*/
-            , this.connect(this.clientId, {
-              url: url
-            })];
-
-          case 2:
             client = _a.sent();
-            logger.debug('Publishing to topic(s)', targetTopics.join(','), message);
-            targetTopics.forEach(function (topic) {
-              return client.send(topic, message);
-            });
+
+            if (client) {
+              logger.debug('Publishing to topic(s)', targetTopics.join(','), message);
+              targetTopics.forEach(function (topic) {
+                return client.send(topic, message);
+              });
+            } else {
+              logger.debug('Publishing to topic(s) failed', targetTopics.join(','), message);
+            }
+
             return [2
             /*return*/
             ];
@@ -14496,6 +14463,7 @@ function (_super) {
 
     var targetTopics = [].concat(topics);
     logger.debug('Subscribing to topic(s)', targetTopics.join(','));
+    var reconnectSubscription;
     return new zen_observable_ts__WEBPACK_IMPORTED_MODULE_2__["default"](function (observer) {
       targetTopics.forEach(function (topic) {
         // this._topicObservers is used to notify the observers according to the topic received on the message
@@ -14508,9 +14476,7 @@ function (_super) {
         }
 
         observersForTopic.add(observer);
-      }); // @ts-ignore
-
-      var client;
+      });
       var _a = options.clientId,
           clientId = _a === void 0 ? _this.clientId : _a; // this._clientIdObservers is used to close observers when client gets disconnected
 
@@ -14526,59 +14492,92 @@ function (_super) {
 
       (function () {
         return __awaiter(_this, void 0, void 0, function () {
-          var _a, url, _b, e_1;
+          var getClient;
 
-          return __generator(this, function (_c) {
-            switch (_c.label) {
+          var _this = this;
+
+          return __generator(this, function (_a) {
+            switch (_a.label) {
               case 0:
-                _a = options.url;
-                if (!(_a === void 0)) return [3
-                /*break*/
-                , 2];
-                return [4
-                /*yield*/
-                , this.endpoint];
+                getClient = function getClient() {
+                  return __awaiter(_this, void 0, void 0, function () {
+                    var _a, url, _b, client_1, e_1;
 
-              case 1:
-                _b = _c.sent();
-                return [3
-                /*break*/
-                , 3];
+                    return __generator(this, function (_c) {
+                      switch (_c.label) {
+                        case 0:
+                          _c.trys.push([0, 5,, 6]);
 
-              case 2:
-                _b = _a;
-                _c.label = 3;
+                          _a = options.url;
+                          if (!(_a === void 0)) return [3
+                          /*break*/
+                          , 2];
+                          return [4
+                          /*yield*/
+                          , this.endpoint];
+
+                        case 1:
+                          _b = _c.sent();
+                          return [3
+                          /*break*/
+                          , 3];
+
+                        case 2:
+                          _b = _a;
+                          _c.label = 3;
+
+                        case 3:
+                          url = _b;
+                          return [4
+                          /*yield*/
+                          , this.connect(clientId, {
+                            url: url
+                          })];
 
-              case 3:
-                url = _b;
-                _c.label = 4;
+                        case 4:
+                          client_1 = _c.sent();
+
+                          if (client_1 !== undefined) {
+                            targetTopics.forEach(function (topic) {
+                              client_1.subscribe(topic);
+                            });
+                          }
+
+                          return [3
+                          /*break*/
+                          , 6];
+
+                        case 5:
+                          e_1 = _c.sent();
+                          logger.debug('Error forming connection', e_1);
+                          return [3
+                          /*break*/
+                          , 6];
+
+                        case 6:
+                          return [2
+                          /*return*/
+                          ];
+                      }
+                    });
+                  });
+                }; // Establish the initial connection
 
-              case 4:
-                _c.trys.push([4, 6,, 7]);
 
                 return [4
                 /*yield*/
-                , this.connect(clientId, {
-                  url: url
-                })];
+                , getClient()];
 
-              case 5:
-                client = _c.sent();
-                targetTopics.forEach(function (topic) {
-                  client.subscribe(topic);
-                });
-                return [3
-                /*break*/
-                , 7];
+              case 1:
+                // Establish the initial connection
+                _a.sent(); // Add an observable to the reconnection list to manage reconnection for this subscription
 
-              case 6:
-                e_1 = _c.sent();
-                observer.error(e_1);
-                return [3
-                /*break*/
-                , 7];
 
-              case 7:
+                reconnectSubscription = new zen_observable_ts__WEBPACK_IMPORTED_MODULE_2__["default"](function (observer) {
+                  _this.reconnectionMonitor.addObserver(observer);
+                }).subscribe(function () {
+                  getClient();
+                });
                 return [2
                 /*return*/
                 ];
@@ -14588,34 +14587,54 @@ function (_super) {
       })();
 
       return function () {
-        var _a, _b;
+        return __awaiter(_this, void 0, void 0, function () {
+          var client;
 
-        logger.debug('Unsubscribing from topic(s)', targetTopics.join(','));
+          var _this = this;
+
+          var _a, _b;
+
+          return __generator(this, function (_c) {
+            switch (_c.label) {
+              case 0:
+                return [4
+                /*yield*/
+                , this.clientsQueue.get(clientId)];
 
-        if (client) {
-          (_a = _this._clientIdObservers.get(clientId)) === null || _a === void 0 ? void 0 : _a["delete"](observer); // No more observers per client => client not needed anymore
+              case 1:
+                client = _c.sent();
+                reconnectSubscription === null || reconnectSubscription === void 0 ? void 0 : reconnectSubscription.unsubscribe();
 
-          if (((_b = _this._clientIdObservers.get(clientId)) === null || _b === void 0 ? void 0 : _b.size) === 0) {
-            _this.disconnect(clientId);
+                if (client) {
+                  (_a = this._clientIdObservers.get(clientId)) === null || _a === void 0 ? void 0 : _a["delete"](observer); // No more observers per client => client not needed anymore
 
-            _this._clientIdObservers["delete"](clientId);
-          }
+                  if (((_b = this._clientIdObservers.get(clientId)) === null || _b === void 0 ? void 0 : _b.size) === 0) {
+                    this.disconnect(clientId);
+                    this.connectionStateMonitor.record(_utils_ConnectionStateMonitor__WEBPACK_IMPORTED_MODULE_6__["CONNECTION_CHANGE"].CLOSING_CONNECTION);
 
-          targetTopics.forEach(function (topic) {
-            var observersForTopic = _this._topicObservers.get(topic) || new Set();
-            observersForTopic["delete"](observer); // if no observers exists for the topic, topic should be removed
+                    this._clientIdObservers["delete"](clientId);
+                  }
 
-            if (observersForTopic.size === 0) {
-              _this._topicObservers["delete"](topic);
+                  targetTopics.forEach(function (topic) {
+                    var observersForTopic = _this._topicObservers.get(topic) || new Set();
+                    observersForTopic["delete"](observer); // if no observers exists for the topic, topic should be removed
 
-              if (client.isConnected()) {
-                client.unsubscribe(topic);
-              }
+                    if (observersForTopic.size === 0) {
+                      _this._topicObservers["delete"](topic);
+
+                      if (client.isConnected()) {
+                        client.unsubscribe(topic);
+                      }
+                    }
+                  });
+                }
+
+                return [2
+                /*return*/
+                , null];
             }
           });
-        }
-
-        return null;
+        });
       };
     });
   };
@@ -14695,6 +14714,151 @@ function () {
 
 
 
+/***/ }),
+
+/***/ "../pubsub/lib-esm/Providers/constants.js":
+/*!************************************************!*\
+  !*** ../pubsub/lib-esm/Providers/constants.js ***!
+  \************************************************/
+/*! exports provided: MAX_DELAY_MS, NON_RETRYABLE_CODES, CONNECTION_STATE_CHANGE, MESSAGE_TYPES, SUBSCRIPTION_STATUS, SOCKET_STATUS, AMPLIFY_SYMBOL, AWS_APPSYNC_REALTIME_HEADERS, CONNECTION_INIT_TIMEOUT, START_ACK_TIMEOUT, DEFAULT_KEEP_ALIVE_TIMEOUT, DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT, RECONNECT_DELAY, RECONNECT_INTERVAL */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MAX_DELAY_MS", function() { return MAX_DELAY_MS; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NON_RETRYABLE_CODES", function() { return NON_RETRYABLE_CODES; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CONNECTION_STATE_CHANGE", function() { return CONNECTION_STATE_CHANGE; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MESSAGE_TYPES", function() { return MESSAGE_TYPES; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SUBSCRIPTION_STATUS", function() { return SUBSCRIPTION_STATUS; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SOCKET_STATUS", function() { return SOCKET_STATUS; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AMPLIFY_SYMBOL", function() { return AMPLIFY_SYMBOL; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AWS_APPSYNC_REALTIME_HEADERS", function() { return AWS_APPSYNC_REALTIME_HEADERS; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CONNECTION_INIT_TIMEOUT", function() { return CONNECTION_INIT_TIMEOUT; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "START_ACK_TIMEOUT", function() { return START_ACK_TIMEOUT; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DEFAULT_KEEP_ALIVE_TIMEOUT", function() { return DEFAULT_KEEP_ALIVE_TIMEOUT; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT", function() { return DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RECONNECT_DELAY", function() { return RECONNECT_DELAY; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RECONNECT_INTERVAL", function() { return RECONNECT_INTERVAL; });
+var MAX_DELAY_MS = 5000;
+var NON_RETRYABLE_CODES = [400, 401, 403];
+var CONNECTION_STATE_CHANGE = 'ConnectionStateChange';
+var MESSAGE_TYPES;
+
+(function (MESSAGE_TYPES) {
+  /**
+   * Client -> Server message.
+   * This message type is the first message after handshake and this will initialize AWS AppSync RealTime communication
+   */
+  MESSAGE_TYPES["GQL_CONNECTION_INIT"] = "connection_init";
+  /**
+   * Server -> Client message
+   * This message type is in case there is an issue with AWS AppSync RealTime when establishing connection
+   */
+
+  MESSAGE_TYPES["GQL_CONNECTION_ERROR"] = "connection_error";
+  /**
+   * Server -> Client message.
+   * This message type is for the ack response from AWS AppSync RealTime for GQL_CONNECTION_INIT message
+   */
+
+  MESSAGE_TYPES["GQL_CONNECTION_ACK"] = "connection_ack";
+  /**
+   * Client -> Server message.
+   * This message type is for register subscriptions with AWS AppSync RealTime
+   */
+
+  MESSAGE_TYPES["GQL_START"] = "start";
+  /**
+   * Server -> Client message.
+   * This message type is for the ack response from AWS AppSync RealTime for GQL_START message
+   */
+
+  MESSAGE_TYPES["GQL_START_ACK"] = "start_ack";
+  /**
+   * Server -> Client message.
+   * This message type is for subscription message from AWS AppSync RealTime
+   */
+
+  MESSAGE_TYPES["GQL_DATA"] = "data";
+  /**
+   * Server -> Client message.
+   * This message type helps the client to know is still receiving messages from AWS AppSync RealTime
+   */
+
+  MESSAGE_TYPES["GQL_CONNECTION_KEEP_ALIVE"] = "ka";
+  /**
+   * Client -> Server message.
+   * This message type is for unregister subscriptions with AWS AppSync RealTime
+   */
+
+  MESSAGE_TYPES["GQL_STOP"] = "stop";
+  /**
+   * Server -> Client message.
+   * This message type is for the ack response from AWS AppSync RealTime for GQL_STOP message
+   */
+
+  MESSAGE_TYPES["GQL_COMPLETE"] = "complete";
+  /**
+   * Server -> Client message.
+   * This message type is for sending error messages from AWS AppSync RealTime to the client
+   */
+
+  MESSAGE_TYPES["GQL_ERROR"] = "error";
+})(MESSAGE_TYPES || (MESSAGE_TYPES = {}));
+
+var SUBSCRIPTION_STATUS;
+
+(function (SUBSCRIPTION_STATUS) {
+  SUBSCRIPTION_STATUS[SUBSCRIPTION_STATUS["PENDING"] = 0] = "PENDING";
+  SUBSCRIPTION_STATUS[SUBSCRIPTION_STATUS["CONNECTED"] = 1] = "CONNECTED";
+  SUBSCRIPTION_STATUS[SUBSCRIPTION_STATUS["FAILED"] = 2] = "FAILED";
+})(SUBSCRIPTION_STATUS || (SUBSCRIPTION_STATUS = {}));
+
+var SOCKET_STATUS;
+
+(function (SOCKET_STATUS) {
+  SOCKET_STATUS[SOCKET_STATUS["CLOSED"] = 0] = "CLOSED";
+  SOCKET_STATUS[SOCKET_STATUS["READY"] = 1] = "READY";
+  SOCKET_STATUS[SOCKET_STATUS["CONNECTING"] = 2] = "CONNECTING";
+})(SOCKET_STATUS || (SOCKET_STATUS = {}));
+
+var AMPLIFY_SYMBOL = typeof Symbol !== 'undefined' && typeof Symbol["for"] === 'function' ? Symbol["for"]('amplify_default') : '@@amplify_default';
+var AWS_APPSYNC_REALTIME_HEADERS = {
+  accept: 'application/json, text/javascript',
+  'content-encoding': 'amz-1.0',
+  'content-type': 'application/json; charset=UTF-8'
+};
+/**
+ * Time in milleseconds to wait for GQL_CONNECTION_INIT message
+ */
+
+var CONNECTION_INIT_TIMEOUT = 15000;
+/**
+ * Time in milleseconds to wait for GQL_START_ACK message
+ */
+
+var START_ACK_TIMEOUT = 15000;
+/**
+ * Default Time in milleseconds to wait for GQL_CONNECTION_KEEP_ALIVE message
+ */
+
+var DEFAULT_KEEP_ALIVE_TIMEOUT = 5 * 60 * 1000;
+/**
+ * Default Time in milleseconds to alert for missed GQL_CONNECTION_KEEP_ALIVE message
+ */
+
+var DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT = 65 * 1000;
+/**
+ * Default delay time in milleseconds between when reconnect is triggered vs when it is attempted
+ */
+
+var RECONNECT_DELAY = 5 * 1000;
+/**
+ * Default interval time in milleseconds between when reconnect is re-attempted
+ */
+
+var RECONNECT_INTERVAL = 60 * 1000;
+
 /***/ }),
 
 /***/ "../pubsub/lib-esm/Providers/index.js":
@@ -15128,13 +15292,11 @@ _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Amplify"].register(PubSub);
 /*!**********************************!*\
   !*** ../pubsub/lib-esm/index.js ***!
   \**********************************/
-/*! exports provided: AbstractPubSubProvider, AWSAppSyncProvider, AWSAppSyncRealTimeProvider, AWSIoTProvider, mqttTopicMatch, MqttOverWSProvider, CONNECTION_STATE_CHANGE, ConnectionState, PubSub, CONTROL_MSG, default */
+/*! exports provided: AbstractPubSubProvider, AWSAppSyncProvider, AWSAppSyncRealTimeProvider, AWSIoTProvider, mqttTopicMatch, MqttOverWSProvider, CONNECTION_STATE_CHANGE, ConnectionState, CONTROL_MSG, PubSub, default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CONNECTION_STATE_CHANGE", function() { return CONNECTION_STATE_CHANGE; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CONTROL_MSG", function() { return CONTROL_MSG; });
 /* harmony import */ var _PubSub__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./PubSub */ "../pubsub/lib-esm/PubSub.js");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "PubSub", function() { return _PubSub__WEBPACK_IMPORTED_MODULE_0__["PubSub"]; });
 
@@ -15151,8 +15313,13 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MqttOverWSProvider", function() { return _Providers__WEBPACK_IMPORTED_MODULE_1__["MqttOverWSProvider"]; });
 
-/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./types */ "../pubsub/lib-esm/types/index.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConnectionState", function() { return _types__WEBPACK_IMPORTED_MODULE_2__["ConnectionState"]; });
+/* harmony import */ var _Providers_constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Providers/constants */ "../pubsub/lib-esm/Providers/constants.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "CONNECTION_STATE_CHANGE", function() { return _Providers_constants__WEBPACK_IMPORTED_MODULE_2__["CONNECTION_STATE_CHANGE"]; });
+
+/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./types */ "../pubsub/lib-esm/types/index.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConnectionState", function() { return _types__WEBPACK_IMPORTED_MODULE_3__["ConnectionState"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "CONTROL_MSG", function() { return _types__WEBPACK_IMPORTED_MODULE_3__["CONTROL_MSG"]; });
 
 /*
  * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -15168,17 +15335,7 @@ __webpack_require__.r(__webpack_exports__);
  */
 
 
-var CONTROL_MSG;
-
-(function (CONTROL_MSG) {
-  CONTROL_MSG["CONNECTION_CLOSED"] = "Connection closed";
-  CONTROL_MSG["CONNECTION_FAILED"] = "Connection failed";
-  CONTROL_MSG["REALTIME_SUBSCRIPTION_INIT_ERROR"] = "AppSync Realtime subscription init error";
-  CONTROL_MSG["SUBSCRIPTION_ACK"] = "Subscription ack";
-  CONTROL_MSG["TIMEOUT_DISCONNECT"] = "Timeout disconnect";
-})(CONTROL_MSG || (CONTROL_MSG = {}));
 
-var CONNECTION_STATE_CHANGE = 'ConnectionStateChange';
 
 
 /**
@@ -15189,17 +15346,41 @@ var CONNECTION_STATE_CHANGE = 'ConnectionStateChange';
 
 /***/ }),
 
-/***/ "../pubsub/lib-esm/types/index.js":
-/*!****************************************!*\
-  !*** ../pubsub/lib-esm/types/index.js ***!
-  \****************************************/
-/*! exports provided: ConnectionState */
+/***/ "../pubsub/lib-esm/types/PubSub.js":
+/*!*****************************************!*\
+  !*** ../pubsub/lib-esm/types/PubSub.js ***!
+  \*****************************************/
+/*! exports provided: CONTROL_MSG, ConnectionState */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CONTROL_MSG", function() { return CONTROL_MSG; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ConnectionState", function() { return ConnectionState; });
+/*
+ * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+ * the License. A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+var CONTROL_MSG;
+
+(function (CONTROL_MSG) {
+  CONTROL_MSG["CONNECTION_CLOSED"] = "Connection closed";
+  CONTROL_MSG["CONNECTION_FAILED"] = "Connection failed";
+  CONTROL_MSG["REALTIME_SUBSCRIPTION_INIT_ERROR"] = "AppSync Realtime subscription init error";
+  CONTROL_MSG["SUBSCRIPTION_ACK"] = "Subscription ack";
+  CONTROL_MSG["TIMEOUT_DISCONNECT"] = "Timeout disconnect";
+})(CONTROL_MSG || (CONTROL_MSG = {}));
 /** @enum {string} */
+
+
 var ConnectionState;
 
 (function (ConnectionState) {
@@ -15244,6 +15425,24 @@ var ConnectionState;
   ConnectionState["ConnectedPendingKeepAlive"] = "ConnectedPendingKeepAlive";
 })(ConnectionState || (ConnectionState = {}));
 
+/***/ }),
+
+/***/ "../pubsub/lib-esm/types/index.js":
+/*!****************************************!*\
+  !*** ../pubsub/lib-esm/types/index.js ***!
+  \****************************************/
+/*! exports provided: CONTROL_MSG, ConnectionState */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _PubSub__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./PubSub */ "../pubsub/lib-esm/types/PubSub.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "CONTROL_MSG", function() { return _PubSub__WEBPACK_IMPORTED_MODULE_0__["CONTROL_MSG"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConnectionState", function() { return _PubSub__WEBPACK_IMPORTED_MODULE_0__["ConnectionState"]; });
+
+
+
 /***/ }),
 
 /***/ "../pubsub/lib-esm/utils/ConnectionStateMonitor.js":
@@ -15257,10 +15456,9 @@ var ConnectionState;
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CONNECTION_CHANGE", function() { return CONNECTION_CHANGE; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ConnectionStateMonitor", function() { return ConnectionStateMonitor; });
-/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @aws-amplify/core */ "@aws-amplify/core");
-/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var zen_observable_ts__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! zen-observable-ts */ "../../node_modules/zen-observable-ts/lib/bundle.esm.js");
-/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../index */ "../pubsub/lib-esm/index.js");
+/* harmony import */ var zen_observable_ts__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! zen-observable-ts */ "../../node_modules/zen-observable-ts/lib/bundle.esm.js");
+/* harmony import */ var _types_PubSub__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../types/PubSub */ "../pubsub/lib-esm/types/PubSub.js");
+/* harmony import */ var _ReachabilityMonitor__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ReachabilityMonitor */ "../pubsub/lib-esm/utils/ReachabilityMonitor/index.js");
 /*
  * Copyright 2017-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
@@ -15336,8 +15534,18 @@ function () {
       connectionState: 'disconnected',
       intendedConnectionState: 'disconnected',
       keepAliveState: 'healthy'
-    };
-    this._linkedConnectionStateObservable = new zen_observable_ts__WEBPACK_IMPORTED_MODULE_1__["default"](function (connectionStateObserver) {
+    }; // Attempt to update the state with the current actual network state
+
+    this._initialNetworkStateSubscription = Object(_ReachabilityMonitor__WEBPACK_IMPORTED_MODULE_2__["ReachabilityMonitor"])().subscribe(function (_a) {
+      var online = _a.online;
+
+      var _b;
+
+      _this.record(online ? CONNECTION_CHANGE.ONLINE : CONNECTION_CHANGE.OFFLINE);
+
+      (_b = _this._initialNetworkStateSubscription) === null || _b === void 0 ? void 0 : _b.unsubscribe();
+    });
+    this._linkedConnectionStateObservable = new zen_observable_ts__WEBPACK_IMPORTED_MODULE_0__["default"](function (connectionStateObserver) {
       connectionStateObserver.next(_this._linkedConnectionState);
       _this._linkedConnectionStateObserver = connectionStateObserver;
     });
@@ -15348,11 +15556,15 @@ function () {
 
 
   ConnectionStateMonitor.prototype.enableNetworkMonitoring = function () {
-    var _this = this; // Maintain the network state based on the reachability monitor
+    var _this = this;
+
+    var _a; // If no initial network state was discovered, stop trying
 
 
+    (_a = this._initialNetworkStateSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe(); // Maintain the network state based on the reachability monitor
+
     if (this._networkMonitoringSubscription === undefined) {
-      this._networkMonitoringSubscription = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Reachability"]().networkMonitor().subscribe(function (_a) {
+      this._networkMonitoringSubscription = Object(_ReachabilityMonitor__WEBPACK_IMPORTED_MODULE_2__["ReachabilityMonitor"])().subscribe(function (_a) {
         var online = _a.online;
 
         _this.record(online ? CONNECTION_CHANGE.ONLINE : CONNECTION_CHANGE.OFFLINE);
@@ -15425,15 +15637,15 @@ function () {
         networkState = _a.networkState,
         intendedConnectionState = _a.intendedConnectionState,
         keepAliveState = _a.keepAliveState;
-    if (connectionState === 'connected' && networkState === 'disconnected') return _index__WEBPACK_IMPORTED_MODULE_2__["ConnectionState"].ConnectedPendingNetwork;
-    if (connectionState === 'connected' && intendedConnectionState === 'disconnected') return _index__WEBPACK_IMPORTED_MODULE_2__["ConnectionState"].ConnectedPendingDisconnect;
-    if (connectionState === 'disconnected' && intendedConnectionState === 'connected' && networkState === 'disconnected') return _index__WEBPACK_IMPORTED_MODULE_2__["ConnectionState"].ConnectionDisruptedPendingNetwork;
-    if (connectionState === 'disconnected' && intendedConnectionState === 'connected') return _index__WEBPACK_IMPORTED_MODULE_2__["ConnectionState"].ConnectionDisrupted;
-    if (connectionState === 'connected' && keepAliveState === 'unhealthy') return _index__WEBPACK_IMPORTED_MODULE_2__["ConnectionState"].ConnectedPendingKeepAlive; // All remaining states directly correspond to the connection state
+    if (connectionState === 'connected' && networkState === 'disconnected') return _types_PubSub__WEBPACK_IMPORTED_MODULE_1__["ConnectionState"].ConnectedPendingNetwork;
+    if (connectionState === 'connected' && intendedConnectionState === 'disconnected') return _types_PubSub__WEBPACK_IMPORTED_MODULE_1__["ConnectionState"].ConnectedPendingDisconnect;
+    if (connectionState === 'disconnected' && intendedConnectionState === 'connected' && networkState === 'disconnected') return _types_PubSub__WEBPACK_IMPORTED_MODULE_1__["ConnectionState"].ConnectionDisruptedPendingNetwork;
+    if (connectionState === 'disconnected' && intendedConnectionState === 'connected') return _types_PubSub__WEBPACK_IMPORTED_MODULE_1__["ConnectionState"].ConnectionDisrupted;
+    if (connectionState === 'connected' && keepAliveState === 'unhealthy') return _types_PubSub__WEBPACK_IMPORTED_MODULE_1__["ConnectionState"].ConnectedPendingKeepAlive; // All remaining states directly correspond to the connection state
 
-    if (connectionState === 'connecting') return _index__WEBPACK_IMPORTED_MODULE_2__["ConnectionState"].Connecting;
-    if (connectionState === 'disconnected') return _index__WEBPACK_IMPORTED_MODULE_2__["ConnectionState"].Disconnected;
-    return _index__WEBPACK_IMPORTED_MODULE_2__["ConnectionState"].Connected;
+    if (connectionState === 'connecting') return _types_PubSub__WEBPACK_IMPORTED_MODULE_1__["ConnectionState"].Connecting;
+    if (connectionState === 'disconnected') return _types_PubSub__WEBPACK_IMPORTED_MODULE_1__["ConnectionState"].Disconnected;
+    return _types_PubSub__WEBPACK_IMPORTED_MODULE_1__["ConnectionState"].Connected;
   };
 
   return ConnectionStateMonitor;
@@ -15441,6 +15653,129 @@ function () {
 
 
 
+/***/ }),
+
+/***/ "../pubsub/lib-esm/utils/ReachabilityMonitor/index.js":
+/*!************************************************************!*\
+  !*** ../pubsub/lib-esm/utils/ReachabilityMonitor/index.js ***!
+  \************************************************************/
+/*! exports provided: ReachabilityMonitor */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ReachabilityMonitor", function() { return ReachabilityMonitor; });
+/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @aws-amplify/core */ "@aws-amplify/core");
+/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__);
+
+var ReachabilityMonitor = function ReachabilityMonitor() {
+  return new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Reachability"]().networkMonitor();
+};
+
+/***/ }),
+
+/***/ "../pubsub/lib-esm/utils/ReconnectionMonitor.js":
+/*!******************************************************!*\
+  !*** ../pubsub/lib-esm/utils/ReconnectionMonitor.js ***!
+  \******************************************************/
+/*! exports provided: ReconnectEvent, ReconnectionMonitor */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ReconnectEvent", function() { return ReconnectEvent; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ReconnectionMonitor", function() { return ReconnectionMonitor; });
+/* harmony import */ var _Providers_constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../Providers/constants */ "../pubsub/lib-esm/Providers/constants.js");
+
+var ReconnectEvent;
+
+(function (ReconnectEvent) {
+  ReconnectEvent["START_RECONNECT"] = "START_RECONNECT";
+  ReconnectEvent["HALT_RECONNECT"] = "HALT_RECONNECT";
+})(ReconnectEvent || (ReconnectEvent = {}));
+/**
+ * Captures the reconnect event logic used to determine when to reconnect to PubSub providers.
+ *   Reconnnect attempts are delayed by 5 seconds to let the interface settle.
+ *   Attempting to reconnect only once creates unrecoverable states when the network state isn't
+ *   supported by the browser, so this keeps retrying every minute until halted.
+ */
+
+
+var ReconnectionMonitor =
+/** @class */
+function () {
+  function ReconnectionMonitor() {
+    this.reconnectObservers = [];
+  }
+  /**
+   * Add reconnect observer to the list of observers to alert on reconnect
+   */
+
+
+  ReconnectionMonitor.prototype.addObserver = function (reconnectObserver) {
+    this.reconnectObservers.push(reconnectObserver);
+  };
+  /**
+   * Given a reconnect event, start the appropriate behavior
+   */
+
+
+  ReconnectionMonitor.prototype.record = function (event) {
+    var _this = this;
+
+    if (event === ReconnectEvent.START_RECONNECT) {
+      // If the reconnection hasn't been started
+      if (this.reconnectSetTimeoutId === undefined && this.reconnectIntervalId === undefined) {
+        this.reconnectSetTimeoutId = setTimeout(function () {
+          // Reconnect now
+          _this._triggerReconnect(); // Retry reconnect every periodically until it works
+
+
+          _this.reconnectIntervalId = setInterval(function () {
+            _this._triggerReconnect();
+          }, _Providers_constants__WEBPACK_IMPORTED_MODULE_0__["RECONNECT_INTERVAL"]);
+        }, _Providers_constants__WEBPACK_IMPORTED_MODULE_0__["RECONNECT_DELAY"]);
+      }
+    }
+
+    if (event === ReconnectEvent.HALT_RECONNECT) {
+      if (this.reconnectIntervalId) {
+        clearInterval(this.reconnectIntervalId);
+        this.reconnectIntervalId = undefined;
+      }
+
+      if (this.reconnectSetTimeoutId) {
+        clearTimeout(this.reconnectSetTimeoutId);
+        this.reconnectSetTimeoutId = undefined;
+      }
+    }
+  };
+  /**
+   * Complete all reconnect observers
+   */
+
+
+  ReconnectionMonitor.prototype.close = function () {
+    this.reconnectObservers.forEach(function (reconnectObserver) {
+      var _a;
+
+      (_a = reconnectObserver.complete) === null || _a === void 0 ? void 0 : _a.call(reconnectObserver);
+    });
+  };
+
+  ReconnectionMonitor.prototype._triggerReconnect = function () {
+    this.reconnectObservers.forEach(function (reconnectObserver) {
+      var _a;
+
+      (_a = reconnectObserver.next) === null || _a === void 0 ? void 0 : _a.call(reconnectObserver);
+    });
+  };
+
+  return ReconnectionMonitor;
+}();
+
+
+
 /***/ }),
 
 /***/ "./lib-esm/API.js":