@aws-amplify/core 6.0.1-preview-testing.be90020.0 → 6.0.1-ssr-api.df60e41.0

package/lib-esm/utils/retry/jitteredBackoff.js

@@ -0,0 +1,15 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { MAX_DELAY_MS } from './constants';
+/**
+ * @private
+ * Internal use of Amplify only
+ */
+export function jitteredBackoff(maxDelayMs = MAX_DELAY_MS) {
+    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;
+    };
+}

package/lib-esm/utils/retry/jitteredExponentialRetry.d.ts

@@ -0,0 +1,5 @@
+/**
+ * @private
+ * Internal use of Amplify only
+ */
+export declare const jitteredExponentialRetry: <T>(functionToRetry: (...args: any[]) => T, args: any[], maxDelayMs?: number, onTerminate?: Promise<void>) => Promise<T>;

package/lib-esm/utils/retry/jitteredExponentialRetry.js

@@ -0,0 +1,10 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { MAX_DELAY_MS } from './constants';
+import { jitteredBackoff } from './jitteredBackoff';
+import { retry } from './retry';
+/**
+ * @private
+ * Internal use of Amplify only
+ */
+export const jitteredExponentialRetry = (functionToRetry, args, maxDelayMs = MAX_DELAY_MS, onTerminate) => retry(functionToRetry, args, jitteredBackoff(maxDelayMs), onTerminate);

package/lib-esm/utils/retry/retry.d.ts

@@ -0,0 +1,6 @@
+import { DelayFunction } from '../../types';
+/**
+ * @private
+ * Internal use of Amplify only
+ */
+export declare function retry<T>(functionToRetry: (...args: any[]) => T, args: any[], delayFn: DelayFunction, onTerminate?: Promise<void>): Promise<T>;

package/lib-esm/utils/retry/retry.js

@@ -0,0 +1,60 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { ConsoleLogger as Logger } from '../../Logger/ConsoleLogger';
+import { isNonRetryableError } from './isNonRetryableError';
+const logger = new Logger('Util');
+/**
+ * @private
+ * Internal use of Amplify only
+ */
+export async function retry(functionToRetry, args, delayFn, onTerminate) {
+    if (typeof functionToRetry !== 'function') {
+        throw Error('functionToRetry must be a function');
+    }
+    return new Promise(async (resolve, reject) => {
+        let attempt = 0;
+        let terminated = false;
+        let timeout;
+        let wakeUp = () => { }; // will be replaced with a resolver()
+        // used after the loop if terminated while waiting for a timer.
+        let lastError;
+        onTerminate &&
+            onTerminate.then(() => {
+                // signal not to try anymore.
+                terminated = true;
+                // stop sleeping if we're sleeping.
+                clearTimeout(timeout);
+                wakeUp();
+            });
+        while (!terminated) {
+            attempt++;
+            logger.debug(`${functionToRetry.name} attempt #${attempt} with this vars: ${JSON.stringify(args)}`);
+            try {
+                return resolve(await functionToRetry(...args));
+            }
+            catch (err) {
+                lastError = err;
+                logger.debug(`error on ${functionToRetry.name}`, err);
+                if (isNonRetryableError(err)) {
+                    logger.debug(`${functionToRetry.name} non retryable error`, err);
+                    return reject(err);
+                }
+                const retryIn = delayFn(attempt, args, err);
+                logger.debug(`${functionToRetry.name} retrying in ${retryIn} ms`);
+                // we check `terminated` again here because it could have flipped
+                // in the time it took `functionToRetry` to return.
+                if (retryIn === false || terminated) {
+                    return reject(err);
+                }
+                else {
+                    await new Promise(r => {
+                        wakeUp = r; // export wakeUp for onTerminate handling
+                        timeout = setTimeout(wakeUp, retryIn);
+                    });
+                }
+            }
+        }
+        // reached if terminated while waiting for a timer.
+        reject(lastError);
+    });
+}

package/lib-esm/utils/sessionListener/SessionListener.d.ts

@@ -0,0 +1,10 @@
+import { SessionStateChangeListener, SessionListenerInterface } from './types';
+export declare class SessionListener implements SessionListenerInterface {
+    private listenerActive;
+    constructor();
+    addStateChangeListener(listener: SessionStateChangeListener, notifyOnAdd?: boolean): void;
+    removeStateChangeListener(handler: SessionStateChangeListener): void;
+    private handleVisibilityChange;
+    private notifyHandlers;
+    private getSessionState;
+}

