@aws-amplify/api 4.0.33-unstable.9 → 4.0.34-cloud-logging.8

package/dist/aws-amplify-api.js

@@ -10245,17 +10245,12 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GRAPHQL_AUTH_MODE", function() { return GRAPHQL_AUTH_MODE; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GraphQLAuthError", function() { return GraphQLAuthError; });
-var GRAPHQL_AUTH_MODE;
+/* harmony import */ var _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @aws-amplify/auth */ "@aws-amplify/auth");
+/* harmony import */ var _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_auth__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "GRAPHQL_AUTH_MODE", function() { return _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_0__["GRAPHQL_AUTH_MODE"]; });
+
 
-(function (GRAPHQL_AUTH_MODE) {
-  GRAPHQL_AUTH_MODE["API_KEY"] = "API_KEY";
-  GRAPHQL_AUTH_MODE["AWS_IAM"] = "AWS_IAM";
-  GRAPHQL_AUTH_MODE["OPENID_CONNECT"] = "OPENID_CONNECT";
-  GRAPHQL_AUTH_MODE["AMAZON_COGNITO_USER_POOLS"] = "AMAZON_COGNITO_USER_POOLS";
-  GRAPHQL_AUTH_MODE["AWS_LAMBDA"] = "AWS_LAMBDA";
-})(GRAPHQL_AUTH_MODE || (GRAPHQL_AUTH_MODE = {}));
 
 var GraphQLAuthError;
 
