@aws-amplify/core 6.0.1-console-preview.67f944e.0 → 6.0.1-console-preview.0bbe168.0

package/src/{Util → Mutex}/Mutex.ts

@@ -24,25 +24,9 @@
  * THE SOFTWARE.
  */
 
-interface MutexInterface {
-	acquire(): Promise<MutexInterface.Releaser>;
+import { MutexInterface } from './types';
 
-	runExclusive<T>(callback: MutexInterface.Worker<T>): Promise<T>;
-
-	isLocked(): boolean;
-}
-
-namespace MutexInterface {
-	export interface Releaser {
-		(): void;
-	}
-
-	export interface Worker<T> {
-		(): Promise<T> | T;
-	}
-}
-
-class Mutex implements MutexInterface {
+export class Mutex implements MutexInterface {
 	isLocked(): boolean {
 		return this._pending;
 	}
@@ -92,5 +76,3 @@ class Mutex implements MutexInterface {
 	private _queue: Array<(release: MutexInterface.Releaser) => void> = [];
 	private _pending = false;
 }
-
-export default Mutex;

package/src/Mutex/index.ts

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { Mutex } from './Mutex';

package/src/Mutex/types.ts

@@ -0,0 +1,20 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export interface MutexInterface {
+	acquire(): Promise<MutexInterface.Releaser>;
+
+	runExclusive<T>(callback: MutexInterface.Worker<T>): Promise<T>;
+
+	isLocked(): boolean;
+}
+
+export namespace MutexInterface {
+	export interface Releaser {
+		(): void;
+	}
+
+	export interface Worker<T> {
+		(): Promise<T> | T;
+	}
+}

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '6.0.1-console-preview.67f944e.0+67f944e';
+export const version = '6.0.1-console-preview.0bbe168.0+0bbe168';

package/src/{Util → Reachability}/Reachability.native.ts

@@ -1,16 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import Observable from 'zen-observable-ts';
-import { ConsoleLogger as Logger } from '../Logger';
+import { Observable } from 'rxjs';
 import type NetInfo from '@react-native-community/netinfo';
+import { ConsoleLogger as Logger } from '../Logger';
+import { NetworkStatus } from './types';
 
 const logger = new Logger('Reachability', 'DEBUG');
 
-type NetworkStatus = {
-	online: boolean;
-};
-
-export default class ReachabilityNavigator implements Reachability {
+export class Reachability {
 	networkMonitor(netInfo?: typeof NetInfo): Observable<NetworkStatus> {
 		/**
 		 * Here netinfo refers to @react-native-community/netinfo
@@ -45,7 +42,3 @@ export default class ReachabilityNavigator implements Reachability {
 		});
 	}
 }
-
-interface Reachability {
-	networkMonitor(netInfo?: typeof NetInfo): Observable<NetworkStatus>;
-}

package/src/Reachability/Reachability.ts

@@ -0,0 +1,35 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { CompletionObserver, Observable } from 'rxjs';
+import { isWebWorker } from '../libraryUtils';
+import { NetworkStatus } from './types';
+
+export class Reachability {
+	private static _observers: Array<CompletionObserver<NetworkStatus>> = [];
+
+	networkMonitor(_?: unknown): Observable<NetworkStatus> {
+		const globalObj = isWebWorker() ? self : window;
+
+		return new Observable(observer => {
+			observer.next({ online: globalObj.navigator.onLine });
+
+			const notifyOnline = () => observer.next({ online: true });
+			const notifyOffline = () => observer.next({ online: false });
+
+			globalObj.addEventListener('online', notifyOnline);
+			globalObj.addEventListener('offline', notifyOffline);
+
+			Reachability._observers.push(observer);
+
+			return () => {
+				globalObj.removeEventListener('online', notifyOnline);
+				globalObj.removeEventListener('offline', notifyOffline);
+
+				Reachability._observers = Reachability._observers.filter(
+					_observer => _observer !== observer
+				);
+			};
+		});
+	}
+}

package/src/Reachability/index.ts

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { Reachability } from './Reachability';

package/src/Reachability/types.ts

@@ -0,0 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export type NetworkStatus = {
+	online: boolean;
+};

package/src/ServiceWorker/ServiceWorker.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ConsoleLogger as Logger } from '../Logger';
-import { isBrowser } from '../Util/JS';
+import { isBrowser } from '../utils';
 import { Amplify } from '../Amplify';
 import { AmplifyError } from '../errors';
 import { assert, ServiceWorkerErrorCode } from './errorHelpers';

package/src/{Signer.ts → Signer/Signer.ts}

@@ -1,12 +1,12 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { DateUtils } from './Util';
+import { DateUtils } from './DateUtils';
 import {
 	presignUrl,
 	signRequest,
 	TOKEN_QUERY_PARAM,
-} from './clients/middleware/signing/signer/signatureV4';
+} from '../clients/middleware/signing/signer/signatureV4';
 
 const IOT_SERVICE_NAME = 'iotdevicegateway';
 // Best practice regex to parse the service and region from an AWS endpoint

package/src/Signer/index.ts

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { Signer } from './Signer';

package/src/clients/middleware/retry/jitteredBackoff.ts

@@ -3,7 +3,7 @@
 
 import type { RetryOptions } from './middleware';
 // TODO: [v6] The separate retry utility is used by Data packages now and will replaced by retry middleware.
-import { jitteredBackoff as jitteredBackoffUtil } from '../../../Util/Retry';
+import { jitteredBackoff as jitteredBackoffUtil } from '../../../utils';
 
 const DEFAULT_MAX_DELAY_MS = 5 * 60 * 1000;
 

package/src/{Util/Constants.ts → constants.ts}

@@ -3,11 +3,6 @@
 
 // Logging constants
 export const AWS_CLOUDWATCH_CATEGORY = 'Logging';
-export const NO_CREDS_ERROR_STRING = 'No credentials';
-export const RETRY_ERROR_CODES = [
-	'ResourceNotFoundException',
-	'InvalidSequenceTokenException',
-];
 
 /**
  * This Symbol is used to reference an internal-only PubSub provider that

package/src/libraryUtils.ts

@@ -5,21 +5,19 @@
 This file maps top-level exports from `@aws-amplify/core/internals/utils`. These are intended to be internal
 utils for use throughout the library.
 */
-// JS utilities
+// Core utilities
 export {
-	isBrowser,
-	filenameToContentType,
 	generateRandomString,
-	isEmpty,
-	isStrictObject,
-	isTextFile,
+	isBrowser,
+	isNonRetryableError,
 	isWebWorker,
-	makeQuerablePromise,
-	objectLessAttributes,
-	sortByField,
-	transferKeyToLowerCase,
-	transferKeyToUpperCase,
-} from './Util/JS';
+	jitteredBackoff,
+	jitteredExponentialRetry,
+	NonRetryableError,
+	retry,
+	urlSafeDecode,
+	urlSafeEncode,
+} from './utils';
 export { parseAWSExports } from './parseAWSExports';
 export { LegacyConfig } from './singleton/types';
 export {
@@ -43,7 +41,6 @@ export { Signer } from './Signer';
 export { ConsoleLogger, ConsoleLogger as Logger } from './Logger';
 
 // Platform & device utils
-import { Platform } from './Platform';
 export { ClientDevice } from './ClientDevice';
 export {
 	Platform,
@@ -66,32 +63,14 @@ export {
 	PushNotificationAction,
 	StorageAction,
 } from './Platform/types';
-export const Constants = {
-	userAgent: Platform.userAgent,
-};
 
 // Service worker
 export { ServiceWorker } from './ServiceWorker';
 
 // Other utilities & constants
-export {
-	AWS_CLOUDWATCH_CATEGORY,
-	BackgroundManagerNotOpenError,
-	BackgroundProcessManager,
-	BackgroundProcessManagerState,
-	DateUtils,
-	Mutex,
-	NO_CREDS_ERROR_STRING,
-	NonRetryableError,
-	RETRY_ERROR_CODES,
-	Reachability,
-	isNonRetryableError,
-	jitteredBackoff,
-	jitteredExponentialRetry,
-	retry,
-	urlSafeDecode,
-	urlSafeEncode,
-} from './Util';
+export { BackgroundProcessManager } from './BackgroundProcessManager';
+export { Mutex } from './Mutex';
+export { Reachability } from './Reachability';
 export {
 	AmplifyError,
 	PlatformNotSupportedError,
@@ -107,6 +86,8 @@ export {
 export {
 	INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER,
 	USER_AGENT_HEADER,
-} from './Util/Constants';
+} from './constants';
 export { fetchAuthSession } from './singleton/apis/internal/fetchAuthSession';
 export { AMPLIFY_SYMBOL } from './Hub';
+export { base64Decoder, base64Encoder } from './utils/convert';
+export { getCrypto } from './utils/globalHelpers';

package/src/providers/pinpoint/apis/updateEndpoint.ts

@@ -22,6 +22,7 @@ export const updateEndpoint = async ({
 	identityId,
 	optOut,
 	region,
+	userAttributes,
 	userId,
 	userProfile,
 	userAgentValue,
@@ -29,7 +30,15 @@ export const updateEndpoint = async ({
 	const endpointId = await getEndpointId(appId, category);
 	// only generate a new endpoint id if one was not found in cache
 	const createdEndpointId = !endpointId ? uuidv4() : undefined;
-	const { attributes, demographic, location, metrics } = userProfile ?? {};
+	const {
+		customProperties,
+		demographic,
+		email,
+		location,
+		metrics,
+		name,
+		plan,
+	} = userProfile ?? {};
 	const clientInfo = ClientDevice.clientInfo();
 	const mergedDemographic = {
 		appVersion: clientInfo.appVersion,
@@ -39,6 +48,13 @@ export const updateEndpoint = async ({
 		platform: clientInfo.platform,
 		...demographic,
 	};
+	const shouldAddAttributes = email || customProperties || name || plan;
+	const attributes = {
+		...(email && { email: [email] }),
+		...(name && { name: [name] }),
+		...(plan && { plan: [plan] }),
+		...customProperties,
+	};
 	const input: UpdateEndpointInput = {
 		ApplicationId: appId,
 		EndpointId: endpointId ?? createdEndpointId,
@@ -47,7 +63,7 @@ export const updateEndpoint = async ({
 			EffectiveDate: new Date().toISOString(),
 			ChannelType: channelType,
 			Address: address,
-			Attributes: attributes,
+			Attributes: shouldAddAttributes ? attributes : undefined,
 			Demographic: {
 				AppVersion: mergedDemographic.appVersion,
 				Locale: mergedDemographic.locale,
@@ -70,7 +86,7 @@ export const updateEndpoint = async ({
 			OptOut: optOut,
 			User: {
 				UserId: userId ?? identityId,
-				UserAttributes: attributes,
+				UserAttributes: userAttributes,
 			},
 		},
 	};

package/src/providers/pinpoint/types/pinpoint.ts

@@ -21,6 +21,7 @@ export type PinpointProviderConfig = {
 export type PinpointServiceOptions = {
 	address?: string;
 	optOut?: 'ALL' | 'NONE';
+	userAttributes?: Record<string, string[]>;
 };
 
 export type PinpointSession = {

package/src/singleton/Auth/utils/index.ts

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { AuthConfigurationErrorCode, assert } from './errorHelpers';
+import { base64Decoder } from '../../../utils/convert';
 
 import {
 	AuthConfig,
@@ -97,6 +98,6 @@ export function decodeJWT(token: string): JWT {
 }
 
 function base64ToBytes(base64: string): Uint8Array {
-	const binString = atob(base64);
+	const binString = base64Decoder.convert(base64);
 	return Uint8Array.from(binString, m => m.codePointAt(0) || 0);
 }

package/src/types/core.ts

@@ -16,7 +16,7 @@ export interface AmplifyConfig {
 }
 
 export type UserProfile = {
-	attributes?: Record<string, string[]>;
+	customProperties?: Record<string, string[]>;
 	demographic?: {
 		appVersion?: string;
 		locale?: string;
@@ -27,6 +27,7 @@ export type UserProfile = {
 		platformVersion?: string;
 		timezone?: string;
 	};
+	email?: string;
 	location?: {
 		city?: string;
 		country?: string;
@@ -36,6 +37,8 @@ export type UserProfile = {
 		region?: string;
 	};
 	metrics?: Record<string, number>;
+	name?: string;
+	plan?: string;
 };
 
 /**

package/src/utils/convert/base64/base64Decoder.ts

@@ -0,0 +1,11 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { getAtob } from '../../globalHelpers';
+import { Base64Decoder } from '../types';
+
+export const base64Decoder: Base64Decoder = {
+	convert(input) {
+		return getAtob()(input);
+	},
+};

package/src/utils/convert/base64/base64Encoder.ts

@@ -0,0 +1,18 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { getBtoa } from '../../globalHelpers';
+import { Base64Encoder } from '../types';
+import { bytesToString } from './bytesToString';
+
+export const base64Encoder: Base64Encoder = {
+	convert(input, { urlSafe } = { urlSafe: false }) {
+		const inputStr = typeof input === 'string' ? input : bytesToString(input);
+		const encodedStr = getBtoa()(inputStr);
+
+		// see details about the char replacing at https://datatracker.ietf.org/doc/html/rfc4648#section-5
+		return urlSafe
+			? encodedStr.replace(/\+/g, '-').replace(/\//g, '_')
+			: encodedStr;
+	},
+};

package/src/utils/convert/base64/bytesToString.ts

@@ -0,0 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export function bytesToString(input: Uint8Array): string {
+	return Array.from(input, byte => String.fromCodePoint(byte)).join('');
+}

package/src/utils/convert/index.ts

@@ -0,0 +1,5 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { base64Decoder } from './base64/base64Decoder';
+export { base64Encoder } from './base64/base64Encoder';

package/src/utils/convert/types.ts

@@ -0,0 +1,17 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export interface Base64EncoderConvertOptions {
+	urlSafe: boolean;
+}
+
+export interface Base64Encoder {
+	convert(
+		input: Uint8Array | string,
+		options?: Base64EncoderConvertOptions
+	): string;
+}
+
+export interface Base64Decoder {
+	convert(input: string): string;
+}

package/src/utils/generateRandomString.ts

@@ -0,0 +1,16 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export const generateRandomString = (length: number) => {
+	const STATE_CHARSET =
+		'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+	let result = '';
+
+	for (let i = 0; i < length; i++) {
+		result += STATE_CHARSET.charAt(
+			Math.floor(Math.random() * STATE_CHARSET.length)
+		);
+	}
+
+	return result;
+};

package/src/utils/globalHelpers/index.native.ts

@@ -0,0 +1,28 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import 'react-native-get-random-values';
+import { encode, decode } from 'base-64';
+import { AmplifyError } from '../../errors';
+
+export const getCrypto = () => {
+	if (
+		typeof crypto !== 'undefined' &&
+		typeof crypto.getRandomValues === 'function'
+	) {
+		return crypto;
+	}
+
+	throw new AmplifyError({
+		name: 'MissingPolyfill',
+		message: 'Cannot resolve the `crypto` function from the environment.',
+	});
+};
+
+export const getBtoa = () => {
+	return encode;
+};
+
+export const getAtob = () => {
+	return decode;
+};

package/src/utils/globalHelpers/index.ts

@@ -0,0 +1,54 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AmplifyError } from '../../errors';
+
+export const getCrypto = () => {
+	if (typeof window === 'object' && typeof window.crypto === 'object') {
+		return window.crypto;
+	}
+
+	// Next.js global polyfill
+	if (typeof crypto === 'object') {
+		return crypto;
+	}
+
+	throw new AmplifyError({
+		name: 'MissingPolyfill',
+		message: 'Cannot resolve the `crypto` function from the environment.',
+	});
+};
+
+export const getBtoa = () => {
+	// browser
+	if (typeof window !== 'undefined' && typeof window.btoa === 'function') {
+		return window.btoa;
+	}
+
+	// Next.js global polyfill
+	if (typeof btoa === 'function') {
+		return btoa;
+	}
+
+	throw new AmplifyError({
+		name: 'Base64EncoderError',
+		message: 'Cannot resolve the `btoa` function from the environment.',
+	});
+};
+
+export const getAtob = () => {
+	// browser
+	if (typeof window !== 'undefined' && typeof window.atob === 'function') {
+		return window.atob;
+	}
+
+	// Next.js global polyfill
+	if (typeof atob === 'function') {
+		return atob;
+	}
+
+	throw new AmplifyError({
+		name: 'Base64EncoderError',
+		message: 'Cannot resolve the `atob` function from the environment.',
+	});
+};

package/src/utils/index.ts

@@ -0,0 +1,15 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { generateRandomString } from './generateRandomString';
+export { isBrowser } from './isBrowser';
+export { isWebWorker } from './isWebWorker';
+export {
+	NonRetryableError,
+	isNonRetryableError,
+	jitteredBackoff,
+	jitteredExponentialRetry,
+	retry,
+} from './retry';
+export { urlSafeDecode } from './urlSafeDecode';
+export { urlSafeEncode } from './urlSafeEncode';

package/src/utils/isBrowser.ts

@@ -0,0 +1,5 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export const isBrowser = () =>
+	typeof window !== 'undefined' && typeof window.document !== 'undefined';

package/src/utils/isWebWorker.ts

@@ -0,0 +1,13 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export const isWebWorker = () => {
+	if (typeof self === 'undefined') {
+		return false;
+	}
+	const selfContext = self as { WorkerGlobalScope?: any };
+	return (
+		typeof selfContext.WorkerGlobalScope !== 'undefined' &&
+		self instanceof selfContext.WorkerGlobalScope
+	);
+};

package/src/utils/retry/NonRetryableError.ts

@@ -0,0 +1,9 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export class NonRetryableError extends Error {
+	public readonly nonRetryable = true;
+	constructor(message: string) {
+		super(message);
+	}
+}

package/src/utils/retry/constants.ts

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export const MAX_DELAY_MS = 5 * 60 * 1000;

package/src/utils/retry/index.ts

@@ -0,0 +1,8 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { NonRetryableError } from './NonRetryableError';
+export { isNonRetryableError } from './isNonRetryableError';
+export { jitteredBackoff } from './jitteredBackoff';
+export { jitteredExponentialRetry } from './jitteredExponentialRetry';
+export { retry } from './retry';

package/src/utils/retry/isNonRetryableError.ts

@@ -0,0 +1,9 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { NonRetryableError } from './NonRetryableError';
+
+export const isNonRetryableError = (obj: any): obj is NonRetryableError => {
+	const key: keyof NonRetryableError = 'nonRetryable';
+	return obj && obj[key];
+};

package/src/utils/retry/jitteredBackoff.ts

@@ -0,0 +1,21 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { DelayFunction } from '../../types';
+import { MAX_DELAY_MS } from './constants';
+
+/**
+ * @private
+ * Internal use of Amplify only
+ */
+export function jitteredBackoff(
+	maxDelayMs: number = MAX_DELAY_MS
+): DelayFunction {
+	const BASE_TIME_MS = 100;
+	const JITTER_FACTOR = 100;
+
+	return attempt => {
+		const delay = 2 ** attempt * BASE_TIME_MS + JITTER_FACTOR * Math.random();
+		return delay > maxDelayMs ? false : delay;
+	};
+}