@flowerforce/flowerbase-client 0.3.0 → 0.3.1-beta.0

package/dist/app.d.ts

@@ -48,6 +48,8 @@ export declare class App {
     get allUsers(): Readonly<Record<string, User>>;
     private persistSessionsByUser;
     private persistUsersOrder;
+    private restorePersistedUsers;
+    private restoreCurrentSession;
     private touchUser;
     private removeUserFromOrder;
     private setSessionForUser;

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}

package/dist/app.js

@@ -19,29 +19,8 @@ class App {
         this.baseUrl = (config.baseUrl ?? '').replace(/\/$/, '');
         this.timeout = config.timeout ?? 10000;
         this.sessionManager = new session_1.SessionManager(this.id);
-        const persistedSessionsByUser = this.sessionManager.getSessionsByUser();
-        for (const [userId, session] of Object.entries(persistedSessionsByUser)) {
-            this.sessionsByUserId.set(userId, session);
-        }
-        this.usersOrder = this.sessionManager.getUsersOrder();
-        for (const userId of this.sessionsByUserId.keys()) {
-            if (!this.usersOrder.includes(userId)) {
-                this.usersOrder.push(userId);
-            }
-        }
-        for (const userId of this.usersOrder) {
-            this.getOrCreateUser(userId);
-        }
-        const currentSession = this.sessionManager.get();
-        if (currentSession?.userId) {
-            this.sessionsByUserId.set(currentSession.userId, currentSession);
-            this.getOrCreateUser(currentSession.userId);
-            this.touchUser(currentSession.userId);
-            this.persistSessionsByUser();
-        }
-        else {
-            this.setCurrentSessionFromOrder();
-        }
+        this.restorePersistedUsers();
+        this.restoreCurrentSession();
         this.sessionBootstrapPromise = this.bootstrapSessionOnLoad();
         this.emailPasswordAuth = {
             registerUser: ({ email, password }) => this.postProvider('/local-userpass/register', { email, password }),
@@ -109,6 +88,39 @@ class App {
     persistUsersOrder() {
         this.sessionManager.setUsersOrder(this.usersOrder);
     }
+    restorePersistedUsers() {
+        const persistedSessionsByUser = this.sessionManager.getSessionsByUser();
+        for (const [userId, session] of Object.entries(persistedSessionsByUser)) {
+            this.sessionsByUserId.set(userId, session);
+        }
+        const persistedOrder = this.sessionManager.getUsersOrder();
+        const nextUsersOrder = [];
+        for (const userId of persistedOrder) {
+            if (!nextUsersOrder.includes(userId)) {
+                nextUsersOrder.push(userId);
+            }
+        }
+        for (const userId of this.sessionsByUserId.keys()) {
+            if (!nextUsersOrder.includes(userId)) {
+                nextUsersOrder.push(userId);
+            }
+        }
+        this.usersOrder = nextUsersOrder;
+        for (const userId of this.usersOrder) {
+            this.getOrCreateUser(userId);
+        }
+    }
+    restoreCurrentSession() {
+        const currentSession = this.sessionManager.get();
+        if (currentSession?.userId) {
+            this.sessionsByUserId.set(currentSession.userId, currentSession);
+            this.getOrCreateUser(currentSession.userId);
+            this.touchUser(currentSession.userId);
+            this.persistSessionsByUser();
+            return;
+        }
+        this.setCurrentSessionFromOrder();
+    }
     touchUser(userId) {
         this.usersOrder = [userId, ...this.usersOrder.filter((id) => id !== userId)];
         this.persistUsersOrder();
@@ -167,8 +179,11 @@ class App {
         });
     }
     async bootstrapSessionOnLoad() {
+        await this.sessionManager.whenReady();
+        this.restorePersistedUsers();
+        this.restoreCurrentSession();
         const session = this.sessionManager.get();
-        if (!session || typeof localStorage === 'undefined') {
+        if (!session || !this.sessionManager.hasPersistentStorage()) {
             return;
         }
         try {

package/dist/session.d.ts

@@ -4,15 +4,22 @@ export declare class SessionManager {
     private readonly usersKey;
     private readonly sessionsKey;
     private readonly storage;
+    private readonly hydrationPromise;
     private session;
+    private usersOrder;
+    private sessionsByUser;
     constructor(appId: string);
-    load(): SessionData | null;
+    private hydrate;
+    whenReady(): Promise<void>;
+    hasPersistentStorage(): boolean;
     get(): SessionData | null;
     set(session: SessionData): void;
     clear(): void;
     getUsersOrder(): string[];
     setUsersOrder(order: string[]): void;
-    getSessionsByUser(): Record<string, SessionData>;
+    getSessionsByUser(): {
+        [x: string]: SessionData;
+    };
     setSessionsByUser(sessionsByUser: Record<string, SessionData>): void;
 }
 //# sourceMappingURL=session.d.ts.map

package/dist/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAwBrC,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,OAAO,CAA2B;gBAE9B,KAAK,EAAE,MAAM;IAOzB,IAAI,IAAI,WAAW,GAAG,IAAI;IAW1B,GAAG;IAIH,GAAG,CAAC,OAAO,EAAE,WAAW;IAKxB,KAAK;IAKL,aAAa;IAYb,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE;IAQ7B,iBAAiB;IAuBjB,iBAAiB,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;CAO9D"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAgDrC,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAe;IAChD,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,UAAU,CAAe;IACjC,OAAO,CAAC,cAAc,CAAkC;gBAE5C,KAAK,EAAE,MAAM;YAUX,OAAO;IAOrB,SAAS;IAIT,oBAAoB;IAIpB,GAAG;IAIH,GAAG,CAAC,OAAO,EAAE,WAAW;IAKxB,KAAK;IAKL,aAAa;IAIb,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE;IAS7B,iBAAiB;;;IAIjB,iBAAiB,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;CAQ9D"}

package/dist/session.js

@@ -1,44 +1,76 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionManager = void 0;
-const memoryStore = new Map();
-const getStorage = () => {
-    if (typeof localStorage !== 'undefined') {
-        return {
-            getItem: (key) => localStorage.getItem(key),
-            setItem: (key, value) => localStorage.setItem(key, value),
-            removeItem: (key) => localStorage.removeItem(key)
-        };
-    }
-    return {
-        getItem: (key) => memoryStore.get(key) ?? null,
-        setItem: (key, value) => {
-            memoryStore.set(key, value);
-        },
-        removeItem: (key) => {
-            memoryStore.delete(key);
+const storage_1 = require("./storage");
+const parseSession = (raw) => {
+    if (!raw)
+        return null;
+    try {
+        return JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+};
+const parseUsersOrder = (raw) => {
+    if (!raw)
+        return [];
+    try {
+        const parsed = JSON.parse(raw);
+        if (!Array.isArray(parsed))
+            return [];
+        return parsed.filter((item) => typeof item === 'string');
+    }
+    catch {
+        return [];
+    }
+};
+const parseSessionsByUser = (raw) => {
+    if (!raw)
+        return {};
+    try {
+        const parsed = JSON.parse(raw);
+        const normalized = {};
+        for (const [userId, session] of Object.entries(parsed)) {
+            if (session &&
+                typeof session === 'object' &&
+                typeof session.accessToken === 'string' &&
+                typeof session.refreshToken === 'string' &&
+                typeof session.userId === 'string') {
+                normalized[userId] = session;
+            }
         }
-    };
+        return normalized;
+    }
+    catch {
+        return {};
+    }
 };
 class SessionManager {
     constructor(appId) {
-        this.storage = getStorage();
+        this.storage = (0, storage_1.createStorage)();
         this.session = null;
+        this.usersOrder = [];
+        this.sessionsByUser = {};
         this.key = `flowerbase:${appId}:session`;
         this.usersKey = `flowerbase:${appId}:users`;
         this.sessionsKey = `flowerbase:${appId}:sessions`;
-        this.session = this.load();
-    }
-    load() {
-        const raw = this.storage.getItem(this.key);
-        if (!raw)
-            return null;
-        try {
-            return JSON.parse(raw);
-        }
-        catch {
-            return null;
-        }
+        this.session = parseSession(this.storage.getItem(this.key));
+        this.usersOrder = parseUsersOrder(this.storage.getItem(this.usersKey));
+        this.sessionsByUser = parseSessionsByUser(this.storage.getItem(this.sessionsKey));
+        this.hydrationPromise = this.hydrate();
+    }
+    async hydrate() {
+        const hydrated = await this.storage.hydrate([this.key, this.usersKey, this.sessionsKey]);
+        this.session = parseSession(hydrated[this.key] ?? null);
+        this.usersOrder = parseUsersOrder(hydrated[this.usersKey] ?? null);
+        this.sessionsByUser = parseSessionsByUser(hydrated[this.sessionsKey] ?? null);
+    }
+    whenReady() {
+        return this.hydrationPromise;
+    }
+    hasPersistentStorage() {
+        return this.storage.isPersistent;
     }
     get() {
         return this.session;
@@ -52,20 +84,10 @@ class SessionManager {
         this.storage.removeItem(this.key);
     }
     getUsersOrder() {
-        const raw = this.storage.getItem(this.usersKey);
-        if (!raw)
-            return [];
-        try {
-            const parsed = JSON.parse(raw);
-            if (!Array.isArray(parsed))
-                return [];
-            return parsed.filter((item) => typeof item === 'string');
-        }
-        catch {
-            return [];
-        }
+        return [...this.usersOrder];
     }
     setUsersOrder(order) {
+        this.usersOrder = [...order];
         if (order.length === 0) {
             this.storage.removeItem(this.usersKey);
             return;
@@ -73,28 +95,10 @@ class SessionManager {
         this.storage.setItem(this.usersKey, JSON.stringify(order));
     }
     getSessionsByUser() {
-        const raw = this.storage.getItem(this.sessionsKey);
-        if (!raw)
-            return {};
-        try {
-            const parsed = JSON.parse(raw);
-            const normalized = {};
-            for (const [userId, session] of Object.entries(parsed)) {
-                if (session &&
-                    typeof session === 'object' &&
-                    typeof session.accessToken === 'string' &&
-                    typeof session.refreshToken === 'string' &&
-                    typeof session.userId === 'string') {
-                    normalized[userId] = session;
-                }
-            }
-            return normalized;
-        }
-        catch {
-            return {};
-        }
+        return { ...this.sessionsByUser };
     }
     setSessionsByUser(sessionsByUser) {
+        this.sessionsByUser = { ...sessionsByUser };
         if (Object.keys(sessionsByUser).length === 0) {
             this.storage.removeItem(this.sessionsKey);
             return;

package/dist/storage.d.ts

@@ -0,0 +1,11 @@
+type StorageSnapshot = Record<string, string | null>;
+export type PersistedStorage = {
+    isPersistent: boolean;
+    getItem: (key: string) => string | null;
+    setItem: (key: string, value: string) => void;
+    removeItem: (key: string) => void;
+    hydrate: (keys: string[]) => Promise<StorageSnapshot>;
+};
+export declare const createStorage: () => PersistedStorage;
+export {};
+//# sourceMappingURL=storage.d.ts.map

package/dist/storage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAAA,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAA;AAEpD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,OAAO,CAAA;IACrB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAA;IACvC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7C,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,eAAe,CAAC,CAAA;CACtD,CAAA;AA8BD,eAAO,MAAM,aAAa,QAAO,gBAkBhC,CAAA"}

package/dist/storage.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createStorage = void 0;
+const memoryStore = new Map();
+const getStorage = () => {
+    const browserStorage = globalThis.localStorage;
+    if (browserStorage &&
+        typeof browserStorage.getItem === 'function' &&
+        typeof browserStorage.setItem === 'function' &&
+        typeof browserStorage.removeItem === 'function') {
+        return {
+            getItem: (key) => browserStorage.getItem(key),
+            setItem: (key, value) => browserStorage.setItem(key, value),
+            removeItem: (key) => browserStorage.removeItem(key)
+        };
+    }
+    return {
+        getItem: (key) => memoryStore.get(key) ?? null,
+        setItem: (key, value) => {
+            memoryStore.set(key, value);
+        },
+        removeItem: (key) => {
+            memoryStore.delete(key);
+        }
+    };
+};
+const createStorage = () => {
+    const browserStorage = globalThis.localStorage;
+    const isPersistent = !!browserStorage &&
+        typeof browserStorage.getItem === 'function' &&
+        typeof browserStorage.setItem === 'function' &&
+        typeof browserStorage.removeItem === 'function';
+    const storage = getStorage();
+    return {
+        isPersistent,
+        getItem: storage.getItem,
+        setItem: storage.setItem,
+        removeItem: storage.removeItem,
+        async hydrate(keys) {
+            return Object.fromEntries(keys.map((key) => [key, storage.getItem(key)]));
+        }
+    };
+};
+exports.createStorage = createStorage;

package/dist/storage.native.d.ts

@@ -0,0 +1,11 @@
+type StorageSnapshot = Record<string, string | null>;
+export type PersistedStorage = {
+    isPersistent: boolean;
+    getItem: (key: string) => string | null;
+    setItem: (key: string, value: string) => void;
+    removeItem: (key: string) => void;
+    hydrate: (keys: string[]) => Promise<StorageSnapshot>;
+};
+export declare const createStorage: () => PersistedStorage;
+export {};
+//# sourceMappingURL=storage.native.d.ts.map

package/dist/storage.native.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.native.d.ts","sourceRoot":"","sources":["../src/storage.native.ts"],"names":[],"mappings":"AAEA,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAA;AAEpD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,OAAO,CAAA;IACrB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAA;IACvC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7C,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,eAAe,CAAC,CAAA;CACtD,CAAA;AAOD,eAAO,MAAM,aAAa,QAAO,gBA+B/B,CAAA"}

package/dist/storage.native.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createStorage = void 0;
+const async_storage_1 = __importDefault(require("@react-native-async-storage/async-storage"));
+const memoryStore = new Map();
+const getSnapshot = (keys) => Object.fromEntries(keys.map((key) => [key, memoryStore.get(key) ?? null]));
+const createStorage = () => ({
+    isPersistent: true,
+    getItem: (key) => memoryStore.get(key) ?? null,
+    setItem: (key, value) => {
+        memoryStore.set(key, value);
+        void async_storage_1.default.setItem(key, value).catch(() => {
+            // Ignore write failures and keep the in-memory cache alive.
+        });
+    },
+    removeItem: (key) => {
+        memoryStore.delete(key);
+        void async_storage_1.default.removeItem(key).catch(() => {
+            // Ignore delete failures and keep the in-memory cache alive.
+        });
+    },
+    async hydrate(keys) {
+        try {
+            const entries = await async_storage_1.default.multiGet(keys);
+            for (const [key, value] of entries) {
+                if (value === null) {
+                    memoryStore.delete(key);
+                    continue;
+                }
+                memoryStore.set(key, value);
+            }
+        }
+        catch {
+            // Ignore storage read failures and keep the in-memory cache alive.
+        }
+        return getSnapshot(keys);
+    }
+});
+exports.createStorage = createStorage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase-client",
-  "version": "0.3.0",
+  "version": "0.3.1-beta.0",
   "description": "Client for Flowerbase",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/app.ts

@@ -52,29 +52,8 @@ export class App {
     this.baseUrl = (config.baseUrl ?? '').replace(/\/$/, '')
     this.timeout = config.timeout ?? 10000
     this.sessionManager = new SessionManager(this.id)
-    const persistedSessionsByUser = this.sessionManager.getSessionsByUser()
-    for (const [userId, session] of Object.entries(persistedSessionsByUser)) {
-      this.sessionsByUserId.set(userId, session)
-    }
-    this.usersOrder = this.sessionManager.getUsersOrder()
-    for (const userId of this.sessionsByUserId.keys()) {
-      if (!this.usersOrder.includes(userId)) {
-        this.usersOrder.push(userId)
-      }
-    }
-    for (const userId of this.usersOrder) {
-      this.getOrCreateUser(userId)
-    }
-
-    const currentSession = this.sessionManager.get()
-    if (currentSession?.userId) {
-      this.sessionsByUserId.set(currentSession.userId, currentSession)
-      this.getOrCreateUser(currentSession.userId)
-      this.touchUser(currentSession.userId)
-      this.persistSessionsByUser()
-    } else {
-      this.setCurrentSessionFromOrder()
-    }
+    this.restorePersistedUsers()
+    this.restoreCurrentSession()
     this.sessionBootstrapPromise = this.bootstrapSessionOnLoad()
 
     this.emailPasswordAuth = {
@@ -157,6 +136,44 @@ export class App {
     this.sessionManager.setUsersOrder(this.usersOrder)
   }
 
+  private restorePersistedUsers() {
+    const persistedSessionsByUser = this.sessionManager.getSessionsByUser()
+    for (const [userId, session] of Object.entries(persistedSessionsByUser)) {
+      this.sessionsByUserId.set(userId, session)
+    }
+
+    const persistedOrder = this.sessionManager.getUsersOrder()
+    const nextUsersOrder: string[] = []
+    for (const userId of persistedOrder) {
+      if (!nextUsersOrder.includes(userId)) {
+        nextUsersOrder.push(userId)
+      }
+    }
+    for (const userId of this.sessionsByUserId.keys()) {
+      if (!nextUsersOrder.includes(userId)) {
+        nextUsersOrder.push(userId)
+      }
+    }
+    this.usersOrder = nextUsersOrder
+
+    for (const userId of this.usersOrder) {
+      this.getOrCreateUser(userId)
+    }
+  }
+
+  private restoreCurrentSession() {
+    const currentSession = this.sessionManager.get()
+    if (currentSession?.userId) {
+      this.sessionsByUserId.set(currentSession.userId, currentSession)
+      this.getOrCreateUser(currentSession.userId)
+      this.touchUser(currentSession.userId)
+      this.persistSessionsByUser()
+      return
+    }
+
+    this.setCurrentSessionFromOrder()
+  }
+
   private touchUser(userId: string) {
     this.usersOrder = [userId, ...this.usersOrder.filter((id) => id !== userId)]
     this.persistUsersOrder()
@@ -225,8 +242,12 @@ export class App {
   }
 
   private async bootstrapSessionOnLoad(): Promise<void> {
+    await this.sessionManager.whenReady()
+    this.restorePersistedUsers()
+    this.restoreCurrentSession()
+
     const session = this.sessionManager.get()
-    if (!session || typeof localStorage === 'undefined') {
+    if (!session || !this.sessionManager.hasPersistentStorage()) {
       return
     }
 

package/src/session.ts

@@ -1,24 +1,48 @@
 import { SessionData } from './types'
+import { createStorage } from './storage'
 
-const memoryStore = new Map<string, string>()
+const parseSession = (raw: string | null): SessionData | null => {
+  if (!raw) return null
 
-const getStorage = () => {
-  if (typeof localStorage !== 'undefined') {
-    return {
-      getItem: (key: string) => localStorage.getItem(key),
-      setItem: (key: string, value: string) => localStorage.setItem(key, value),
-      removeItem: (key: string) => localStorage.removeItem(key)
-    }
+  try {
+    return JSON.parse(raw) as SessionData
+  } catch {
+    return null
+  }
+}
+
+const parseUsersOrder = (raw: string | null) => {
+  if (!raw) return []
+
+  try {
+    const parsed = JSON.parse(raw)
+    if (!Array.isArray(parsed)) return []
+    return parsed.filter((item): item is string => typeof item === 'string')
+  } catch {
+    return []
   }
+}
 
-  return {
-    getItem: (key: string) => memoryStore.get(key) ?? null,
-    setItem: (key: string, value: string) => {
-      memoryStore.set(key, value)
-    },
-    removeItem: (key: string) => {
-      memoryStore.delete(key)
+const parseSessionsByUser = (raw: string | null) => {
+  if (!raw) return {} as Record<string, SessionData>
+
+  try {
+    const parsed = JSON.parse(raw) as Record<string, SessionData>
+    const normalized: Record<string, SessionData> = {}
+    for (const [userId, session] of Object.entries(parsed)) {
+      if (
+        session &&
+        typeof session === 'object' &&
+        typeof session.accessToken === 'string' &&
+        typeof session.refreshToken === 'string' &&
+        typeof session.userId === 'string'
+      ) {
+        normalized[userId] = session
+      }
     }
+    return normalized
+  } catch {
+    return {} as Record<string, SessionData>
   }
 }
 
@@ -26,25 +50,35 @@ export class SessionManager {
   private readonly key: string
   private readonly usersKey: string
   private readonly sessionsKey: string
-  private readonly storage = getStorage()
+  private readonly storage = createStorage()
+  private readonly hydrationPromise: Promise<void>
   private session: SessionData | null = null
+  private usersOrder: string[] = []
+  private sessionsByUser: Record<string, SessionData> = {}
 
   constructor(appId: string) {
     this.key = `flowerbase:${appId}:session`
     this.usersKey = `flowerbase:${appId}:users`
     this.sessionsKey = `flowerbase:${appId}:sessions`
-    this.session = this.load()
+    this.session = parseSession(this.storage.getItem(this.key))
+    this.usersOrder = parseUsersOrder(this.storage.getItem(this.usersKey))
+    this.sessionsByUser = parseSessionsByUser(this.storage.getItem(this.sessionsKey))
+    this.hydrationPromise = this.hydrate()
   }
 
-  load(): SessionData | null {
-    const raw = this.storage.getItem(this.key)
-    if (!raw) return null
+  private async hydrate() {
+    const hydrated = await this.storage.hydrate([this.key, this.usersKey, this.sessionsKey])
+    this.session = parseSession(hydrated[this.key] ?? null)
+    this.usersOrder = parseUsersOrder(hydrated[this.usersKey] ?? null)
+    this.sessionsByUser = parseSessionsByUser(hydrated[this.sessionsKey] ?? null)
+  }
 
-    try {
-      return JSON.parse(raw) as SessionData
-    } catch {
-      return null
-    }
+  whenReady() {
+    return this.hydrationPromise
+  }
+
+  hasPersistentStorage() {
+    return this.storage.isPersistent
   }
 
   get() {
@@ -62,18 +96,11 @@ export class SessionManager {
   }
 
   getUsersOrder() {
-    const raw = this.storage.getItem(this.usersKey)
-    if (!raw) return []
-    try {
-      const parsed = JSON.parse(raw)
-      if (!Array.isArray(parsed)) return []
-      return parsed.filter((item): item is string => typeof item === 'string')
-    } catch {
-      return []
-    }
+    return [...this.usersOrder]
   }
 
   setUsersOrder(order: string[]) {
+    this.usersOrder = [...order]
     if (order.length === 0) {
       this.storage.removeItem(this.usersKey)
       return
@@ -82,29 +109,11 @@ export class SessionManager {
   }
 
   getSessionsByUser() {
-    const raw = this.storage.getItem(this.sessionsKey)
-    if (!raw) return {} as Record<string, SessionData>
-    try {
-      const parsed = JSON.parse(raw) as Record<string, SessionData>
-      const normalized: Record<string, SessionData> = {}
-      for (const [userId, session] of Object.entries(parsed)) {
-        if (
-          session &&
-          typeof session === 'object' &&
-          typeof session.accessToken === 'string' &&
-          typeof session.refreshToken === 'string' &&
-          typeof session.userId === 'string'
-        ) {
-          normalized[userId] = session
-        }
-      }
-      return normalized
-    } catch {
-      return {} as Record<string, SessionData>
-    }
+    return { ...this.sessionsByUser }
   }
 
   setSessionsByUser(sessionsByUser: Record<string, SessionData>) {
+    this.sessionsByUser = { ...sessionsByUser }
     if (Object.keys(sessionsByUser).length === 0) {
       this.storage.removeItem(this.sessionsKey)
       return

package/src/storage.native.ts

@@ -0,0 +1,49 @@
+import AsyncStorage from '@react-native-async-storage/async-storage'
+
+type StorageSnapshot = Record<string, string | null>
+
+export type PersistedStorage = {
+  isPersistent: boolean
+  getItem: (key: string) => string | null
+  setItem: (key: string, value: string) => void
+  removeItem: (key: string) => void
+  hydrate: (keys: string[]) => Promise<StorageSnapshot>
+}
+
+const memoryStore = new Map<string, string>()
+
+const getSnapshot = (keys: string[]): StorageSnapshot =>
+  Object.fromEntries(keys.map((key) => [key, memoryStore.get(key) ?? null]))
+
+export const createStorage = (): PersistedStorage => ({
+  isPersistent: true,
+  getItem: (key) => memoryStore.get(key) ?? null,
+  setItem: (key, value) => {
+    memoryStore.set(key, value)
+    void AsyncStorage.setItem(key, value).catch(() => {
+      // Ignore write failures and keep the in-memory cache alive.
+    })
+  },
+  removeItem: (key) => {
+    memoryStore.delete(key)
+    void AsyncStorage.removeItem(key).catch(() => {
+      // Ignore delete failures and keep the in-memory cache alive.
+    })
+  },
+  async hydrate(keys) {
+    try {
+      const entries = await AsyncStorage.multiGet(keys)
+      for (const [key, value] of entries) {
+        if (value === null) {
+          memoryStore.delete(key)
+          continue
+        }
+        memoryStore.set(key, value)
+      }
+    } catch {
+      // Ignore storage read failures and keep the in-memory cache alive.
+    }
+
+    return getSnapshot(keys)
+  }
+})

package/src/storage.ts

@@ -0,0 +1,57 @@
+type StorageSnapshot = Record<string, string | null>
+
+export type PersistedStorage = {
+  isPersistent: boolean
+  getItem: (key: string) => string | null
+  setItem: (key: string, value: string) => void
+  removeItem: (key: string) => void
+  hydrate: (keys: string[]) => Promise<StorageSnapshot>
+}
+
+const memoryStore = new Map<string, string>()
+
+const getStorage = () => {
+  const browserStorage = globalThis.localStorage
+  if (
+    browserStorage &&
+    typeof browserStorage.getItem === 'function' &&
+    typeof browserStorage.setItem === 'function' &&
+    typeof browserStorage.removeItem === 'function'
+  ) {
+    return {
+      getItem: (key: string) => browserStorage.getItem(key),
+      setItem: (key: string, value: string) => browserStorage.setItem(key, value),
+      removeItem: (key: string) => browserStorage.removeItem(key)
+    }
+  }
+
+  return {
+    getItem: (key: string) => memoryStore.get(key) ?? null,
+    setItem: (key: string, value: string) => {
+      memoryStore.set(key, value)
+    },
+    removeItem: (key: string) => {
+      memoryStore.delete(key)
+    }
+  }
+}
+
+export const createStorage = (): PersistedStorage => {
+  const browserStorage = globalThis.localStorage
+  const isPersistent =
+    !!browserStorage &&
+    typeof browserStorage.getItem === 'function' &&
+    typeof browserStorage.setItem === 'function' &&
+    typeof browserStorage.removeItem === 'function'
+  const storage = getStorage()
+
+  return {
+    isPersistent,
+    getItem: storage.getItem,
+    setItem: storage.setItem,
+    removeItem: storage.removeItem,
+    async hydrate(keys) {
+      return Object.fromEntries(keys.map((key) => [key, storage.getItem(key)]))
+    }
+  }
+}

package/dist/session.native.d.ts

@@ -1,14 +0,0 @@
-import { SessionData } from './types';
-export declare class SessionManager {
-    private readonly key;
-    private session;
-    private readonly asyncStorage;
-    private hydrationPromise;
-    constructor(appId: string);
-    private hydrateFromAsyncStorage;
-    load(): SessionData | null;
-    get(): SessionData | null;
-    set(session: SessionData): void;
-    clear(): void;
-}
-//# sourceMappingURL=session.native.d.ts.map

package/dist/session.native.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"session.native.d.ts","sourceRoot":"","sources":["../src/session.native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAsBrC,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoB;IACjD,OAAO,CAAC,gBAAgB,CAA6B;gBAEzC,KAAK,EAAE,MAAM;IAMzB,OAAO,CAAC,uBAAuB;IAwB/B,IAAI,IAAI,WAAW,GAAG,IAAI;IAI1B,GAAG;IAIH,GAAG,CAAC,OAAO,EAAE,WAAW;IAYxB,KAAK;CAUN"}

package/dist/session.native.js

@@ -1,76 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SessionManager = void 0;
-const async_storage_1 = __importDefault(require("@react-native-async-storage/async-storage"));
-const memoryStore = new Map();
-const getAsyncStorage = () => async_storage_1.default;
-const parseSession = (raw) => {
-    if (!raw)
-        return null;
-    try {
-        return JSON.parse(raw);
-    }
-    catch {
-        return null;
-    }
-};
-class SessionManager {
-    constructor(appId) {
-        this.session = null;
-        this.asyncStorage = getAsyncStorage();
-        this.hydrationPromise = null;
-        this.key = `flowerbase:${appId}:session`;
-        this.session = this.load();
-        void this.hydrateFromAsyncStorage();
-    }
-    hydrateFromAsyncStorage() {
-        if (!this.asyncStorage) {
-            return Promise.resolve();
-        }
-        if (this.hydrationPromise) {
-            return this.hydrationPromise;
-        }
-        this.hydrationPromise = this.asyncStorage
-            .getItem(this.key)
-            .then((raw) => {
-            const parsed = parseSession(raw);
-            if (!parsed)
-                return;
-            this.session = parsed;
-            memoryStore.set(this.key, JSON.stringify(parsed));
-        })
-            .catch(() => {
-            // Ignore storage read failures and keep memory fallback.
-        });
-        return this.hydrationPromise;
-    }
-    load() {
-        return parseSession(memoryStore.get(this.key) ?? null);
-    }
-    get() {
-        return this.session;
-    }
-    set(session) {
-        this.session = session;
-        const raw = JSON.stringify(session);
-        memoryStore.set(this.key, raw);
-        if (this.asyncStorage) {
-            void this.asyncStorage.setItem(this.key, raw).catch(() => {
-                // Ignore write failures and keep memory fallback.
-            });
-        }
-    }
-    clear() {
-        this.session = null;
-        memoryStore.delete(this.key);
-        if (this.asyncStorage) {
-            void this.asyncStorage.removeItem(this.key).catch(() => {
-                // Ignore delete failures and keep memory fallback.
-            });
-        }
-    }
-}
-exports.SessionManager = SessionManager;

package/src/session.native.ts

@@ -1,89 +0,0 @@
-import { SessionData } from './types'
-import AsyncStorage from '@react-native-async-storage/async-storage'
-
-type StorageLike = {
-  getItem: (key: string) => Promise<string | null>
-  setItem: (key: string, value: string) => Promise<void>
-  removeItem: (key: string) => Promise<void>
-}
-
-const memoryStore = new Map<string, string>()
-
-const getAsyncStorage = (): StorageLike => AsyncStorage
-
-const parseSession = (raw: string | null): SessionData | null => {
-  if (!raw) return null
-  try {
-    return JSON.parse(raw) as SessionData
-  } catch {
-    return null
-  }
-}
-
-export class SessionManager {
-  private readonly key: string
-  private session: SessionData | null = null
-  private readonly asyncStorage = getAsyncStorage()
-  private hydrationPromise: Promise<void> | null = null
-
-  constructor(appId: string) {
-    this.key = `flowerbase:${appId}:session`
-    this.session = this.load()
-    void this.hydrateFromAsyncStorage()
-  }
-
-  private hydrateFromAsyncStorage() {
-    if (!this.asyncStorage) {
-      return Promise.resolve()
-    }
-
-    if (this.hydrationPromise) {
-      return this.hydrationPromise
-    }
-
-    this.hydrationPromise = this.asyncStorage
-      .getItem(this.key)
-      .then((raw) => {
-        const parsed = parseSession(raw)
-        if (!parsed) return
-        this.session = parsed
-        memoryStore.set(this.key, JSON.stringify(parsed))
-      })
-      .catch(() => {
-        // Ignore storage read failures and keep memory fallback.
-      })
-
-    return this.hydrationPromise
-  }
-
-  load(): SessionData | null {
-    return parseSession(memoryStore.get(this.key) ?? null)
-  }
-
-  get() {
-    return this.session
-  }
-
-  set(session: SessionData) {
-    this.session = session
-    const raw = JSON.stringify(session)
-    memoryStore.set(this.key, raw)
-
-    if (this.asyncStorage) {
-      void this.asyncStorage.setItem(this.key, raw).catch(() => {
-        // Ignore write failures and keep memory fallback.
-      })
-    }
-  }
-
-  clear() {
-    this.session = null
-    memoryStore.delete(this.key)
-
-    if (this.asyncStorage) {
-      void this.asyncStorage.removeItem(this.key).catch(() => {
-        // Ignore delete failures and keep memory fallback.
-      })
-    }
-  }
-}