package/lib-esm/utils/sessionListener/SessionListener.js

@@ -0,0 +1,49 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { isBrowser } from '../isBrowser';
+const stateChangeListeners = new Set();
+export class SessionListener {
+    constructor() {
+        this.listenerActive = false;
+        this.handleVisibilityChange = this.handleVisibilityChange.bind(this);
+        // Setup state listeners
+        if (isBrowser()) {
+            document.addEventListener('visibilitychange', this.handleVisibilityChange, false);
+            this.listenerActive = true;
+        }
+    }
+    addStateChangeListener(listener, notifyOnAdd = false) {
+        // No-op if document listener is not active
+        if (!this.listenerActive) {
+            return;
+        }
+        stateChangeListeners.add(listener);
+        // Notify new handlers of the current status on add
+        if (notifyOnAdd) {
+            listener(this.getSessionState());
+        }
+    }
+    removeStateChangeListener(handler) {
+        // No-op if document listener is not active
+        if (!this.listenerActive) {
+            return;
+        }
+        stateChangeListeners.delete(handler);
+    }
+    handleVisibilityChange() {
+        this.notifyHandlers();
+    }
+    notifyHandlers() {
+        const sessionState = this.getSessionState();
+        stateChangeListeners.forEach(listener => {
+            listener(sessionState);
+        });
+    }
+    getSessionState() {
+        if (isBrowser() && document.visibilityState !== 'hidden') {
+            return 'started';
+        }
+        // If, for any reason, document is undefined the session will never start
+        return 'ended';
+    }
+}

package/lib-esm/utils/sessionListener/SessionListener.native.d.ts

@@ -0,0 +1,10 @@
+import { SessionStateChangeListener, SessionListenerInterface } from './types';
+export declare class SessionListener implements SessionListenerInterface {
+    private currentAppState?;
+    constructor();
+    addStateChangeListener(listener: SessionStateChangeListener, notifyOnAdd?: boolean): void;
+    removeStateChangeListener(handler: SessionStateChangeListener): void;
+    private handleStateChange;
+    private notifyHandlers;
+    private getSessionState;
+}

package/lib-esm/utils/sessionListener/SessionListener.native.js

@@ -0,0 +1,46 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { loadAppState } from '@aws-amplify/react-native';
+const stateChangeListeners = new Set();
+const isActive = (appState) => appState === 'active';
+const isInactive = (appState) => appState === 'inactive' || appState === 'background';
+export class SessionListener {
+    constructor() {
+        this.handleStateChange = this.handleStateChange.bind(this);
+        // Setup state listeners
+        loadAppState().addEventListener('change', this.handleStateChange);
+    }
+    addStateChangeListener(listener, notifyOnAdd = false) {
+        stateChangeListeners.add(listener);
+        // Notify new handlers of the current state on add if the current state has been determined
+        if (notifyOnAdd && this.currentAppState !== undefined) {
+            listener(this.getSessionState());
+        }
+    }
+    removeStateChangeListener(handler) {
+        stateChangeListeners.delete(handler);
+    }
+    handleStateChange(nextAppState) {
+        if ((this.currentAppState === undefined ||
+            isInactive(this.currentAppState)) &&
+            isActive(nextAppState)) {
+            this.notifyHandlers('started');
+        }
+        else if (isActive(this.currentAppState) && isInactive(nextAppState)) {
+            this.notifyHandlers('ended');
+        }
+        this.currentAppState = nextAppState;
+    }
+    notifyHandlers(state) {
+        stateChangeListeners.forEach(listener => {
+            listener(state);
+        });
+    }
+    getSessionState() {
+        if (isActive(this.currentAppState)) {
+            return 'started';
+        }
+        // Consider any other app state as ended
+        return 'ended';
+    }
+}

package/lib-esm/utils/sessionListener/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const SESSION_START_EVENT = "_session.start";
+export declare const SESSION_STOP_EVENT = "_session.stop";

package/lib-esm/utils/sessionListener/constants.js

@@ -0,0 +1,5 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+// Standard session start & stop event names
+export const SESSION_START_EVENT = '_session.start';
+export const SESSION_STOP_EVENT = '_session.stop';

package/lib-esm/utils/sessionListener/index.d.ts

