@aws-amplify/core 6.0.1-api-v6-models.8035dfc.0 → 6.0.1-api-v6-models.572a7b5.0

package/src/Cache/{Utils → utils}/CacheList.ts

@@ -1,185 +1,185 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { assert, CacheErrorCode } from './errorHelpers';
-
-class DoubleLinkedNode {
-	key: string;
-	prevNode: DoubleLinkedNode | null;
-	nextNode: DoubleLinkedNode | null;
-
-	constructor(keyVal?: string) {
-		this.key = keyVal ? keyVal : '';
-		this.prevNode = null;
-		this.nextNode = null;
-	}
-}
-
-/**
- * double linked list plus a hash table inside
- * each key in the cache stored as a node in the list
- * recently visited node will be rotated to the head
- * so the Last Recently Visited node will be at the tail
- *
- * @member head - dummy head of the linked list
- * @member tail - dummy tail of the linked list
- * @member hashtable - the hashtable which maps cache key to list node
- * @member length - length of the list
- */
-export default class CacheList {
-	private head: DoubleLinkedNode;
-	private tail: DoubleLinkedNode;
-	private hashtable: Record<string, any>;
-	private length: number;
-
-	/**
-	 * initialization
-	 */
-	constructor() {
-		this.head = new DoubleLinkedNode();
-		this.tail = new DoubleLinkedNode();
-		this.hashtable = {};
-		this.length = 0;
-
-		this.head.nextNode = this.tail;
-		this.tail.prevNode = this.head;
-	}
-
-	/**
-	 * insert node to the head of the list
-	 *
-	 * @param node
-	 */
-	private insertNodeToHead(node: DoubleLinkedNode) {
-		const tmp: DoubleLinkedNode | null = this.head.nextNode;
-		this.head.nextNode = node;
-		node.nextNode = tmp;
-		node.prevNode = this.head;
-		assert(tmp !== null, CacheErrorCode.NullPreviousNode);
-		tmp.prevNode = node;
-
-		this.length = this.length + 1;
-	}
-
-	/**
-	 * remove node
-	 *
-	 * @param node
-	 */
-	private removeNode(node: DoubleLinkedNode): void {
-		assert(node.prevNode !== null, CacheErrorCode.NullPreviousNode);
-		assert(node.nextNode !== null, CacheErrorCode.NullNextNode);
-		node.prevNode.nextNode = node.nextNode;
-		node.nextNode.prevNode = node.prevNode;
-
-		node.prevNode = null;
-		node.nextNode = null;
-
-		this.length = this.length - 1;
-	}
-
-	/**
-	 * @return true if list is empty
-	 */
-	public isEmpty(): boolean {
-		return this.length === 0;
-	}
-
-	/**
-	 * refresh node so it is rotated to the head
-	 *
-	 * @param key - key of the node
-	 */
-	public refresh(key: string): void {
-		const node: DoubleLinkedNode = this.hashtable[key];
-		this.removeNode(node);
-		this.insertNodeToHead(node);
-	}
-
-	/**
-	 * insert new node to the head and add it in the hashtable
-	 *
-	 * @param key - the key of the node
-	 */
-	public insertItem(key: string): void {
-		const node: DoubleLinkedNode = new DoubleLinkedNode(key);
-		this.hashtable[key] = node;
-		this.insertNodeToHead(node);
-	}
-
-	/**
-	 * @return the LAST Recently Visited key
-	 */
-	public getLastItem(): string {
-		assert(this.tail.prevNode !== null, CacheErrorCode.NullPreviousNode);
-		return this.tail.prevNode.key;
-	}
-
-	/**
-	 * remove the cache key from the list and hashtable
-	 * @param key - the key of the node
-	 */
-	public removeItem(key: string): void {
-		const removedItem: DoubleLinkedNode = this.hashtable[key];
-		this.removeNode(removedItem);
-		delete this.hashtable[key];
-	}
-
-	/**
-	 * @return length of the list
-	 */
-	public getSize(): number {
-		return this.length;
-	}
-
-	/**
-	 * @return true if the key is in the hashtable
-	 * @param key
-	 */
-	public containsKey(key: string): boolean {
-		return key in this.hashtable;
-	}
-
-	/**
-	 * clean up the list and hashtable
-	 */
-	public clearList(): void {
-		for (const key of Object.keys(this.hashtable)) {
-			if (this.hashtable.hasOwnProperty(key)) {
-				delete this.hashtable[key];
-			}
-		}
-		this.head.nextNode = this.tail;
-		this.tail.prevNode = this.head;
-		this.length = 0;
-	}
-
-	/**
-	 * @return all keys in the hashtable
-	 */
-	public getKeys(): string[] {
-		return Object.keys(this.hashtable);
-	}
-
-	/**
-	 * mainly for test
-	 *
-	 * @param key
-	 * @return true if key is the head node
-	 */
-	public isHeadNode(key: string): boolean {
-		const node = this.hashtable[key];
-		return node.prevNode === this.head;
-	}
-
-	/**
-	 * mainly for test
-	 *
-	 * @param key
-	 * @return true if key is the tail node
-	 */
-	public isTailNode(key: string): boolean {
-		const node = this.hashtable[key];
-		return node.nextNode === this.tail;
-	}
-}
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { assert, CacheErrorCode } from './errorHelpers';
+
+class DoubleLinkedNode {
+	key: string;
+	prevNode: DoubleLinkedNode | null;
+	nextNode: DoubleLinkedNode | null;
+
+	constructor(keyVal?: string) {
+		this.key = keyVal ? keyVal : '';
+		this.prevNode = null;
+		this.nextNode = null;
+	}
+}
+
+/**
+ * double linked list plus a hash table inside
+ * each key in the cache stored as a node in the list
+ * recently visited node will be rotated to the head
+ * so the Last Recently Visited node will be at the tail
+ *
+ * @member head - dummy head of the linked list
+ * @member tail - dummy tail of the linked list
+ * @member hashtable - the hashtable which maps cache key to list node
+ * @member length - length of the list
+ */
+export class CacheList {
+	private head: DoubleLinkedNode;
+	private tail: DoubleLinkedNode;
+	private hashtable: Record<string, any>;
+	private length: number;
+
+	/**
+	 * initialization
+	 */
+	constructor() {
+		this.head = new DoubleLinkedNode();
+		this.tail = new DoubleLinkedNode();
+		this.hashtable = {};
+		this.length = 0;
+
+		this.head.nextNode = this.tail;
+		this.tail.prevNode = this.head;
+	}
+
+	/**
+	 * insert node to the head of the list
+	 *
+	 * @param node
+	 */
+	private insertNodeToHead(node: DoubleLinkedNode) {
+		const tmp: DoubleLinkedNode | null = this.head.nextNode;
+		this.head.nextNode = node;
+		node.nextNode = tmp;
+		node.prevNode = this.head;
+		assert(tmp !== null, CacheErrorCode.NullPreviousNode);
+		tmp.prevNode = node;
+
+		this.length = this.length + 1;
+	}
+
+	/**
+	 * remove node
+	 *
+	 * @param node
+	 */
+	private removeNode(node: DoubleLinkedNode): void {
+		assert(node.prevNode !== null, CacheErrorCode.NullPreviousNode);
+		assert(node.nextNode !== null, CacheErrorCode.NullNextNode);
+		node.prevNode.nextNode = node.nextNode;
+		node.nextNode.prevNode = node.prevNode;
+
+		node.prevNode = null;
+		node.nextNode = null;
+
+		this.length = this.length - 1;
+	}
+
+	/**
+	 * @return true if list is empty
+	 */
+	public isEmpty(): boolean {
+		return this.length === 0;
+	}
+
+	/**
+	 * refresh node so it is rotated to the head
+	 *
+	 * @param key - key of the node
+	 */
+	public refresh(key: string): void {
+		const node: DoubleLinkedNode = this.hashtable[key];
+		this.removeNode(node);
+		this.insertNodeToHead(node);
+	}
+
+	/**
+	 * insert new node to the head and add it in the hashtable
+	 *
+	 * @param key - the key of the node
+	 */
+	public insertItem(key: string): void {
+		const node: DoubleLinkedNode = new DoubleLinkedNode(key);
+		this.hashtable[key] = node;
+		this.insertNodeToHead(node);
+	}
+
+	/**
+	 * @return the LAST Recently Visited key
+	 */
+	public getLastItem(): string {
+		assert(this.tail.prevNode !== null, CacheErrorCode.NullPreviousNode);
+		return this.tail.prevNode.key;
+	}
+
+	/**
+	 * remove the cache key from the list and hashtable
+	 * @param key - the key of the node
+	 */
+	public removeItem(key: string): void {
+		const removedItem: DoubleLinkedNode = this.hashtable[key];
+		this.removeNode(removedItem);
+		delete this.hashtable[key];
+	}
+
+	/**
+	 * @return length of the list
+	 */
+	public getSize(): number {
+		return this.length;
+	}
+
+	/**
+	 * @return true if the key is in the hashtable
+	 * @param key
+	 */
+	public containsKey(key: string): boolean {
+		return key in this.hashtable;
+	}
+
+	/**
+	 * clean up the list and hashtable
+	 */
+	public clearList(): void {
+		for (const key of Object.keys(this.hashtable)) {
+			if (this.hashtable.hasOwnProperty(key)) {
+				delete this.hashtable[key];
+			}
+		}
+		this.head.nextNode = this.tail;
+		this.tail.prevNode = this.head;
+		this.length = 0;
+	}
+
+	/**
+	 * @return all keys in the hashtable
+	 */
+	public getKeys(): string[] {
+		return Object.keys(this.hashtable);
+	}
+
+	/**
+	 * mainly for test
+	 *
+	 * @param key
+	 * @return true if key is the head node
+	 */
+	public isHeadNode(key: string): boolean {
+		const node = this.hashtable[key];
+		return node.prevNode === this.head;
+	}
+
+	/**
+	 * mainly for test
+	 *
+	 * @param key
+	 * @return true if key is the tail node
+	 */
+	public isTailNode(key: string): boolean {
+		const node = this.hashtable[key];
+		return node.nextNode === this.tail;
+	}
+}

