@aws-amplify/api 4.0.29-unstable.4 → 4.0.30-custom-pk.79

package/dist/aws-amplify-api.js

@@ -125,12 +125,24 @@ var buildFullPath = __webpack_require__(/*! ../core/buildFullPath */ "../../node
 var parseHeaders = __webpack_require__(/*! ./../helpers/parseHeaders */ "../../node_modules/axios/lib/helpers/parseHeaders.js");
 var isURLSameOrigin = __webpack_require__(/*! ./../helpers/isURLSameOrigin */ "../../node_modules/axios/lib/helpers/isURLSameOrigin.js");
 var createError = __webpack_require__(/*! ../core/createError */ "../../node_modules/axios/lib/core/createError.js");
+var defaults = __webpack_require__(/*! ../defaults */ "../../node_modules/axios/lib/defaults.js");
+var Cancel = __webpack_require__(/*! ../cancel/Cancel */ "../../node_modules/axios/lib/cancel/Cancel.js");
 
 module.exports = function xhrAdapter(config) {
   return new Promise(function dispatchXhrRequest(resolve, reject) {
     var requestData = config.data;
     var requestHeaders = config.headers;
     var responseType = config.responseType;
+    var onCanceled;
+    function done() {
+      if (config.cancelToken) {
+        config.cancelToken.unsubscribe(onCanceled);
+      }
+
+      if (config.signal) {
+        config.signal.removeEventListener('abort', onCanceled);
+      }
+    }
 
     if (utils.isFormData(requestData)) {
       delete requestHeaders['Content-Type']; // Let the browser set it
@@ -168,7 +180,13 @@ module.exports = function xhrAdapter(config) {
         request: request
       };
 
-      settle(resolve, reject, response);
+      settle(function _resolve(value) {
+        resolve(value);
+        done();
+      }, function _reject(err) {
+        reject(err);
+        done();
+      }, response);
 
       // Clean up request
       request = null;
@@ -221,14 +239,15 @@ module.exports = function xhrAdapter(config) {
 
     // Handle timeout
     request.ontimeout = function handleTimeout() {
-      var timeoutErrorMessage = 'timeout of ' + config.timeout + 'ms exceeded';
+      var timeoutErrorMessage = config.timeout ? 'timeout of ' + config.timeout + 'ms exceeded' : 'timeout exceeded';
+      var transitional = config.transitional || defaults.transitional;
       if (config.timeoutErrorMessage) {
         timeoutErrorMessage = config.timeoutErrorMessage;
       }
       reject(createError(
         timeoutErrorMessage,
         config,
-        config.transitional && config.transitional.clarifyTimeoutError ? 'ETIMEDOUT' : 'ECONNABORTED',
+        transitional.clarifyTimeoutError ? 'ETIMEDOUT' : 'ECONNABORTED',
         request));
 
       // Clean up request
@@ -282,18 +301,22 @@ module.exports = function xhrAdapter(config) {
       request.upload.addEventListener('progress', config.onUploadProgress);
     }
 
-    if (config.cancelToken) {
+    if (config.cancelToken || config.signal) {
       // Handle cancellation
-      config.cancelToken.promise.then(function onCanceled(cancel) {
+      // eslint-disable-next-line func-names
+      onCanceled = function(cancel) {
         if (!request) {
           return;
         }
-
+        reject(!cancel || (cancel && cancel.type) ? new Cancel('canceled') : cancel);
         request.abort();
-        reject(cancel);
-        // Clean up request
         request = null;
-      });
+      };
+
+      config.cancelToken && config.cancelToken.subscribe(onCanceled);
+      if (config.signal) {
+        config.signal.aborted ? onCanceled() : config.signal.addEventListener('abort', onCanceled);
+      }
     }
 
     if (!requestData) {
@@ -340,6 +363,11 @@ function createInstance(defaultConfig) {
   // Copy context to instance
   utils.extend(instance, context);
 
+  // Factory for creating new instances
+  instance.create = function create(instanceConfig) {
+    return createInstance(mergeConfig(defaultConfig, instanceConfig));
+  };
+
   return instance;
 }
 
@@ -349,15 +377,11 @@ var axios = createInstance(defaults);
 // Expose Axios class to allow class inheritance
 axios.Axios = Axios;
 
-// Factory for creating new instances
-axios.create = function create(instanceConfig) {
-  return createInstance(mergeConfig(axios.defaults, instanceConfig));
-};
-
 // Expose Cancel & CancelToken
 axios.Cancel = __webpack_require__(/*! ./cancel/Cancel */ "../../node_modules/axios/lib/cancel/Cancel.js");
 axios.CancelToken = __webpack_require__(/*! ./cancel/CancelToken */ "../../node_modules/axios/lib/cancel/CancelToken.js");
 axios.isCancel = __webpack_require__(/*! ./cancel/isCancel */ "../../node_modules/axios/lib/cancel/isCancel.js");
+axios.VERSION = __webpack_require__(/*! ./env/data */ "../../node_modules/axios/lib/env/data.js").version;
 
 // Expose all/spread
 axios.all = function all(promises) {
@@ -431,11 +455,42 @@ function CancelToken(executor) {
   }
 
   var resolvePromise;
+
   this.promise = new Promise(function promiseExecutor(resolve) {
     resolvePromise = resolve;
   });
 
   var token = this;
+
+  // eslint-disable-next-line func-names
+  this.promise.then(function(cancel) {
+    if (!token._listeners) return;
+
+    var i;
+    var l = token._listeners.length;
+
+    for (i = 0; i < l; i++) {
+      token._listeners[i](cancel);
+    }
+    token._listeners = null;
+  });
+
+  // eslint-disable-next-line func-names
+  this.promise.then = function(onfulfilled) {
+    var _resolve;
+    // eslint-disable-next-line func-names
+    var promise = new Promise(function(resolve) {
+      token.subscribe(resolve);
+      _resolve = resolve;
+    }).then(onfulfilled);
+
+    promise.cancel = function reject() {
+      token.unsubscribe(_resolve);
+    };
+
+    return promise;
+  };
+
   executor(function cancel(message) {
     if (token.reason) {
       // Cancellation has already been requested
@@ -456,6 +511,37 @@ CancelToken.prototype.throwIfRequested = function throwIfRequested() {
   }
 };
 
+/**
+ * Subscribe to the cancel signal
+ */
+
+CancelToken.prototype.subscribe = function subscribe(listener) {
+  if (this.reason) {
+    listener(this.reason);
+    return;
+  }
+
+  if (this._listeners) {
+    this._listeners.push(listener);
+  } else {
+    this._listeners = [listener];
+  }
+};
+
+/**
+ * Unsubscribe from the cancel signal
+ */
+
+CancelToken.prototype.unsubscribe = function unsubscribe(listener) {
+  if (!this._listeners) {
+    return;
+  }
+  var index = this._listeners.indexOf(listener);
+  if (index !== -1) {
+    this._listeners.splice(index, 1);
+  }
+};
+
 /**
  * Returns an object that contains a new `CancelToken` and a function that, when called,
  * cancels the `CancelToken`.
@@ -529,14 +615,14 @@ function Axios(instanceConfig) {
  *
  * @param {Object} config The config specific for this request (merged with this.defaults)
  */
-Axios.prototype.request = function request(config) {
+Axios.prototype.request = function request(configOrUrl, config) {
   /*eslint no-param-reassign:0*/
   // Allow for axios('example/url'[, config]) a la fetch API
-  if (typeof config === 'string') {
-    config = arguments[1] || {};
-    config.url = arguments[0];
-  } else {
+  if (typeof configOrUrl === 'string') {
     config = config || {};
+    config.url = configOrUrl;
+  } else {
+    config = configOrUrl || {};
   }
 
   config = mergeConfig(this.defaults, config);
@@ -554,9 +640,9 @@ Axios.prototype.request = function request(config) {
 
   if (transitional !== undefined) {
     validator.assertOptions(transitional, {
-      silentJSONParsing: validators.transitional(validators.boolean, '1.0.0'),
-      forcedJSONParsing: validators.transitional(validators.boolean, '1.0.0'),
-      clarifyTimeoutError: validators.transitional(validators.boolean, '1.0.0')
+      silentJSONParsing: validators.transitional(validators.boolean),
+      forcedJSONParsing: validators.transitional(validators.boolean),
+      clarifyTimeoutError: validators.transitional(validators.boolean)
     }, false);
   }
 
@@ -795,6 +881,7 @@ var utils = __webpack_require__(/*! ./../utils */ "../../node_modules/axios/lib/
 var transformData = __webpack_require__(/*! ./transformData */ "../../node_modules/axios/lib/core/transformData.js");
 var isCancel = __webpack_require__(/*! ../cancel/isCancel */ "../../node_modules/axios/lib/cancel/isCancel.js");
 var defaults = __webpack_require__(/*! ../defaults */ "../../node_modules/axios/lib/defaults.js");
+var Cancel = __webpack_require__(/*! ../cancel/Cancel */ "../../node_modules/axios/lib/cancel/Cancel.js");
 
 /**
  * Throws a `Cancel` if cancellation has been requested.
@@ -803,6 +890,10 @@ function throwIfCancellationRequested(config) {
   if (config.cancelToken) {
     config.cancelToken.throwIfRequested();
   }
+
+  if (config.signal && config.signal.aborted) {
+    throw new Cancel('canceled');
+  }
 }
 
 /**
@@ -920,7 +1011,8 @@ module.exports = function enhanceError(error, config, code, request, response) {
       stack: this.stack,
       // Axios
       config: this.config,
-      code: this.code
+      code: this.code,
+      status: this.response && this.response.status ? this.response.status : null
     };
   };
   return error;
@@ -954,17 +1046,6 @@ module.exports = function mergeConfig(config1, config2) {
   config2 = config2 || {};
   var config = {};
 
-  var valueFromConfig2Keys = ['url', 'method', 'data'];
-  var mergeDeepPropertiesKeys = ['headers', 'auth', 'proxy', 'params'];
-  var defaultToConfig2Keys = [
-    'baseURL', 'transformRequest', 'transformResponse', 'paramsSerializer',
-    'timeout', 'timeoutMessage', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
-    'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'decompress',
-    'maxContentLength', 'maxBodyLength', 'maxRedirects', 'transport', 'httpAgent',
-    'httpsAgent', 'cancelToken', 'socketPath', 'responseEncoding'
-  ];
-  var directMergeKeys = ['validateStatus'];
-
   function getMergedValue(target, source) {
     if (utils.isPlainObject(target) && utils.isPlainObject(source)) {
       return utils.merge(target, source);
@@ -976,52 +1057,75 @@ module.exports = function mergeConfig(config1, config2) {
     return source;
   }
 
+  // eslint-disable-next-line consistent-return
   function mergeDeepProperties(prop) {
     if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(config1[prop], config2[prop]);
+      return getMergedValue(config1[prop], config2[prop]);
     } else if (!utils.isUndefined(config1[prop])) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
+      return getMergedValue(undefined, config1[prop]);
     }
   }
 
-  utils.forEach(valueFromConfig2Keys, function valueFromConfig2(prop) {
+  // eslint-disable-next-line consistent-return
+  function valueFromConfig2(prop) {
     if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(undefined, config2[prop]);
+      return getMergedValue(undefined, config2[prop]);
     }
-  });
-
-  utils.forEach(mergeDeepPropertiesKeys, mergeDeepProperties);
+  }
 
-  utils.forEach(defaultToConfig2Keys, function defaultToConfig2(prop) {
+  // eslint-disable-next-line consistent-return
+  function defaultToConfig2(prop) {
     if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(undefined, config2[prop]);
+      return getMergedValue(undefined, config2[prop]);
     } else if (!utils.isUndefined(config1[prop])) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
+      return getMergedValue(undefined, config1[prop]);
     }
-  });
+  }
 
-  utils.forEach(directMergeKeys, function merge(prop) {
+  // eslint-disable-next-line consistent-return
+  function mergeDirectKeys(prop) {
     if (prop in config2) {
-      config[prop] = getMergedValue(config1[prop], config2[prop]);
+      return getMergedValue(config1[prop], config2[prop]);
     } else if (prop in config1) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
-    }
+      return getMergedValue(undefined, config1[prop]);
+    }
+  }
+
+  var mergeMap = {
+    'url': valueFromConfig2,
+    'method': valueFromConfig2,
+    'data': valueFromConfig2,
+    'baseURL': defaultToConfig2,
+    'transformRequest': defaultToConfig2,
+    'transformResponse': defaultToConfig2,
+    'paramsSerializer': defaultToConfig2,
+    'timeout': defaultToConfig2,
+    'timeoutMessage': defaultToConfig2,
+    'withCredentials': defaultToConfig2,
+    'adapter': defaultToConfig2,
+    'responseType': defaultToConfig2,
+    'xsrfCookieName': defaultToConfig2,
+    'xsrfHeaderName': defaultToConfig2,
+    'onUploadProgress': defaultToConfig2,
+    'onDownloadProgress': defaultToConfig2,
+    'decompress': defaultToConfig2,
+    'maxContentLength': defaultToConfig2,
+    'maxBodyLength': defaultToConfig2,
+    'transport': defaultToConfig2,
+    'httpAgent': defaultToConfig2,
+    'httpsAgent': defaultToConfig2,
+    'cancelToken': defaultToConfig2,
+    'socketPath': defaultToConfig2,
+    'responseEncoding': defaultToConfig2,
+    'validateStatus': mergeDirectKeys
+  };
+
+  utils.forEach(Object.keys(config1).concat(Object.keys(config2)), function computeConfigValue(prop) {
+    var merge = mergeMap[prop] || mergeDeepProperties;
+    var configValue = merge(prop);
+    (utils.isUndefined(configValue) && merge !== mergeDirectKeys) || (config[prop] = configValue);
   });
 
-  var axiosKeys = valueFromConfig2Keys
-    .concat(mergeDeepPropertiesKeys)
-    .concat(defaultToConfig2Keys)
-    .concat(directMergeKeys);
-
-  var otherKeys = Object
-    .keys(config1)
-    .concat(Object.keys(config2))
-    .filter(function filterAxiosKeys(key) {
-      return axiosKeys.indexOf(key) === -1;
-    });
-
-  utils.forEach(otherKeys, mergeDeepProperties);
-
   return config;
 };
 
@@ -1188,7 +1292,7 @@ var defaults = {
   }],
 
   transformResponse: [function transformResponse(data) {
-    var transitional = this.transitional;
+    var transitional = this.transitional || defaults.transitional;
     var silentJSONParsing = transitional && transitional.silentJSONParsing;
     var forcedJSONParsing = transitional && transitional.forcedJSONParsing;
     var strictJSONParsing = !silentJSONParsing && this.responseType === 'json';
@@ -1223,12 +1327,12 @@ var defaults = {
 
   validateStatus: function validateStatus(status) {
     return status >= 200 && status < 300;
-  }
-};
+  },
 
-defaults.headers = {
-  common: {
-    'Accept': 'application/json, text/plain, */*'
+  headers: {
+    common: {
+      'Accept': 'application/json, text/plain, */*'
+    }
   }
 };
 
@@ -1246,6 +1350,19 @@ module.exports = defaults;
 
 /***/ }),
 
+/***/ "../../node_modules/axios/lib/env/data.js":
+/*!***********************************************************!*\
+  !*** /root/amplify-js/node_modules/axios/lib/env/data.js ***!
+  \***********************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = {
+  "version": "0.26.0"
+};
+
+/***/ }),
+
 /***/ "../../node_modules/axios/lib/helpers/bind.js":
 /*!***************************************************************!*\
   !*** /root/amplify-js/node_modules/axios/lib/helpers/bind.js ***!
@@ -1462,7 +1579,7 @@ module.exports = function isAbsoluteURL(url) {
   // A URL is considered absolute if it begins with "<scheme>://" or "//" (protocol-relative URL).
   // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed
   // by any combination of letters, digits, plus, period, or hyphen.
-  return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+  return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url);
 };
 
 
@@ -1478,6 +1595,8 @@ module.exports = function isAbsoluteURL(url) {
 "use strict";
 
 
+var utils = __webpack_require__(/*! ./../utils */ "../../node_modules/axios/lib/utils.js");
+
 /**
  * Determines whether the payload is an error thrown by Axios
  *
@@ -1485,7 +1604,7 @@ module.exports = function isAbsoluteURL(url) {
  * @returns {boolean} True if the payload is an error thrown by Axios, otherwise false
  */
 module.exports = function isAxiosError(payload) {
-  return (typeof payload === 'object') && (payload.isAxiosError === true);
+  return utils.isObject(payload) && (payload.isAxiosError === true);
 };
 
 
@@ -1709,7 +1828,7 @@ module.exports = function spread(callback) {
 "use strict";
 
 
-var pkg = __webpack_require__(/*! ./../../package.json */ "../../node_modules/axios/package.json");
+var VERSION = __webpack_require__(/*! ../env/data */ "../../node_modules/axios/lib/env/data.js").version;
 
 var validators = {};
 
@@ -1721,48 +1840,26 @@ var validators = {};
 });
 
 var deprecatedWarnings = {};
-var currentVerArr = pkg.version.split('.');
-
-/**
- * Compare package versions
- * @param {string} version
- * @param {string?} thanVersion
- * @returns {boolean}
- */
-function isOlderVersion(version, thanVersion) {
-  var pkgVersionArr = thanVersion ? thanVersion.split('.') : currentVerArr;
-  var destVer = version.split('.');
-  for (var i = 0; i < 3; i++) {
-    if (pkgVersionArr[i] > destVer[i]) {
-      return true;
-    } else if (pkgVersionArr[i] < destVer[i]) {
-      return false;
-    }
-  }
-  return false;
-}
 
 /**
  * Transitional option validator
- * @param {function|boolean?} validator
- * @param {string?} version
- * @param {string} message
+ * @param {function|boolean?} validator - set to false if the transitional option has been removed
+ * @param {string?} version - deprecated version / removed since version
+ * @param {string?} message - some message with additional info
  * @returns {function}
  */
 validators.transitional = function transitional(validator, version, message) {
-  var isDeprecated = version && isOlderVersion(version);
-
   function formatMessage(opt, desc) {
-    return '[Axios v' + pkg.version + '] Transitional option \'' + opt + '\'' + desc + (message ? '. ' + message : '');
+    return '[Axios v' + VERSION + '] Transitional option \'' + opt + '\'' + desc + (message ? '. ' + message : '');
   }
 
   // eslint-disable-next-line func-names
   return function(value, opt, opts) {
     if (validator === false) {
-      throw new Error(formatMessage(opt, ' has been removed in ' + version));
+      throw new Error(formatMessage(opt, ' has been removed' + (version ? ' in ' + version : '')));
     }
 
-    if (isDeprecated && !deprecatedWarnings[opt]) {
+    if (version && !deprecatedWarnings[opt]) {
       deprecatedWarnings[opt] = true;
       // eslint-disable-next-line no-console
       console.warn(
@@ -1808,7 +1905,6 @@ function assertOptions(options, schema, allowUnknown) {
 }
 
 module.exports = {
-  isOlderVersion: isOlderVersion,
   assertOptions: assertOptions,
   validators: validators
 };
@@ -1839,7 +1935,7 @@ var toString = Object.prototype.toString;
  * @returns {boolean} True if value is an Array, otherwise false
  */
 function isArray(val) {
-  return toString.call(val) === '[object Array]';
+  return Array.isArray(val);
 }
 
 /**
@@ -1880,7 +1976,7 @@ function isArrayBuffer(val) {
  * @returns {boolean} True if value is an FormData, otherwise false
  */
 function isFormData(val) {
-  return (typeof FormData !== 'undefined') && (val instanceof FormData);
+  return toString.call(val) === '[object FormData]';
 }
 
 /**
@@ -1894,7 +1990,7 @@ function isArrayBufferView(val) {
   if ((typeof ArrayBuffer !== 'undefined') && (ArrayBuffer.isView)) {
     result = ArrayBuffer.isView(val);
   } else {
-    result = (val) && (val.buffer) && (val.buffer instanceof ArrayBuffer);
+    result = (val) && (val.buffer) && (isArrayBuffer(val.buffer));
   }
   return result;
 }
@@ -2001,7 +2097,7 @@ function isStream(val) {
  * @returns {boolean} True if value is a URLSearchParams object, otherwise false
  */
 function isURLSearchParams(val) {
-  return typeof URLSearchParams !== 'undefined' && val instanceof URLSearchParams;
+  return toString.call(val) === '[object URLSearchParams]';
 }
 
 /**
@@ -2175,17 +2271,6 @@ module.exports = {
 };
 
 
-/***/ }),
-
-/***/ "../../node_modules/axios/package.json":
-/*!********************************************************!*\
-  !*** /root/amplify-js/node_modules/axios/package.json ***!
-  \********************************************************/
-/*! exports provided: name, version, description, main, scripts, repository, keywords, author, license, bugs, homepage, devDependencies, browser, jsdelivr, unpkg, typings, dependencies, bundlesize, default */
-/***/ (function(module) {
-
-module.exports = JSON.parse("{\"name\":\"axios\",\"version\":\"0.21.4\",\"description\":\"Promise based HTTP client for the browser and node.js\",\"main\":\"index.js\",\"scripts\":{\"test\":\"grunt test\",\"start\":\"node ./sandbox/server.js\",\"build\":\"NODE_ENV=production grunt build\",\"preversion\":\"npm test\",\"version\":\"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json\",\"postversion\":\"git push && git push --tags\",\"examples\":\"node ./examples/server.js\",\"coveralls\":\"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js\",\"fix\":\"eslint --fix lib/**/*.js\"},\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/axios/axios.git\"},\"keywords\":[\"xhr\",\"http\",\"ajax\",\"promise\",\"node\"],\"author\":\"Matt Zabriskie\",\"license\":\"MIT\",\"bugs\":{\"url\":\"https://github.com/axios/axios/issues\"},\"homepage\":\"https://axios-http.com\",\"devDependencies\":{\"coveralls\":\"^3.0.0\",\"es6-promise\":\"^4.2.4\",\"grunt\":\"^1.3.0\",\"grunt-banner\":\"^0.6.0\",\"grunt-cli\":\"^1.2.0\",\"grunt-contrib-clean\":\"^1.1.0\",\"grunt-contrib-watch\":\"^1.0.0\",\"grunt-eslint\":\"^23.0.0\",\"grunt-karma\":\"^4.0.0\",\"grunt-mocha-test\":\"^0.13.3\",\"grunt-ts\":\"^6.0.0-beta.19\",\"grunt-webpack\":\"^4.0.2\",\"istanbul-instrumenter-loader\":\"^1.0.0\",\"jasmine-core\":\"^2.4.1\",\"karma\":\"^6.3.2\",\"karma-chrome-launcher\":\"^3.1.0\",\"karma-firefox-launcher\":\"^2.1.0\",\"karma-jasmine\":\"^1.1.1\",\"karma-jasmine-ajax\":\"^0.1.13\",\"karma-safari-launcher\":\"^1.0.0\",\"karma-sauce-launcher\":\"^4.3.6\",\"karma-sinon\":\"^1.0.5\",\"karma-sourcemap-loader\":\"^0.3.8\",\"karma-webpack\":\"^4.0.2\",\"load-grunt-tasks\":\"^3.5.2\",\"minimist\":\"^1.2.0\",\"mocha\":\"^8.2.1\",\"sinon\":\"^4.5.0\",\"terser-webpack-plugin\":\"^4.2.3\",\"typescript\":\"^4.0.5\",\"url-search-params\":\"^0.10.0\",\"webpack\":\"^4.44.2\",\"webpack-dev-server\":\"^3.11.0\"},\"browser\":{\"./lib/adapters/http.js\":\"./lib/adapters/xhr.js\"},\"jsdelivr\":\"dist/axios.min.js\",\"unpkg\":\"dist/axios.min.js\",\"typings\":\"./index.d.ts\",\"dependencies\":{\"follow-redirects\":\"^1.14.0\"},\"bundlesize\":[{\"path\":\"./dist/axios.min.js\",\"threshold\":\"5kB\"}]}");
-
 /***/ }),
 
 /***/ "../../node_modules/base64-js/index.js":
@@ -9601,7 +9686,7 @@ var __read = undefined && undefined.__read || function (o, n) {
 
 var USER_AGENT_HEADER = 'x-amz-user-agent';
 var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["ConsoleLogger"]('GraphQLAPI');
-var graphqlOperation = function graphqlOperation(query, variables, authToken) {
+var graphqlOperation = function graphqlOperation(query, variables, authToken, userAgentSuffix) {
   if (variables === void 0) {
     variables = {};
   }
@@ -9609,7 +9694,8 @@ var graphqlOperation = function graphqlOperation(query, variables, authToken) {
   return {
     query: query,
     variables: variables,
-    authToken: authToken
+    authToken: authToken,
+    userAgentSuffix: userAgentSuffix
   };
 };
 /**
@@ -9889,9 +9975,9 @@ function () {
   /**
    * Executes a GraphQL operation
    *
-   * @param {GraphQLOptions} GraphQL Options
-   * @param {object} additionalHeaders headers to merge in after any `graphql_headers` set in the config
-   * @returns {Promise<GraphQLResult> | Observable<object>}
+   * @param options - GraphQL Options
+   * @param [additionalHeaders] - headers to merge in after any `graphql_headers` set in the config
+   * @returns An Observable if the query is a subscription query, else a promise of the graphql result.
    */
 
 
@@ -9900,7 +9986,8 @@ function () {
         _b = _a.variables,
         variables = _b === void 0 ? {} : _b,
         authMode = _a.authMode,
-        authToken = _a.authToken;
+        authToken = _a.authToken,
+        userAgentSuffix = _a.userAgentSuffix;
     var query = typeof paramQuery === 'string' ? Object(graphql__WEBPACK_IMPORTED_MODULE_0__["parse"])(paramQuery) : Object(graphql__WEBPACK_IMPORTED_MODULE_0__["parse"])(Object(graphql__WEBPACK_IMPORTED_MODULE_0__["print"])(paramQuery));
 
     var _c = __read(query.definitions.filter(function (def) {
@@ -9928,7 +10015,8 @@ function () {
         var responsePromise = this._graphql({
           query: query,
           variables: variables,
-          authMode: authMode
+          authMode: authMode,
+          userAgentSuffix: userAgentSuffix
         }, headers, initParams);
 
         this._api.updateRequestToBeCancellable(responsePromise, cancellableToken);
@@ -9941,15 +10029,17 @@ function () {
           variables: variables,
           authMode: authMode
         }, headers);
-    }
 
-    throw new Error("invalid operation type: " + operationType);
+      default:
+        throw new Error("invalid operation type: " + operationType);
+    }
   };
 
   GraphQLAPIClass.prototype._graphql = function (_a, additionalHeaders, initParams) {
     var query = _a.query,
         variables = _a.variables,
-        authMode = _a.authMode;
+        authMode = _a.authMode,
+        userAgentSuffix = _a.userAgentSuffix;
 
     if (additionalHeaders === void 0) {
       additionalHeaders = {};
@@ -10035,7 +10125,7 @@ function () {
             })];
 
           case 9:
-            headers = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _j.concat([_l.sent()])), additionalHeaders]), !customGraphqlEndpoint && (_k = {}, _k[USER_AGENT_HEADER] = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Constants"].userAgent, _k)]);
+            headers = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _j.concat([_l.sent()])), additionalHeaders]), !customGraphqlEndpoint && (_k = {}, _k[USER_AGENT_HEADER] = Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["getAmplifyUserAgent"])(userAgentSuffix), _k)]);
             body = {
               query: Object(graphql__WEBPACK_IMPORTED_MODULE_0__["print"])(query),
               variables: variables
@@ -10124,6 +10214,16 @@ function () {
   GraphQLAPIClass.prototype.cancel = function (request, message) {
     return this._api.cancel(request, message);
   };
+  /**
+   * Check if the request has a corresponding cancel token in the WeakMap.
+   * @params request - The request promise
+   * @return if the request has a corresponding cancel token.
+   */
+
+
+  GraphQLAPIClass.prototype.hasCancelToken = function (request) {
+    return this._api.hasCancelToken(request);
+  };
 
   GraphQLAPIClass.prototype._graphqlSubscribe = function (_a, additionalHeaders) {
     var query = _a.query,
@@ -10244,17 +10344,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;
 
@@ -10735,6 +10830,16 @@ function () {
   RestAPIClass.prototype.cancel = function (request, message) {
     return this._api.cancel(request, message);
   };
+  /**
+   * Check if the request has a corresponding cancel token in the WeakMap.
+   * @params request - The request promise
+   * @return if the request has a corresponding cancel token.
+   */
+
+
+  RestAPIClass.prototype.hasCancelToken = function (request) {
+    return this._api.hasCancelToken(request);
+  };
   /**
    * Getting endpoint for API
    * @param {string} apiName - The name of the api
@@ -11300,9 +11405,20 @@ function () {
 
     if (source) {
       source.cancel(message);
+      return true;
     }
 
-    return true;
+    return false;
+  };
+  /**
+   * Check if the request has a corresponding cancel token in the WeakMap.
+   * @params request - The request promise
+   * @return if the request has a corresponding cancel token.
+   */
+
+
+  RestClient.prototype.hasCancelToken = function (request) {
+    return this._cancelTokenMap.has(request);
   };
   /**
    * Checks to see if an error thrown is from an api request cancellation
@@ -11712,6 +11828,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 */
@@ -12018,10 +12137,135 @@ function (_super) {
 
 /***/ }),
 
-/***/ "../pubsub/lib-esm/Providers/AWSAppSyncRealTimeProvider.js":
-/*!*****************************************************************!*\
-  !*** ../pubsub/lib-esm/Providers/AWSAppSyncRealTimeProvider.js ***!
-  \*****************************************************************/
+/***/ "../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 */
+/***/ (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; });
+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;
+
+/***/ }),
+
+/***/ "../pubsub/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.js":
+/*!***********************************************************************!*\
+  !*** ../pubsub/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.js ***!
+  \***********************************************************************/
 /*! exports provided: AWSAppSyncRealTimeProvider */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -12043,8 +12287,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _aws_amplify_cache__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_cache__WEBPACK_IMPORTED_MODULE_6__);
 /* 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 _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");
 var __extends = undefined && undefined.__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
     _extendStatics = Object.setPrototypeOf || {
@@ -12280,119 +12525,17 @@ var __read = undefined && undefined.__read || function (o, n) {
 
 
 
+
 var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["Logger"]('AWSAppSyncRealTimeProvider');
-var AMPLIFY_SYMBOL = typeof Symbol !== 'undefined' && typeof Symbol["for"] === 'function' ? Symbol["for"]('amplify_default') : '@@amplify_default';
 
 var dispatchApiEvent = function dispatchApiEvent(event, data, message) {
   _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["Hub"].dispatch('api', {
     event: event,
     data: data,
     message: message
-  }, 'PubSub', AMPLIFY_SYMBOL);
+  }, 'PubSub', _constants__WEBPACK_IMPORTED_MODULE_10__["AMPLIFY_SYMBOL"]);
 };
 
-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 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;
 var standardDomainPattern = /^https:\/\/\w{26}\.appsync\-api\.\w{2}(?:(?:\-\w{2,})+)\-\d\.amazonaws.com\/graphql$/i;
 var customDomainPath = '/realtime';
 
@@ -12404,13 +12547,17 @@ function (_super) {
   function AWSAppSyncRealTimeProvider() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
-    _this.socketStatus = SOCKET_STATUS.CLOSED;
-    _this.keepAliveTimeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
+    _this.socketStatus = _constants__WEBPACK_IMPORTED_MODULE_10__["SOCKET_STATUS"].CLOSED;
+    _this.keepAliveTimeout = _constants__WEBPACK_IMPORTED_MODULE_10__["DEFAULT_KEEP_ALIVE_TIMEOUT"];
     _this.subscriptionObserverMap = new Map();
     _this.promiseArray = [];
     return _this;
   }
 
+  AWSAppSyncRealTimeProvider.prototype.getNewWebSocket = function (url, protocol) {
+    return new WebSocket(url, protocol);
+  };
+
   AWSAppSyncRealTimeProvider.prototype.getProviderName = function () {
     return 'AWSAppSyncRealTimeProvider';
   };
@@ -12435,9 +12582,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"))]
         });
@@ -12482,7 +12629,7 @@ function (_super) {
                     ];
                   }
 
-                  if (subscriptionState === SUBSCRIPTION_STATUS.CONNECTED) {
+                  if (subscriptionState === _constants__WEBPACK_IMPORTED_MODULE_10__["SUBSCRIPTION_STATUS"].CONNECTED) {
                     this._sendUnsubscriptionMessage(subscriptionId_1);
                   } else {
                     throw new Error('Subscription never connected');
@@ -12530,20 +12677,23 @@ 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;
-            subscriptionState = SUBSCRIPTION_STATUS.PENDING;
+            } : _d, _e = options.additionalHeaders, additionalHeaders = _e === void 0 ? {} : _e;
+            subscriptionState = _constants__WEBPACK_IMPORTED_MODULE_10__["SUBSCRIPTION_STATUS"].PENDING;
             data = {
               query: query,
               variables: variables
@@ -12551,13 +12701,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({
@@ -12571,13 +12721,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: {
@@ -12586,13 +12736,13 @@ function (_super) {
                   authorization: __assign({}, headerObj)
                 }
               },
-              type: MESSAGE_TYPES.GQL_START
+              type: _constants__WEBPACK_IMPORTED_MODULE_10__["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*/
@@ -12605,18 +12755,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))]
             });
@@ -12632,18 +12782,18 @@ 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 () {
                 _this._timeoutStartSubscriptionAck.call(_this, subscriptionId);
-              }, START_ACK_TIMEOUT)
+              }, _constants__WEBPACK_IMPORTED_MODULE_10__["START_ACK_TIMEOUT"])
             });
 
             if (this.awsRealTimeSocket) {
@@ -12661,32 +12811,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 === _constants__WEBPACK_IMPORTED_MODULE_10__["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
@@ -12698,11 +12851,11 @@ function (_super) {
 
   AWSAppSyncRealTimeProvider.prototype._sendUnsubscriptionMessage = function (subscriptionId) {
     try {
-      if (this.awsRealTimeSocket && this.awsRealTimeSocket.readyState === WebSocket.OPEN && this.socketStatus === SOCKET_STATUS.READY) {
+      if (this.awsRealTimeSocket && this.awsRealTimeSocket.readyState === WebSocket.OPEN && this.socketStatus === _constants__WEBPACK_IMPORTED_MODULE_10__["SOCKET_STATUS"].READY) {
         // Preparing unsubscribe message to stop receiving messages for that subscription
         var unsubscribeMessage = {
           id: subscriptionId,
-          type: MESSAGE_TYPES.GQL_STOP
+          type: _constants__WEBPACK_IMPORTED_MODULE_10__["MESSAGE_TYPES"].GQL_STOP
         };
         var stringToAWSRealTime = JSON.stringify(unsubscribeMessage);
         this.awsRealTimeSocket.send(stringToAWSRealTime);
@@ -12728,7 +12881,7 @@ function (_super) {
     }
 
     if (!this.awsRealTimeSocket) {
-      this.socketStatus = SOCKET_STATUS.CLOSED;
+      this.socketStatus = _constants__WEBPACK_IMPORTED_MODULE_10__["SOCKET_STATUS"].CLOSED;
       return;
     }
 
@@ -12737,14 +12890,14 @@ 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.socketStatus = SOCKET_STATUS.CLOSED;
+      this.awsRealTimeSocket = undefined;
+      this.socketStatus = _constants__WEBPACK_IMPORTED_MODULE_10__["SOCKET_STATUS"].CLOSED;
     }
   };
 
@@ -12775,7 +12928,7 @@ function (_super) {
       variables: variables
     });
 
-    if (type === MESSAGE_TYPES.GQL_DATA && payload && payload.data) {
+    if (type === _constants__WEBPACK_IMPORTED_MODULE_10__["MESSAGE_TYPES"].GQL_DATA && payload && payload.data) {
       if (observer) {
         observer.next(payload);
       } else {
@@ -12785,7 +12938,7 @@ function (_super) {
       return;
     }
 
-    if (type === MESSAGE_TYPES.GQL_START_ACK) {
+    if (type === _constants__WEBPACK_IMPORTED_MODULE_10__["MESSAGE_TYPES"].GQL_START_ACK) {
       logger.debug("subscription ready for " + JSON.stringify({
         query: query,
         variables: variables
@@ -12795,50 +12948,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
+      var subscriptionState = _constants__WEBPACK_IMPORTED_MODULE_10__["SUBSCRIPTION_STATUS"].CONNECTED;
+
+      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 (type === _constants__WEBPACK_IMPORTED_MODULE_10__["MESSAGE_TYPES"].GQL_CONNECTION_KEEP_ALIVE) {
+      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 (type === _constants__WEBPACK_IMPORTED_MODULE_10__["MESSAGE_TYPES"].GQL_ERROR) {
+      var subscriptionState = _constants__WEBPACK_IMPORTED_MODULE_10__["SUBSCRIPTION_STATUS"].FAILED;
 
-      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();
+        }
       }
     }
   };
@@ -12860,41 +13020,44 @@ function (_super) {
       this.awsRealTimeSocket.close();
     }
 
-    this.socketStatus = SOCKET_STATUS.CLOSED;
+    this.socketStatus = _constants__WEBPACK_IMPORTED_MODULE_10__["SOCKET_STATUS"].CLOSED;
   };
 
   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: _constants__WEBPACK_IMPORTED_MODULE_10__["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) {
@@ -12906,7 +13069,7 @@ function (_super) {
         region = _a.region,
         additionalHeaders = _a.additionalHeaders;
 
-    if (this.socketStatus === SOCKET_STATUS.READY) {
+    if (this.socketStatus === _constants__WEBPACK_IMPORTED_MODULE_10__["SOCKET_STATUS"].READY) {
       return;
     }
 
@@ -12921,7 +13084,7 @@ function (_super) {
                 res: res,
                 rej: rej
               });
-              if (!(this.socketStatus === SOCKET_STATUS.CLOSED)) return [3
+              if (!(this.socketStatus === _constants__WEBPACK_IMPORTED_MODULE_10__["SOCKET_STATUS"].CLOSED)) return [3
               /*break*/
               , 5];
               _c.label = 1;
@@ -12929,7 +13092,7 @@ function (_super) {
             case 1:
               _c.trys.push([1, 4,, 5]);
 
-              this.socketStatus = SOCKET_STATUS.CONNECTING;
+              this.socketStatus = _constants__WEBPACK_IMPORTED_MODULE_10__["SOCKET_STATUS"].CONNECTING;
               payloadString = '{}';
               _b = (_a = JSON).stringify;
               return [4
@@ -12948,7 +13111,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);
@@ -12961,9 +13124,7 @@ function (_super) {
               awsRealTimeUrl = discoverableEndpoint + "?header=" + headerQs + "&payload=" + payloadQs;
               return [4
               /*yield*/
-              , this._initializeRetryableHandshake({
-                awsRealTimeUrl: awsRealTimeUrl
-              })];
+              , this._initializeRetryableHandshake(awsRealTimeUrl)];
 
             case 3:
               _c.sent();
@@ -12973,7 +13134,7 @@ function (_super) {
                 logger.debug('Notifying connection successful');
                 res();
               });
-              this.socketStatus = SOCKET_STATUS.READY;
+              this.socketStatus = _constants__WEBPACK_IMPORTED_MODULE_10__["SOCKET_STATUS"].READY;
               this.promiseArray = [];
               return [3
               /*break*/
@@ -12991,8 +13152,8 @@ function (_super) {
                 this.awsRealTimeSocket.close(3001);
               }
 
-              this.awsRealTimeSocket = null;
-              this.socketStatus = SOCKET_STATUS.CLOSED;
+              this.awsRealTimeSocket = undefined;
+              this.socketStatus = _constants__WEBPACK_IMPORTED_MODULE_10__["SOCKET_STATUS"].CLOSED;
               return [3
               /*break*/
               , 5];
@@ -13007,21 +13168,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], _constants__WEBPACK_IMPORTED_MODULE_10__["MAX_DELAY_MS"])];
 
           case 1:
-            _b.sent();
+            _a.sent();
 
             return [2
             /*return*/
@@ -13031,10 +13189,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;
 
@@ -13051,7 +13208,7 @@ function (_super) {
             /*yield*/
             , function () {
               return new Promise(function (res, rej) {
-                var newSocket = new WebSocket(awsRealTimeUrl, 'graphql-ws');
+                var newSocket = _this.getNewWebSocket(awsRealTimeUrl, 'graphql-ws');
 
                 newSocket.onerror = function () {
                   logger.debug("WebSocket connection error");
@@ -13076,77 +13233,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 ? _constants__WEBPACK_IMPORTED_MODULE_10__["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 === _constants__WEBPACK_IMPORTED_MODULE_10__["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 === _constants__WEBPACK_IMPORTED_MODULE_10__["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
+                      });
+                    }
+                  };
+
+                  var gqlInit = {
+                    type: _constants__WEBPACK_IMPORTED_MODULE_10__["MESSAGE_TYPES"].GQL_CONNECTION_INIT
+                  };
 
-                _this.awsRealTimeSocket.send(JSON.stringify(gqlInit));
+                  _this.awsRealTimeSocket.send(JSON.stringify(gqlInit));
+
+                  setTimeout(checkAckOk.bind(_this, ackOk_1), _constants__WEBPACK_IMPORTED_MODULE_10__["CONNECTION_INIT_TIMEOUT"]);
+                }
 
-                function checkAckOk() {
+                function checkAckOk(ackOk) {
                   if (!ackOk) {
-                    rej(new Error("Connection timeout: ack from AWSRealTime was not received on " + CONNECTION_INIT_TIMEOUT + " ms"));
+                    rej(new Error("Connection timeout: ack from AWSRealTime was not received on " + _constants__WEBPACK_IMPORTED_MODULE_10__["CONNECTION_INIT_TIMEOUT"] + " ms"));
                   }
                 }
-
-                setTimeout(checkAckOk.bind(_this), CONNECTION_INIT_TIMEOUT);
               });
             }()];
 
@@ -13160,9 +13322,9 @@ 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)) {
+            if (_constants__WEBPACK_IMPORTED_MODULE_10__["NON_RETRYABLE_CODES"].includes(errorCode)) {
               throw new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["NonRetryableError"](errorType);
             } else if (errorType) {
               throw new Error(errorType);
@@ -13203,16 +13365,18 @@ 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;
+            logger.debug("Authenticating with " + authenticationType);
             return [4
             /*yield*/
             , handler({
@@ -13225,7 +13389,7 @@ function (_super) {
               additionalHeaders: additionalHeaders
             })];
 
-          case 1:
+          case 2:
             result = _b.sent();
             return [2
             /*return*/
@@ -13357,10 +13521,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
               };
             })];
 
@@ -13370,7 +13538,7 @@ function (_super) {
               url: "" + appSyncGraphqlEndpoint + canonicalUri,
               data: payload,
               method: 'POST',
-              headers: __assign({}, AWS_APPSYNC_REALTIME_HEADERS)
+              headers: __assign({}, _constants__WEBPACK_IMPORTED_MODULE_10__["AWS_APPSYNC_REALTIME_HEADERS"])
             };
             signed_params = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["Signer"].sign(request, creds, endpointInfo);
             return [2
@@ -13385,7 +13553,7 @@ function (_super) {
     var host = _a.host,
         additionalHeaders = _a.additionalHeaders;
 
-    if (!additionalHeaders.Authorization) {
+    if (!additionalHeaders || !additionalHeaders['Authorization']) {
       throw new Error('No auth token specified');
     }
 
@@ -13622,8 +13790,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", {
@@ -13953,21 +14125,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];
       });
     });
   };
@@ -14059,6 +14237,10 @@ function (_super) {
       }, args), null, 2));
       var topicsToDelete_1 = [];
 
+      if (!clientId) {
+        return;
+      }
+
       var clientIdObservers = this._clientIdObservers.get(clientId);
 
       if (!clientIdObservers) {
@@ -14177,9 +14359,7 @@ function (_super) {
           case 0:
             return [4
             /*yield*/
-            , this.clientsQueue.get(clientId, function () {
-              return null;
-            })];
+            , this.clientsQueue.get(clientId)];
 
           case 1:
             client = _a.sent();
@@ -14358,13 +14538,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);
@@ -14481,7 +14662,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _AWSAppSyncProvider__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./AWSAppSyncProvider */ "../pubsub/lib-esm/Providers/AWSAppSyncProvider.js");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AWSAppSyncProvider", function() { return _AWSAppSyncProvider__WEBPACK_IMPORTED_MODULE_1__["AWSAppSyncProvider"]; });
 
-/* harmony import */ var _AWSAppSyncRealTimeProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./AWSAppSyncRealTimeProvider */ "../pubsub/lib-esm/Providers/AWSAppSyncRealTimeProvider.js");
+/* harmony import */ var _AWSAppSyncRealTimeProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./AWSAppSyncRealTimeProvider */ "../pubsub/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.js");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AWSAppSyncRealTimeProvider", function() { return _AWSAppSyncRealTimeProvider__WEBPACK_IMPORTED_MODULE_2__["AWSAppSyncRealTimeProvider"]; });
 
 /* harmony import */ var _AWSIotProvider__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./AWSIotProvider */ "../pubsub/lib-esm/Providers/AWSIotProvider.js");
