@aws-amplify/datastore 5.0.1-api-v6-models.c1977f8.0 → 5.0.1-api-v6-models.891fe0d.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/datastore",
-  "version": "5.0.1-api-v6-models.c1977f8.0+c1977f8",
+  "version": "5.0.1-api-v6-models.891fe0d.0+891fe0d",
   "description": "AppSyncLocal support for aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -47,8 +47,8 @@
     "ssr"
   ],
   "dependencies": {
-    "@aws-amplify/api": "6.0.1-api-v6-models.c1977f8.0+c1977f8",
-    "@aws-amplify/auth": "6.0.1-api-v6-models.c1977f8.0+c1977f8",
+    "@aws-amplify/api": "6.0.1-api-v6-models.891fe0d.0+891fe0d",
+    "@aws-amplify/auth": "6.0.1-api-v6-models.891fe0d.0+891fe0d",
     "buffer": "4.9.2",
     "idb": "5.0.6",
     "immer": "9.0.6",
@@ -56,11 +56,11 @@
     "ulid": "^2.3.0"
   },
   "peerDependencies": {
-    "@aws-amplify/core": "6.0.1-api-v6-models.c1977f8.0+c1977f8"
+    "@aws-amplify/core": "6.0.1-api-v6-models.891fe0d.0+891fe0d"
   },
   "devDependencies": {
-    "@aws-amplify/core": "6.0.1-api-v6-models.c1977f8.0+c1977f8",
-    "@aws-amplify/react-native": "1.0.1-api-v6-models.c1977f8.0+c1977f8",
+    "@aws-amplify/core": "6.0.1-api-v6-models.891fe0d.0+891fe0d",
+    "@aws-amplify/react-native": "1.0.1-api-v6-models.891fe0d.0+891fe0d",
     "@types/uuid-validate": "^0.0.1",
     "dexie": "3.2.2",
     "dexie-export-import": "1.0.3",
@@ -73,7 +73,7 @@
       "name": "DataStore (top-level class)",
       "path": "./lib-esm/index.js",
       "import": "{ Amplify, DataStore }",
-      "limit": "89.0 kB"
+      "limit": "65.25 kB"
     }
   ],
   "jest": {
@@ -106,10 +106,7 @@
       "__tests__/model.ts",
       "__tests__/schema.ts",
       "__tests__/helpers/",
-      "__tests__/commonAdapterTests.ts",
-      "__tests__/DataStore.ts",
-      "__tests__/connectivityHandling.test.ts",
-      "__tests__/mutation.test.ts"
+      "__tests__/commonAdapterTests.ts"
     ],
     "moduleFileExtensions": [
       "ts",
@@ -133,7 +130,10 @@
       "dist",
       "lib",
       "lib-esm"
+    ],
+    "setupFilesAfterEnv": [
+      "<rootDir>/jest.setup.js"
     ]
   },
-  "gitHead": "c1977f8efaae41b693495a2d6c53c503d0038e95"
+  "gitHead": "891fe0dc64e168de42b3b8d42def3eb9aed89efa"
 }

package/src/datastore/datastore.ts

@@ -11,7 +11,7 @@ import {
 	enablePatches,
 	Patch,
 } from 'immer';
