@aws-amplify/datastore 3.7.7-unstable.8 → 3.7.8-cloud-logging.7

package/dist/aws-amplify-datastore.js

@@ -28071,6 +28071,24 @@ function tryDecode(str, decode) {
 }
 
 
+/***/ }),
+
+/***/ "../../node_modules/fast-text-encoding/text.min.js":
+/*!********************************************************************!*\
+  !*** /root/amplify-js/node_modules/fast-text-encoding/text.min.js ***!
+  \********************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+/* WEBPACK VAR INJECTION */(function(global, Buffer) {(function(l){function m(){}function k(a,c){a=void 0===a?"utf-8":a;c=void 0===c?{fatal:!1}:c;if(-1===r.indexOf(a.toLowerCase()))throw new RangeError("Failed to construct 'TextDecoder': The encoding label provided ('"+a+"') is invalid.");if(c.fatal)throw Error("Failed to construct 'TextDecoder': the 'fatal' option is unsupported.");}function t(a){return Buffer.from(a.buffer,a.byteOffset,a.byteLength).toString("utf-8")}function u(a){var c=URL.createObjectURL(new Blob([a],{type:"text/plain;charset=UTF-8"}));
+try{var f=new XMLHttpRequest;f.open("GET",c,!1);f.send();return f.responseText}catch(e){return q(a)}finally{URL.revokeObjectURL(c)}}function q(a){for(var c=0,f=Math.min(65536,a.length+1),e=new Uint16Array(f),h=[],d=0;;){var b=c<a.length;if(!b||d>=f-1){h.push(String.fromCharCode.apply(null,e.subarray(0,d)));if(!b)return h.join("");a=a.subarray(c);d=c=0}b=a[c++];if(0===(b&128))e[d++]=b;else if(192===(b&224)){var g=a[c++]&63;e[d++]=(b&31)<<6|g}else if(224===(b&240)){g=a[c++]&63;var n=a[c++]&63;e[d++]=
+(b&31)<<12|g<<6|n}else if(240===(b&248)){g=a[c++]&63;n=a[c++]&63;var v=a[c++]&63;b=(b&7)<<18|g<<12|n<<6|v;65535<b&&(b-=65536,e[d++]=b>>>10&1023|55296,b=56320|b&1023);e[d++]=b}}}if(l.TextEncoder&&l.TextDecoder)return!1;var r=["utf-8","utf8","unicode-1-1-utf-8"];Object.defineProperty(m.prototype,"encoding",{value:"utf-8"});m.prototype.encode=function(a,c){c=void 0===c?{stream:!1}:c;if(c.stream)throw Error("Failed to encode: the 'stream' option is unsupported.");c=0;for(var f=a.length,e=0,h=Math.max(32,
+f+(f>>>1)+7),d=new Uint8Array(h>>>3<<3);c<f;){var b=a.charCodeAt(c++);if(55296<=b&&56319>=b){if(c<f){var g=a.charCodeAt(c);56320===(g&64512)&&(++c,b=((b&1023)<<10)+(g&1023)+65536)}if(55296<=b&&56319>=b)continue}e+4>d.length&&(h+=8,h*=1+c/a.length*2,h=h>>>3<<3,g=new Uint8Array(h),g.set(d),d=g);if(0===(b&4294967168))d[e++]=b;else{if(0===(b&4294965248))d[e++]=b>>>6&31|192;else if(0===(b&4294901760))d[e++]=b>>>12&15|224,d[e++]=b>>>6&63|128;else if(0===(b&4292870144))d[e++]=b>>>18&7|240,d[e++]=b>>>12&
+63|128,d[e++]=b>>>6&63|128;else continue;d[e++]=b&63|128}}return d.slice?d.slice(0,e):d.subarray(0,e)};Object.defineProperty(k.prototype,"encoding",{value:"utf-8"});Object.defineProperty(k.prototype,"fatal",{value:!1});Object.defineProperty(k.prototype,"ignoreBOM",{value:!1});var p=q;"function"===typeof Buffer&&Buffer.from?p=t:"function"===typeof Blob&&"function"===typeof URL&&"function"===typeof URL.createObjectURL&&(p=u);k.prototype.decode=function(a,c){c=void 0===c?{stream:!1}:c;if(c.stream)throw Error("Failed to decode: the 'stream' option is unsupported.");
+a=a instanceof Uint8Array?a:a.buffer instanceof ArrayBuffer?new Uint8Array(a.buffer):new Uint8Array(a);return p(a)};l.TextEncoder=m;l.TextDecoder=k})("undefined"!==typeof window?window:"undefined"!==typeof global?global:this);
+
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../webpack/buildin/global.js */ "../../node_modules/webpack/buildin/global.js"), __webpack_require__(/*! ./../buffer/index.js */ "../../node_modules/buffer/index.js").Buffer))
+
 /***/ }),
 
 /***/ "../../node_modules/graphql/error/GraphQLError.mjs":