@@ -0,0 +1,3 @@
+import { SessionListener } from './SessionListener';
+export { SESSION_START_EVENT, SESSION_STOP_EVENT } from './constants';
+export declare const sessionListener: SessionListener;

package/lib-esm/utils/sessionListener/index.js

@@ -0,0 +1,5 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { SessionListener } from './SessionListener';
+export { SESSION_START_EVENT, SESSION_STOP_EVENT } from './constants';
+export const sessionListener = new SessionListener();

package/lib-esm/utils/sessionListener/types.d.ts

@@ -0,0 +1,6 @@
+export type SessionState = 'started' | 'ended';
+export type SessionStateChangeListener = (state: SessionState) => void;
+export interface SessionListenerInterface {
+    addStateChangeListener: (listener: SessionStateChangeListener) => void;
+    removeStateChangeListener: (listener: SessionStateChangeListener) => void;
+}

package/lib-esm/utils/sessionListener/types.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/{Util/StringUtils.d.ts → utils/urlSafeDecode.d.ts}

@@ -1,2 +1 @@
-export declare function urlSafeEncode(str: string): string;
 export declare function urlSafeDecode(hex: string): string;

package/lib-esm/utils/urlSafeDecode.js

@@ -0,0 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export function urlSafeDecode(hex) {
+    const matchArr = hex.match(/.{2}/g) || [];
+    return matchArr.map(char => String.fromCharCode(parseInt(char, 16))).join('');
+}

package/{lib/Util/StringUtils.d.ts → lib-esm/utils/urlSafeEncode.d.ts}

@@ -1,2 +1 @@
 export declare function urlSafeEncode(str: string): string;
-export declare function urlSafeDecode(hex: string): string;

package/lib-esm/utils/urlSafeEncode.js

