@aws-amplify/core 6.0.1-console-preview.f63250a.0 → 6.0.1-console-preview.5dc0b68.0

package/lib-esm/types/core.d.ts

@@ -0,0 +1,47 @@
+export interface AmplifyConfig {
+    Analytics?: object;
+    Auth?: object;
+    API?: object;
+    Logging?: object;
+    Storage?: object;
+    Cache?: object;
+    Geo?: object;
+    Notifications?: {
+        InAppMessaging?: object;
+    };
+    ssr?: boolean;
+}
+export type UserProfile = {
+    attributes?: Record<string, string[]>;
+    demographic?: {
+        appVersion?: string;
+        locale?: string;
+        make?: string;
+        model?: string;
+        modelVersion?: string;
+        platform?: string;
+        platformVersion?: string;
+        timezone?: string;
+    };
+    location?: {
+        city?: string;
+        country?: string;
+        latitude?: number;
+        longitude?: number;
+        postalCode?: string;
+        region?: string;
+    };
+    metrics?: Record<string, number>;
+};
+export interface ICredentials {
+    accessKeyId: string;
+    sessionToken: string;
+    secretAccessKey: string;
+    identityId: string;
+    authenticated: boolean;
+    expiration?: Date;
+}
+/**
+ * @internal
+ */
+export type DelayFunction = (attempt: number, args?: any[], error?: unknown) => number | false;

package/lib-esm/types/core.js

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

package/lib-esm/types/errors.d.ts

@@ -0,0 +1,16 @@
+export type ErrorParams = {
+    message: string;
+    name: string;
+    recoverySuggestion?: string;
+    underlyingError?: Error | unknown;
+};
+export type AmplifyErrorMap<ErrorCode extends string> = {
+    [name in ErrorCode]: {
+        message: string;
+        recoverySuggestion?: string;
+    };
+};
+export type ServiceError = {
+    name: string;
+    message: string;
+};

package/lib-esm/types/errors.js

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

package/lib-esm/types/index.d.ts

@@ -1 +1,4 @@
-export * from './types';
+export * from './core';
+export * from './errors';
+export * from './logging';
+export * from './storage';

package/lib-esm/types/index.js

@@ -1,3 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-export * from './types';
+export * from './core';
+export * from './errors';
+export * from './logging';
+export * from './storage';

package/lib-esm/types/logging.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Taken from @aws-sdk/client-cloudwatch-logs@3.6.1
+ */
+export interface InputLogEvent {
+    timestamp: number | undefined;
+    message: string | undefined;
+}
+export interface LoggingProvider {
+    getProviderName(): string;
+    getCategoryName(): string;
+    configure(config?: object): object;
+    pushLogs(logs: InputLogEvent[]): void;
+}

package/lib-esm/types/logging.js

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

package/lib-esm/types/storage.d.ts

@@ -0,0 +1,14 @@
+export interface KeyValueStorageInterface {
+    setItem(key: string, value: string): Promise<void>;
+    getItem(key: string): Promise<string | null>;
+    removeItem(key: string): Promise<void>;
+    clear(): Promise<void>;
+}
+export type SameSite = 'strict' | 'lax' | 'none';
+export type CookieStorageData = {
+    domain?: string;
+    path?: string;
+    expires?: number;
+    secure?: boolean;
+    sameSite?: SameSite;
+};

package/lib-esm/types/storage.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "6.0.1-console-preview.f63250a.0+f63250a",
+	"version": "6.0.1-console-preview.5dc0b68.0+5dc0b68",
 	"description": "Core category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -59,11 +59,11 @@
 		"src",
 		"typings.d.ts",
 		"internals",