@@ -61911,7 +61929,7 @@ function () {
    * Delete the current authenticated user
    * @return {Promise}
    **/
-  //TODO: Check return type void
+  // TODO: Check return type void
 
 
   AuthClass.prototype.deleteUser = function () {
@@ -69767,6 +69785,7 @@ var LOG_LEVELS = {
   WARN: 4,
   ERROR: 5
 };
+var COMPATIBLE_PLUGINS = [_Util_Constants__WEBPACK_IMPORTED_MODULE_0__["AWS_CLOUDWATCH_CATEGORY"]];
 var LOG_TYPE;
 
 (function (LOG_TYPE) {
@@ -69776,12 +69795,13 @@ var LOG_TYPE;
   LOG_TYPE["WARN"] = "WARN";
   LOG_TYPE["VERBOSE"] = "VERBOSE";
 })(LOG_TYPE || (LOG_TYPE = {}));
+
+var cloudWatchExcludeList = ['AWSCloudWatch', 'Amplify', 'Credentials', 'AuthClass', 'CloudLogger'];
 /**
  * Write logs
  * @class Logger
  */
 
-
 var ConsoleLogger =
 /** @class */
 function () {
@@ -69797,8 +69817,19 @@ function () {
     this.name = name;
     this.level = level;
     this._pluggables = [];
+    this.addPluggable = this.addPluggable.bind(this);
   }
 
+  ConsoleLogger.globalPluggables = function (pluggable) {
+    if (pluggable && COMPATIBLE_PLUGINS.includes(pluggable.getCategoryName())) {
+      ConsoleLogger._globalpluggables.push(pluggable);
+    }
+  };
+
+  ConsoleLogger.clearGlobalPluggables = function () {
+    ConsoleLogger._globalpluggables = [];
+  };
+
   ConsoleLogger.prototype._padding = function (n) {
     return n < 10 ? '0' + n : '' + n;
   };
@@ -69813,6 +69844,20 @@ function () {
     this._config = config;
     return this._config;
   };
+
+  ConsoleLogger.prototype._checkPluggables = function () {
+    if (this._pluggables.length !== ConsoleLogger._globalpluggables.length) {
+      if (ConsoleLogger._globalpluggables.length > 0) {
+        ConsoleLogger._globalpluggables.forEach(this.addPluggable);
+
+        return;
+      }
+
+      if (ConsoleLogger._globalpluggables.length === 0) {
+        this._pluggables = [];
+      }
+    }
+  };
   /**
    * Write log
    * @method
@@ -69825,12 +69870,47 @@ function () {
   ConsoleLogger.prototype._log = function (type) {
     var e_1, _a;
 
+    var _this = this;
+
     var msg = [];
 
     for (var _i = 1; _i < arguments.length; _i++) {
       msg[_i - 1] = arguments[_i];
     }
 
+    if (!cloudWatchExcludeList.includes(this.name)) {
+      this._checkPluggables();
+    }
+
+    var generateCloudMessage = function generateCloudMessage(msg) {
+      var message = '';
+      var data;
+
+      if (msg.length === 1 && typeof msg[0] === 'string') {
+        message = msg[0];
+      } else if (msg.length === 1) {
+        data = msg[0];
+      } else if (typeof msg[0] === 'string') {
+        var obj = msg.slice(1);
+
+        if (obj.length === 1) {
+          obj = obj[0];
+        }
+
+        message = msg[0];
+        data = obj;
+      } else {
+        data = msg;
+      }
+
+      return JSON.stringify({
+        level: type,
+        "class": _this.name,
+        message: message,
+        data: data
+      });
+    };
+
     var logger_level_name = this.level;
 
     if (ConsoleLogger.LOG_LEVEL) {
@@ -69844,62 +69924,72 @@ function () {
     var logger_level = LOG_LEVELS[logger_level_name];
     var type_level = LOG_LEVELS[type];
 
-    if (!(type_level >= logger_level)) {
-      // Do nothing if type is not greater than or equal to logger level (handle undefined)
-      return;
-    }
+    if (type_level >= logger_level) {
+      var log = console.log.bind(console);
 
-    var log = console.log.bind(console);
+      if (type === LOG_TYPE.ERROR && console.error) {
+        log = console.error.bind(console);
+      }
 
-    if (type === LOG_TYPE.ERROR && console.error) {
-      log = console.error.bind(console);
-    }
+      if (type === LOG_TYPE.WARN && console.warn) {
+        log = console.warn.bind(console);
+      }
 
-    if (type === LOG_TYPE.WARN && console.warn) {
-      log = console.warn.bind(console);
-    }
+      var prefix = "[" + type + "] " + this._ts() + " " + this.name;
+      var message = '';
+      var data = void 0;
 
-    var prefix = "[" + type + "] " + this._ts() + " " + this.name;
-    var message = '';
+      if (msg.length === 1 && typeof msg[0] === 'string') {
+        message = msg[0];
+        log(prefix + " - " + message);
+      } else if (msg.length === 1) {
+        data = msg[0];
+        log(prefix, data);
+      } else if (typeof msg[0] === 'string') {
+        var obj = msg.slice(1);
 
-    if (msg.length === 1 && typeof msg[0] === 'string') {
-      message = prefix + " - " + msg[0];
-      log(message);
-    } else if (msg.length === 1) {
-      message = prefix + " " + msg[0];
-      log(prefix, msg[0]);
-    } else if (typeof msg[0] === 'string') {
-      var obj = msg.slice(1);
+        if (obj.length === 1) {
+          obj = obj[0];
+        }
 
-      if (obj.length === 1) {
-        obj = obj[0];
+        message = msg[0];
+        data = obj;
+        log(prefix + " - " + message, data);
+      } else {
+        data = msg;
+        log(prefix, data);
       }
-
-      message = prefix + " - " + msg[0] + " " + obj;
-      log(prefix + " - " + msg[0], obj);
-    } else {
-      message = prefix + " " + msg;
-      log(prefix, msg);
     }
 
-    try {
-      for (var _b = __values(this._pluggables), _c = _b.next(); !_c.done; _c = _b.next()) {
-        var plugin = _c.value;
-        var logEvent = {
-          message: message,
-          timestamp: Date.now()
-        };
-        plugin.pushLogs([logEvent]);
-      }
-    } catch (e_1_1) {
-      e_1 = {
-        error: e_1_1
-      };
-    } finally {
+    if (ConsoleLogger.CLOUD_LOG_LEVEL != null && !cloudWatchExcludeList.includes(this.name)) {
+      var cloudMessage = generateCloudMessage(msg);
+
       try {
-        if (_c && !_c.done && (_a = _b["return"])) _a.call(_b);
+        for (var _b = __values(this._pluggables), _c = _b.next(); !_c.done; _c = _b.next()) {
+          var plugin = _c.value;
+          var logger_level_1 = LOG_LEVELS[ConsoleLogger.CLOUD_LOG_LEVEL];
+          var type_level_1 = LOG_LEVELS[type];
+          var logEvent = {
+            message: cloudMessage,
+            timestamp: Date.now()
+          };
+
+          if (type_level_1 >= logger_level_1) {
+            plugin.pushLogs([logEvent]);
+          } else {
+            plugin.pushLogs([]);
+          }
+        }
+      } catch (e_1_1) {
+        e_1 = {
+          error: e_1_1
+        };
       } finally {
-        if (e_1) throw e_1.error;
+        try {
+          if (_c && !_c.done && (_a = _b["return"])) _a.call(_b);
+        } finally {
+          if (e_1) throw e_1.error;
+        }
       }
     }
   };
@@ -70007,10 +70097,8 @@ function () {
   };
 
   ConsoleLogger.prototype.addPluggable = function (pluggable) {
-    if (pluggable && pluggable.getCategoryName() === _Util_Constants__WEBPACK_IMPORTED_MODULE_0__["AWS_CLOUDWATCH_CATEGORY"]) {
+    if (pluggable && COMPATIBLE_PLUGINS.includes(pluggable.getCategoryName())) {
       this._pluggables.push(pluggable);
-
-      pluggable.configure(this._config);
     }
   };
 
@@ -70018,7 +70106,9 @@ function () {
     return this._pluggables;
   };
 
+  ConsoleLogger._globalpluggables = [];
   ConsoleLogger.LOG_LEVEL = null;
+  ConsoleLogger.CLOUD_LOG_LEVEL = null;
   return ConsoleLogger;
 }();
 
@@ -70846,7 +70936,7 @@ var getAmplifyUserAgent = function getAmplifyUserAgent() {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "version", function() { return version; });
 // generated by genversion
-var version = '4.3.14';
+var version = '4.4.0';
 
 /***/ }),
 
@@ -70866,6 +70956,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Platform__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../Platform */ "../core/lib-esm/Platform/index.js");
 /* harmony import */ var _Parser__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../Parser */ "../core/lib-esm/Parser.js");
 /* harmony import */ var _Util_Constants__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../Util/Constants */ "../core/lib-esm/Util/Constants.js");
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
+}
 /*
  * Copyright 2017-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
@@ -70878,6 +70977,8 @@ __webpack_require__.r(__webpack_exports__);
  * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
+
+
 var __awaiter = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -71021,61 +71122,42 @@ var __generator = undefined && undefined.__generator || function (thisArg, body)
   }
 };
 
-var __read = undefined && undefined.__read || function (o, n) {
-  var m = typeof Symbol === "function" && o[Symbol.iterator];
-  if (!m) return o;
-  var i = m.call(o),
-      r,
-      ar = [],
-      e;
-
-  try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
-      ar.push(r.value);
-    }
-  } catch (error) {
-    e = {
-      error: error
-    };
-  } finally {
-    try {
-      if (r && !r.done && (m = i["return"])) m.call(i);
-    } finally {
-      if (e) throw e.error;
-    }
-  }
-
-  return ar;
-};
-
-var __spread = undefined && undefined.__spread || function () {
-  for (var ar = [], i = 0; i < arguments.length; i++) {
-    ar = ar.concat(__read(arguments[i]));
-  }
 
-  return ar;
-};
 
 
 
 
 
 
+if (typeof window === 'undefined' || (typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object' && !window.TextEncoder) {
+  __webpack_require__(/*! fast-text-encoding */ "../../node_modules/fast-text-encoding/text.min.js");
+}
 
 var logger = new _Logger__WEBPACK_IMPORTED_MODULE_2__["ConsoleLogger"]('AWSCloudWatch');