@@ -0,0 +1,8 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export function urlSafeEncode(str) {
+    return str
+        .split('')
+        .map(char => char.charCodeAt(0).toString(16).padStart(2, '0'))
+        .join('');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "6.0.1-preview-testing.be90020.0+be90020",
+	"version": "6.0.1-ssr-api.df60e41.0+df60e41",
 	"description": "Core category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -13,10 +13,8 @@
 		"./lib/Credentials.js",
 		"./lib-esm/I18n/index.js",
 		"./lib-esm/Credentials.js",
-		"./lib/Cache/BrowserStorageCache.js",
-		"./lib/Cache/AsyncStorageCache.js",
-		"./lib-esm/Cache/BrowserStorageCache.js",
-		"./lib-esm/Cache/AsyncStorageCache.js"
+		"./lib/Cache/index.js",
+		"./lib-esm/Cache/index.js"
 	],
 	"scripts": {
 		"test": "npm run lint && jest -w 1 --coverage",
@@ -36,11 +34,7 @@
 		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 92.36"
 	},
 	"react-native": {
-		"./lib/index": "./lib-esm/index.js",
-		"./lib-esm/ClientDevice": "./lib-esm/ClientDevice/reactnative.js",
-		"./lib-esm/RNComponents": "./lib-esm/RNComponents/reactnative.js",
-		"./lib-esm/StorageHelper": "./lib-esm/StorageHelper/reactnative.js",
-		"./lib-esm/Cache": "./lib-esm/Cache/reactnative.js"
+		"./lib/index": "./lib-esm/index.js"
 	},
 	"repository": {
 		"type": "git",
@@ -58,25 +52,22 @@
 		"src",
 		"typings.d.ts",
 		"internals",
-		"polyfills",
 		"server"
 	],
 	"dependencies": {
-		"@aws-crypto/sha256-js": "5.0.0",
+		"@aws-crypto/sha256-js": "5.2.0",
 		"@aws-sdk/types": "3.398.0",
 		"@smithy/util-hex-encoding": "2.0.0",
-		"js-cookie": "^2.2.1",
+		"js-cookie": "^3.0.5",
+		"rxjs": "^7.8.1",
 		"tslib": "^2.5.0",
-		"uuid": "^9.0.0",
-		"zen-observable-ts": "0.8.19"
+		"uuid": "^9.0.0"
 	},
 	"devDependencies": {
-		"@react-native-async-storage/async-storage": "^1.17.12",
-		"@react-native-community/netinfo": "4.7.0",
+		"@aws-amplify/react-native": "1.0.1-ssr-api.df60e41.0+df60e41",
+		"@types/js-cookie": "3.0.2",
 		"@types/uuid": "^9.0.0",
-		"find": "^0.2.7",
 		"genversion": "^2.2.0",
-		"react-native": "^0.68.7",
 		"typescript": "5.0.2"
 	},
 	"size-limit": [
@@ -84,61 +75,43 @@
 			"name": "Core (Hub)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Hub }",
-			"limit": "2.35 kB"
+			"limit": "1.43 kB"
 		},
 		{
 			"name": "Core (I18n)",
 			"path": "./lib-esm/index.js",
 			"import": "{ I18n }",
-			"limit": "2.33 kB"
+			"limit": "1.46 kB"
 		},
 		{
 			"name": "Custom clients (fetch handler)",
 			"path": "./lib-esm/clients/handlers/fetch.js",
 			"import": "{ fetchTransferHandler }",
-			"limit": "1.86 kB"
+			"limit": "500 B"
 		},
 		{
 			"name": "Custom clients (unauthenticated handler)",
 			"path": "./lib-esm/clients/handlers/unauthenticated.js",
 			"import": "{ unauthenticatedHandler }",
-			"limit": "2.74 kB"
-		},
-		{
-			"name": "Custom clients (retry middleware)",
-			"path": "./lib-esm/clients/middleware/retry/middleware.js",
-			"import": "{ retryMiddleware }",
-			"limit": "1.45 kB"
-		},
-		{
-			"name": "Custom clients (signing middleware)",
-			"path": "./lib-esm/clients/middleware/signing/middleware.js",
-			"import": "{ signingMiddleware }",
-			"limit": "6.81 kB"
+			"limit": "1 kB"
 		},
 		{
 			"name": "Custom clients (request signer)",
 			"path": "./lib-esm/clients/middleware/signing/signer/signatureV4/index.js",
 			"import": "{ signRequest }",
-			"limit": "6.27 kB"
+			"limit": "3.53 kB"
 		},
 		{
 			"name": "Custom clients (url presigner)",
 			"path": "./lib-esm/clients/middleware/signing/signer/signatureV4/index.js",
 			"import": "{ presignUrl }",
-			"limit": "6.4 kB"
+			"limit": "3.58 kB"
 		},
 		{
 			"name": "Cache (default browser storage)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Cache }",
-			"limit": "4.13 kB"
-		},
-		{
-			"name": "Cache (in-memory)",
-			"path": "./lib-esm/index.js",
-			"import": "{ InMemoryCache }",
-			"limit": "4.15 kB"
+			"limit": "3.3 kB"
 		}
 	],
 	"jest": {
@@ -183,5 +156,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "be9002044ab6c76669c39ba512c6ee0bc2936a2f"
+	"gitHead": "df60e41fbc70bd6277162b7780b3fc030c93c6a0"
 }

package/src/BackgroundProcessManager/BackgroundManagerNotOpenError.ts

@@ -0,0 +1,8 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export class BackgroundManagerNotOpenError extends Error {
+	constructor(message: string) {
+		super(`BackgroundManagerNotOpenError: ${message}`);
+	}
+}

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

@@ -1,5 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+
+import { BackgroundManagerNotOpenError } from './BackgroundManagerNotOpenError';
+import { BackgroundProcessManagerState, JobEntry } from './types';
+
 /**
  * @private For internal Amplify use.
  *
@@ -415,61 +419,3 @@ export class BackgroundProcessManager {
 		this._state = BackgroundProcessManagerState.Open;
 	}
 }
-
-/**
- *
- */
-export class BackgroundManagerNotOpenError extends Error {
-	constructor(message: string) {
-		super(`BackgroundManagerNotOpenError: ${message}`);
-	}
-}
-
-/**
- * All possible states a `BackgroundProcessManager` instance can be in.
- */
-export enum BackgroundProcessManagerState {
-	/**
-	 * Accepting new jobs.
-	 */
-	Open = 'Open',
-
-	/**
-	 * Not accepting new jobs. Waiting for submitted jobs to complete.
-	 */
-	Closing = 'Closing',
-
-	/**
-	 * Not accepting new jobs. All submitted jobs are complete.
-	 */
-	Closed = 'Closed',
-}
-
-/**
- * Completely internal to `BackgroundProcessManager`, and describes the structure of
- * an entry in the jobs registry.
- */
-type JobEntry = {
-	/**
-	 * The underlying promise provided by the job function to wait for.
-	 */
-	promise: Promise<any>;
-
-	/**
-	 * Request the termination of the job.
-	 */
-	terminate: () => void;
-
-	/**
-	 * An object provided by the caller that can be used to identify the description
-	 * of the job, which can otherwise be unclear from the `promise` and
-	 * `terminate` function. The `description` can be a string. (May be extended
-	 * later to also support object refs.)
-	 *
-	 * Useful for troubleshooting why a manager is waiting for long periods of time
-	 * on `close()`.
-	 */
-	description?: string;
-};
-
-const process = new BackgroundProcessManager();

