@aws-amplify/datastore 4.7.6-api-v6-models.b3abc9b.0 → 5.0.0

package/src/sync/index.ts

@@ -1,17 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import {
-	browserOrNode,
-	ConsoleLogger as Logger,
-	BackgroundProcessManager,
-	Hub,
-} from '@aws-amplify/core';
-import {
-	CONTROL_MSG as PUBSUB_CONTROL_MSG,
-	CONNECTION_STATE_CHANGE as PUBSUB_CONNECTION_STATE_CHANGE,
-	ConnectionState,
-} from '@aws-amplify/pubsub';
-import Observable, { ZenObservable } from 'zen-observable-ts';
+import { BackgroundProcessManager } from '@aws-amplify/core/internals/utils';
+import { Hub, ConsoleLogger } from '@aws-amplify/core';
+
+import { filter, Observable, of, SubscriptionLike } from 'rxjs';
 import { ModelInstanceCreator } from '../datastore/datastore';
 import { ModelPredicateCreator } from '../predicates';
 import { ExclusiveStorage as Storage } from '../storage/storage';
@@ -53,8 +45,13 @@ import {
 	TransformerMutationType,
 } from './utils';
 
-const { isNode } = browserOrNode();
-const logger = new Logger('DataStore');
+import {
+	CONTROL_MSG as PUBSUB_CONTROL_MSG,
+	ConnectionState,
+	CONNECTION_STATE_CHANGE as PUBSUB_CONNECTION_STATE_CHANGE,
+} from '@aws-amplify/api-graphql';
+
+const logger = new ConsoleLogger('DataStore');
 
 const ownSymbol = Symbol('sync');
 
