@aws-amplify/datastore 3.12.1-unstable.7 → 3.12.2-unstable.3

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.12.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.12.0...@aws-amplify/datastore@3.12.1) (2022-06-18)
+
+
+### Bug Fixes
+
+* decrease error handler verbosity on self recovering errors ([#9987](https://github.com/aws-amplify/amplify-js/issues/9987)) ([67ccf09](https://github.com/aws-amplify/amplify-js/commit/67ccf09a93221a06d4560300cfd67fdd9efeda71))
+
+
+### Reverts
+
+* Revert "fix: decrease error handler verbosity on self recovering errors (#9987)" (#10004) ([eb73ad7](https://github.com/aws-amplify/amplify-js/commit/eb73ad70b3eee0632eaed4bae00f1d2179ae45b5)), closes [#9987](https://github.com/aws-amplify/amplify-js/issues/9987) [#10004](https://github.com/aws-amplify/amplify-js/issues/10004)
+
+
+
+
+
 # [3.12.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.11.3...@aws-amplify/datastore@3.12.0) (2022-06-15)
 
 

package/dist/aws-amplify-datastore.js

@@ -63054,7 +63054,7 @@ function () {
   };
 
   AuthClass.prototype.oAuthSignOutRedirect = function (resolve, reject) {
-    var isBrowser = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["JS"].browserOrNode().isBrowser;
+    var isBrowser = Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["browserOrNode"])().isBrowser;
 
     if (isBrowser) {
       this.oAuthSignOutRedirectOrReject(reject);
@@ -63512,7 +63512,7 @@ function () {
             dispatchAuthEvent('parsingCallbackUrl', {
               url: URL
             }, "The callback url is being parsed");
-            currentUrl = URL || (_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["JS"].browserOrNode().isBrowser ? window.location.href : '');
+            currentUrl = URL || (Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["browserOrNode"])().isBrowser ? window.location.href : '');
             hasCodeOrError = !!(Object(url__WEBPACK_IMPORTED_MODULE_3__["parse"])(currentUrl).query || '').split('&').map(function (entry) {
               return entry.split('=');
             }).find(function (_a) {
@@ -64965,12 +64965,12 @@ __webpack_require__.r(__webpack_exports__);
  */
 
 /* harmony default export */ __webpack_exports__["default"] = (function (callback) {
-  if (_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["JS"].browserOrNode().isBrowser && window.location) {
+  if (Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["browserOrNode"])().isBrowser && window.location) {
     var url = window.location.href;
     callback({
       url: url
     });
-  } else if (_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["JS"].browserOrNode().isNode) {
+  } else if (Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["browserOrNode"])().isNode) {
     // continue building on ssr
     (function () {}); // noop
 
@@ -71245,7 +71245,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.5.7';
+var version = '4.5.8';
 
 /***/ }),
 
@@ -94264,6 +94264,32 @@ function () {
                                                   _a = subscriptionError.error, _b = __read((_a === void 0 ? {
                                                     errors: []
                                                   } : _a).errors, 1), _c = _b[0], _d = (_c === void 0 ? {} : _c).message, message = _d === void 0 ? '' : _d;
+
+                                                  if (message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].REALTIME_SUBSCRIPTION_INIT_ERROR) || message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].CONNECTION_FAILED)) {
+                                                    // Unsubscribe and clear subscription array for model/operation
+                                                    subscriptions[modelDefinition.name][transformerMutationType].forEach(function (subscription) {
+                                                      return subscription.unsubscribe();
+                                                    });
+                                                    subscriptions[modelDefinition.name][transformerMutationType] = [];
+                                                    operationAuthModeAttempts[operation]++;
+
+                                                    if (operationAuthModeAttempts[operation] >= readAuthModes.length) {
+                                                      // last auth mode retry. Continue with error
+                                                      logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1]);
+                                                    } else {
+                                                      // retry with different auth mode. Do not trigger
+                                                      // observer error or error handler
+                                                      logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1] + ". Retrying with authMode: " + readAuthModes[operationAuthModeAttempts[operation]]);
+
+                                                      _authModeRetry(operation);
+
+                                                      return [2
+                                                      /*return*/
+                                                      ];
+                                                    }
+                                                  }
+
+                                                  logger.warn('subscriptionError', message);
                                                   _e.label = 1;
 
                                                 case 1:
@@ -94292,39 +94318,12 @@ function () {
 
                                                 case 3:
                                                   e_1 = _e.sent();
-                                                  logger.error('Sync error handler failed with:', e_1);
+                                                  logger.error('Subscription error handler failed with:', e_1);
                                                   return [3
                                                   /*break*/
                                                   , 4];
 
                                                 case 4:
-                                                  if (message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].REALTIME_SUBSCRIPTION_INIT_ERROR) || message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].CONNECTION_FAILED)) {
-                                                    // Unsubscribe and clear subscription array for model/operation
-                                                    subscriptions[modelDefinition.name][transformerMutationType].forEach(function (subscription) {
-                                                      return subscription.unsubscribe();
-                                                    });
-                                                    subscriptions[modelDefinition.name][transformerMutationType] = [];
-                                                    operationAuthModeAttempts[operation]++;
-
-                                                    if (operationAuthModeAttempts[operation] >= readAuthModes.length) {
-                                                      logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1]);
-                                                      logger.warn('subscriptionError', message);
-                                                      return [2
-                                                      /*return*/
-                                                      ];
-                                                    } else {
-                                                      logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1] + ". Retrying with authMode: " + readAuthModes[operationAuthModeAttempts[operation]]);
-
-                                                      _authModeRetry(operation);
-
-                                                      return [2
-                                                      /*return*/
-                                                      ];
-                                                    }
-                                                  }
-
-                                                  logger.warn('subscriptionError', message);
-
                                                   if (typeof subscriptionReadyCallback === 'function') {
                                                     subscriptionReadyCallback();
                                                   }