-		"polyfills"
+		"polyfills",
+		"server"
 	],
 	"dependencies": {
 		"@aws-crypto/sha256-js": "1.2.2",
-		"@aws-sdk/client-cloudwatch-logs": "3.6.1",
 		"@aws-sdk/types": "3.6.1",
 		"@aws-sdk/util-hex-encoding": "3.6.1",
 		"@types/node-fetch": "2.6.4",
@@ -73,10 +73,13 @@
 		"rxjs": "^7.8.1",
 		"tslib": "^2.5.0",
 		"universal-cookie": "^4.0.4",
+		"uuid": "^9.0.0",
 		"zen-observable-ts": "0.8.19"
 	},
 	"devDependencies": {
 		"@react-native-async-storage/async-storage": "^1.17.12",
+		"@react-native-community/netinfo": "4.7.0",
+		"@types/uuid": "^9.0.0",
 		"find": "^0.2.7",
 		"genversion": "^2.2.0",
 		"react-native": "^0.68.7",
@@ -87,37 +90,37 @@
 			"name": "Core (ServiceWorker)",
 			"path": "./lib-esm/index.js",
 			"import": "{ ServiceWorker }",
-			"limit": "2.41 kB"
+			"limit": "19.6 kB"
 		},
 		{
 			"name": "Core (Hub)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Hub }",
-			"limit": "2.05 kB"
+			"limit": "2.3 kB"
 		},
 		{
 			"name": "Core (I18n)",
 			"path": "./lib-esm/index.js",
 			"import": "{ I18n }",
-			"limit": "2.17 kB"
+			"limit": "6.1 kB"
 		},
 		{
 			"name": "Core (Logger)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Logger }",
-			"limit": "1.2 kB"
+			"limit": "1.3 kB"
 		},
 		{
 			"name": "Core (Credentials)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Credentials }",
-			"limit": "13.78 kB"
+			"limit": "14.1 kB"
 		},
 		{
 			"name": "Core (Signer)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Signer }",
-			"limit": "7.4 kB"
+			"limit": "19.6 kB"
 		},
 		{
 			"name": "Custom clients (fetch handler)",
@@ -159,13 +162,13 @@
 			"name": "Cache (default browser storage)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Cache }",
-			"limit": "4.66 kB"
+			"limit": "7.8 kB"
 		},
 		{
 			"name": "Cache (in-memory)",
 			"path": "./lib-esm/index.js",
 			"import": "{ InMemoryCache }",
-			"limit": "4.35 kB"
+			"limit": "7.9 kB"
 		}
 	],
 	"jest": {
@@ -210,5 +213,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "f63250a93e9fb0cf2e2f1490a0b0c9b1f3a35b5d"
+	"gitHead": "5dc0b68f9d56006a92abc29aa4e7d8142e083387"
 }

package/server/package.json

@@ -0,0 +1,8 @@
+{
+	"name": "@aws-amplify/core/server",
+	"types": "../lib-esm/server.d.ts",
+	"main": "../lib/server.js",
+	"module": "../lib-esm/server.js",
+	"react-native": "../lib-esm/server.js",
+	"sideEffects": false
+}

package/src/AwsClients/Pinpoint/index.ts

@@ -12,4 +12,4 @@ export {
 	UpdateEndpointInput,
 	UpdateEndpointOutput,
 } from './updateEndpoint';
-export { Event, InAppMessageCampaign } from './types';
+export { Event, InAppMessageCampaign, EventsBatch } from './types';

package/src/AwsClients/Pinpoint/putEvents.ts

@@ -11,7 +11,7 @@ import {
 	parseMetadata,
 } from '../../clients/serde';
 import { Endpoint, HttpRequest, HttpResponse } from '../../clients/types';