@@ -215,7 +212,7 @@ export class SyncEngine {
 		return new Observable<ControlMessageType<ControlMessage>>(observer => {
 			logger.log('starting sync engine...');
 
-			let subscriptions: ZenObservable.Subscription[] = [];
+			let subscriptions: SubscriptionLike[] = [];
 
 			this.runningProcesses.add(async () => {
 				try {
@@ -249,53 +246,47 @@ export class SyncEngine {
 											[TransformerMutationType, SchemaModel, PersistentModel]
 										>;
 
-										// NOTE: need a way to override this conditional for testing.
-										if (isNode) {
-											logger.warn(
-												'Realtime disabled when in a server-side environment'
-											);
-										} else {
-											this.stopDisruptionListener =
-												this.startDisruptionListener();
-											//#region GraphQL Subscriptions
-											[ctlSubsObservable, dataSubsObservable] =
-												this.subscriptionsProcessor.start();
-
-											try {
-												await new Promise<void>((resolve, reject) => {
-													onTerminate.then(reject);
-													const ctlSubsSubscription =
-														ctlSubsObservable.subscribe({
-															next: msg => {
-																if (msg === CONTROL_MSG.CONNECTED) {
-																	resolve();
-																}
-															},
-															error: err => {
-																reject(err);
-																const handleDisconnect =
-																	this.disconnectionHandler();
-																handleDisconnect(err);
-															},
-														});
-
-													subscriptions.push(ctlSubsSubscription);
-												});
-											} catch (err) {
-												observer.error(err);
-												failedStarting();
-												return;
-											}
+										this.stopDisruptionListener =
+											this.startDisruptionListener();
+										//#region GraphQL Subscriptions
+										[ctlSubsObservable, dataSubsObservable] =
+											this.subscriptionsProcessor.start();
 
-											logger.log('Realtime ready');
+										try {
+											await new Promise<void>((resolve, reject) => {
+												onTerminate.then(reject);
+												const ctlSubsSubscription = ctlSubsObservable.subscribe(
+													{
+														next: msg => {
+															if (msg === CONTROL_MSG.CONNECTED) {
+																resolve();
+															}
+														},
+														error: err => {
+															reject(err);
+															const handleDisconnect =
+																this.disconnectionHandler();
+															handleDisconnect(err);
+														},
+													}
+												);
 
-											observer.next({
-												type: ControlMessage.SYNC_ENGINE_SUBSCRIPTIONS_ESTABLISHED,
+												subscriptions.push(ctlSubsSubscription);
 											});
-
-											//#endregion
+										} catch (err) {
+											observer.error(err);
+											failedStarting();
+											return;
 										}
 
+										logger.log('Realtime ready');
+
+										observer.next({
+											type: ControlMessage.SYNC_ENGINE_SUBSCRIPTIONS_ESTABLISHED,
+										});
+
+										//#endregion
+
 										//#region Base & Sync queries
 										try {
 											await new Promise<void>((resolve, reject) => {
@@ -376,32 +367,29 @@ export class SyncEngine {
 										//#endregion
 
 										//#region Merge subscriptions buffer
-										// TODO: extract to function
-										if (!isNode) {
-											subscriptions.push(
-												dataSubsObservable!.subscribe(
-													([_transformerMutationType, modelDefinition, item]) =>
-														this.runningProcesses.add(async () => {
-															const modelConstructor = this.userModelClasses[
-																modelDefinition.name
-															] as PersistentModelConstructor<any>;
-
-															const model = this.modelInstanceCreator(
-																modelConstructor,
-																item
-															);
-
-															await this.storage.runExclusive(storage =>
-																this.modelMerger.merge(
-																	storage,
-																	model,
-																	modelDefinition
-																)
-															);
-														}, 'subscription dataSubsObservable event')
-												)
-											);
-										}
+										subscriptions.push(
+											dataSubsObservable!.subscribe(
+												([_transformerMutationType, modelDefinition, item]) =>
+													this.runningProcesses.add(async () => {
+														const modelConstructor = this.userModelClasses[
+															modelDefinition.name
+														] as PersistentModelConstructor<any>;
+
+														const model = this.modelInstanceCreator(
+															modelConstructor,
+															item
+														);
+
+														await this.storage.runExclusive(storage =>
+															this.modelMerger.merge(
+																storage,
+																model,
+																modelDefinition
+															)
+														);
+													}, 'subscription dataSubsObservable event')
+											)
+										);
 										//#endregion
 									} else if (!online) {
 										this.online = online;
@@ -425,10 +413,12 @@ export class SyncEngine {
 
 				this.storage
 					.observe(null, null, ownSymbol)
-					.filter(({ model }) => {
-						const modelDefinition = this.getModelDefinition(model);
-						return modelDefinition.syncable === true;
-					})
+					.pipe(
+						filter(({ model }) => {
+							const modelDefinition = this.getModelDefinition(model);
+							return modelDefinition.syncable === true;
+						})
+					)
 					.subscribe({
 						next: async ({ opType, model, element, condition }) =>
 							this.runningProcesses.add(async () => {
@@ -540,11 +530,11 @@ export class SyncEngine {
 		ControlMessageType<ControlMessage>
 	> {
 		if (!this.online) {
-			return Observable.of<ControlMessageType<ControlMessage>>();
+			return of<ControlMessageType<ControlMessage>>({} as any); // TODO(v6): fix this
 		}
 
 		return new Observable<ControlMessageType<ControlMessage>>(observer => {
-			let syncQueriesSubscription: ZenObservable.Subscription;
+			let syncQueriesSubscription: SubscriptionLike;
 
 			this.runningProcesses.isOpen &&
 				this.runningProcesses.add(async onTerminate => {

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

@@ -1,18 +1,20 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
+import { GraphQLResult } from '@aws-amplify/api';
 import { InternalAPI } from '@aws-amplify/api/internals';
 import {
 	Category,
-	ConsoleLogger as Logger,
 	CustomUserAgentDetails,
 	DataStoreAction,
 	jitteredBackoff,
 	NonRetryableError,
 	retry,
 	BackgroundProcessManager,
-} from '@aws-amplify/core';
-import Observable, { ZenObservable } from 'zen-observable-ts';
+	GraphQLAuthMode,
+	AmplifyError,
+} from '@aws-amplify/core/internals/utils';
+
+import { Observable, Observer } from 'rxjs';
 import { MutationEvent } from '../';
 import { ModelInstanceCreator } from '../../datastore/datastore';
 import { ExclusiveStorage as Storage } from '../../storage/storage';
@@ -44,10 +46,11 @@ import {
 	getTokenForCustomAuth,
 } from '../utils';
 import { getMutationErrorType } from './errorMaps';
+import { ConsoleLogger } from '@aws-amplify/core';
 
 const MAX_ATTEMPTS = 10;
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 type MutationProcessorEvent = {
 	operation: TransformerMutationType;
@@ -65,7 +68,7 @@ class MutationProcessor {
 	 * yet started. In this case, `isReady()` will be `false` and `resume()` will exit
 	 * early.
 	 */
-	private observer?: ZenObservable.Observer<MutationProcessorEvent>;
+	private observer?: Observer<MutationProcessorEvent>;
 	private readonly typeQuery = new WeakMap<
 		SchemaModel,
 		[TransformerMutationType, string, string][]
@@ -161,8 +164,8 @@ class MutationProcessor {
 	}
 
 	public async resume(): Promise<void> {
-		await (this.runningProcesses.isOpen &&
-			this.runningProcesses.add(async onTerminate => {
+		if (this.runningProcesses.isOpen) {
+			await this.runningProcesses.add(async onTerminate => {
 				if (
 					this.processing ||
 					!this.isReady() ||
@@ -170,7 +173,6 @@ class MutationProcessor {
 				) {
 					return;
 				}
-
 				this.processing = true;
 				let head: MutationEvent;
 				const namespaceName = USER;
@@ -300,7 +302,8 @@ class MutationProcessor {
 
 				// pauses itself
 				this.pause();
-			}, 'mutation resume loop'));
+			}, 'mutation resume loop');
+		}
 	}
 
 	private async jitteredRetry(
@@ -312,7 +315,7 @@ class MutationProcessor {
 		modelConstructor: PersistentModelConstructor<PersistentModel>,
 		MutationEvent: PersistentModelConstructor<MutationEvent>,
 		mutationEvent: MutationEvent,
-		authMode: GRAPHQL_AUTH_MODE,
+		authMode: GraphQLAuthMode,
 		onTerminate: Promise<void>
 	): Promise<
 		[GraphQLResult<Record<string, PersistentModel>>, string, SchemaModel]
@@ -544,7 +547,7 @@ class MutationProcessor {
 
 		// include all the fields that comprise a custom PK if one is specified
 		const deleteInput = {};
-		if (primaryKey?.length) {
+		if (primaryKey && primaryKey.length) {
 			for (const pkField of primaryKey) {
 				deleteInput[pkField] = parsedData[pkField];
 			}
@@ -679,7 +682,10 @@ export const safeJitteredBackoff: typeof originalJitteredBackoff = (
 	const attemptResult = originalJitteredBackoff(attempt);
 
 	// If this is the last attempt and it is a network error, we retry indefinitively every 5 minutes
-	if (attemptResult === false && error?.message === 'Network Error') {
+	if (
+		attemptResult === false &&
+		((error || {}) as any).message === 'Network Error'
+	) {
 		return MAX_RETRY_DELAY_MS;
 	}