+var INTERVAL = 10000;
 
 var AWSCloudWatchProvider =
 /** @class */
 function () {
   function AWSCloudWatchProvider(config) {
-    this.configure(config);
-    this._dataTracker = {
-      eventUploadInProgress: false,
-      logEvents: []
-    };
-    this._currentLogBatch = [];
+    this._initialized = false;
+    console.log('cstr', config);
 
-    this._initiateLogPushInterval();
+    if (!this._initialized) {
+      this.configure(config);
+      this._dataTracker = {
+        eventUploadInProgress: false,
+        logEvents: [],
+        verifiedLogGroup: {
+          logGroupName: this._config.logGroupName
+        }
+      };
+      this._currentLogBatch = [];
+
+      this._initiateLogPushInterval();
+
+      this._initialized = true;
+    }
   }
 
   AWSCloudWatchProvider.prototype.getProviderName = function () {
@@ -71090,6 +71172,12 @@ function () {
     return this._dataTracker.logEvents;
   };
 
+  AWSCloudWatchProvider.prototype.setPreFlightCheck = function (cb) {
+    if (typeof cb === 'function') {
+      this._preFlightCheck = cb;
+    }
+  };
+
   AWSCloudWatchProvider.prototype.configure = function (config) {
     if (!config) return this._config || {};
     var conf = Object.assign({}, this._config, Object(_Parser__WEBPACK_IMPORTED_MODULE_4__["parseMobileHubConfig"])(config).Logging, config);
@@ -71343,8 +71431,27 @@ function () {
   };
 
   AWSCloudWatchProvider.prototype.pushLogs = function (logs) {
-    logger.debug('pushing log events to Cloudwatch...');
-    this._dataTracker.logEvents = __spread(this._dataTracker.logEvents, logs);
+    logger.debug('pushing log events to buffer');
+    this._dataTracker.logEvents = this._dataTracker.logEvents.concat(logs);
+  };
+
+  AWSCloudWatchProvider.prototype.pause = function () {
+    this._processing = false;
+
+    if (this._timer) {
+      clearInterval(this._timer);
+    }
+  };
+
+  AWSCloudWatchProvider.prototype.resume = function () {
+    this._processing = true;
+
+    this._initiateLogPushInterval();
+  };
+
+  AWSCloudWatchProvider.prototype.clear = function () {
+    this._dataTracker.logEvents = [];
+    this._currentLogBatch = [];
   };
 
   AWSCloudWatchProvider.prototype._validateLogGroupExistsAndCreate = function (logGroupName) {
@@ -71661,13 +71768,33 @@ function () {
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
-            _a.trys.push([0, 3,, 4]);
+            _a.trys.push([0, 4,, 5]);
 
             return [4
             /*yield*/
-            , this._getNextSequenceToken()];
+            , this._preFlightCheck()];
 
           case 1:
+            /**
+             * CloudWatch has restrictions on the size of the log events that get sent up.
+             * We need to track both the size of each event and the total size of the batch
+             * of logs.
+             *
+             * We also need to ensure that the logs in the batch are sorted in chronological order.
+             * https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutLogEvents.html
+             */
+            if (!_a.sent()) {
+              this.clear();
+              return [2
+              /*return*/
+              ];
+            }
+
+            return [4
+            /*yield*/
+            , this._getNextSequenceToken()];
+
+          case 2:
             seqToken = _a.sent();
             logBatch = this._currentLogBatch.length === 0 ? this._getBufferedBatchOfLogs() : this._currentLogBatch;
             putLogsPayload = {
@@ -71681,7 +71808,7 @@ function () {
             /*yield*/
             , this._sendLogEvents(putLogsPayload)];
 
-          case 2:
+          case 3:
             sendLogEventsResponse = _a.sent();
             this._nextSequenceToken = sendLogEventsResponse.nextSequenceToken;
             this._dataTracker.eventUploadInProgress = false;
@@ -71690,7 +71817,7 @@ function () {
             /*return*/
             , sendLogEventsResponse];
 
-          case 3:
+          case 4:
             err_5 = _a.sent();
             logger.error("error during _safeUploadLogEvents: " + err_5);
 
@@ -71707,9 +71834,9 @@ function () {
 
             return [3
             /*break*/
-            , 4];
+            , 5];
 
-          case 4:
+          case 5:
             return [2
             /*return*/
             ];
@@ -71718,6 +71845,41 @@ function () {
     });
   };
 
+  AWSCloudWatchProvider.prototype.truncateOversizedEvent = function (event) {
+    var timestamp = event.timestamp,
+        message = event.message;
+    var messageJson;
+
+    try {
+      messageJson = JSON.parse(message);
+      var truncated = JSON.stringify({
+        level: messageJson.level,
+        "class": messageJson["class"],
+        message: messageJson.message.substring(0, 500)
+      });
+
+      if (messageJson.data != null) {
+        truncated['data'] = "OBJECT SIZE EXCEEDS CLOUDWATCH EVENT LIMIT. Truncated: " + JSON.stringify(messageJson.data).substring(0, 500);
+      }
+
+      return {
+        timestamp: timestamp,
+        message: truncated
+      };
+    } catch (error) {
+      logger.warn('Could not minify oversized event', error);
+      var truncated = JSON.stringify({
+        level: 'UNKNOWN',
+        "class": 'Unknown',
+        message: 'OBJECT SIZE EXCEEDS CLOUDWATCH EVENT LIMIT. Could not parse event to truncate'
+      });
+      return {
+        timestamp: timestamp,
+        message: truncated
+      };
+    }
+  };
+
   AWSCloudWatchProvider.prototype._getBufferedBatchOfLogs = function () {
     /**
      * CloudWatch has restrictions on the size of the log events that get sent up.
@@ -71737,7 +71899,9 @@ function () {
       if (eventSize > _Util_Constants__WEBPACK_IMPORTED_MODULE_5__["AWS_CLOUDWATCH_MAX_EVENT_SIZE"]) {
         var errString = "Log entry exceeds maximum size for CloudWatch logs. Log size: " + eventSize + ". Truncating log message.";
         logger.warn(errString);
-        currentEvent.message = currentEvent.message.substring(0, eventSize);
+        currentEvent = this.truncateOversizedEvent(currentEvent);
+        this._dataTracker.logEvents[currentEventIdx] = currentEvent;
+        eventSize = new TextEncoder().encode(currentEvent.message).length + _Util_Constants__WEBPACK_IMPORTED_MODULE_5__["AWS_CLOUDWATCH_BASE_BUFFER_SIZE"];
       }
 
       if (totalByteSize + eventSize > _Util_Constants__WEBPACK_IMPORTED_MODULE_5__["AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE"]) break;
@@ -71828,6 +71992,7 @@ function () {
             case 3:
               err_7 = _a.sent();
               logger.error("error when calling _safeUploadLogEvents in the timer interval - " + err_7);
+              this.pause();
               return [3
               /*break*/
               , 4];
@@ -71839,7 +72004,7 @@ function () {
           }
         });
       });