-import { amplifyUuid } from '@aws-amplify/core/internals/utils';
+import { amplifyUuid, isBrowser } from '@aws-amplify/core/internals/utils';
 import { Observable, SubscriptionLike, filter } from 'rxjs';
 import { defaultAuthStrategy, multiAuthStrategy } from '../authModeStrategies';
 import {
@@ -1554,7 +1554,9 @@ class DataStore {
 						.subscribe({
 							next: ({ type, data }) => {
 								// In the Browser, we can begin returning data once subscriptions are in place.
-								const readyType = ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED;
+								const readyType = isBrowser()
+									? ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED
+									: ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY;
 
 								if (type === readyType) {
 									this.initResolve();
@@ -1724,7 +1726,6 @@ class DataStore {
 		return this.runningProcesses
 			.add(async () => {
 				await this.start();
-
 				if (!this.storage) {
 					throw new Error('No storage to save to');
 				}

package/src/storage/adapter/getDefaultAdapter/index.ts

@@ -3,10 +3,8 @@
 import { Adapter } from '..';
 import IndexedDBAdapter from '../IndexedDBAdapter';
 import AsyncStorageAdapter from '../AsyncStorageAdapter';
-import { isWebWorker } from '@aws-amplify/core/internals/utils';
+import { isWebWorker, isBrowser } from '@aws-amplify/core/internals/utils';
 const getDefaultAdapter: () => Adapter = () => {
-	const isBrowser = true; // TODO(v6): Update this for SSR
-
 	if ((isBrowser && window.indexedDB) || (isWebWorker() && self.indexedDB)) {
 		return IndexedDBAdapter as Adapter;
 	}

package/src/sync/processors/mutation.ts

@@ -13,7 +13,6 @@ import {
 	GraphQLAuthMode,
 	AmplifyError,
 } from '@aws-amplify/core/internals/utils';
-import { ConsoleLogger } from '@aws-amplify/core';
 
 import { Observable, Observer } from 'rxjs';
 import { MutationEvent } from '../';
@@ -47,6 +46,7 @@ import {
 	getTokenForCustomAuth,
 } from '../utils';
 import { getMutationErrorType } from './errorMaps';
+import { ConsoleLogger } from '@aws-amplify/core';
 
 const MAX_ATTEMPTS = 10;
 

package/src/sync/processors/sync.ts

@@ -34,7 +34,7 @@ import {
 	AmplifyError,
 } from '@aws-amplify/core/internals/utils';
 
-import { Amplify, Hub, ConsoleLogger } from '@aws-amplify/core';
+import { Amplify, ConsoleLogger, Hub } from '@aws-amplify/core';
 
 import { ModelPredicateCreator } from '../../predicates';
 import { getSyncErrorType } from './errorMaps';

package/src/sync/utils.ts

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { GraphQLAuthError } from '@aws-amplify/api';
-import { ConsoleLogger } from '@aws-amplify/core';
 import type { GraphQLError } from 'graphql';
 import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
 import { ModelInstanceCreator } from '../datastore/datastore';
@@ -40,6 +39,7 @@ import {
 	IDENTIFIER_KEY_SEPARATOR,
 } from '../util';
 import { MutationEvent } from './';
+import { ConsoleLogger } from '@aws-amplify/core';
 
 const logger = new ConsoleLogger('DataStore');
 

package/src/util.ts

@@ -1,7 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { monotonicFactory, ULID } from 'ulid';
-import { amplifyUuid, AmplifyUrl } from '@aws-amplify/core/internals/utils';
+import {
+	amplifyUuid,
+	AmplifyUrl,
+	WordArray,
+} from '@aws-amplify/core/internals/utils';
 import { produce, applyPatches, Patch } from 'immer';
 import { ModelInstanceCreator } from './datastore/datastore';
 import {
@@ -373,11 +377,45 @@ export const isSafariCompatabilityMode: () => Promise<boolean> = async () => {
 	return safariCompatabilityModeResult;
 };
 
-// TODO(v6): refactor this random number logic  auth -> core
-// const randomBytes = (nBytes: number): Buffer => {
-// 	return Buffer.from(new WordArray().random(nBytes).toString(), 'hex');
-// };
-const prng = () => 10 / 0xff;
+const HEX_TO_SHORT: Record<string, number> = {};
+
+for (let i = 0; i < 256; i++) {
+	let encodedByte = i.toString(16).toLowerCase();
+	if (encodedByte.length === 1) {
+		encodedByte = `0${encodedByte}`;
+	}
+
+	HEX_TO_SHORT[encodedByte] = i;
+}
+
+const getBytesFromHex = (encoded: string): Uint8Array => {
+	if (encoded.length % 2 !== 0) {
+		throw new Error('Hex encoded strings must have an even number length');
+	}
+
+	const out = new Uint8Array(encoded.length / 2);
+	for (let i = 0; i < encoded.length; i += 2) {
+		const encodedByte = encoded.slice(i, i + 2).toLowerCase();
+		if (encodedByte in HEX_TO_SHORT) {
+			out[i / 2] = HEX_TO_SHORT[encodedByte];
+		} else {
+			throw new Error(
+				`Cannot decode unrecognized sequence ${encodedByte} as hexadecimal`
+			);
+		}
+	}
+
+	return out;
+};
+
+const randomBytes = (nBytes: number): Uint8Array => {
+	const str = new WordArray().random(nBytes).toString();
+
+	return getBytesFromHex(str);
+};
+
+const prng = () => randomBytes(1)[0] / 0xff;
+
 export function monotonicUlidFactory(seed?: number): ULID {
 	const ulid = monotonicFactory(prng);