-import { APPLICATION_ID_EXCEPTION } from '../../constants';
+import { APPLICATION_ID_EXCEPTION } from '../../Util/Constants';
 import { defaultConfig, getSharedHeaders } from './base';
 import type {
 	PutEventsCommandInput as PutEventsInput,

package/src/Cache/AsyncStorageCache.ts

@@ -6,7 +6,7 @@ import { ConsoleLogger as Logger } from '../Logger';
 import { StorageCache } from './StorageCache';
 import { defaultConfig, getCurrTime } from './Utils';
 import { CacheConfig, CacheItem, CacheItemOptions, ICache } from './types';
-import { STORAGE_CACHE_EXCEPTION } from '../constants';
+import { STORAGE_CACHE_EXCEPTION } from '../Util/Constants';
 import { asserts } from '../Util/errors/AssertError';
 import { getCurrSizeKey } from './Utils/CacheUtils';
 

package/src/Cache/BrowserStorageCache.ts

@@ -6,7 +6,7 @@ import { defaultConfig, getCurrTime } from './Utils';
 import { StorageCache } from './StorageCache';
 import { ICache, CacheConfig, CacheItem, CacheItemOptions } from './types';
 import { asserts } from '../Util/errors/AssertError';
-import { STORAGE_CACHE_EXCEPTION } from '../constants';
+import { STORAGE_CACHE_EXCEPTION } from '../Util/Constants';
 import { getCurrSizeKey } from './Utils/CacheUtils';
 
 const logger = new Logger('Cache');

package/src/Cache/InMemoryCache.ts

@@ -7,7 +7,7 @@ import { StorageCache } from './StorageCache';
 import { ICache, CacheConfig, CacheItem, CacheItemOptions } from './types';
 import { ConsoleLogger as Logger } from '../Logger';
 import { asserts } from '../Util/errors/AssertError';
-import { STORAGE_CACHE_EXCEPTION } from '../constants';
+import { STORAGE_CACHE_EXCEPTION } from '../Util/Constants';
 import { getCurrSizeKey } from './Utils/CacheUtils';
 
 const logger = new Logger('InMemoryCache');

package/src/Cache/StorageCache.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { getCurrTime, getByteLength, defaultConfig } from './Utils';
-import { AmplifyV6 } from '../singleton';
+import { Amplify } from '../singleton';
 import { CacheConfig, CacheItem, CacheItemOptions } from './types';
 import { ConsoleLogger as Logger } from '../Logger';
 
@@ -141,7 +141,7 @@ export class StorageCache {
 	 * @internal
 	 */
 	protected get cacheConfig(): CacheConfig {
-		const globalCacheConfig = AmplifyV6.getConfig().Cache || {};
+		const globalCacheConfig = Amplify.getConfig().Cache || {};
 
 		if (this.instanceConfig) {
 			return Object.assign(

package/src/Cache/Utils/CacheList.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { asserts } from '../../Util/errors/AssertError';
-import { CACHE_LIST_EXCEPTION } from '../../constants';
+import { CACHE_LIST_EXCEPTION } from '../../Util/Constants';
 
 class DoubleLinkedNode {
 	key: string;

package/src/Credentials.ts

@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: Apache-2.0
 import { ConsoleLogger as Logger } from './Logger';
 import { StorageHelper } from './StorageHelper';
-import { makeQuerablePromise } from './JS';
+import { makeQuerablePromise } from './Util/JS';
 import { FacebookOAuth, GoogleOAuth } from './OAuthHelper';
 import { jitteredExponentialRetry } from './Util';
 import { ICredentials } from './types';
 import { Amplify } from './Amplify';
 import { getId, getCredentialsForIdentity } from './AwsClients/CognitoIdentity';
 import { parseAWSExports } from './parseAWSExports';
-import { Hub } from './Hub';
+import { Hub, AMPLIFY_SYMBOL } from './Hub';
 
 const logger = new Logger('Credentials');
 
@@ -18,12 +18,6 @@ const CREDENTIALS_TTL = 50 * 60 * 1000; // 50 min, can be modified on config if
 
 const COGNITO_IDENTITY_KEY_PREFIX = 'CognitoIdentityId-';
 
-const AMPLIFY_SYMBOL = (
-	typeof Symbol !== 'undefined' && typeof Symbol.for === 'function'
-		? Symbol.for('amplify_default')
-		: '@@amplify_default'
-) as Symbol;
-
 const dispatchCredentialsEvent = (
 	event: string,
 	data: any,

package/src/Hub/index.ts

@@ -0,0 +1,204 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { ConsoleLogger as Logger } from '../Logger';
+import { NO_HUBCALLBACK_PROVIDED_EXCEPTION } from '../Util/Constants';
+import { AmplifyError } from '../Util/Errors';
+import {
+	AmplifyChannel,
+	AmplifyEventData,
+	EventDataMap,
+	HubCallback,
+	HubCapsule,
+	HubPayload,
+	IListener,
+	StopListenerCallback,
+} from './types';
+
+export const AMPLIFY_SYMBOL = (
+	typeof Symbol !== 'undefined' && typeof Symbol.for === 'function'
+		? Symbol.for('amplify_default')
+		: '@@amplify_default'
+) as Symbol;
+
+const logger = new Logger('Hub');
+
+export class HubClass {
+	name: string;
+	private listeners = new Map<string, IListener>();
+
+	protectedChannels = [
+		'core',
+		'auth',
+		'api',
+		'analytics',
+		'interactions',
+		'pubsub',
+		'storage',
+		'ui',
+		'xr',
+	];
+
+	constructor(name: string) {
+		this.name = name;
+	}
+
+	/**
+	 * Used internally to remove a Hub listener.
+	 *
+	 * @remarks
+	 * This private method is for internal use only. Instead of calling Hub.remove, call the result of Hub.listen.
+	 */
+	private _remove<
+		Channel extends AmplifyChannel | string = string,
+		EventData extends EventDataMap = EventDataMap
+	>(channel: Channel, listener: HubCallback<Channel, EventData>) {
+		const holder = this.listeners.get(channel);
+		if (!holder) {
+			logger.warn(`No listeners for ${channel}`);
+			return;
+		}
+		this.listeners.set(channel, [
+			...holder.filter(({ callback }) => callback !== listener),
+		]);
+	}
+
+	/**
+	 * Used to send a Hub event.
+	 *
+	 * @param channel - The channel on which the event will be broadcast
+	 * @param payload - The HubPayload
+	 * @param source  - The source of the event; defaults to ''
+	 * @param ampSymbol - Symbol used to determine if the event is dispatched internally on a protected channel
+	 *
+	 */
+	dispatch<Channel extends AmplifyChannel>(
+		channel: Channel,
+		payload: HubPayload<AmplifyEventData[Channel]>,
+		source?: string,
+		ampSymbol?: Symbol
+	): void;
+
+	dispatch(
+		channel: string,
+		payload: HubPayload,
+		source?: string,
+		ampSymbol?: Symbol
+	): void;
+
+	dispatch<
+		Channel extends AmplifyChannel | string,
+		EventData extends EventDataMap = EventDataMap
+	>(
+		channel: Channel | string,
+		payload: HubPayload<EventData>,
+		source?: string,
+		ampSymbol?: Symbol
+	): void {
+		if (
+			typeof channel === 'string' &&
+			this.protectedChannels.indexOf(channel) > -1
+		) {
+			const hasAccess = ampSymbol === AMPLIFY_SYMBOL;
+
+			if (!hasAccess) {
+				logger.warn(
+					`WARNING: ${channel} is protected and dispatching on it can have unintended consequences`
+				);
+			}
+		}
+
+		const capsule: HubCapsule<Channel | string, EventData> = {
+			channel,
+			payload: { ...payload },
+			source,
+			patternInfo: [],
+		};
+
+		try {
+			this._toListeners(capsule);
+		} catch (e) {
+			logger.error(e);
+		}
+	}
+
+	/**
+	 * Used to listen for Hub events.
+	 *
+	 * @param channel - The channel on which to listen
+	 * @param callback - The callback to execute when an event is received on the specified channel
+	 * @param listenerName - The name of the listener; defaults to 'noname'
+	 * @returns A function which can be called to cancel the listener.
+	 *
+	 */
+	listen<
+		Channel extends AmplifyChannel,
+		EventData extends EventDataMap = EventDataMap
+	>(
+		channel: Channel,
+		callback: HubCallback<Channel, AmplifyEventData[Channel]>,
+		listenerName?: string
+	): StopListenerCallback;
+
+	listen<EventData extends EventDataMap>(
+		channel: string,
+		callback: HubCallback<string, EventData>,
+		listenerName?: string
+	): StopListenerCallback;
+
+	listen<
+		Channel extends AmplifyChannel | string = string,
+		EventData extends EventDataMap = EventDataMap
+	>(
+		channel: Channel,
+		callback: HubCallback<Channel, EventData>,
+		listenerName: string = 'noname'
+	): StopListenerCallback {
+		let cb: HubCallback<string, EventDataMap>;
+		if (typeof callback !== 'function') {
+			throw new AmplifyError({
+				name: NO_HUBCALLBACK_PROVIDED_EXCEPTION,
+				message: 'No callback supplied to Hub',
+			});
+		} else {
+			// Needs to be casted as a more generic type
+			cb = callback as HubCallback<string, EventDataMap>;
+		}
+		let holder = this.listeners.get(channel);
+
+		if (!holder) {
+			holder = [];
+			this.listeners.set(channel, holder);
+		}
+
+		holder.push({
+			name: listenerName,
+			callback: cb,
+		});
+		return () => {
+			this._remove(channel, cb);
+		};
+	}
+
+	private _toListeners<Channel extends AmplifyChannel | string>(
+		capsule: HubCapsule<Channel, EventDataMap | AmplifyEventData[Channel]>
+	) {
+		const { channel, payload } = capsule;
+		const holder = this.listeners.get(channel);
+		if (holder) {
+			holder.forEach(listener => {
+				logger.debug(`Dispatching to ${channel} with `, payload);
+				try {
+					listener.callback(capsule);
+				} catch (e) {
+					logger.error(e);
+				}
+			});
+		}
+	}
+}
+
+/*We export a __default__ instance of HubClass to use it as a 
+pseudo Singleton for the main messaging bus, however you can still create
+your own instance of HubClass() for a separate "private bus" of events.*/
+export const Hub = new HubClass('__default__');

package/src/Hub/types/AuthTypes.ts

@@ -0,0 +1,10 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// TODO Need to update types of data
+export type AuthHubEventData =
+	| { event: 'signInWithRedirect' } // Used when an oauth flow is done
+	| { event: 'tokenRefresh' } // used when a token is refreshed
+	| { event: 'tokenRefresh_failure' } // used when the refresh of tokens failed
+	| { event: 'customOAuthState' }
+	| { event: 'customState_failure' };

package/src/Hub/types/HubTypes.ts

@@ -0,0 +1,46 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AuthHubEventData } from './AuthTypes';
+
+export type IListener<
+	Channel extends string = AmplifyChannel | string,
+	EventData extends EventDataMap = EventDataMap
+> = {
+	name: string;
+	callback: HubCallback<Channel, EventData>;
+}[];
+
+export type EventDataMap = { event: string; data?: unknown };
+
+export type AmplifyEventData = {
+	auth: AuthHubEventData;
+	[key: string]: EventDataMap;
+};
+export type AmplifyChannel = 'auth';
+
+export type StopListenerCallback = () => void;
+
+export type HubCapsule<
+	Channel extends string,
+	EventData extends EventDataMap
+> = {
+	channel: Channel;
+	payload: HubPayload<EventData>;
+	source?: string;
+	patternInfo?: string[];
+};
+
+export type HubCallback<
+	Channel extends string = string,
+	EventData extends EventDataMap = EventDataMap
+> = (capsule: HubCapsule<Channel, EventData>) => void;
+
+export type HubPayload<EventData extends EventDataMap = EventDataMap> =
+	EventData & {
+		message?: string;
+	};
+
+export type AmplifyHubCallbackMap<Channel extends AmplifyChannel> = {
+	auth: HubCallback<Channel>;
+};

package/src/{Providers → Hub/types}/index.ts

@@ -1,3 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-export { AWSCloudWatchProvider } from './AWSCloudWatchProvider';
+
+export * from './HubTypes';
+export * from './AuthTypes';

package/src/I18n/I18n.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ConsoleLogger as Logger } from '../Logger';
-import { AmplifyV6 } from '../singleton';
+import { Amplify } from '../singleton';
 import { I18nOptions } from './types';
 
 const logger = new Logger('I18n');
@@ -44,7 +44,7 @@ export class I18n {
 	 */
 	setDefaultLanguage() {
 		if (!this._lang) {
-			const i18nConfig = AmplifyV6.getConfig().I18n;
+			const i18nConfig = Amplify.getConfig().I18n;
 			this._lang = i18nConfig?.language;
 		}
 

package/src/I18n/index.ts

@@ -6,7 +6,7 @@ import { I18n as I18nClass } from './I18n';
 import { ConsoleLogger as Logger } from '../Logger';
 import { I18nOptions } from './types';
 import { asserts } from '../Util/errors/AssertError';
-import { I18N_EXCEPTION } from '../constants';
+import { I18N_EXCEPTION } from '../Util/Constants';
 
 const logger = new Logger('I18n');
 

package/src/Logger/ConsoleLogger.ts

@@ -1,8 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { InputLogEvent } from '@aws-sdk/client-cloudwatch-logs';
-import { LoggingProvider } from '../types';
+import { LoggingProvider, InputLogEvent } from '../types';
 import { AWS_CLOUDWATCH_CATEGORY } from '../Util/Constants';
 import { Logger } from './logger-interface';
 

package/src/OAuthHelper/FacebookOAuth.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { ConsoleLogger as Logger } from '../Logger';
-import { browserOrNode } from '../JS';
+import { browserOrNode } from '../Util/JS';
 import { NonRetryableError } from '../Util';
 
 const logger = new Logger('CognitoCredentials');