package/src/Cache/utils/cacheHelpers.ts

@@ -0,0 +1,52 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { currentSizeKey } from '../constants';
+
+/**
+ * return the byte size of the string
+ * @param str
+ */
+export function getByteLength(str: string): number {
+	let ret: number = 0;
+	ret = str.length;
+
+	for (let i = str.length; i >= 0; i -= 1) {
+		const charCode: number = str.charCodeAt(i);
+		if (charCode > 0x7f && charCode <= 0x7ff) {
+			ret += 1;
+		} else if (charCode > 0x7ff && charCode <= 0xffff) {
+			ret += 2;
+		}
+		// trail surrogate
+		if (charCode >= 0xdc00 && charCode <= 0xdfff) {
+			i -= 1;
+		}
+	}
+
+	return ret;
+}
+
+/**
+ * get current time
+ */
+export function getCurrentTime(): number {
+	const currentTime = new Date();
+	return currentTime.getTime();
+}
+
+/**
+ * check if passed value is an integer
+ */
+export function isInteger(value?: number): boolean {
+	if (Number.isInteger) {
+		return Number.isInteger(value);
+	}
+
+	return (
+		typeof value === 'number' && isFinite(value) && Math.floor(value) === value
+	);
+}
+
+export const getCurrentSizeKey = (keyPrefix: string) =>
+	`${keyPrefix}${currentSizeKey}`;