@@ -11713,6 +11708,9 @@ var __spread = undefined && undefined.__spread || function () {
 
 
 var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["ConsoleLogger"]('AWSAppSyncProvider');
+/**
+ * @deprecated Unused, all usecases have migrated to AWSAppSyncRealtimeProvider
+ */
 
 var AWSAppSyncProvider =
 /** @class */
@@ -12436,9 +12434,9 @@ function (_super) {
   AWSAppSyncRealTimeProvider.prototype.subscribe = function (_topics, options) {
     var _this = this;
 
-    var appSyncGraphqlEndpoint = options.appSyncGraphqlEndpoint;
+    var appSyncGraphqlEndpoint = options === null || options === void 0 ? void 0 : options.appSyncGraphqlEndpoint;
     return new zen_observable_ts__WEBPACK_IMPORTED_MODULE_0__["default"](function (observer) {
-      if (!appSyncGraphqlEndpoint) {
+      if (!options || !appSyncGraphqlEndpoint) {
         observer.error({
           errors: [__assign({}, new graphql__WEBPACK_IMPORTED_MODULE_1__["GraphQLError"]("Subscribe only available for AWS AppSync endpoint"))]
         });
@@ -12531,19 +12529,22 @@ function (_super) {
     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, _b, graphql_headers, _c, additionalHeaders, subscriptionState, data, dataString, headerObj, _d, _e, subscriptionMessage, stringToAWSRealTime, err_2, _f, message, subscriptionFailedCallback_1, _g, subscriptionFailedCallback, subscriptionReadyCallback;
+      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 _h;
+      var _j;
 
       var _this = this;
 
-      return __generator(this, function (_j) {
-        switch (_j.label) {
+      return __generator(this, function (_k) {
+        switch (_k.label) {
           case 0:
-            appSyncGraphqlEndpoint = options.appSyncGraphqlEndpoint, authenticationType = options.authenticationType, query = options.query, variables = options.variables, apiKey = options.apiKey, region = options.region, _b = options.graphql_headers, graphql_headers = _b === void 0 ? function () {
+            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 {};
-            } : _b, _c = options.additionalHeaders, additionalHeaders = _c === void 0 ? {} : _c;
+            } : _d, _e = options.additionalHeaders, additionalHeaders = _e === void 0 ? {} : _e;
             subscriptionState = SUBSCRIPTION_STATUS.PENDING;
             data = {
               query: query,
@@ -12552,13 +12553,13 @@ function (_super) {
 
             this.subscriptionObserverMap.set(subscriptionId, {
               observer: observer,
-              query: query,
-              variables: variables,
+              query: query !== null && query !== void 0 ? query : '',
+              variables: variables !== null && variables !== void 0 ? variables : {},
               subscriptionState: subscriptionState,
-              startAckTimeoutId: null
+              startAckTimeoutId: undefined
             });
             dataString = JSON.stringify(data);
-            _d = [{}];
+            _f = [{}];
             return [4
             /*yield*/
             , this._awsRealTimeHeaderBasedAuth({
@@ -12572,13 +12573,13 @@ function (_super) {
             })];
 
           case 1:
-            _e = [__assign.apply(void 0, _d.concat([_j.sent()]))];
+            _g = [__assign.apply(void 0, _f.concat([_k.sent()]))];
             return [4
             /*yield*/
             , graphql_headers()];
 
           case 2:
-            headerObj = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _e.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)]);
+            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)]);
             subscriptionMessage = {
               id: subscriptionId,
               payload: {
@@ -12590,10 +12591,10 @@ function (_super) {
               type: MESSAGE_TYPES.GQL_START
             };
             stringToAWSRealTime = JSON.stringify(subscriptionMessage);
-            _j.label = 3;
+            _k.label = 3;
 
           case 3:
-            _j.trys.push([3, 5,, 6]);
+            _k.trys.push([3, 5,, 6]);
 
             return [4
             /*yield*/
@@ -12606,18 +12607,18 @@ function (_super) {
             })];
 
           case 4:
-            _j.sent();
+            _k.sent();
 
             return [3
             /*break*/
             , 6];
 
           case 5:
-            err_2 = _j.sent();
+            err_2 = _k.sent();
             logger.debug({
               err: err_2
             });
-            _f = err_2.message, message = _f === void 0 ? '' : _f;
+            message = (_b = err_2['message']) !== null && _b !== void 0 ? _b : '';
             observer.error({
               errors: [__assign({}, new graphql__WEBPACK_IMPORTED_MODULE_1__["GraphQLError"](_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_FAILED + ": " + message))]
             });
@@ -12633,13 +12634,13 @@ function (_super) {
             ];
 
           case 6:
-            _g = this.subscriptionObserverMap.get(subscriptionId), subscriptionFailedCallback = _g.subscriptionFailedCallback, subscriptionReadyCallback = _g.subscriptionReadyCallback; // This must be done before sending the message in order to be listening immediately
+            _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
 
             this.subscriptionObserverMap.set(subscriptionId, {
               observer: observer,
               subscriptionState: subscriptionState,
-              variables: variables,
-              query: query,
+              query: query !== null && query !== void 0 ? query : '',
+              variables: variables !== null && variables !== void 0 ? variables : {},
               subscriptionReadyCallback: subscriptionReadyCallback,
               subscriptionFailedCallback: subscriptionFailedCallback,
               startAckTimeoutId: setTimeout(function () {
@@ -12662,32 +12663,35 @@ function (_super) {
 
   AWSAppSyncRealTimeProvider.prototype._waitForSubscriptionToBeConnected = function (subscriptionId) {
     return __awaiter(this, void 0, void 0, function () {
-      var subscriptionState;
+      var subscriptionObserver, subscriptionState;
 
       var _this = this;
 
       return __generator(this, function (_a) {
-        subscriptionState = this.subscriptionObserverMap.get(subscriptionId).subscriptionState; // This in case unsubscribe is invoked before sending start subscription message
+        subscriptionObserver = this.subscriptionObserverMap.get(subscriptionId);
 
-        if (subscriptionState === SUBSCRIPTION_STATUS.PENDING) {
-          return [2
-          /*return*/
-          , new Promise(function (res, rej) {
-            var _a = _this.subscriptionObserverMap.get(subscriptionId),
-                observer = _a.observer,
-                subscriptionState = _a.subscriptionState,
-                variables = _a.variables,
-                query = _a.query;
-
-            _this.subscriptionObserverMap.set(subscriptionId, {
-              observer: observer,
-              subscriptionState: subscriptionState,
-              variables: variables,
-              query: query,
-              subscriptionReadyCallback: res,
-              subscriptionFailedCallback: rej
-            });
-          })];
+        if (subscriptionObserver) {
+          subscriptionState = subscriptionObserver.subscriptionState; // This in case unsubscribe is invoked before sending start subscription message
+
+          if (subscriptionState === SUBSCRIPTION_STATUS.PENDING) {
+            return [2
+            /*return*/
+            , new Promise(function (res, rej) {
+              var observer = subscriptionObserver.observer,
+                  subscriptionState = subscriptionObserver.subscriptionState,
+                  variables = subscriptionObserver.variables,
+                  query = subscriptionObserver.query;
+
+              _this.subscriptionObserverMap.set(subscriptionId, {
+                observer: observer,
+                subscriptionState: subscriptionState,
+                variables: variables,
+                query: query,
+                subscriptionReadyCallback: res,
+                subscriptionFailedCallback: rej
+              });
+            })];
+          }
         }
 
         return [2
@@ -12738,19 +12742,23 @@ function (_super) {
       setTimeout(this._closeSocketIfRequired.bind(this), 1000);
     } else {
       logger.debug('closing WebSocket...');
-      clearTimeout(this.keepAliveTimeoutId);
+      if (this.keepAliveTimeoutId) clearTimeout(this.keepAliveTimeoutId);
       var tempSocket = this.awsRealTimeSocket; // Cleaning callbacks to avoid race condition, socket still exists
 
-      tempSocket.onclose = undefined;
-      tempSocket.onerror = undefined;
+      tempSocket.onclose = null;
+      tempSocket.onerror = null;
       tempSocket.close(1000);
-      this.awsRealTimeSocket = null;
+      this.awsRealTimeSocket = undefined;
       this.socketStatus = SOCKET_STATUS.CLOSED;
     }
   };
 
   AWSAppSyncRealTimeProvider.prototype._handleIncomingSubscriptionMessage = function (message) {
-    logger.debug("subscription message from AWS AppSync RealTime: " + message.data);
+    if (message.data && message.data === '{"type":"ka"}') {
+      logger.verbose("subscription message from AWS AppSync RealTime: " + message.data);
+    } else {
+      logger.debug("subscription message from AWS AppSync RealTime: " + message.data);
+    }
 
     var _a = JSON.parse(message.data),
         _b = _a.id,
@@ -12769,12 +12777,21 @@ function (_super) {
         subscriptionReadyCallback = _c.subscriptionReadyCallback,
         subscriptionFailedCallback = _c.subscriptionFailedCallback;
 
-    logger.debug({
-      id: id,
-      observer: observer,
-      query: query,
-      variables: variables
-    });
+    if (!id && !observer && !query && Object.keys(variables).length === 0) {
+      logger.verbose({
+        id: id,
+        observer: observer,
+        query: query,
+        variables: variables
+      });
+    } else {
+      logger.debug({
+        id: id,
+        observer: observer,
+        query: query,
+        variables: variables
+      });
+    }
 
     if (type === MESSAGE_TYPES.GQL_DATA && payload && payload.data) {
       if (observer) {
@@ -12796,50 +12813,57 @@ function (_super) {
         subscriptionReadyCallback();
       }
 
-      clearTimeout(startAckTimeoutId);
+      if (startAckTimeoutId) clearTimeout(startAckTimeoutId);
       dispatchApiEvent(_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].SUBSCRIPTION_ACK, {
         query: query,
         variables: variables
       }, 'Connection established for subscription');
       var subscriptionState = SUBSCRIPTION_STATUS.CONNECTED;
-      this.subscriptionObserverMap.set(id, {
-        observer: observer,
-        query: query,
-        variables: variables,
-        startAckTimeoutId: null,
-        subscriptionState: subscriptionState,
-        subscriptionReadyCallback: subscriptionReadyCallback,
-        subscriptionFailedCallback: subscriptionFailedCallback
-      }); // TODO: emit event on hub but it requires to store the id first
+
+      if (observer) {
+        this.subscriptionObserverMap.set(id, {
+          observer: observer,
+          query: query,
+          variables: variables,
+          startAckTimeoutId: undefined,
+          subscriptionState: subscriptionState,
+          subscriptionReadyCallback: subscriptionReadyCallback,
+          subscriptionFailedCallback: subscriptionFailedCallback
+        });
+      } // TODO: emit event on hub but it requires to store the id first
+
 
       return;
     }
 
     if (type === MESSAGE_TYPES.GQL_CONNECTION_KEEP_ALIVE) {
-      clearTimeout(this.keepAliveTimeoutId);
+      if (this.keepAliveTimeoutId) clearTimeout(this.keepAliveTimeoutId);
       this.keepAliveTimeoutId = setTimeout(this._errorDisconnect.bind(this, _index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].TIMEOUT_DISCONNECT), this.keepAliveTimeout);
       return;
     }
 
     if (type === MESSAGE_TYPES.GQL_ERROR) {
       var subscriptionState = SUBSCRIPTION_STATUS.FAILED;
-      this.subscriptionObserverMap.set(id, {
-        observer: observer,
-        query: query,
-        variables: variables,
-        startAckTimeoutId: startAckTimeoutId,
-        subscriptionReadyCallback: subscriptionReadyCallback,
-        subscriptionFailedCallback: subscriptionFailedCallback,
-        subscriptionState: subscriptionState
-      });
-      observer.error({
-        errors: [__assign({}, new graphql__WEBPACK_IMPORTED_MODULE_1__["GraphQLError"](_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_FAILED + ": " + JSON.stringify(payload)))]
-      });
-      clearTimeout(startAckTimeoutId);
-      observer.complete();
 
-      if (typeof subscriptionFailedCallback === 'function') {
-        subscriptionFailedCallback();
+      if (observer) {
+        this.subscriptionObserverMap.set(id, {
+          observer: observer,
+          query: query,
+          variables: variables,
+          startAckTimeoutId: startAckTimeoutId,
+          subscriptionReadyCallback: subscriptionReadyCallback,
+          subscriptionFailedCallback: subscriptionFailedCallback,
+          subscriptionState: subscriptionState
+        });
+        observer.error({
+          errors: [__assign({}, new graphql__WEBPACK_IMPORTED_MODULE_1__["GraphQLError"](_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_FAILED + ": " + JSON.stringify(payload)))]
+        });
+        if (startAckTimeoutId) clearTimeout(startAckTimeoutId);
+        observer.complete();
+
+        if (typeof subscriptionFailedCallback === 'function') {
+          subscriptionFailedCallback();
+        }
       }
     }
   };
@@ -12865,37 +12889,40 @@ function (_super) {
   };
 
   AWSAppSyncRealTimeProvider.prototype._timeoutStartSubscriptionAck = function (subscriptionId) {
-    var _a = this.subscriptionObserverMap.get(subscriptionId) || {},
-        observer = _a.observer,
-        query = _a.query,
-        variables = _a.variables;
+    var subscriptionObserver = this.subscriptionObserverMap.get(subscriptionId);
 
-    if (!observer) {
-      return;
-    }
+    if (subscriptionObserver) {
+      var observer = subscriptionObserver.observer,
+          query = subscriptionObserver.query,
+          variables = subscriptionObserver.variables;
 
-    this.subscriptionObserverMap.set(subscriptionId, {
-      observer: observer,
-      query: query,
-      variables: variables,
-      subscriptionState: SUBSCRIPTION_STATUS.FAILED
-    });
+      if (!observer) {
+        return;
+      }
 
-    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
+      this.subscriptionObserverMap.set(subscriptionId, {
+        observer: observer,
+        query: query,
+        variables: variables,
+        subscriptionState: SUBSCRIPTION_STATUS.FAILED
+      });
 
-      observer.complete();
-    }
+      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
 
-    logger.debug('timeoutStartSubscription', JSON.stringify({
-      query: query,
-      variables: variables
-    }));
+        observer.complete();
+      }
+
+      logger.debug('timeoutStartSubscription', JSON.stringify({
+        query: query,
+        variables: variables
+      }));
+    }
   };
 
   AWSAppSyncRealTimeProvider.prototype._initializeWebSocketConnection = function (_a) {
@@ -12949,7 +12976,7 @@ function (_super) {
               headerString = _b.apply(_a, [_c.sent()]);
               headerQs = buffer__WEBPACK_IMPORTED_MODULE_4__["Buffer"].from(headerString).toString('base64');
               payloadQs = buffer__WEBPACK_IMPORTED_MODULE_4__["Buffer"].from(payloadString).toString('base64');
-              discoverableEndpoint = appSyncGraphqlEndpoint;
+              discoverableEndpoint = appSyncGraphqlEndpoint !== null && appSyncGraphqlEndpoint !== void 0 ? appSyncGraphqlEndpoint : '';
 
               if (this.isCustomDomain(discoverableEndpoint)) {
                 discoverableEndpoint = discoverableEndpoint.concat(customDomainPath);
@@ -12962,9 +12989,7 @@ function (_super) {
               awsRealTimeUrl = discoverableEndpoint + "?header=" + headerQs + "&payload=" + payloadQs;
               return [4
               /*yield*/
-              , this._initializeRetryableHandshake({
-                awsRealTimeUrl: awsRealTimeUrl
-              })];
+              , this._initializeRetryableHandshake(awsRealTimeUrl)];
 
             case 3:
               _c.sent();
@@ -12992,7 +13017,7 @@ function (_super) {
                 this.awsRealTimeSocket.close(3001);
               }
 
-              this.awsRealTimeSocket = null;
+              this.awsRealTimeSocket = undefined;
               this.socketStatus = SOCKET_STATUS.CLOSED;
               return [3
               /*break*/
@@ -13008,21 +13033,18 @@ function (_super) {
     });
   };
 
-  AWSAppSyncRealTimeProvider.prototype._initializeRetryableHandshake = function (_a) {
-    var awsRealTimeUrl = _a.awsRealTimeUrl;
+  AWSAppSyncRealTimeProvider.prototype._initializeRetryableHandshake = function (awsRealTimeUrl) {
     return __awaiter(this, void 0, void 0, function () {
-      return __generator(this, function (_b) {
-        switch (_b.label) {
+      return __generator(this, function (_a) {
+        switch (_a.label) {
           case 0:
             logger.debug("Initializaling retryable Handshake");
             return [4
             /*yield*/
-            , Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["jitteredExponentialRetry"])(this._initializeHandshake.bind(this), [{
-              awsRealTimeUrl: awsRealTimeUrl
-            }], MAX_DELAY_MS)];
+            , Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["jitteredExponentialRetry"])(this._initializeHandshake.bind(this), [awsRealTimeUrl], MAX_DELAY_MS)];
 
           case 1:
-            _b.sent();
+            _a.sent();
 
             return [2
             /*return*/
@@ -13032,10 +13054,9 @@ function (_super) {
     });
   };
 
-  AWSAppSyncRealTimeProvider.prototype._initializeHandshake = function (_a) {
-    var awsRealTimeUrl = _a.awsRealTimeUrl;
+  AWSAppSyncRealTimeProvider.prototype._initializeHandshake = function (awsRealTimeUrl) {
     return __awaiter(this, void 0, void 0, function () {
-      var err_4, errorType, errorCode;
+      var err_4, _a, errorType, errorCode;
 
       var _this = this;
 
@@ -13077,77 +13098,82 @@ function (_super) {
             /*yield*/
             , function () {
               return new Promise(function (res, rej) {
-                var ackOk = false;
+                if (_this.awsRealTimeSocket) {
+                  var ackOk_1 = false;
 
-                _this.awsRealTimeSocket.onerror = function (error) {
-                  logger.debug("WebSocket error " + JSON.stringify(error));
-                };
+                  _this.awsRealTimeSocket.onerror = function (error) {
+                    logger.debug("WebSocket error " + JSON.stringify(error));
+                  };
 
-                _this.awsRealTimeSocket.onclose = function (event) {
-                  logger.debug("WebSocket closed " + event.reason);
-                  rej(new Error(JSON.stringify(event)));
-                };
+                  _this.awsRealTimeSocket.onclose = function (event) {
+                    logger.debug("WebSocket closed " + event.reason);
+                    rej(new Error(JSON.stringify(event)));
+                  };
 
-                _this.awsRealTimeSocket.onmessage = function (message) {
-                  logger.debug("subscription message from AWS AppSyncRealTime: " + message.data + " ");
-                  var data = JSON.parse(message.data);
-                  var type = data.type,
-                      _a = data.payload,
-                      _b = (_a === void 0 ? {} : _a).connectionTimeoutMs,
-                      connectionTimeoutMs = _b === void 0 ? DEFAULT_KEEP_ALIVE_TIMEOUT : _b;
+                  _this.awsRealTimeSocket.onmessage = function (message) {
+                    logger.debug("subscription message from AWS AppSyncRealTime: " + message.data + " ");
+                    var data = JSON.parse(message.data);
+                    var type = data.type,
+                        _a = data.payload,
+                        _b = (_a === void 0 ? {} : _a).connectionTimeoutMs,
+                        connectionTimeoutMs = _b === void 0 ? DEFAULT_KEEP_ALIVE_TIMEOUT : _b;
 
-                  if (type === MESSAGE_TYPES.GQL_CONNECTION_ACK) {
-                    ackOk = true;
-                    _this.keepAliveTimeout = connectionTimeoutMs;
-                    _this.awsRealTimeSocket.onmessage = _this._handleIncomingSubscriptionMessage.bind(_this);
+                    if (type === MESSAGE_TYPES.GQL_CONNECTION_ACK) {
+                      ackOk_1 = true;
 
-                    _this.awsRealTimeSocket.onerror = function (err) {
-                      logger.debug(err);
+                      if (_this.awsRealTimeSocket) {
+                        _this.keepAliveTimeout = connectionTimeoutMs;
+                        _this.awsRealTimeSocket.onmessage = _this._handleIncomingSubscriptionMessage.bind(_this);
 
-                      _this._errorDisconnect(_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_CLOSED);
-                    };
+                        _this.awsRealTimeSocket.onerror = function (err) {
+                          logger.debug(err);
 
-                    _this.awsRealTimeSocket.onclose = function (event) {
-                      logger.debug("WebSocket closed " + event.reason);
+                          _this._errorDisconnect(_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_CLOSED);
+                        };
 
-                      _this._errorDisconnect(_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_CLOSED);
-                    };
+                        _this.awsRealTimeSocket.onclose = function (event) {
+                          logger.debug("WebSocket closed " + event.reason);
 
-                    res('Cool, connected to AWS AppSyncRealTime');
-                    return;
-                  }
+                          _this._errorDisconnect(_index__WEBPACK_IMPORTED_MODULE_9__["CONTROL_MSG"].CONNECTION_CLOSED);
+                        };
+                      }
 
-                  if (type === 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;
-
-                    rej({
-                      errorType: errorType,
-                      errorCode: errorCode
-                    });
-                  }
-                };
+                      res('Cool, connected to AWS AppSyncRealTime');
+                      return;
+                    }
 
-                var gqlInit = {
-                  type: MESSAGE_TYPES.GQL_CONNECTION_INIT
-                };
+                    if (type === 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;
+
+                      rej({
+                        errorType: errorType,
+                        errorCode: errorCode
+                      });
+                    }
+                  };
 
-                _this.awsRealTimeSocket.send(JSON.stringify(gqlInit));
+                  var gqlInit = {
+                    type: MESSAGE_TYPES.GQL_CONNECTION_INIT
+                  };
 
-                function checkAckOk() {
+                  _this.awsRealTimeSocket.send(JSON.stringify(gqlInit));
+
+                  setTimeout(checkAckOk.bind(_this, ackOk_1), CONNECTION_INIT_TIMEOUT);
+                }
+
+                function checkAckOk(ackOk) {
                   if (!ackOk) {
                     rej(new Error("Connection timeout: ack from AWSRealTime was not received on " + CONNECTION_INIT_TIMEOUT + " ms"));
                   }
                 }
-
-                setTimeout(checkAckOk.bind(_this), CONNECTION_INIT_TIMEOUT);
               });
             }()];
 
@@ -13161,7 +13187,7 @@ function (_super) {
 
           case 4:
             err_4 = _b.sent();
-            errorType = err_4.errorType, errorCode = err_4.errorCode;
+            _a = err_4, errorType = _a.errorType, errorCode = _a.errorCode;
 
             if (NON_RETRYABLE_CODES.includes(errorCode)) {
               throw new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["NonRetryableError"](errorType);
@@ -13204,16 +13230,17 @@ function (_super) {
               AMAZON_COGNITO_USER_POOLS: this._awsRealTimeCUPHeader.bind(this),
               AWS_LAMBDA: this._customAuthHeader
             };
-            handler = headerHandler[authenticationType];
-
-            if (typeof handler !== 'function') {
-              logger.debug("Authentication type " + authenticationType + " not supported");
-              return [2
-              /*return*/
-              , ''];
-            }
+            if (!(!authenticationType || !headerHandler[authenticationType])) return [3
+            /*break*/
+            , 1];
+            logger.debug("Authentication type " + authenticationType + " not supported");
+            return [2
+            /*return*/
+            , ''];
 
-            host = url__WEBPACK_IMPORTED_MODULE_2__["parse"](appSyncGraphqlEndpoint).host;
+          case 1:
+            handler = headerHandler[authenticationType];
+            host = url__WEBPACK_IMPORTED_MODULE_2__["parse"](appSyncGraphqlEndpoint !== null && appSyncGraphqlEndpoint !== void 0 ? appSyncGraphqlEndpoint : '').host;
             return [4
             /*yield*/
             , handler({
@@ -13226,7 +13253,7 @@ function (_super) {
               additionalHeaders: additionalHeaders
             })];
 
-          case 1:
+          case 2:
             result = _b.sent();
             return [2
             /*return*/
@@ -13358,10 +13385,14 @@ function (_super) {
             return [4
             /*yield*/
             , _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["Credentials"].get().then(function (credentials) {
+              var _a = credentials,
+                  secretAccessKey = _a.secretAccessKey,
+                  accessKeyId = _a.accessKeyId,
+                  sessionToken = _a.sessionToken;
               return {
-                secret_key: credentials.secretAccessKey,
-                access_key: credentials.accessKeyId,
-                session_token: credentials.sessionToken
+                secret_key: secretAccessKey,
+                access_key: accessKeyId,
+                session_token: sessionToken
               };
             })];
 
@@ -13386,7 +13417,7 @@ function (_super) {
     var host = _a.host,
         additionalHeaders = _a.additionalHeaders;
 
-    if (!additionalHeaders.Authorization) {
+    if (!additionalHeaders || !additionalHeaders['Authorization']) {
       throw new Error('No auth token specified');
     }
 
@@ -13623,8 +13654,12 @@ var AWSIoTProvider =
 function (_super) {
   __extends(AWSIoTProvider, _super);
 
-  function AWSIoTProvider() {
-    return _super !== null && _super.apply(this, arguments) || this;
+  function AWSIoTProvider(options) {
+    if (options === void 0) {
+      options = {};
+    }
+
+    return _super.call(this, options) || this;
   }
 
   Object.defineProperty(AWSIoTProvider.prototype, "region", {
@@ -13954,21 +13989,27 @@ function () {
 
   ClientsQueue.prototype.get = function (clientId, clientFactory) {
     return __awaiter(this, void 0, void 0, function () {
-      var promise;
+      var cachedPromise, newPromise;
       return __generator(this, function (_a) {
-        promise = this.promises.get(clientId);
+        cachedPromise = this.promises.get(clientId);
+
+        if (cachedPromise) {
+          return [2
+          /*return*/
+          , cachedPromise];
+        }
 
-        if (promise) {
+        if (clientFactory) {
+          newPromise = clientFactory(clientId);
+          this.promises.set(clientId, newPromise);
           return [2
           /*return*/
-          , promise];
+          , newPromise];
         }
 
-        promise = clientFactory(clientId);
-        this.promises.set(clientId, promise);
         return [2
         /*return*/
-        , promise];
+        , undefined];
       });
     });
   };
@@ -14060,6 +14101,10 @@ function (_super) {
       }, args), null, 2));
       var topicsToDelete_1 = [];
 
+      if (!clientId) {
+        return;
+      }
+
       var clientIdObservers = this._clientIdObservers.get(clientId);
 
       if (!clientIdObservers) {
@@ -14178,9 +14223,7 @@ function (_super) {
           case 0:
             return [4
             /*yield*/
-            , this.clientsQueue.get(clientId, function () {
-              return null;
-            })];
+            , this.clientsQueue.get(clientId)];
 
           case 1:
             client = _a.sent();
@@ -14359,13 +14402,14 @@ function (_super) {
       })();
 
       return function () {
+        var _a, _b;
+
         logger.debug('Unsubscribing from topic(s)', targetTopics.join(','));
 
         if (client) {
-          _this._clientIdObservers.get(clientId)["delete"](observer); // No more observers per client => client not needed anymore
+          (_a = _this._clientIdObservers.get(clientId)) === null || _a === void 0 ? void 0 : _a["delete"](observer); // No more observers per client => client not needed anymore
 
-
-          if (_this._clientIdObservers.get(clientId).size === 0) {
+          if (((_b = _this._clientIdObservers.get(clientId)) === null || _b === void 0 ? void 0 : _b.size) === 0) {
             _this.disconnect(clientId);
 
             _this._clientIdObservers["delete"](clientId);
@@ -14700,7 +14744,7 @@ function () {
    * @param {PubSubOptions} options - Configuration object for PubSub
    */
   function PubSubClass(options) {
-    this._options = options;
+    this._options = options !== null && options !== void 0 ? options : {};
     logger.debug('PubSub Options', this._options);
     this._pluggables = [];
     this.subscribe = this.subscribe.bind(this);
@@ -14889,7 +14933,7 @@ function () {
 }();
 
 
-var PubSub = new PubSubClass(null);
+var PubSub = new PubSubClass();
 _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Amplify"].register(PubSub);
 
 /***/ }),