@aws-amplify/datastore 5.0.1-console-preview.5a31ca1.0 → 5.0.1-console-preview.8d88eef.0

package/lib/datastore/datastore.js

@@ -136,7 +136,7 @@ var utils_2 = require("../sync/utils");
 var utils_3 = require("@aws-amplify/core/internals/utils");
 (0, immer_1.setAutoFreeze)(true);
 (0, immer_1.enablePatches)();
-var logger = new utils_3.Logger('DataStore');
+var logger = new core_1.ConsoleLogger('DataStore');
 var ulid = (0, util_1.monotonicUlidFactory)(Date.now());
 var SETTING_SCHEMA_VERSION = 'schemaVersion';
 var schema;

package/lib/storage/adapter/IndexedDBAdapter.js

@@ -123,8 +123,8 @@ var idb = __importStar(require("idb"));
 var types_1 = require("../../types");
 var util_1 = require("../../util");
 var StorageAdapterBase_1 = require("./StorageAdapterBase");
-var utils_1 = require("@aws-amplify/core/internals/utils");
-var logger = new utils_1.Logger('DataStore');
+var core_1 = require("@aws-amplify/core");
+var logger = new core_1.ConsoleLogger('DataStore');
 /**
  * The point after which queries composed of multiple simple OR conditions
  * should scan-and-filter instead of individual queries for each condition.

package/lib/storage/adapter/StorageAdapterBase.js

@@ -59,8 +59,8 @@ var predicates_1 = require("../../predicates");
 var types_1 = require("../../types");
 var util_1 = require("../../util");
 var relationship_1 = require("../relationship");
-var utils_1 = require("@aws-amplify/core/internals/utils");
-var logger = new utils_1.Logger('DataStore');
+var core_1 = require("@aws-amplify/core");
+var logger = new core_1.ConsoleLogger('DataStore');
 var DB_NAME = 'amplify-datastore';
 var StorageAdapterBase = /** @class */ (function () {
     function StorageAdapterBase() {

package/lib/storage/storage.js

@@ -98,7 +98,8 @@ var util_1 = require("../util");
 var utils_1 = require("../sync/utils");
 var getDefaultAdapter_1 = __importDefault(require("./adapter/getDefaultAdapter"));
 var utils_2 = require("@aws-amplify/core/internals/utils");
-var logger = new utils_2.Logger('DataStore');
+var core_1 = require("@aws-amplify/core");
+var logger = new core_1.ConsoleLogger('DataStore');
 var StorageClass = /** @class */ (function () {
     function StorageClass(schema, namespaceResolver, getModelConstructorByModelName, modelInstanceCreator, adapter, sessionId) {
         this.schema = schema;

package/lib/sync/datastoreConnectivity.js

@@ -51,8 +51,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // SPDX-License-Identifier: Apache-2.0
 var rxjs_1 = require("rxjs");
 var datastoreReachability_1 = require("./datastoreReachability");
-var utils_1 = require("@aws-amplify/core/internals/utils");
-var logger = new utils_1.Logger('DataStore');
+var core_1 = require("@aws-amplify/core");
+var logger = new core_1.ConsoleLogger('DataStore');
 var RECONNECTING_IN = 5000; // 5s this may be configurable in the future
 var DataStoreConnectivity = /** @class */ (function () {
     function DataStoreConnectivity() {

package/lib/sync/index.js

@@ -92,7 +92,7 @@ var subscription_1 = require("./processors/subscription");
 var sync_1 = require("./processors/sync");
 var utils_2 = require("./utils");
 var api_graphql_1 = require("@aws-amplify/api-graphql");
-var logger = new utils_1.Logger('DataStore');
+var logger = new core_1.ConsoleLogger('DataStore');
 var ownSymbol = Symbol('sync');
 var ControlMessage;
 (function (ControlMessage) {

package/lib/sync/processors/errorMaps.js

@@ -37,12 +37,11 @@ var __values = (this && this.__values) || function(o) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapErrorToType = exports.getSyncErrorType = exports.getSubscriptionErrorType = exports.getMutationErrorType = exports.syncErrorMap = exports.subscriptionErrorMap = exports.mutationErrorMap = void 0;
+var utils_1 = require("../utils");
 var connectionTimeout = function (error) {
     return /^Connection failed: Connection Timeout/.test(error.message);
 };
-var serverError = function (error) {
-    return /^Error: Request failed with status code 5\d\d/.test(error.message);
-};
+var serverError = function (error) { return (0, utils_1.resolveServiceErrorStatusCode)(error) >= 500; };
 exports.mutationErrorMap = {
     BadModel: function () { return false; },
     BadRecord: function (error) {
@@ -54,7 +53,7 @@ exports.mutationErrorMap = {
     Transient: function (error) { return connectionTimeout(error) || serverError(error); },
     Unauthorized: function (error) {
         return error.message === 'Unauthorized' ||
-            /^Request failed with status code 401/.test(error.message);
+            (0, utils_1.resolveServiceErrorStatusCode)(error) === 401;
     },
 };
 exports.subscriptionErrorMap = {

package/lib/sync/processors/mutation.js

@@ -88,13 +88,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MutationProcessor = exports.safeJitteredBackoff = void 0;
 var internals_1 = require("@aws-amplify/api/internals");
 var utils_1 = require("@aws-amplify/core/internals/utils");
+var core_1 = require("@aws-amplify/core");
 var rxjs_1 = require("rxjs");
 var types_1 = require("../../types");
 var util_1 = require("../../util");
 var utils_2 = require("../utils");
 var errorMaps_1 = require("./errorMaps");
 var MAX_ATTEMPTS = 10;
-var logger = new utils_1.Logger('DataStore');
+var logger = new core_1.ConsoleLogger('DataStore');
 var MutationProcessor = /** @class */ (function () {
     function MutationProcessor(schema, storage, userClasses, outbox, modelInstanceCreator, MutationEvent, amplifyConfig, authModeStrategy, errorHandler, conflictHandler, amplifyContext) {
         if (amplifyConfig === void 0) { amplifyConfig = {}; }

package/lib/sync/processors/subscription.js

@@ -83,7 +83,7 @@ var predicates_1 = require("../../predicates");
 var util_1 = require("../../util");
 var errorMaps_1 = require("./errorMaps");
 var api_graphql_1 = require("@aws-amplify/api-graphql");
-var logger = new utils_1.Logger('DataStore');
+var logger = new core_1.ConsoleLogger('DataStore');
 var CONTROL_MSG;
 (function (CONTROL_MSG) {
     CONTROL_MSG["CONNECTED"] = "CONNECTED";

package/lib/sync/processors/sync.js

@@ -77,7 +77,7 @@ var opResultDefaults = {
     nextToken: null,
     startedAt: null,
 };
-var logger = new utils_2.ConsoleLogger('DataStore');
+var logger = new core_1.ConsoleLogger('DataStore');
 var SyncProcessor = /** @class */ (function () {
     function SyncProcessor(schema, syncPredicates, amplifyConfig, authModeStrategy, errorHandler, amplifyContext) {
         if (amplifyConfig === void 0) { amplifyConfig = {}; }
@@ -213,14 +213,14 @@ var SyncProcessor = /** @class */ (function () {
                     case 0: return [4 /*yield*/, (0, utils_2.jitteredExponentialRetry)(function (query, variables) { return __awaiter(_this, void 0, void 0, function () {
                             var authToken, customUserAgentDetails, error_2, clientOrForbiddenErrorMessage, hasItems, unauthorized, otherErrors, result;
                             var _this = this;
-                            var _a, _b, _c, _d;
-                            return __generator(this, function (_e) {
-                                switch (_e.label) {
+                            var _a, _b, _c, _d, _e;
+                            return __generator(this, function (_f) {
+                                switch (_f.label) {
                                     case 0:
-                                        _e.trys.push([0, 3, , 6]);
+                                        _f.trys.push([0, 3, , 6]);
                                         return [4 /*yield*/, (0, utils_1.getTokenForCustomAuth)(authMode, this.amplifyConfig)];
                                     case 1:
-                                        authToken = _e.sent();
+                                        authToken = _f.sent();
                                         customUserAgentDetails = {
                                             category: utils_2.Category.DataStore,
                                             action: utils_2.DataStoreAction.GraphQl,
@@ -231,9 +231,9 @@ var SyncProcessor = /** @class */ (function () {
                                                 authMode: authMode,
                                                 authToken: authToken,
                                             }, undefined, customUserAgentDetails)];
-                                    case 2: return [2 /*return*/, _e.sent()];
+                                    case 2: return [2 /*return*/, _f.sent()];
                                     case 3:
-                                        error_2 = _e.sent();
+                                        error_2 = _f.sent();
                                         clientOrForbiddenErrorMessage = (0, utils_1.getClientSideAuthError)(error_2) || (0, utils_1.getForbiddenError)(error_2);
                                         if (clientOrForbiddenErrorMessage) {
                                             logger.error('Sync processor retry error:', error_2);
@@ -278,7 +278,7 @@ var SyncProcessor = /** @class */ (function () {
                                                 });
                                             }); }))];
                                     case 4:
-                                        _e.sent();
+                                        _f.sent();
                                         core_1.Hub.dispatch('datastore', {
                                             event: 'nonApplicableDataReceived',
                                             data: {
@@ -286,7 +286,7 @@ var SyncProcessor = /** @class */ (function () {
                                                 modelName: modelDefinition.name,
                                             },
                                         });
-                                        _e.label = 5;
+                                        _f.label = 5;
                                     case 5:
                                         /**
                                          * Handle $util.unauthorized() in resolver request mapper, which responses with something
@@ -326,7 +326,7 @@ var SyncProcessor = /** @class */ (function () {
                                             });
                                             throw new utils_2.NonRetryableError(error_2);
                                         }
-                                        if ((_d = (_c = result.data) === null || _c === void 0 ? void 0 : _c[opName].items) === null || _d === void 0 ? void 0 : _d.length) {
+                                        if ((_e = (_d = (_c = result.data) === null || _c === void 0 ? void 0 : _c[opName]) === null || _d === void 0 ? void 0 : _d.items) === null || _e === void 0 ? void 0 : _e.length) {
                                             return [2 /*return*/, result];
                                         }
                                         throw error_2;

package/lib/sync/utils.d.ts

@@ -100,6 +100,7 @@ export declare function getModelAuthModes({ authModeStrategy, defaultAuthMode, m
     [key in ModelOperation]: GraphQLAuthMode[];
 }>;
 export declare function getForbiddenError(error: any): any;
+export declare function resolveServiceErrorStatusCode(error: unknown): number | null;
 export declare function getClientSideAuthError(error: any): GraphQLAuthError;
 export declare function getTokenForCustomAuth(authMode: GraphQLAuthMode, amplifyConfig?: Record<string, any>): Promise<string | undefined>;
 export declare function getIdentifierValue(modelDefinition: SchemaModel, model: ModelInstanceMetadata | PersistentModel): string;

package/lib/sync/utils.js

@@ -83,14 +83,14 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIdentifierValue = exports.getTokenForCustomAuth = exports.getClientSideAuthError = exports.getForbiddenError = exports.getModelAuthModes = exports.getUserGroupsFromToken = exports.generateRTFRemediation = exports.RTFError = exports.repeatedFieldInGroup = exports.countFilterCombinations = exports.dynamicAuthFields = exports.filterFields = exports.predicateToGraphQLFilter = exports.predicateToGraphQLCondition = exports.createMutationInstanceFromModelOperation = exports.buildGraphQLOperation = exports.buildSubscriptionGraphQLOperation = exports.getAuthorizationRules = exports.generateSelectionSet = exports.getMetadataFields = exports.TransformerMutationType = void 0;
+exports.getIdentifierValue = exports.getTokenForCustomAuth = exports.getClientSideAuthError = exports.resolveServiceErrorStatusCode = exports.getForbiddenError = exports.getModelAuthModes = exports.getUserGroupsFromToken = exports.generateRTFRemediation = exports.RTFError = exports.repeatedFieldInGroup = exports.countFilterCombinations = exports.dynamicAuthFields = exports.filterFields = exports.predicateToGraphQLFilter = exports.predicateToGraphQLCondition = exports.createMutationInstanceFromModelOperation = exports.buildGraphQLOperation = exports.buildSubscriptionGraphQLOperation = exports.getAuthorizationRules = exports.generateSelectionSet = exports.getMetadataFields = exports.TransformerMutationType = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 var api_1 = require("@aws-amplify/api");
-var utils_1 = require("@aws-amplify/core/internals/utils");
+var core_1 = require("@aws-amplify/core");
 var types_1 = require("../types");
 var util_1 = require("../util");
-var logger = new utils_1.Logger('DataStore');
+var logger = new core_1.ConsoleLogger('DataStore');
 var GraphQLOperationType;
 (function (GraphQLOperationType) {
     GraphQLOperationType["LIST"] = "query";
@@ -765,25 +765,36 @@ function getModelAuthModes(_a) {
 }
 exports.getModelAuthModes = getModelAuthModes;
 function getForbiddenError(error) {
-    var forbiddenErrorMessages = [
-        'Request failed with status code 401',
-        'Request failed with status code 403',
-    ];
+    var _a;
+    var forbiddenErrorCodes = [401, 403];
     var forbiddenError;
     if (error && error.errors) {
         forbiddenError = error.errors.find(function (err) {
-            return forbiddenErrorMessages.includes(err.message);
+            return forbiddenErrorCodes.includes(resolveServiceErrorStatusCode(err));
         });
     }
     else if (error && error.message) {
         forbiddenError = error;
     }
     if (forbiddenError) {
-        return forbiddenError.message;
+        return ((_a = forbiddenError.message) !== null && _a !== void 0 ? _a : "Request failed with status code ".concat(resolveServiceErrorStatusCode(forbiddenError)));
     }
     return null;
 }
 exports.getForbiddenError = getForbiddenError;
+function resolveServiceErrorStatusCode(error) {
+    var _a, _b;
+    if ((_a = error === null || error === void 0 ? void 0 : error['$metadata']) === null || _a === void 0 ? void 0 : _a['httpStatusCode']) {
+        return Number((_b = error === null || error === void 0 ? void 0 : error['$metadata']) === null || _b === void 0 ? void 0 : _b['httpStatusCode']);
+    }
+    else if (error === null || error === void 0 ? void 0 : error.originalError) {
+        return resolveServiceErrorStatusCode(error === null || error === void 0 ? void 0 : error.originalError);
+    }
+    else {
+        return null;
+    }
+}
+exports.resolveServiceErrorStatusCode = resolveServiceErrorStatusCode;
 function getClientSideAuthError(error) {
     var clientSideAuthErrors = Object.values(api_1.GraphQLAuthError);
     var clientSideError = error &&