@evolu/react-native 12.0.1-preview.5 → 12.0.1-preview.6

package/dist/components/EvoluAvatar.d.ts

@@ -0,0 +1,8 @@
+import { FC } from 'react';
+import { OwnerId } from '@evolu/common';
+export declare const EvoluAvatar: FC<{
+    id: OwnerId;
+    size?: number;
+    borderRadius?: number;
+}>;
+//# sourceMappingURL=EvoluAvatar.d.ts.map

package/dist/components/EvoluAvatar.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EvoluAvatar.d.ts","sourceRoot":"","sources":["../../src/components/EvoluAvatar.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAW,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAgBA,CAAA"}

package/dist/components/EvoluAvatar.js

@@ -0,0 +1,14 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { View } from 'react-native';
+import { SvgXml } from 'react-native-svg';
+import { useMemo } from 'react';
+import { bloSvg } from 'blo';
+export const EvoluAvatar = ({ id, size = 32, borderRadius = 3 }) => {
+    const svg = useMemo(() => bloSvg(`0x${id}`), [id]);
+    return id ? (_jsx(View, { style: {
+            width: size,
+            height: size,
+            borderRadius,
+            overflow: 'hidden',
+        }, children: _jsx(SvgXml, { xml: svg, width: size, height: size }) })) : null;
+};

package/dist/expo-sqlite.d.ts

@@ -1,3 +1,5 @@
 import { EvoluDeps } from "@evolu/common/evolu";
+export * from "./components/EvoluAvatar.js";
+export declare const localAuth: import("@evolu/common").LocalAuth;
 export declare const evoluReactNativeDeps: EvoluDeps;
 //# sourceMappingURL=expo-sqlite.d.ts.map