@@ -14699,7 +14880,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);
@@ -14888,7 +15069,7 @@ function () {
 }();
 
 
-var PubSub = new PubSubClass(null);
+var PubSub = new PubSubClass();
 _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Amplify"].register(PubSub);
 
 /***/ }),
@@ -15198,10 +15379,10 @@ function () {
   };
   /**
    * Make a GET request
-   * @param {string} apiName - The api name of the request
-   * @param {string} path - The path of the request
-   * @param {json} [init] - Request extra params
-   * @return {Promise} - A promise that resolves to an object with response status and JSON data, if successful.
+   * @param apiName - The api name of the request
+   * @param path - The path of the request
+   * @param [init] - Request extra params
+   * @return A promise that resolves to an object with response status and JSON data, if successful.
    */
 
 
@@ -15210,10 +15391,10 @@ function () {
   };
   /**
    * Make a POST request
-   * @param {string} apiName - The api name of the request
-   * @param {string} path - The path of the request
-   * @param {json} [init] - Request extra params
-   * @return {Promise} - A promise that resolves to an object with response status and JSON data, if successful.
+   * @param apiName - The api name of the request
+   * @param path - The path of the request
+   * @param [init] - Request extra params
+   * @return A promise that resolves to an object with response status and JSON data, if successful.
    */
 
 