-    }, 2000);
+    }, INTERVAL);
   };
 
   AWSCloudWatchProvider.prototype._getDocUploadPermissibility = function () {
@@ -72871,7 +73036,7 @@ function () {
 /*!*****************************************!*\
   !*** ../core/lib-esm/Util/Constants.js ***!
   \*****************************************/
-/*! exports provided: AWS_CLOUDWATCH_BASE_BUFFER_SIZE, AWS_CLOUDWATCH_CATEGORY, AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE, AWS_CLOUDWATCH_MAX_EVENT_SIZE, AWS_CLOUDWATCH_PROVIDER_NAME, NO_CREDS_ERROR_STRING, RETRY_ERROR_CODES */
+/*! exports provided: AWS_CLOUDWATCH_BASE_BUFFER_SIZE, AWS_CLOUDWATCH_CATEGORY, AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE, AWS_CLOUDWATCH_MAX_EVENT_SIZE, AWS_CLOUDWATCH_PROVIDER_NAME, NO_CREDS_ERROR_STRING, RETRY_ERROR_CODES, AMAZON_KINESIS_LOGGING_PROVIDER_NAME, AMAZON_KINESIS_LOGGING_CATEGORY */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -72883,6 +73048,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AWS_CLOUDWATCH_PROVIDER_NAME", function() { return AWS_CLOUDWATCH_PROVIDER_NAME; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NO_CREDS_ERROR_STRING", function() { return NO_CREDS_ERROR_STRING; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RETRY_ERROR_CODES", function() { return RETRY_ERROR_CODES; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AMAZON_KINESIS_LOGGING_PROVIDER_NAME", function() { return AMAZON_KINESIS_LOGGING_PROVIDER_NAME; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AMAZON_KINESIS_LOGGING_CATEGORY", function() { return AMAZON_KINESIS_LOGGING_CATEGORY; });
 /*
  * Copyright 2017-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
@@ -72896,11 +73063,14 @@ __webpack_require__.r(__webpack_exports__);
  * and limitations under the License.
  */
 // Logging constants
+// Cloudwatch
 var AWS_CLOUDWATCH_BASE_BUFFER_SIZE = 26;
 var AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE = 1048576;
 var AWS_CLOUDWATCH_MAX_EVENT_SIZE = 256000;
 var AWS_CLOUDWATCH_CATEGORY = 'Logging';
 var AWS_CLOUDWATCH_PROVIDER_NAME = 'AWSCloudWatch';
+var AMAZON_KINESIS_LOGGING_CATEGORY = 'KinesisLogging';
+var AMAZON_KINESIS_LOGGING_PROVIDER_NAME = 'AmazonKinesisLogging';
 var NO_CREDS_ERROR_STRING = 'No credentials';
 var RETRY_ERROR_CODES = ['ResourceNotFoundException', 'InvalidSequenceTokenException'];
 
@@ -73486,7 +73656,7 @@ function retry(functionToRetry, args, delayFn, attempt) {
             throw Error('functionToRetry must be a function');
           }
 
-          logger.debug(functionToRetry.name + " attempt #" + attempt + " with this vars: " + JSON.stringify(args));
+          logger.debug(functionToRetry.name + " attempt #" + attempt + " with this vars:", args);
           _a.label = 1;
 
         case 1:
@@ -73603,7 +73773,7 @@ function urlSafeDecode(hex) {
 /*!*************************************!*\
   !*** ../core/lib-esm/Util/index.js ***!
   \*************************************/
-/*! exports provided: NonRetryableError, retry, jitteredExponentialRetry, Mutex, Reachability, DateUtils, urlSafeEncode, urlSafeDecode, AWS_CLOUDWATCH_BASE_BUFFER_SIZE, AWS_CLOUDWATCH_CATEGORY, AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE, AWS_CLOUDWATCH_MAX_EVENT_SIZE, AWS_CLOUDWATCH_PROVIDER_NAME, NO_CREDS_ERROR_STRING, RETRY_ERROR_CODES */
+/*! exports provided: NonRetryableError, retry, jitteredExponentialRetry, Mutex, Reachability, DateUtils, urlSafeEncode, urlSafeDecode, AWS_CLOUDWATCH_BASE_BUFFER_SIZE, AWS_CLOUDWATCH_CATEGORY, AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE, AWS_CLOUDWATCH_MAX_EVENT_SIZE, AWS_CLOUDWATCH_PROVIDER_NAME, NO_CREDS_ERROR_STRING, RETRY_ERROR_CODES, AMAZON_KINESIS_LOGGING_PROVIDER_NAME, AMAZON_KINESIS_LOGGING_CATEGORY */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -73644,6 +73814,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "RETRY_ERROR_CODES", function() { return _Constants__WEBPACK_IMPORTED_MODULE_5__["RETRY_ERROR_CODES"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AMAZON_KINESIS_LOGGING_PROVIDER_NAME", function() { return _Constants__WEBPACK_IMPORTED_MODULE_5__["AMAZON_KINESIS_LOGGING_PROVIDER_NAME"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AMAZON_KINESIS_LOGGING_CATEGORY", function() { return _Constants__WEBPACK_IMPORTED_MODULE_5__["AMAZON_KINESIS_LOGGING_CATEGORY"]; });
+
 
 
 
@@ -73693,7 +73867,7 @@ var USER_AGENT_HEADER = 'x-amz-user-agent';
 /*!********************************!*\
   !*** ../core/lib-esm/index.js ***!
   \********************************/
-/*! exports provided: AmplifyClass, ClientDevice, ConsoleLogger, Logger, missingConfig, invalidParameter, Hub, I18n, isEmpty, sortByField, objectLessAttributes, filenameToContentType, isTextFile, generateRandomString, makeQuerablePromise, isWebWorker, browserOrNode, transferKeyToLowerCase, transferKeyToUpperCase, isStrictObject, JS, Signer, parseMobileHubConfig, Parser, AWSCloudWatchProvider, FacebookOAuth, GoogleOAuth, Linking, AppState, AsyncStorage, Credentials, CredentialsClass, ServiceWorker, StorageHelper, MemoryStorage, UniversalStorage, Platform, getAmplifyUserAgent, INTERNAL_AWS_APPSYNC_PUBSUB_PROVIDER, INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER, USER_AGENT_HEADER, Constants, NonRetryableError, retry, jitteredExponentialRetry, Mutex, Reachability, DateUtils, urlSafeEncode, urlSafeDecode, AWS_CLOUDWATCH_BASE_BUFFER_SIZE, AWS_CLOUDWATCH_CATEGORY, AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE, AWS_CLOUDWATCH_MAX_EVENT_SIZE, AWS_CLOUDWATCH_PROVIDER_NAME, NO_CREDS_ERROR_STRING, RETRY_ERROR_CODES, Amplify, default */
+/*! exports provided: AmplifyClass, ClientDevice, ConsoleLogger, Logger, missingConfig, invalidParameter, Hub, I18n, isEmpty, sortByField, objectLessAttributes, filenameToContentType, isTextFile, generateRandomString, makeQuerablePromise, isWebWorker, browserOrNode, transferKeyToLowerCase, transferKeyToUpperCase, isStrictObject, JS, Signer, parseMobileHubConfig, Parser, AWSCloudWatchProvider, FacebookOAuth, GoogleOAuth, Linking, AppState, AsyncStorage, Credentials, CredentialsClass, ServiceWorker, StorageHelper, MemoryStorage, UniversalStorage, Platform, getAmplifyUserAgent, INTERNAL_AWS_APPSYNC_PUBSUB_PROVIDER, INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER, USER_AGENT_HEADER, Constants, NonRetryableError, retry, jitteredExponentialRetry, Mutex, Reachability, DateUtils, urlSafeEncode, urlSafeDecode, AWS_CLOUDWATCH_BASE_BUFFER_SIZE, AWS_CLOUDWATCH_CATEGORY, AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE, AWS_CLOUDWATCH_MAX_EVENT_SIZE, AWS_CLOUDWATCH_PROVIDER_NAME, NO_CREDS_ERROR_STRING, RETRY_ERROR_CODES, AMAZON_KINESIS_LOGGING_PROVIDER_NAME, AMAZON_KINESIS_LOGGING_CATEGORY, Amplify, default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -73832,6 +74006,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "RETRY_ERROR_CODES", function() { return _Util__WEBPACK_IMPORTED_MODULE_18__["RETRY_ERROR_CODES"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AMAZON_KINESIS_LOGGING_PROVIDER_NAME", function() { return _Util__WEBPACK_IMPORTED_MODULE_18__["AMAZON_KINESIS_LOGGING_PROVIDER_NAME"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AMAZON_KINESIS_LOGGING_CATEGORY", function() { return _Util__WEBPACK_IMPORTED_MODULE_18__["AMAZON_KINESIS_LOGGING_CATEGORY"]; });
+
 /*
  * Copyright 2017-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
@@ -82066,7 +82244,7 @@ function defaultConflictHandler(conflictData) {
 }
 
 function defaultErrorHandler(error) {
-  logger.warn(error);
+  logger.warn('DataStore Mutation Error', error);
 }
 
 function getModelConstructorByModelName(namespaceName, modelName) {
@@ -82279,24 +82457,32 @@ function () {
             case 4:
               _b.sent();
 
+              logger.debug('Debug info before sync');
               return [4
               /*yield*/
-              , checkSchemaVersion(this.storage, schema.version)];
+              , this.storage.logDebugInfo()];
 
             case 5:
               _b.sent();
 
+              return [4
+              /*yield*/
+              , checkSchemaVersion(this.storage, schema.version)];
+
+            case 6:
+              _b.sent();
+
               aws_appsync_graphqlEndpoint = this.amplifyConfig.aws_appsync_graphqlEndpoint;
               if (!aws_appsync_graphqlEndpoint) return [3
               /*break*/
-              , 7];
+              , 8];
               logger.debug('GraphQL endpoint available', aws_appsync_graphqlEndpoint);
               _a = this;
               return [4
               /*yield*/
               , this.processSyncExpressions()];
 
-            case 6:
+            case 7:
               _a.syncPredicates = _b.sent();
               this.sync = new _sync__WEBPACK_IMPORTED_MODULE_7__["SyncEngine"](schema, namespaceResolver, syncClasses, userClasses, this.storage, modelInstanceCreator, this.conflictHandler, this.errorHandler, this.syncPredicates, this.amplifyConfig, this.authModeStrategy);
               fullSyncIntervalInMilliseconds = this.fullSyncInterval * 1000 * 60;
@@ -82314,6 +82500,16 @@ function () {
                     _this.initResolve();
                   }
 
+                  if (type === _sync__WEBPACK_IMPORTED_MODULE_7__["ControlMessage"].SYNC_ENGINE_SYNC_QUERIES_READY) {
+                    logger.debug('Debug info after sync');
+
+                    _this.storage.logDebugInfo();
+                  }
+
+                  logger.debug({
+                    event: type,
+                    data: data
+                  });
                   _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Hub"].dispatch('datastore', {
                     event: type,
                     data: data
@@ -82327,21 +82523,21 @@ function () {
               });
               return [3
               /*break*/
-              , 8];
+              , 9];
 
-            case 7:
+            case 8:
               logger.warn("Data won't be synchronized. No GraphQL endpoint configured. Did you forget `Amplify.configure(awsconfig)`?", {
                 config: this.amplifyConfig
               });
               this.initResolve();
-              _b.label = 8;
+              _b.label = 9;
 
-            case 8:
+            case 9:
               return [4
               /*yield*/
               , this.initialized];
 
-            case 9:
+            case 10:
               _b.sent();
 
               return [2
@@ -89337,6 +89533,33 @@ function () {
     });
   };
 