package/dist/expo-sqlite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expo-sqlite.d.ts","sourceRoot":"","sources":["../src/expo-sqlite.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,SAAS,EAEV,MAAM,qBAAqB,CAAC;AA+B7B,eAAO,MAAM,oBAAoB,EAAE,SAOlC,CAAC"}
+{"version":3,"file":"expo-sqlite.d.ts","sourceRoot":"","sources":["../src/expo-sqlite.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,SAAS,EAEV,MAAM,qBAAqB,CAAC;AA2B7B,cAAc,6BAA6B,CAAC;AAE5C,eAAO,MAAM,SAAS,mCAGpB,CAAC;AAEH,eAAO,MAAM,oBAAoB,EAAE,SAMlC,CAAC"}

package/dist/expo-sqlite.js

@@ -1,17 +1,13 @@
 import { createConsole, createLocalAuth, createRandom, createRandomBytes, createTime, createWebSocket, } from "@evolu/common";
 import { createDbWorkerForPlatform, } from "@evolu/common/evolu";
 import * as Expo from "expo";
-import { SensitiveInfo } from "react-native-sensitive-info";
 import { createExpoSqliteDriver } from "./providers/ExpoSqliteDriver.js";
+import { createSecureStore } from "./utils/LocalAuth.js";
 import { polyfillHermes } from "./utils/Hermes.js";
 polyfillHermes();
 const console = createConsole();
 const time = createTime();
 const randomBytes = createRandomBytes();
-const localAuth = createLocalAuth({
-    randomBytes: randomBytes,
-    secureStorage: SensitiveInfo,
-});
 const createDbWorker = () => createDbWorkerForPlatform({
     console,
     createSqliteDriver: createExpoSqliteDriver,
@@ -23,11 +19,15 @@ const createDbWorker = () => createDbWorkerForPlatform({
 const reloadApp = () => {
     void Expo.reloadAppAsync();
 };
+export * from "./components/EvoluAvatar.js";
+export const localAuth = createLocalAuth({
+    randomBytes: randomBytes,
+    secureStorage: createSecureStore(),
+});
 export const evoluReactNativeDeps = {
     console,
     createDbWorker,
     randomBytes,
-    localAuth,
     reloadApp,
     time,
 };

package/dist/op-sqlite.d.ts

@@ -1,3 +1,5 @@
 import { EvoluDeps } from "@evolu/common/evolu";
+export * from "./components/EvoluAvatar.js";
+export declare const localAuth: import("@evolu/common").LocalAuth;
 export declare const evoluReactNativeDeps: EvoluDeps;
 //# sourceMappingURL=op-sqlite.d.ts.map

package/dist/op-sqlite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"op-sqlite.d.ts","sourceRoot":"","sources":["../src/op-sqlite.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,SAAS,EAEV,MAAM,qBAAqB,CAAC;AAmC7B,eAAO,MAAM,oBAAoB,EAAE,SAOlC,CAAC"}
+{"version":3,"file":"op-sqlite.d.ts","sourceRoot":"","sources":["../src/op-sqlite.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,SAAS,EAEV,MAAM,qBAAqB,CAAC;AA+B7B,cAAc,6BAA6B,CAAC;AAE5C,eAAO,MAAM,SAAS,mCAGpB,CAAC;AAEH,eAAO,MAAM,oBAAoB,EAAE,SAMlC,CAAC"}

package/dist/op-sqlite.js

@@ -8,10 +8,6 @@ polyfillHermes();
 const console = createConsole();
 const time = createTime();
 const randomBytes = createRandomBytes();
-const localAuth = createLocalAuth({
-    randomBytes: randomBytes,
-    secureStorage: SensitiveInfo,
-});
 const createDbWorker = () => createDbWorkerForPlatform({
     console,
     createSqliteDriver: createOpSqliteDriver,
@@ -28,11 +24,15 @@ const reloadApp = () => {
         // TODO: reload not implemented for bare rn
     }
 };
+export * from "./components/EvoluAvatar.js";
+export const localAuth = createLocalAuth({
+    randomBytes: randomBytes,
+    secureStorage: SensitiveInfo,
+});
 export const evoluReactNativeDeps = {
     console,
     createDbWorker,
     randomBytes,
-    localAuth,
     reloadApp,
     time,
 };

package/dist/utils/LocalAuth.d.ts

@@ -0,0 +1,3 @@
+import type { SecureStorage } from "@evolu/common";
+export declare const createSecureStore: () => SecureStorage;
+//# sourceMappingURL=LocalAuth.d.ts.map

package/dist/utils/LocalAuth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LocalAuth.d.ts","sourceRoot":"","sources":["../../src/utils/LocalAuth.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,aAAa,EAAqD,MAAM,eAAe,CAAC;AAExH,eAAO,MAAM,iBAAiB,QAAO,aAwDpC,CAAC"}

package/dist/utils/LocalAuth.js

@@ -0,0 +1,110 @@
+import KVStore from 'expo-sqlite/kv-store';
+import * as SecureStore from 'expo-secure-store';
+import { AUTH_DEFAULT_OPTIONS } from '@evolu/common';
+export const createSecureStore = () => {
+    const store = {
+        setItem: async (key, value, options) => {
+            const rnsiOpts = convertOptions(options);
+            const service = options?.service ?? 'default';
+            const metadata = createMetadata(options?.accessControl === 'none');
+            await KVStore.setItem(`${service}-${key}`, '1');
+            await SecureStore.setItemAsync(key, JSON.stringify({ value, metadata }), rnsiOpts);
+            return { metadata };
+        },
+        getItem: async (key, options) => {
+            const rnsiOpts = convertOptions(options);
+            const service = options?.service ?? 'default';
+            let data;
+            try {
+                const result = await SecureStore.getItemAsync(key, rnsiOpts);
+                if (!result)
+                    return null;
+                data = JSON.parse(result);
+            }
+            catch (_error) {
+                return null;
+            }
+            return { key, service, ...data };
+        },
+        deleteItem: async (key, options) => {
+            const rnsiOpts = convertOptions(options);
+            const service = options?.service ?? 'default';
+            await Promise.all([
+                KVStore.removeItemAsync(`${service}-${key}`),
+                SecureStore.deleteItemAsync(key, rnsiOpts),
+            ]);
+            return true;
+        },
+        getAllItems: async (options) => {
+            const keys = await KVStore.getAllKeysAsync();
+            const service = options?.service ?? 'default';
+            const metadata = createMetadata(options?.accessControl === 'none');
+            return keys
+                .filter(key => key.startsWith(`${service}-`))
+                .map(key => ({ key: key.slice(service.length + 1), service, metadata }));
+        },
+        clearService: async (options) => {
+            const rnsiOpts = convertOptions(options);
+            const service = options?.service ?? 'default';
+            const items = await store.getAllItems(options);
+            await KVStore.multiRemove(items.map(item => `${service}-${item.key}`));
+            await Promise.all(items.map(async (item) => {
+                await SecureStore.deleteItemAsync(item.key, rnsiOpts);
+            }));
+        },
+    };
+    return store;
+};
+/**
+ * Create default metadata for backwards compatibility with items that don't
+ * have stored metadata.
+ */
+const createMetadata = (isSecure = true) => {
+    return {
+        backend: "keychain",
+        accessControl: isSecure ? "biometryCurrentSet" : "none",
+        securityLevel: isSecure ? "biometry" : "software",
+        timestamp: Date.now(),
+    };
+};
+function convertOptions(options) {
+    const accessGroup = options?.keychainGroup
+        ?? AUTH_DEFAULT_OPTIONS.keychainGroup
+        ?? '';
+    const keychainService = options?.service
+        ?? AUTH_DEFAULT_OPTIONS.service
+        ?? '';
+    const keychainAccessible = convertKeychainAccessible(options?.accessControl
+        ?? AUTH_DEFAULT_OPTIONS.accessControl
+        ?? 'biometryCurrentSet');
+    const authenticationPrompt = options?.authenticationPrompt?.title
+        ?? AUTH_DEFAULT_OPTIONS.authenticationPrompt?.title
+        ?? '';
+    return {
+        accessGroup,
+        keychainService,
+        keychainAccessible,
+        authenticationPrompt,
+        requireAuthentication: options?.accessControl !== 'none',
+    };
+}
+function convertKeychainAccessible(accessControl) {
+    switch (accessControl) {
+        case "none":
+            // eslint-disable-next-line @typescript-eslint/no-deprecated
+            return SecureStore.ALWAYS;
+        case "biometryCurrentSet":
+            return SecureStore.AFTER_FIRST_UNLOCK;
+        case "biometryAny":
+            return SecureStore.AFTER_FIRST_UNLOCK;
+        case "devicePasscode":
+            return SecureStore.AFTER_FIRST_UNLOCK;
+        case "secureEnclaveBiometry":
+            return SecureStore.AFTER_FIRST_UNLOCK;
+        // Exhaustive check
+        default:
+            accessControl;
+            // Default (for typescript, should never hit)
+            return SecureStore.AFTER_FIRST_UNLOCK;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/react-native",
-  "version": "12.0.1-preview.5",
+  "version": "12.0.1-preview.6",
   "description": "Evolu for React Native and Expo",
   "keywords": [
     "evolu",
@@ -50,26 +50,30 @@
   "devDependencies": {
     "@op-engineering/op-sqlite": "^15.0.3",
     "expo": "^54.0.10",
+    "expo-secure-store": "~15.0.7",
     "expo-sqlite": "~16.0.8",
     "react-native": "^0.81.4",
     "react-native-nitro-modules": "^0.31.2",
-    "react-native-sensitive-info": "^6.0.0-rc.4",
+    "react-native-sensitive-info": "^6.0.0-rc.8",
+    "react-native-svg": "^15.14.0",
     "shx": "^0.4.0",
     "typescript": "^5.9.2",
     "vitest": "^4.0.4",
-    "@evolu/common": "6.0.1-preview.20",
-    "@evolu/react": "9.0.1-preview.5",
+    "@evolu/common": "6.0.1-preview.23",
+    "@evolu/react": "9.0.1-preview.6",
     "@evolu/tsconfig": "0.0.2"
   },
   "peerDependencies": {
-    "@evolu/common": "^6.0.1-preview.20",
-    "@evolu/react": "^9.0.1-preview.5",
+    "@evolu/common": "^6.0.1-preview.23",
+    "@evolu/react": "^9.0.1-preview.6",
     "@op-engineering/op-sqlite": ">=12",
     "expo": ">=54",
-    "expo-sqlite": ">=15",
+    "expo-secure-store": ">=15",
+    "expo-sqlite": ">=16",
     "react-native": ">=0.81",
     "react-native-nitro-modules": ">=0.31",
-    "react-native-sensitive-info": ">=6"
+    "react-native-sensitive-info": ">=6",
+    "react-native-svg": ">=15"
   },
   "peerDependenciesMeta": {
     "@op-engineering/op-sqlite": {
@@ -81,11 +85,17 @@
     "expo-sqlite": {
       "optional": true
     },
+    "expo-secure-store": {
+      "optional": true
+    },
     "react-native-nitro-modules": {
       "optional": true
     },
     "react-native-sensitive-info": {
       "optional": true
+    },
+    "react-native-svg": {
+      "optional": true
     }
   },
   "publishConfig": {

package/src/components/EvoluAvatar.tsx

@@ -0,0 +1,27 @@
+import { View } from 'react-native';
+import { SvgXml } from 'react-native-svg';
+import { FC, useMemo } from 'react';
+import { bloSvg } from 'blo';
+import { OwnerId } from '@evolu/common';
+
+export const EvoluAvatar: FC<{
+  id: OwnerId;
+  size?: number;
+  borderRadius?: number;
+}> = ({ id, size = 32, borderRadius = 3 }) => {
+  const svg = useMemo(() => bloSvg(`0x${id}`), [id]);
+  return id ? (
+    <View style={{
+      width: size,
+      height: size,
+      borderRadius,
+      overflow: 'hidden',
+    }}>
+      <SvgXml
+        xml={svg}
+        width={size}
+        height={size}
+      />
+    </View>
+  ) : null;
+}

package/src/expo-sqlite.ts

@@ -15,8 +15,8 @@ import {
 } from "@evolu/common/evolu";
 
 import * as Expo from "expo";
-import { SensitiveInfo } from "react-native-sensitive-info";
 import { createExpoSqliteDriver } from "./providers/ExpoSqliteDriver.js";
+import { createSecureStore } from "./utils/LocalAuth.js";
 import { polyfillHermes } from "./utils/Hermes.js";
 
 polyfillHermes();
@@ -24,10 +24,6 @@ polyfillHermes();
 const console = createConsole();
 const time = createTime();
 const randomBytes = createRandomBytes();
-const localAuth = createLocalAuth({
-  randomBytes: randomBytes,
-  secureStorage: SensitiveInfo,
-});
 
 const createDbWorker: CreateDbWorker = () =>
   createDbWorkerForPlatform({
@@ -43,11 +39,17 @@ const reloadApp: ReloadApp = () => {
   void Expo.reloadAppAsync();
 };
 
+export * from "./components/EvoluAvatar.js";
+
+export const localAuth = createLocalAuth({
+  randomBytes: randomBytes,
+  secureStorage: createSecureStore(),
+});
+
 export const evoluReactNativeDeps: EvoluDeps = {
   console,
   createDbWorker,
   randomBytes,
-  localAuth,
   reloadApp,
   time,
 };

package/src/op-sqlite.ts

@@ -24,10 +24,6 @@ polyfillHermes();
 const console = createConsole();
 const time = createTime();
 const randomBytes = createRandomBytes();
-const localAuth = createLocalAuth({
-  randomBytes: randomBytes,
-  secureStorage: SensitiveInfo,
-});
 
 const createDbWorker: CreateDbWorker = () =>
   createDbWorkerForPlatform({
@@ -47,11 +43,17 @@ const reloadApp: ReloadApp = () => {
   }
 };
 
+export * from "./components/EvoluAvatar.js";
+
+export const localAuth = createLocalAuth({
+  randomBytes: randomBytes,
+  secureStorage: SensitiveInfo,
+});
+
 export const evoluReactNativeDeps: EvoluDeps = {
   console,
   createDbWorker,
   randomBytes,
-  localAuth,
   reloadApp,
   time,
 };

package/src/utils/LocalAuth.ts

@@ -0,0 +1,118 @@
+import KVStore from 'expo-sqlite/kv-store';
+import * as SecureStore from 'expo-secure-store';
+import { AUTH_DEFAULT_OPTIONS } from '@evolu/common';
+
+import type { LocalAuthOptions, SecureStorage, SensitiveInfoItem, StorageMetadata, AccessControl } from "@evolu/common";
+
+export const createSecureStore = (): SecureStorage => {
+  const store: SecureStorage = {
+    setItem: async (key, value, options) => {
+      const rnsiOpts = convertOptions(options);
+      const service = options?.service ?? 'default';
+      const metadata = createMetadata(options?.accessControl === 'none');
+      await KVStore.setItem(`${service}-${key}`, '1');
+      await SecureStore.setItemAsync(key, JSON.stringify({value, metadata}), rnsiOpts);
+      return { metadata };
+    },
+
+    getItem: async (key, options) => {
+      const rnsiOpts = convertOptions(options);
+      const service = options?.service ?? 'default';
+      let data: {value: string; metadata: StorageMetadata};
+      try {
+        const result = await SecureStore.getItemAsync(key, rnsiOpts);
+        if (!result) return null;
+        data = JSON.parse(result) as {value: string; metadata: StorageMetadata};
+      } catch (_error) {
+        return null;
+      }
+      return { key, service, ...data };
+    },
+
+    deleteItem: async (key, options) => {
+      const rnsiOpts = convertOptions(options);
+      const service = options?.service ?? 'default';
+      await Promise.all([
+        KVStore.removeItemAsync(`${service}-${key}`),
+        SecureStore.deleteItemAsync(key, rnsiOpts),
+      ]);
+      return true;
+    },
+
+    getAllItems: async (options) => {
+      const keys = await KVStore.getAllKeysAsync();
+      const service = options?.service ?? 'default';
+      const metadata = createMetadata(options?.accessControl === 'none');
+      return keys
+        .filter(key => key.startsWith(`${service}-`))
+        .map(key => ({ key: key.slice(service.length + 1), service, metadata }));
+    },
+
+    clearService: async (options) => {
+      const rnsiOpts = convertOptions(options);
+      const service = options?.service ?? 'default';
+      const items = await store.getAllItems(options);
+      await KVStore.multiRemove(items.map(item => `${service}-${item.key}`));
+      await Promise.all(items.map(async (item) => {
+        await SecureStore.deleteItemAsync(item.key, rnsiOpts);
+      }));
+    },
+  };
+
+  return store;
+};
+
+/**
+ * Create default metadata for backwards compatibility with items that don't
+ * have stored metadata.
+ */
+const createMetadata = (isSecure = true): SensitiveInfoItem["metadata"] => {
+  return {
+    backend: "keychain",
+    accessControl: isSecure ? "biometryCurrentSet" : "none",
+    securityLevel: isSecure ? "biometry" : "software",
+    timestamp: Date.now(),
+  };
+};
+
+function convertOptions(options?: LocalAuthOptions): SecureStore.SecureStoreOptions {
+  const accessGroup = options?.keychainGroup
+    ?? AUTH_DEFAULT_OPTIONS.keychainGroup
+    ?? '';
+  const keychainService = options?.service
+    ?? AUTH_DEFAULT_OPTIONS.service
+    ?? '';
+  const keychainAccessible = convertKeychainAccessible(options?.accessControl
+    ?? AUTH_DEFAULT_OPTIONS.accessControl
+    ?? 'biometryCurrentSet');
+  const authenticationPrompt = options?.authenticationPrompt?.title
+    ?? AUTH_DEFAULT_OPTIONS.authenticationPrompt?.title
+    ?? '';
+  return {
+    accessGroup,
+    keychainService,
+    keychainAccessible,
+    authenticationPrompt,
+    requireAuthentication: options?.accessControl !== 'none',
+  };
+}
+
+function convertKeychainAccessible(accessControl: AccessControl): SecureStore.KeychainAccessibilityConstant {
+  switch (accessControl) {
+    case "none":
+      // eslint-disable-next-line @typescript-eslint/no-deprecated
+      return SecureStore.ALWAYS;
+    case "biometryCurrentSet":
+      return SecureStore.AFTER_FIRST_UNLOCK;
+    case "biometryAny":
+      return SecureStore.AFTER_FIRST_UNLOCK;
+    case "devicePasscode":
+      return SecureStore.AFTER_FIRST_UNLOCK;
+    case "secureEnclaveBiometry":
+      return SecureStore.AFTER_FIRST_UNLOCK;
+    // Exhaustive check
+    default: accessControl satisfies never;
+    // Default (for typescript, should never hit)
+    return SecureStore.AFTER_FIRST_UNLOCK;
+  }
+}