@aws-amplify/core 6.0.1-preview-testing.034e780.0 → 6.0.1-server-generate-client.1e317a1.0

package/lib-esm/{Util/Retry.js → utils/retry/retry.js}

@@ -1,18 +1,5 @@
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -74,22 +61,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { ConsoleLogger as Logger } from '../Logger/ConsoleLogger';
+import { ConsoleLogger as Logger } from '../../Logger/ConsoleLogger';
+import { isNonRetryableError } from './isNonRetryableError';
 var logger = new Logger('Util');
-var NonRetryableError = /** @class */ (function (_super) {
-    __extends(NonRetryableError, _super);
-    function NonRetryableError(message) {
-        var _this = _super.call(this, message) || this;
-        _this.nonRetryable = true;
-        return _this;
-    }
-    return NonRetryableError;
-}(Error));
-export { NonRetryableError };
-export var isNonRetryableError = function (obj) {
-    var key = 'nonRetryable';
-    return obj && obj[key];
-};
 /**
  * @private
  * Internal use of Amplify only
@@ -174,25 +148,3 @@ export function retry(functionToRetry, args, delayFn, onTerminate) {
         });
     });
 }
-var MAX_DELAY_MS = 5 * 60 * 1000;
-/**
- * @private
- * Internal use of Amplify only
- */
-export function jitteredBackoff(maxDelayMs) {
-    if (maxDelayMs === void 0) { maxDelayMs = MAX_DELAY_MS; }
-    var BASE_TIME_MS = 100;
-    var JITTER_FACTOR = 100;
-    return function (attempt) {
-        var delay = Math.pow(2, attempt) * BASE_TIME_MS + JITTER_FACTOR * Math.random();
-        return delay > maxDelayMs ? false : delay;
-    };
-}
-/**
- * @private
- * Internal use of Amplify only
- */
-export var jitteredExponentialRetry = function (functionToRetry, args, maxDelayMs, onTerminate) {
-    if (maxDelayMs === void 0) { maxDelayMs = MAX_DELAY_MS; }
-    return retry(functionToRetry, args, jitteredBackoff(maxDelayMs), onTerminate);
-};

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,52 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { isBrowser } from '../isBrowser';
+var stateChangeListeners = new Set();
+var SessionListener = /** @class */ (function () {
+    function SessionListener() {
+        this.listenerActive = false;
+        this.handleVisibilityChange = this.handleVisibilityChange.bind(this);
+        // Setup state listeners
+        if (isBrowser()) {
+            document.addEventListener('visibilitychange', this.handleVisibilityChange, false);
+            this.listenerActive = true;
+        }
+    }
+    SessionListener.prototype.addStateChangeListener = function (listener, notifyOnAdd) {
+        if (notifyOnAdd === void 0) { 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());
+        }
+    };
+    SessionListener.prototype.removeStateChangeListener = function (handler) {
+        // No-op if document listener is not active
+        if (!this.listenerActive) {
+            return;
+        }
+        stateChangeListeners.delete(handler);
+    };
+    SessionListener.prototype.handleVisibilityChange = function () {
+        this.notifyHandlers();
+    };
+    SessionListener.prototype.notifyHandlers = function () {
+        var sessionState = this.getSessionState();
+        stateChangeListeners.forEach(function (listener) {
+            listener(sessionState);
+        });
+    };
+    SessionListener.prototype.getSessionState = function () {
+        if (isBrowser() && document.visibilityState !== 'hidden') {
+            return 'started';
+        }
+        // If, for any reason, document is undefined the session will never start
+        return 'ended';
+    };
+    return SessionListener;
+}());
+export { SessionListener };

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,51 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { loadAppState } from '@aws-amplify/react-native';
+var stateChangeListeners = new Set();
+var isActive = function (appState) { return appState === 'active'; };
+var isInactive = function (appState) {
+    return appState === 'inactive' || appState === 'background';
+};
+var SessionListener = /** @class */ (function () {
+    function SessionListener() {
+        this.handleStateChange = this.handleStateChange.bind(this);
+        // Setup state listeners
+        loadAppState().addEventListener('change', this.handleStateChange);
+    }
+    SessionListener.prototype.addStateChangeListener = function (listener, notifyOnAdd) {
+        if (notifyOnAdd === void 0) { 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());
+        }
+    };
+    SessionListener.prototype.removeStateChangeListener = function (handler) {
+        stateChangeListeners.delete(handler);
+    };
+    SessionListener.prototype.handleStateChange = function (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;
+    };
+    SessionListener.prototype.notifyHandlers = function (state) {
+        stateChangeListeners.forEach(function (listener) {
+            listener(state);
+        });
+    };
+    SessionListener.prototype.getSessionState = function () {
+        if (isActive(this.currentAppState)) {
+            return 'started';
+        }
+        // Consider any other app state as ended
+        return 'ended';
+    };
+    return SessionListener;
+}());
+export { SessionListener };

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

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

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

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { SessionListener } from './SessionListener';
+export var 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/{Util/StringUtils.js → utils/urlSafeDecode.js}

@@ -1,11 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-export function urlSafeEncode(str) {
-    return str
-        .split('')
-        .map(function (char) { return char.charCodeAt(0).toString(16).padStart(2, '0'); })
-        .join('');
-}
 export function urlSafeDecode(hex) {
     var matchArr = hex.match(/.{2}/g) || [];
     return matchArr.map(function (char) { return 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(function (char) { return 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.034e780.0+034e780",
+	"version": "6.0.1-server-generate-client.1e317a1.0+1e317a1",
 	"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,23 @@
 		"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-server-generate-client.1e317a1.0+1e317a1",
+		"@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": [
@@ -90,7 +82,7 @@
 			"name": "Core (I18n)",
 			"path": "./lib-esm/index.js",
 			"import": "{ I18n }",
-			"limit": "2.33 kB"
+			"limit": "5.60 kB"
 		},
 		{
 			"name": "Custom clients (fetch handler)",
@@ -133,12 +125,6 @@
 			"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"
 		}
 	],
 	"jest": {
@@ -183,5 +169,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "034e780c26d821aba19fa29a397a5f35ed8874de"
+	"gitHead": "1e317a10a7a7e980919b0d78e397bcff1461fec5"
 }

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);
+	}
+}