@@ -15222,10 +15403,10 @@ function () {
   };
   /**
    * Make a PUT request
-   * @param {string} apiName - The api name of the request
-   * @param {string} path - The path of the request
-   * @param {json} [init] - Request extra params
-   * @return {Promise} - A promise that resolves to an object with response status and JSON data, if successful.
+   * @param apiName - The api name of the request
+   * @param path - The path of the request
+   * @param [init] - Request extra params
+   * @return A promise that resolves to an object with response status and JSON data, if successful.
    */
 
 
@@ -15234,10 +15415,10 @@ function () {
   };
   /**
    * Make a PATCH request
-   * @param {string} apiName - The api name of the request
-   * @param {string} path - The path of the request
-   * @param {json} [init] - Request extra params
-   * @return {Promise} - A promise that resolves to an object with response status and JSON data, if successful.
+   * @param apiName - The api name of the request
+   * @param path - The path of the request
+   * @param [init] - Request extra params
+   * @return A promise that resolves to an object with response status and JSON data, if successful.
    */
 
 
@@ -15246,10 +15427,10 @@ function () {
   };
   /**
    * Make a DEL request
-   * @param {string} apiName - The api name of the request
-   * @param {string} path - The path of the request
-   * @param {json} [init] - Request extra params
-   * @return {Promise} - A promise that resolves to an object with response status and JSON data, if successful.
+   * @param apiName - The api name of the request
+   * @param path - The path of the request
+   * @param [init] - Request extra params
+   * @return A promise that resolves to an object with response status and JSON data, if successful.
    */
 
 