+  StorageClass.prototype.logDebugInfo = function () {
+    return __awaiter(this, void 0, void 0, function () {
+      var results;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (!(typeof this.adapter.getDebugInfo === 'function')) return [3
+            /*break*/
+            , 2];
+            return [4
+            /*yield*/
+            , this.adapter.getDebugInfo()];
+
+          case 1:
+            results = _a.sent();
+            logger.debug('DB Debug Info', results);
+            _a.label = 2;
+
+          case 2:
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
   return StorageClass;
 }();
 
@@ -89442,6 +89665,18 @@ function () {
     return this.storage.batchSave(modelConstructor, items);
   };
 
+  ExclusiveStorage.prototype.logDebugInfo = function () {
+    return __awaiter(this, void 0, void 0, function () {
+      return __generator(this, function (_a) {
+        return [2
+        /*return*/
+        , this.runExclusive(function (storage) {
+          return storage.logDebugInfo();
+        })];
+      });
+    });
+  };
+
   ExclusiveStorage.prototype.init = function () {
     return __awaiter(this, void 0, void 0, function () {
       return __generator(this, function (_a) {
@@ -90052,6 +90287,12 @@ function () {
                                   isEmpty: !hasMore
                                 }
                               });
+
+                              if (!hasMore) {
+                                logger.debug('Debug info after queue drained');
+
+                                _this.storage.logDebugInfo();
+                              }
                             })); //#endregion
                             //#region Merge subscriptions buffer
                             // TODO: extract to function
@@ -90075,26 +90316,34 @@ function () {
 
                             return [3
                             /*break*/
-                            , 11];
+                            , 12];
 
                           case 10:
-                            if (!online) {
-                              this.online = online;
-                              observer.next({
-                                type: ControlMessage.SYNC_ENGINE_NETWORK_STATUS,
-                                data: {
-                                  active: this.online
-                                }
-                              });
-                              subscriptions.forEach(function (sub) {
-                                return sub.unsubscribe();
-                              });
-                              subscriptions = [];
-                            }
-
-                            _c.label = 11;
+                            if (!!online) return [3
+                            /*break*/
+                            , 12];
+                            this.online = online;
+                            observer.next({
+                              type: ControlMessage.SYNC_ENGINE_NETWORK_STATUS,
+                              data: {
+                                active: this.online
+                              }
+                            });
+                            logger.debug('Debug info after offline');
+                            return [4
+                            /*yield*/
+                            , this.storage.logDebugInfo()];
 
                           case 11:
+                            _c.sent();
+
+                            subscriptions.forEach(function (sub) {
+                              return sub.unsubscribe();
+                            });
+                            subscriptions = [];
+                            _c.label = 12;
+
+                          case 12:
                             resolve();
                             return [2
                             /*return*/
@@ -92591,6 +92840,7 @@ function () {
                       /*yield*/
                       , this.errorHandler({
                         localModel: this.modelInstanceCreator(modelConstructor, variables.input),
+                        modelName: model,
                         message: error.message,
                         operation: operation,
                         errorType: error.errorType,