package/src/Cache/{Utils → utils}/errorHelpers.ts

@@ -6,7 +6,6 @@ import { AmplifyErrorMap, AssertionFunction } from '../../types';
 
 export enum CacheErrorCode {
 	NoCacheItem = 'NoCacheItem',
-	NoCacheStorage = 'NoCacheStorage',
 	NullNextNode = 'NullNextNode',
 	NullPreviousNode = 'NullPreviousNode',
 }
@@ -15,9 +14,6 @@ const cacheErrorMap: AmplifyErrorMap<CacheErrorCode> = {
 	[CacheErrorCode.NoCacheItem]: {
 		message: 'Item not found in the cache storage.',
 	},
-	[CacheErrorCode.NoCacheStorage]: {
-		message: 'Storage is not defined in the cache config.',
-	},
 	[CacheErrorCode.NullNextNode]: {
 		message: 'Next node is null.',
 	},

package/src/Cache/{Utils → utils}/index.ts

@@ -2,10 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export {
-	CacheObject,
-	defaultConfig,
 	getByteLength,
-	getCurrTime,
+	getCurrentSizeKey,
+	getCurrentTime,
 	isInteger,
-} from './CacheUtils';
-export { default as CacheList } from './CacheList';
+} from './cacheHelpers';
+export { CacheList } from './CacheList';

