@aws-amplify/datastore 5.0.1-api-v6-models.8035dfc.0 → 5.0.1-api-v6-models.572a7b5.0

package/lib-esm/util.js

@@ -84,7 +84,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { monotonicFactory } from 'ulid';
-import { v4 as uuid } from 'uuid';
+import { amplifyUuid, AmplifyUrl } from '@aws-amplify/core/internals/utils';
 import { produce, applyPatches } from 'immer';
 import { isPredicateGroup, isPredicateObj, SortDirection, isModelAttributeKey, isModelAttributePrimaryKey, isModelAttributeCompositeKey, LimitTimerRaceResolvedValues, } from './types';
 import { ModelSortPredicateCreator } from './predicates';
@@ -226,7 +226,7 @@ export var traverseModel = function (srcModelName, instance, namespace, modelIns
 var privateModeCheckResult;
 export var isPrivateMode = function () {
     return new Promise(function (resolve) {
-        var dbname = uuid();
+        var dbname = amplifyUuid();
         var db;
         var isPrivate = function () {
             privateModeCheckResult = false;
@@ -279,7 +279,7 @@ export var isSafariCompatabilityMode = function () { return __awaiter(void 0, vo
         switch (_c.label) {
             case 0:
                 _c.trys.push([0, 6, , 7]);
-                dbName_1 = uuid();
+                dbName_1 = amplifyUuid();
                 storeName_1 = 'indexedDBFeatureProbeStore';
                 indexName_1 = 'idx';
                 if (indexedDB === null)
@@ -668,7 +668,7 @@ export var isAWSJSON = function (val) {
 };
 export var isAWSURL = function (val) {
     try {
-        return !!new URL(val);
+        return !!new AmplifyUrl(val);
     }
     catch (_c) {
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/datastore",
-  "version": "5.0.1-api-v6-models.8035dfc.0+8035dfc",
+  "version": "5.0.1-api-v6-models.572a7b5.0+572a7b5",
   "description": "AppSyncLocal support for aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -47,26 +47,25 @@
     "ssr"
   ],
   "dependencies": {
-    "@aws-amplify/api": "6.0.1-api-v6-models.8035dfc.0+8035dfc",
-    "@aws-amplify/auth": "6.0.1-api-v6-models.8035dfc.0+8035dfc",
+    "@aws-amplify/api": "6.0.1-api-v6-models.572a7b5.0+572a7b5",
+    "@aws-amplify/auth": "6.0.1-api-v6-models.572a7b5.0+572a7b5",
     "buffer": "4.9.2",
     "idb": "5.0.6",
     "immer": "9.0.6",
     "rxjs": "^7.8.1",
-    "ulid": "^2.3.0",
-    "uuid": "^9.0.0"
+    "ulid": "^2.3.0"
   },
   "peerDependencies": {
-    "@aws-amplify/core": "6.0.1-api-v6-models.8035dfc.0+8035dfc"
+    "@aws-amplify/core": "6.0.1-api-v6-models.572a7b5.0+572a7b5"
   },
   "devDependencies": {
-    "@aws-amplify/core": "6.0.1-api-v6-models.8035dfc.0+8035dfc",
-    "@aws-amplify/react-native": "1.0.1-api-v6-models.8035dfc.0+8035dfc",
-    "@types/uuid": "^9.0.0",
+    "@aws-amplify/core": "6.0.1-api-v6-models.572a7b5.0+572a7b5",
+    "@aws-amplify/react-native": "1.0.1-api-v6-models.572a7b5.0+572a7b5",
     "@types/uuid-validate": "^0.0.1",
     "dexie": "3.2.2",
     "dexie-export-import": "1.0.3",
     "fake-indexeddb": "3.0.0",
+    "graphql": "15.8.0",
     "typescript": "5.0.2"
   },
   "size-limit": [
@@ -136,5 +135,5 @@
       "lib-esm"
     ]
   },
-  "gitHead": "8035dfc20dda8f7b4d116616e89e72d889ceb5f1"
+  "gitHead": "572a7b56d9e87ca779038254de3d68b5c607af07"
 }

package/src/authModeStrategies/multiAuthStrategy.ts

@@ -142,7 +142,11 @@ export const multiAuthStrategy: (
 	async ({ schema, modelName }) => {
 		let currentUser;
 		try {
-			currentUser = await fetchAuthSession();
+			const authSession = await fetchAuthSession();
+			if (authSession.tokens.accessToken) {
+				// the user is authenticated
+				currentUser = authSession;
+			}
 		} catch (e) {
 			// No current user
 		}

package/src/datastore/datastore.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { InternalAPI } from '@aws-amplify/api/internals';
-import { Amplify, Hub, Cache } from '@aws-amplify/core';
+import { Amplify, Hub, Cache, ConsoleLogger } from '@aws-amplify/core';
 
 import {
 	Draft,
@@ -11,7 +11,7 @@ import {
 	enablePatches,
 	Patch,
 } from 'immer';
-import { v4 as uuid4 } from 'uuid';
+import { amplifyUuid } from '@aws-amplify/core/internals/utils';
 import { Observable, SubscriptionLike, filter } from 'rxjs';
 import { defaultAuthStrategy, multiAuthStrategy } from '../authModeStrategies';
 import {
@@ -103,15 +103,12 @@ import {
 } from '../predicates/next';
 import { getIdentifierValue } from '../sync/utils';
 import DataStoreConnectivity from '../sync/datastoreConnectivity';
-import {
-	BackgroundProcessManager,
-	Logger,
-} from '@aws-amplify/core/internals/utils';
+import { BackgroundProcessManager } from '@aws-amplify/core/internals/utils';
 
 setAutoFreeze(true);
 enablePatches();
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 const ulid = monotonicUlidFactory(Date.now());
 
@@ -838,13 +835,14 @@ const createModelClass = <T extends PersistentModel>(
 						const id = isInternalModel
 							? _id
 							: modelDefinition.syncable
-							? uuid4()
+							? amplifyUuid()
 							: ulid();
 
 						(<ModelWithIDIdentifier>(<unknown>draft)).id = id;
 					} else if (isIdOptionallyManaged(modelDefinition)) {
 						// only auto-populate if the id was not provided
-						(<ModelWithIDIdentifier>(<unknown>draft)).id = draft.id || uuid4();
+						(<ModelWithIDIdentifier>(<unknown>draft)).id =
+							draft.id || amplifyUuid();
 					}
 
 					if (!isInternallyInitialized) {

package/src/storage/adapter/IndexedDBAdapter.ts

@@ -24,9 +24,9 @@ import {
 	isSafariCompatabilityMode,
 } from '../../util';
 import { StorageAdapterBase } from './StorageAdapterBase';
-import { Logger } from '@aws-amplify/core/internals/utils';
+import { ConsoleLogger } from '@aws-amplify/core';
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 /**
  * The point after which queries composed of multiple simple OR conditions

package/src/storage/adapter/StorageAdapterBase.ts

@@ -30,9 +30,9 @@ import {
 import type { IDBPDatabase, IDBPObjectStore } from 'idb';
 import type AsyncStorageDatabase from './AsyncStorageDatabase';
 import { ModelRelationship } from '../relationship';
-import { Logger } from '@aws-amplify/core/internals/utils';
+import { ConsoleLogger } from '@aws-amplify/core';
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 const DB_NAME = 'amplify-datastore';
 
 export abstract class StorageAdapterBase implements Adapter {

package/src/storage/storage.ts

@@ -30,7 +30,8 @@ import {
 import { getIdentifierValue } from '../sync/utils';
 import { Adapter } from './adapter';
 import getDefaultAdapter from './adapter/getDefaultAdapter';
-import { Logger, Mutex } from '@aws-amplify/core/internals/utils';
+import { Mutex } from '@aws-amplify/core/internals/utils';
+import { ConsoleLogger } from '@aws-amplify/core';
 
 export type StorageSubscriptionMessage<T extends PersistentModel> =
 	InternalSubscriptionMessage<T> & {
@@ -40,7 +41,7 @@ export type StorageSubscriptionMessage<T extends PersistentModel> =
 export type StorageFacade = Omit<Adapter, 'setUp'>;
 export type Storage = InstanceType<typeof StorageClass>;
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 class StorageClass implements StorageFacade {
 	private initialized: Promise<void> | undefined;
 	private readonly pushStream: Subject<

package/src/sync/datastoreConnectivity.ts

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Observable, Observer, SubscriptionLike } from 'rxjs';
 import { ReachabilityMonitor } from './datastoreReachability';
-import { Logger } from '@aws-amplify/core/internals/utils';
+import { ConsoleLogger } from '@aws-amplify/core';
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 const RECONNECTING_IN = 5000; // 5s this may be configurable in the future
 

package/src/sync/index.ts

@@ -1,12 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import {
-	Logger,
-	BackgroundProcessManager,
-} from '@aws-amplify/core/internals/utils';
-import { Hub } from '@aws-amplify/core';
+import { BackgroundProcessManager } from '@aws-amplify/core/internals/utils';
+import { Hub, ConsoleLogger } from '@aws-amplify/core';
 
-import { filter, Observable, Observer, of, SubscriptionLike } from 'rxjs';
+import { filter, Observable, of, SubscriptionLike } from 'rxjs';
 import { ModelInstanceCreator } from '../datastore/datastore';
 import { ModelPredicateCreator } from '../predicates';
 import { ExclusiveStorage as Storage } from '../storage/storage';
@@ -54,7 +51,7 @@ import {
 	CONNECTION_STATE_CHANGE as PUBSUB_CONNECTION_STATE_CHANGE,
 } from '@aws-amplify/api-graphql';
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 const ownSymbol = Symbol('sync');
 

package/src/sync/processors/errorMaps.ts

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { ErrorType } from '../../types';
+import { resolveServiceErrorStatusCode } from '../utils';
 
 export type ErrorMap = Partial<{
 	[key in ErrorType]: (error: Error) => boolean;
@@ -9,8 +10,7 @@ export type ErrorMap = Partial<{
 const connectionTimeout = error =>
 	/^Connection failed: Connection Timeout/.test(error.message);
 
-const serverError = error =>
-	/^Error: Request failed with status code 5\d\d/.test(error.message);
+const serverError = error => resolveServiceErrorStatusCode(error) >= 500;
 
 export const mutationErrorMap: ErrorMap = {
 	BadModel: () => false,
@@ -25,7 +25,7 @@ export const mutationErrorMap: ErrorMap = {
 	Transient: error => connectionTimeout(error) || serverError(error),
 	Unauthorized: error =>
 		error.message === 'Unauthorized' ||
-		/^Request failed with status code 401/.test(error.message),
+		resolveServiceErrorStatusCode(error) === 401,
 };
 
 export const subscriptionErrorMap: ErrorMap = {
@@ -58,10 +58,10 @@ export const syncErrorMap: ErrorMap = {
  */
 function unwrapObservableError(observableError: any) {
 	const {
-		error: { errors: [error] } = {
-			errors: [],
-		},
-	} = observableError;
+		errors: [error],
+	} = ({
+		errors: [],
+	} = observableError);
 
 	return error;
 }

package/src/sync/processors/mutation.ts

@@ -4,7 +4,6 @@ import { GraphQLResult } from '@aws-amplify/api';
 import { InternalAPI } from '@aws-amplify/api/internals';
 import {
 	Category,
-	Logger,
 	CustomUserAgentDetails,
 	DataStoreAction,
 	jitteredBackoff,
@@ -14,6 +13,7 @@ import {
 	GraphQLAuthMode,
 	AmplifyError,
 } from '@aws-amplify/core/internals/utils';
+import { ConsoleLogger } from '@aws-amplify/core';
 
 import { Observable, Observer } from 'rxjs';
 import { MutationEvent } from '../';
@@ -50,7 +50,7 @@ import { getMutationErrorType } from './errorMaps';
 
 const MAX_ATTEMPTS = 10;
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 type MutationProcessorEvent = {
 	operation: TransformerMutationType;

package/src/sync/processors/subscription.ts

@@ -2,10 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 import { GraphQLResult } from '@aws-amplify/api';
 import { InternalAPI } from '@aws-amplify/api/internals';
-import { Hub, HubCapsule, fetchAuthSession } from '@aws-amplify/core';
+import {
+	Hub,
+	HubCapsule,
+	fetchAuthSession,
+	ConsoleLogger,
+} from '@aws-amplify/core';
 import {
 	Category,
-	Logger,
 	CustomUserAgentDetails,
 	DataStoreAction,
 	BackgroundProcessManager,
@@ -47,7 +51,7 @@ import { validatePredicate } from '../../util';
 import { getSubscriptionErrorType } from './errorMaps';
 import { CONTROL_MSG as PUBSUB_CONTROL_MSG } from '@aws-amplify/api-graphql';
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 export enum CONTROL_MSG {
 	CONNECTED = 'CONNECTED',
@@ -455,10 +459,10 @@ class SubscriptionProcessor {
 												},
 												error: async subscriptionError => {
 													const {
-														error: { errors: [{ message = '' } = {}] } = {
-															errors: [],
-														},
-													} = subscriptionError;
+														errors: [{ message = '' } = {}],
+													} = ({
+														errors: [],
+													} = subscriptionError);
 
 													const isRTFError =
 														// only attempt catch if a filter variable was added to the subscription query

package/src/sync/processors/sync.ts

@@ -26,7 +26,6 @@ import {
 import {
 	jitteredExponentialRetry,
 	Category,
-	ConsoleLogger as Logger,
 	CustomUserAgentDetails,
 	DataStoreAction,
 	NonRetryableError,
@@ -35,7 +34,7 @@ import {
 	AmplifyError,
 } from '@aws-amplify/core/internals/utils';
 
-import { Amplify, Hub } from '@aws-amplify/core';
+import { Amplify, Hub, ConsoleLogger } from '@aws-amplify/core';
 
 import { ModelPredicateCreator } from '../../predicates';
 import { getSyncErrorType } from './errorMaps';
@@ -45,7 +44,7 @@ const opResultDefaults = {
 	startedAt: null,
 };
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 class SyncProcessor {
 	private readonly typeQuery = new WeakMap<SchemaModel, [string, string]>();
@@ -342,7 +341,7 @@ class SyncProcessor {
 						throw new NonRetryableError(error);
 					}
 
-					if (result.data?.[opName].items?.length) {
+					if (result.data?.[opName]?.items?.length) {
 						return result;
 					}
 

package/src/sync/utils.ts

@@ -1,7 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { GraphQLAuthError } from '@aws-amplify/api';
-import { Logger, GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
+import { ConsoleLogger } from '@aws-amplify/core';
+import type { GraphQLError } from 'graphql';
+import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
 import { ModelInstanceCreator } from '../datastore/datastore';
 import {
 	AuthorizationRule,
@@ -39,7 +41,7 @@ import {
 } from '../util';
 import { MutationEvent } from './';
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 enum GraphQLOperationType {
 	LIST = 'query',
@@ -863,25 +865,39 @@ export async function getModelAuthModes({
 }
 
 export function getForbiddenError(error) {
-	const forbiddenErrorMessages = [
-		'Request failed with status code 401',
-		'Request failed with status code 403',
-	];
+	const forbiddenErrorCodes = [401, 403];
 	let forbiddenError;
 	if (error && error.errors) {
 		forbiddenError = (error.errors as [any]).find(err =>
-			forbiddenErrorMessages.includes(err.message)
+			forbiddenErrorCodes.includes(resolveServiceErrorStatusCode(err))
 		);
 	} else if (error && error.message) {
 		forbiddenError = error;
 	}
 
 	if (forbiddenError) {
-		return forbiddenError.message;
+		return (
+			forbiddenError.message ??
+			`Request failed with status code ${resolveServiceErrorStatusCode(
+				forbiddenError
+			)}`
+		);
 	}
 	return null;
 }
 
+export function resolveServiceErrorStatusCode(error: unknown): number | null {
+	if (error?.['$metadata']?.['httpStatusCode']) {
+		return Number(error?.['$metadata']?.['httpStatusCode']);
+	} else if ((error as GraphQLError)?.originalError) {
+		return resolveServiceErrorStatusCode(
+			(error as GraphQLError)?.originalError
+		);
+	} else {
+		return null;
+	}
+}
+
 export function getClientSideAuthError(error) {
 	const clientSideAuthErrors = Object.values(GraphQLAuthError);
 	const clientSideError =

package/src/util.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { monotonicFactory, ULID } from 'ulid';
-import { v4 as uuid } from 'uuid';
+import { amplifyUuid, AmplifyUrl } from '@aws-amplify/core/internals/utils';
 import { produce, applyPatches, Patch } from 'immer';
 import { ModelInstanceCreator } from './datastore/datastore';
 import {
@@ -246,7 +246,7 @@ let privateModeCheckResult;
 
 export const isPrivateMode = () => {
 	return new Promise(resolve => {
-		const dbname = uuid();
+		const dbname = amplifyUuid();
 		let db;
 
 		const isPrivate = () => {
@@ -297,7 +297,7 @@ let safariCompatabilityModeResult;
  */
 export const isSafariCompatabilityMode: () => Promise<boolean> = async () => {
 	try {
-		const dbName = uuid();
+		const dbName = amplifyUuid();
 		const storeName = 'indexedDBFeatureProbeStore';
 		const indexName = 'idx';
 
@@ -642,7 +642,7 @@ export const isAWSJSON = (val: string): boolean => {
 
 export const isAWSURL = (val: string): boolean => {
 	try {
-		return !!new URL(val);
+		return !!new AmplifyUrl(val);
 	} catch {
 		return false;
 	}