package/src/BackgroundProcessManager/index.ts

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

package/src/BackgroundProcessManager/types.ts

@@ -0,0 +1,49 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * All possible states a `BackgroundProcessManager` instance can be in.
+ */
+export enum BackgroundProcessManagerState {
+	/**
+	 * Accepting new jobs.
+	 */
+	Open = 'Open',
+
+	/**
+	 * Not accepting new jobs. Waiting for submitted jobs to complete.
+	 */
+	Closing = 'Closing',
+
+	/**
+	 * Not accepting new jobs. All submitted jobs are complete.
+	 */
+	Closed = 'Closed',
+}
+
+/**
+ * Completely internal to `BackgroundProcessManager`, and describes the structure of
+ * an entry in the jobs registry.
+ */
+export type JobEntry = {
+	/**
+	 * The underlying promise provided by the job function to wait for.
+	 */
+	promise: Promise<any>;
+
+	/**
+	 * Request the termination of the job.
+	 */
+	terminate: () => void;
+
+	/**
+	 * An object provided by the caller that can be used to identify the description
+	 * of the job, which can otherwise be unclear from the `promise` and
+	 * `terminate` function. The `description` can be a string. (May be extended
+	 * later to also support object refs.)
+	 *
+	 * Useful for troubleshooting why a manager is waiting for long periods of time
+	 * on `close()`.
+	 */
+	description?: string;
+};

package/src/Cache/StorageCache.native.ts

@@ -0,0 +1,65 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { loadAsyncStorage } from '@aws-amplify/react-native';
+import { ConsoleLogger as Logger } from '../Logger';
+import { defaultConfig } from './constants';
+import { StorageCacheCommon } from './StorageCacheCommon';
+import { Cache, CacheConfig } from './types';
+import { getCurrentSizeKey, getCurrentTime } from './utils';
+
+const logger = new Logger('StorageCache');
+const AsyncStorage = loadAsyncStorage();
+
+/*
+ * Customized cache which based on the AsyncStorage with LRU implemented
+ */
+export class StorageCache extends StorageCacheCommon implements Cache {
+	/**
+	 * initialize the cache
+	 * @param config - the configuration of the cache
+	 */
+	constructor(config?: CacheConfig) {
+		super({ config, keyValueStorage: AsyncStorage });
+
+		this.getItem = this.getItem.bind(this);
+		this.setItem = this.setItem.bind(this);
+		this.removeItem = this.removeItem.bind(this);
+	}
+
+	protected async getAllCacheKeys(options?: { omitSizeKey?: boolean }) {
+		const { omitSizeKey } = options ?? {};
+		const keys: string[] = [];
+		for (const key of await AsyncStorage.getAllKeys()) {
+			if (omitSizeKey && key === getCurrentSizeKey(this.config.keyPrefix)) {
+				continue;
+			}
+			if (key?.startsWith(this.config.keyPrefix)) {
+				keys.push(key.substring(this.config.keyPrefix.length));
+			}
+		}
+		return keys;
+	}
+
+	protected async getAllStorageKeys() {
+		try {
+			return AsyncStorage.getAllKeys();
+		} catch (e) {
+			logger.warn(`getAllKeys failed! ${e}`);
+			return [];
+		}
+	}
+
+	/**
+	 * Return a new instance of cache with customized configuration.
+	 * @param {Object} config - the customized configuration
+	 * @return {Object} - the new instance of Cache
+	 */
+	public createInstance(config: CacheConfig): Cache {
+		if (!config.keyPrefix || config.keyPrefix === defaultConfig.keyPrefix) {
+			logger.error('invalid keyPrefix, setting keyPrefix with timeStamp');
+			config.keyPrefix = getCurrentTime.toString();
+		}
+		return new StorageCache(config);
+	}
+}