package/src/I18n/I18n.ts

@@ -37,12 +37,7 @@ export class I18n {
 	 * Sets the default language from the configuration when required.
 	 */
 	setDefaultLanguage() {
-		if (!this._lang) {
-			const i18nConfig = Amplify.getConfig().I18n;
-			this._lang = i18nConfig?.language;
-		}
-
-		// Default to window language if not set in config
+		// Default to window language if not set in instance
 		if (
 			!this._lang &&
 			typeof window !== 'undefined' &&

package/src/Platform/types.ts

@@ -83,7 +83,14 @@ export enum DataStoreAction {
 	GraphQl = '2',
 }
 export enum GeoAction {
-	None = '0',
+	SearchByText = '0',
+	SearchByCoordinates = '1',
+	SearchForSuggestions = '2',
+	SearchByPlaceId = '3',
+	SaveGeofences = '4',
+	GetGeofence = '5',
+	ListGeofences = '6',
+	DeleteGeofences = '7',
 }
 export enum InAppMessagingAction {
 	SyncMessages = '1',
@@ -102,7 +109,8 @@ export enum PubSubAction {
 	Subscribe = '1',
 }
 export enum PushNotificationAction {
-	None = '0',
+	InitializePushNotifications = '1',
+	IdentifyUser = '2',
 }
 export enum StorageAction {
 	UploadData = '1',
@@ -166,31 +174,32 @@ export type CustomUserAgentStateMap = Record<string, CategoryUserAgentStateMap>;
 
 export type AdditionalDetails = [string, string?][];
 
-type StorageUserAgentInput = {
+export type StorageUserAgentInput = {
 	category: Category.Storage;
 	apis: StorageAction[];
+	additionalDetails: AdditionalDetails;
 };
 
-type AuthUserAgentInput = {
+export type AuthUserAgentInput = {
 	category: Category.Auth;
 	apis: AuthAction[];
+	additionalDetails: AdditionalDetails;
 };
 
-type InAppMessagingUserAgentInput = {
+export type InAppMessagingUserAgentInput = {
 	category: Category.InAppMessaging;
 	apis: InAppMessagingAction[];
+	additionalDetails: AdditionalDetails;
 };
 
-type GeoUserAgentInput = {
+export type GeoUserAgentInput = {
 	category: Category.Geo;
 	apis: GeoAction[];
+	additionalDetails: AdditionalDetails;
 };
 
-export type SetCustomUserAgentInput = (
+export type SetCustomUserAgentInput =
 	| StorageUserAgentInput
 	| AuthUserAgentInput
 	| InAppMessagingUserAgentInput
-	| GeoUserAgentInput
-) & {
-	additionalDetails: AdditionalDetails;
-};
+	| GeoUserAgentInput;

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '6.0.1-api-v6-models.8035dfc.0+8035dfc';
+export const version = '6.0.1-api-v6-models.572a7b5.0+572a7b5';

package/src/Reachability/Reachability.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { CompletionObserver, Observable } from 'rxjs';
+import { CompletionObserver, Observable, from } from 'rxjs';
 import { isWebWorker } from '../libraryUtils';
 import { NetworkStatus } from './types';
 
@@ -9,7 +9,13 @@ export class Reachability {
 	private static _observers: Array<CompletionObserver<NetworkStatus>> = [];
 
 	networkMonitor(_?: unknown): Observable<NetworkStatus> {
-		const globalObj = isWebWorker() ? self : window;
+		const globalObj = isWebWorker()
+			? self
+			: typeof window !== 'undefined' && window;
+
+		if (!globalObj) {
+			return from([{ online: true }]);
+		}
 
 		return new Observable(observer => {
 			observer.next({ online: globalObj.navigator.onLine });
@@ -32,4 +38,18 @@ export class Reachability {
 			};
 		});
 	}
+
+	// expose observers to simulate offline mode for integration testing
+	private static _observerOverride(status: NetworkStatus): void {
+		for (const observer of this._observers) {
+			if (observer.closed) {
+				this._observers = this._observers.filter(
+					_observer => _observer !== observer
+				);
+				continue;
+			}
+
+			observer?.next && observer.next(status);
+		}
+	}
 }

package/src/ServiceWorker/ServiceWorker.ts

@@ -3,9 +3,11 @@
 
 import { ConsoleLogger as Logger } from '../Logger';
 import { isBrowser } from '../utils';
-import { Amplify } from '../Amplify';
 import { AmplifyError } from '../errors';
 import { assert, ServiceWorkerErrorCode } from './errorHelpers';
+import { record } from '../providers/pinpoint';
+import { Amplify, fetchAuthSession } from '../singleton';
+
 /**
  * Provides a means to registering a service worker in the browser
  * and communicating with it via postMessage events.
@@ -205,15 +207,25 @@ export class ServiceWorkerClass {
 	 * https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorker/state
 	 **/
 	_setupListeners() {
-		this.serviceWorker.addEventListener('statechange', event => {
+		this.serviceWorker.addEventListener('statechange', async event => {
 			const currentState = this.serviceWorker.state;
 			this._logger.debug(`ServiceWorker statechange: ${currentState}`);
-			Amplify.Analytics;
-			if (isAmplifyWithAnalytics(Amplify)) {
-				(Amplify as AmplifyWithAnalytics).Analytics.record({
-					name: 'ServiceWorker',
-					attributes: {
-						state: currentState,
+
+			const { appId, region } = Amplify.getConfig().Analytics?.Pinpoint ?? {};
+			const { credentials } = await fetchAuthSession();
+
+			if (appId && region && credentials) {
+				// Pinpoint is configured, record an event
+				record({
+					appId,
+					region,
+					category: 'Core',
+					credentials,
+					event: {
+						name: 'ServiceWorker',
+						attributes: {
+							state: currentState,
+						},
 					},
 				});
 			}
@@ -223,12 +235,3 @@ export class ServiceWorkerClass {
 		});
 	}
 }
-
-type AmplifyWithAnalytics = {
-	Analytics: {
-		record: Function;
-	};
-};
-function isAmplifyWithAnalytics(amplify: any): amplify is AmplifyWithAnalytics {
-	return amplify.Analytics && typeof amplify.Analytics.record === 'function';
-}

package/src/ServiceWorker/index.ts

@@ -1,16 +1,4 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-/**
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
- * the License. A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
 
 export { ServiceWorkerClass as ServiceWorker } from './ServiceWorker';

package/src/Signer/Signer.ts

@@ -7,6 +7,7 @@ import {
 	signRequest,
 	TOKEN_QUERY_PARAM,
 } from '../clients/middleware/signing/signer/signatureV4';
+import { AmplifyUrl } from '../utils/amplifyUrl';
 
 const IOT_SERVICE_NAME = 'iotdevicegateway';
 // Best practice regex to parse the service and region from an AWS endpoint
@@ -75,7 +76,7 @@ export class Signer {
 		const requestToSign = {
 			...request,
 			body: request.data,
-			url: new URL(request.url),
+			url: new AmplifyUrl(request.url),
 		};
 
 		const options = getOptions(requestToSign, accessInfo, serviceInfo);
@@ -121,7 +122,7 @@ export class Signer {
 		const presignable = {
 			body,
 			method,
-			url: new URL(urlToSign),
+			url: new AmplifyUrl(urlToSign),
 		};
 
 		const options = getOptions(