@@ -15258,10 +15439,10 @@ function () {
   };
   /**
    * Make a HEAD request
-   * @param {string} apiName - The api name of the request
-   * @param {string} path - The path of the request
-   * @param {json} [init] - Request extra params
-   * @return {Promise} - A promise that resolves to an object with response status and JSON data, if successful.
+   * @param apiName - The api name of the request
+   * @param path - The path of the request
+   * @param [init] - Request extra params
+   * @return A promise that resolves to an object with response status and JSON data, if successful.
    */
 
 
@@ -15270,8 +15451,8 @@ function () {
   };
   /**
    * Checks to see if an error thrown is from an api request cancellation
-   * @param {any} error - Any error
-   * @return {boolean} - A boolean indicating if the error was from an api request cancellation
+   * @param error - Any error
+   * @return If the error was from an api request cancellation
    */
 
 
@@ -15279,19 +15460,26 @@ function () {
     return this._restApi.isCancel(error);
   };
   /**
-   * Cancels an inflight request
-   * @param {any} request - request to cancel
-   * @return {boolean} - A boolean indicating if the request was cancelled
+   * Cancels an inflight request for either a GraphQL request or a Rest API request.
+   * @param request - request to cancel
+   * @param [message] - custom error message
+   * @return If the request was cancelled
    */
 
 
   APIClass.prototype.cancel = function (request, message) {
-    return this._restApi.cancel(request, message);
+    if (this._restApi.hasCancelToken(request)) {
+      return this._restApi.cancel(request, message);
+    } else if (this._graphqlApi.hasCancelToken(request)) {
+      return this._graphqlApi.cancel(request, message);
+    }
+
+    return false;
   };
   /**
    * Getting endpoint for API
-   * @param {string} apiName - The name of the api
-   * @return {string} - The endpoint of the api
+   * @param apiName - The name of the api
+   * @return The endpoint of the api
    */
 
 
@@ -15313,14 +15501,6 @@ function () {
   APIClass.prototype.getGraphqlOperationType = function (operation) {
     return this._graphqlApi.getGraphqlOperationType(operation);
   };
-  /**
-   * Executes a GraphQL operation
-   *
-   * @param {GraphQLOptions} GraphQL Options
-   * @param {object} additionalHeaders headers to merge in after any `graphql_headers` set in the config
-   * @returns {Promise<GraphQLResult> | Observable<object>}
-   */
-
 
   APIClass.prototype.graphql = function (options, additionalHeaders) {
     return this._graphqlApi.graphql(options, additionalHeaders);