@oxyhq/services 6.9.46 → 6.10.1

package/lib/commonjs/ui/hooks/queryClient.js

@@ -3,75 +3,104 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createQueryClient = exports.createPersistenceAdapter = exports.clearQueryCache = void 0;
+exports.createQueryClient = exports.clearQueryCache = exports.attachQueryPersistence = void 0;
 var _reactQuery = require("@tanstack/react-query");
+var _reactQueryPersistClient = require("@tanstack/react-query-persist-client");
+var _queryAsyncStoragePersister = require("@tanstack/query-async-storage-persister");
 var _core = require("@oxyhq/core");
-const QUERY_CACHE_KEY = 'oxy_query_cache';
-const QUERY_CACHE_VERSION = '1';
+/**
+ * Offline-first QueryClient with cross-restart persistence.
+ *
+ * Wires together:
+ * - TanStack Query with `networkMode: 'offlineFirst'` for queries and mutations
+ *   so cached data is served immediately and mutations are queued (paused) while
+ *   the browser/device reports offline.
+ * - `persistQueryClient(...)` from `@tanstack/react-query-persist-client` so that
+ *   query results AND paused mutations survive a cold restart (kill-and-relaunch).
+ * - `onlineManager` resume hook so paused mutations replay the moment the
+ *   network is reported back, even if the host app swapped in a custom
+ *   onlineManager implementation.
+ *
+ * Storage layer:
+ * - React Native -> AsyncStorage via `createAsyncStoragePersister`.
+ * - Web -> localStorage via `createSyncStoragePersister` (wrapped in the
+ *   async persister API for a single call site).
+ * - Both adapters are content-shape compatible with our `StorageInterface`.
+ *
+ * Whitelist policy:
+ * - Persist every account/user/session/privacy query and every queued mutation.
+ * - DO NOT persist large list queries (e.g. activity feeds) — they go stale
+ *   fast and would balloon storage. Add new keys to `PERSISTED_QUERY_PREFIXES`
+ *   when introducing reads that should survive restart.
+ */
+
+const QUERY_CACHE_KEY = 'oxy_query_cache_v2';
+const QUERY_CACHE_MAX_AGE = 30 * 24 * 60 * 60 * 1000; // 30 days
+const QUERY_PERSIST_THROTTLE_MS = 1_000;
+
+/**
+ * Query-key prefixes that should survive cold restart. Anything not listed
+ * is dropped during dehydration so the persisted blob stays small.
+ *
+ * Mutations are persisted independently (always) so the offline write queue
+ * works regardless of the read whitelist.
+ */
+const PERSISTED_QUERY_PREFIXES = ['accounts', 'users', 'sessions', 'devices', 'privacy'];
 
 /**
- * Custom persistence adapter for TanStack Query using our StorageInterface
+ * Adapt our `StorageInterface` (which always returns `null` for missing keys)
+ * to TanStack's `AsyncStorage` shape. The two are structurally identical
+ * apart from naming; this also gives us a single place to add error
+ * suppression if a host platform's storage throws.
  */
-const createPersistenceAdapter = storage => {
+function adaptStorage(storage) {
   return {
-    persistClient: async client => {
-      try {
-        const serialized = JSON.stringify({
-          clientState: client,
-          timestamp: Date.now(),
-          version: QUERY_CACHE_VERSION
-        });
-        await storage.setItem(QUERY_CACHE_KEY, serialized);
-      } catch (error) {
-        if ((0, _core.isDev)()) {
-          console.warn('[QueryClient] Failed to persist cache:', error);
-        }
-      }
-    },
-    restoreClient: async () => {
-      try {
-        const cached = await storage.getItem(QUERY_CACHE_KEY);
-        if (!cached) return undefined;
-        const parsed = JSON.parse(cached);
+    getItem: key => storage.getItem(key),
+    setItem: (key, value) => storage.setItem(key, value),
+    removeItem: key => storage.removeItem(key)
+  };
+}
 
-        // Check version compatibility
-        if (parsed.version !== QUERY_CACHE_VERSION) {
-          // Clear old cache on version mismatch
-          await storage.removeItem(QUERY_CACHE_KEY);
-          return undefined;
-        }
+/**
+ * Decide whether a given query should be written to persistent storage.
+ *
+ * Two gates:
+ * 1. The query must be in our prefix whitelist.
+ * 2. The query must have completed successfully at least once — there's no
+ *    point persisting a `pending`/`error` state, and persisting `error` would
+ *    leak failure objects across restarts.
+ */
+function shouldDehydrateQuery(query) {
+  if (query.state.status !== 'success') {
+    return false;
+  }
+  const head = query.queryKey[0];
+  if (typeof head !== 'string') {
+    return false;
+  }
+  return PERSISTED_QUERY_PREFIXES.includes(head);
+}
 
-        // Check if cache is too old (30 days)
-        const maxAge = 30 * 24 * 60 * 60 * 1000;
-        if (parsed.timestamp && Date.now() - parsed.timestamp > maxAge) {
-          await storage.removeItem(QUERY_CACHE_KEY);
-          return undefined;
-        }
-        return parsed.clientState;
-      } catch (error) {
-        if ((0, _core.isDev)()) {
-          console.warn('[QueryClient] Failed to restore cache:', error);
-        }
-        return undefined;
-      }
-    },
-    removeClient: async () => {
-      try {
-        await storage.removeItem(QUERY_CACHE_KEY);
-      } catch (error) {
-        if ((0, _core.isDev)()) {
-          console.warn('[QueryClient] Failed to remove cache:', error);
-        }
-      }
-    }
-  };
-};
+/**
+ * Persist every mutation regardless of status — paused mutations are
+ * exactly the ones that must survive restart to replay when online.
+ */
+function shouldDehydrateMutation(_mutation) {
+  return true;
+}
 
 /**
- * Create a QueryClient with offline-first configuration
+ * Create a QueryClient with offline-first defaults.
+ *
+ * Mutations marked with `networkMode: 'offlineFirst'` are queued by TanStack
+ * Query when offline (status "paused") and resumed automatically when
+ * `onlineManager` transitions back to online. Network monitoring wiring lives
+ * in `OxyProvider.tsx`.
+ *
+ * Persistence is attached separately via `attachQueryPersistence(...)`.
+ * Splitting the steps lets test/SSR callers create a stateless client.
  */
-exports.createPersistenceAdapter = createPersistenceAdapter;
-const createQueryClient = storage => {
+const createQueryClient = () => {
   const client = new _reactQuery.QueryClient({
     defaultOptions: {
       queries: {
@@ -82,37 +111,106 @@ const createQueryClient = storage => {
         // Retry 3 times with exponential backoff
         retry: 3,
         retryDelay: attemptIndex => Math.min(1000 * 2 ** attemptIndex, 30000),
-        // Refetch on reconnect
+        // Refetch on reconnect so stale data is refreshed once online again.
         refetchOnReconnect: true,
         // Don't refetch on window focus (better for mobile)
         refetchOnWindowFocus: false,
-        // Offline-first: use cache when offline
+        // Offline-first: serve cached data immediately, refetch in background.
         networkMode: 'offlineFirst'
       },
       mutations: {
         // Retry once for mutations
         retry: 1,
-        // Offline-first: queue mutations when offline
+        // Offline-first: pause and queue mutations when offline.
         networkMode: 'offlineFirst'
       }
     }
   });
 
-  // Note: Persistence is handled by TanStack Query's built-in persistence
-  // For now, we rely on the query client's default behavior with networkMode: 'offlineFirst'
-  // The cache will be available in memory and queries will use cached data when offline
-  // Full persistence to AsyncStorage can be added later with @tanstack/react-query-persist-client if needed
-
+  // Defensive: explicitly resume paused mutations whenever the network
+  // transitions back to online. TanStack Query does this internally too,
+  // but wiring it here keeps the behaviour robust if a custom onlineManager
+  // implementation is swapped in by the host app.
+  const unsubscribe = _reactQuery.onlineManager.subscribe(isOnline => {
+    if (isOnline) {
+      void client.getMutationCache().resumePausedMutations();
+    }
+  });
+  Object.defineProperty(client, '__oxyOnlineUnsubscribe', {
+    value: unsubscribe,
+    enumerable: false,
+    configurable: true,
+    writable: false
+  });
   return client;
 };
+exports.createQueryClient = createQueryClient;
+/**
+ * Wire `persistQueryClient` to the supplied storage adapter.
+ *
+ * Returns once the in-flight restore promise is available so callers can
+ * `await result.restored` before rendering UI that depends on cached data.
+ *
+ * Safe to no-op if `storage` is null/undefined (e.g. server-side render
+ * with no host storage).
+ */
+const attachQueryPersistence = (queryClient, storage) => {
+  if (!storage) {
+    return {
+      restored: Promise.resolve(),
+      unsubscribe: () => {}
+    };
+  }
+  const persister = (0, _queryAsyncStoragePersister.createAsyncStoragePersister)({
+    storage: adaptStorage(storage),
+    key: QUERY_CACHE_KEY,
+    throttleTime: QUERY_PERSIST_THROTTLE_MS
+  });
+  const [unsubscribe, restored] = (0, _reactQueryPersistClient.persistQueryClient)({
+    queryClient,
+    persister,
+    maxAge: QUERY_CACHE_MAX_AGE,
+    dehydrateOptions: {
+      shouldDehydrateQuery,
+      shouldDehydrateMutation
+    }
+  });
+  restored.catch(error => {
+    if ((0, _core.isDev)()) {
+      console.warn('[QueryClient] Failed to restore persisted cache', error);
+    }
+  });
+  return {
+    unsubscribe,
+    restored
+  };
+};
+
+// Legacy v1 cache key — kept so we can opportunistically purge stale blobs
+// written by older builds. Safe to drop after a few releases.
+exports.attachQueryPersistence = attachQueryPersistence;
+const LEGACY_QUERY_CACHE_KEYS = ['oxy_query_cache'];
 
 /**
- * Clear persisted query cache
+ * Remove the persisted query+mutation cache (used on full sign-out / data
+ * reset). Safe to call even if persistence was never attached. Also clears
+ * legacy cache keys from older builds.
  */
-exports.createQueryClient = createQueryClient;
 const clearQueryCache = async storage => {
-  const adapter = createPersistenceAdapter(storage);
-  await adapter.removeClient();
+  const keys = [QUERY_CACHE_KEY, ...LEGACY_QUERY_CACHE_KEYS];
+  await Promise.all(keys.map(async key => {
+    try {
+      await storage.removeItem(key);
+    } catch (error) {
+      if ((0, _core.isDev)()) {
+        console.warn(`[QueryClient] Failed to clear persisted query cache (${key})`, error);
+      }
+    }
+  }));
 };
+
+/**
+ * Re-export the persisted client shape so callers can type custom persisters.
+ */
 exports.clearQueryCache = clearQueryCache;
 //# sourceMappingURL=queryClient.js.map

package/lib/commonjs/ui/hooks/queryClient.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactQuery","require","_core","QUERY_CACHE_KEY","QUERY_CACHE_VERSION","createPersistenceAdapter","storage","persistClient","client","serialized","JSON","stringify","clientState","timestamp","Date","now","version","setItem","error","isDev","console","warn","restoreClient","cached","getItem","undefined","parsed","parse","removeItem","maxAge","removeClient","exports","createQueryClient","QueryClient","defaultOptions","queries","staleTime","gcTime","retry","retryDelay","attemptIndex","Math","min","refetchOnReconnect","refetchOnWindowFocus","networkMode","mutations","clearQueryCache","adapter"],"sourceRoot":"../../../../src","sources":["ui/hooks/queryClient.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactQuery","require","_reactQueryPersistClient","_queryAsyncStoragePersister","_core","QUERY_CACHE_KEY","QUERY_CACHE_MAX_AGE","QUERY_PERSIST_THROTTLE_MS","PERSISTED_QUERY_PREFIXES","adaptStorage","storage","getItem","key","setItem","value","removeItem","shouldDehydrateQuery","query","state","status","head","queryKey","includes","shouldDehydrateMutation","_mutation","createQueryClient","client","QueryClient","defaultOptions","queries","staleTime","gcTime","retry","retryDelay","attemptIndex","Math","min","refetchOnReconnect","refetchOnWindowFocus","networkMode","mutations","unsubscribe","onlineManager","subscribe","isOnline","getMutationCache","resumePausedMutations","Object","defineProperty","enumerable","configurable","writable","exports","attachQueryPersistence","queryClient","restored","Promise","resolve","persister","createAsyncStoragePersister","throttleTime","persistQueryClient","maxAge","dehydrateOptions","catch","error","isDev","console","warn","LEGACY_QUERY_CACHE_KEYS","clearQueryCache","keys","all","map"],"sourceRoot":"../../../../src","sources":["ui/hooks/queryClient.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/hooks/useAsyncAction.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 exports.executeWithToast = executeWithToast;
 exports.useAsyncAction = useAsyncAction;
 var _react = require("react");
-var _sonner = require("../../lib/sonner");
+var _bloom = require("@oxyhq/bloom");
 /**
  * Hook for handling async actions with loading state, error handling, and toast notifications.
  * Reduces boilerplate for common patterns like try-catch with toast feedback.
@@ -37,18 +37,18 @@ function useAsyncAction(options) {
     setIsLoading(true);
     setError(null);
     if (showLoadingToast && loadingMessage) {
-      _sonner.toast.loading(loadingMessage);
+      _bloom.toast.info(loadingMessage);
     }
     try {
       const result = await action();
       if (successMessage) {
-        _sonner.toast.success(successMessage);
+        _bloom.toast.success(successMessage);
       }
       onSuccess?.(result);
       return result;
     } catch (err) {
       const message = typeof errorMessage === 'function' ? errorMessage(err) : errorMessage || (err instanceof Error ? err.message : null) || 'An error occurred';
-      _sonner.toast.error(message);
+      _bloom.toast.error(message);
       setError(err instanceof Error ? err : new Error(message));
       onError?.(err);
       return undefined;
@@ -78,16 +78,16 @@ async function executeWithToast(action, options) {
     loadingMessage
   } = options || {};
   if (loadingMessage) {
-    _sonner.toast.loading(loadingMessage);
+    _bloom.toast.info(loadingMessage);
   }
   try {
     const result = await action();
     if (successMessage) {
-      _sonner.toast.success(successMessage);
+      _bloom.toast.success(successMessage);
     }
     return result;
   } catch (err) {
-    _sonner.toast.error(errorMessage || (err instanceof Error ? err.message : null) || 'An error occurred');
+    _bloom.toast.error(errorMessage || (err instanceof Error ? err.message : null) || 'An error occurred');
     return undefined;
   }
 }

package/lib/commonjs/ui/hooks/useAsyncAction.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_sonner","useAsyncAction","options","isLoading","setIsLoading","useState","error","setError","execute","useCallback","action","successMessage","errorMessage","onSuccess","onError","showLoadingToast","loadingMessage","toast","loading","result","success","err","message","Error","undefined","resetError","executeWithToast","_default","exports","default"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAsyncAction.ts"],"mappings":";;;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AA8BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,cAAcA,CAC1BC,OAAiC,EACV;EACvB,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAC,eAAQ,EAAC,KAAK,CAAC;EACjD,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAG,IAAAF,eAAQ,EAAe,IAAI,CAAC;EAEtD,MAAMG,OAAO,GAAG,IAAAC,kBAAW,EAAC,YAAoC;IAC5D,MAAM;MACFC,MAAM;MACNC,cAAc;MACdC,YAAY;MACZC,SAAS;MACTC,OAAO;MACPC,gBAAgB;MAChBC;IACJ,CAAC,GAAGd,OAAO;IAEXE,YAAY,CAAC,IAAI,CAAC;IAClBG,QAAQ,CAAC,IAAI,CAAC;IAEd,IAAIQ,gBAAgB,IAAIC,cAAc,EAAE;MACpCC,aAAK,CAACC,OAAO,CAACF,cAAc,CAAC;IACjC;IAEA,IAAI;MACA,MAAMG,MAAM,GAAG,MAAMT,MAAM,CAAC,CAAC;MAE7B,IAAIC,cAAc,EAAE;QAChBM,aAAK,CAACG,OAAO,CAACT,cAAc,CAAC;MACjC;MAEAE,SAAS,GAAGM,MAAM,CAAC;MACnB,OAAOA,MAAM;IACjB,CAAC,CAAC,OAAOE,GAAY,EAAE;MACnB,MAAMC,OAAO,GAAG,OAAOV,YAAY,KAAK,UAAU,GAC5CA,YAAY,CAACS,GAAG,CAAC,GACjBT,YAAY,KAAKS,GAAG,YAAYE,KAAK,GAAGF,GAAG,CAACC,OAAO,GAAG,IAAI,CAAC,IAAI,mBAAmB;MAExFL,aAAK,CAACX,KAAK,CAACgB,OAAO,CAAC;MACpBf,QAAQ,CAACc,GAAG,YAAYE,KAAK,GAAGF,GAAG,GAAG,IAAIE,KAAK,CAACD,OAAO,CAAC,CAAC;MACzDR,OAAO,GAAGO,GAAG,CAAC;MACd,OAAOG,SAAS;IACpB,CAAC,SAAS;MACNpB,YAAY,CAAC,KAAK,CAAC;IACvB;EACJ,CAAC,EAAE,CAACF,OAAO,CAAC,CAAC;EAEb,MAAMuB,UAAU,GAAG,IAAAhB,kBAAW,EAAC,MAAM;IACjCF,QAAQ,CAAC,IAAI,CAAC;EAClB,CAAC,EAAE,EAAE,CAAC;EAEN,OAAO;IAAEC,OAAO;IAAEL,SAAS;IAAEG,KAAK;IAAEmB;EAAW,CAAC;AACpD;;AAEA;AACA;AACA;AACA;AACO,eAAeC,gBAAgBA,CAClChB,MAAwB,EACxBR,OAIC,EACqB;EACtB,MAAM;IAAES,cAAc;IAAEC,YAAY;IAAEI;EAAe,CAAC,GAAGd,OAAO,IAAI,CAAC,CAAC;EAEtE,IAAIc,cAAc,EAAE;IAChBC,aAAK,CAACC,OAAO,CAACF,cAAc,CAAC;EACjC;EAEA,IAAI;IACA,MAAMG,MAAM,GAAG,MAAMT,MAAM,CAAC,CAAC;IAC7B,IAAIC,cAAc,EAAE;MAChBM,aAAK,CAACG,OAAO,CAACT,cAAc,CAAC;IACjC;IACA,OAAOQ,MAAM;EACjB,CAAC,CAAC,OAAOE,GAAY,EAAE;IACnBJ,aAAK,CAACX,KAAK,CAACM,YAAY,KAAKS,GAAG,YAAYE,KAAK,GAAGF,GAAG,CAACC,OAAO,GAAG,IAAI,CAAC,IAAI,mBAAmB,CAAC;IAC/F,OAAOE,SAAS;EACpB;AACJ;AAAC,IAAAG,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEc5B,cAAc","ignoreList":[]}
+{"version":3,"names":["_react","require","_bloom","useAsyncAction","options","isLoading","setIsLoading","useState","error","setError","execute","useCallback","action","successMessage","errorMessage","onSuccess","onError","showLoadingToast","loadingMessage","toast","info","result","success","err","message","Error","undefined","resetError","executeWithToast","_default","exports","default"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAsyncAction.ts"],"mappings":";;;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AA8BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,cAAcA,CAC1BC,OAAiC,EACV;EACvB,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAC,eAAQ,EAAC,KAAK,CAAC;EACjD,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAG,IAAAF,eAAQ,EAAe,IAAI,CAAC;EAEtD,MAAMG,OAAO,GAAG,IAAAC,kBAAW,EAAC,YAAoC;IAC5D,MAAM;MACFC,MAAM;MACNC,cAAc;MACdC,YAAY;MACZC,SAAS;MACTC,OAAO;MACPC,gBAAgB;MAChBC;IACJ,CAAC,GAAGd,OAAO;IAEXE,YAAY,CAAC,IAAI,CAAC;IAClBG,QAAQ,CAAC,IAAI,CAAC;IAEd,IAAIQ,gBAAgB,IAAIC,cAAc,EAAE;MACpCC,YAAK,CAACC,IAAI,CAACF,cAAc,CAAC;IAC9B;IAEA,IAAI;MACA,MAAMG,MAAM,GAAG,MAAMT,MAAM,CAAC,CAAC;MAE7B,IAAIC,cAAc,EAAE;QAChBM,YAAK,CAACG,OAAO,CAACT,cAAc,CAAC;MACjC;MAEAE,SAAS,GAAGM,MAAM,CAAC;MACnB,OAAOA,MAAM;IACjB,CAAC,CAAC,OAAOE,GAAY,EAAE;MACnB,MAAMC,OAAO,GAAG,OAAOV,YAAY,KAAK,UAAU,GAC5CA,YAAY,CAACS,GAAG,CAAC,GACjBT,YAAY,KAAKS,GAAG,YAAYE,KAAK,GAAGF,GAAG,CAACC,OAAO,GAAG,IAAI,CAAC,IAAI,mBAAmB;MAExFL,YAAK,CAACX,KAAK,CAACgB,OAAO,CAAC;MACpBf,QAAQ,CAACc,GAAG,YAAYE,KAAK,GAAGF,GAAG,GAAG,IAAIE,KAAK,CAACD,OAAO,CAAC,CAAC;MACzDR,OAAO,GAAGO,GAAG,CAAC;MACd,OAAOG,SAAS;IACpB,CAAC,SAAS;MACNpB,YAAY,CAAC,KAAK,CAAC;IACvB;EACJ,CAAC,EAAE,CAACF,OAAO,CAAC,CAAC;EAEb,MAAMuB,UAAU,GAAG,IAAAhB,kBAAW,EAAC,MAAM;IACjCF,QAAQ,CAAC,IAAI,CAAC;EAClB,CAAC,EAAE,EAAE,CAAC;EAEN,OAAO;IAAEC,OAAO;IAAEL,SAAS;IAAEG,KAAK;IAAEmB;EAAW,CAAC;AACpD;;AAEA;AACA;AACA;AACA;AACO,eAAeC,gBAAgBA,CAClChB,MAAwB,EACxBR,OAIC,EACqB;EACtB,MAAM;IAAES,cAAc;IAAEC,YAAY;IAAEI;EAAe,CAAC,GAAGd,OAAO,IAAI,CAAC,CAAC;EAEtE,IAAIc,cAAc,EAAE;IAChBC,YAAK,CAACC,IAAI,CAACF,cAAc,CAAC;EAC9B;EAEA,IAAI;IACA,MAAMG,MAAM,GAAG,MAAMT,MAAM,CAAC,CAAC;IAC7B,IAAIC,cAAc,EAAE;MAChBM,YAAK,CAACG,OAAO,CAACT,cAAc,CAAC;IACjC;IACA,OAAOQ,MAAM;EACjB,CAAC,CAAC,OAAOE,GAAY,EAAE;IACnBJ,YAAK,CAACX,KAAK,CAACM,YAAY,KAAKS,GAAG,YAAYE,KAAK,GAAGF,GAAG,CAACC,OAAO,GAAG,IAAI,CAAC,IAAI,mBAAmB,CAAC;IAC/F,OAAOE,SAAS;EACpB;AACJ;AAAC,IAAAG,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEc5B,cAAc","ignoreList":[]}

package/lib/commonjs/ui/hooks/useAuth.js

@@ -4,12 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useAuth = useAuth;
-Object.defineProperty(exports, "useOxy", {
-  enumerable: true,
-  get: function () {
-    return _OxyContext.useOxy;
-  }
-});
 var _react = require("react");
 var _OxyContext = require("../context/OxyContext.js");
 var _useWebSSO = require("./useWebSSO.js");
@@ -164,6 +158,4 @@ function useAuth() {
     openAvatarPicker
   };
 }
-
-// Re-export useOxy for backward compatibility and advanced usage
 //# sourceMappingURL=useAuth.js.map

package/lib/commonjs/ui/hooks/useAuth.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_OxyContext","_useWebSSO","useAuth","user","isAuthenticated","isLoading","isTokenReady","error","signIn","oxySignIn","handlePopupSession","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","openAvatarPicker","useOxy","useCallback","publicKey","authWebUrl","config","idpHostname","URL","hostname","isIdentityProvider","isWebBrowser","window","location","popupSession","signInWithPopup","sessionWithUser","Error","popupError","message","includes","hasExisting","existingKey","Promise","_","reject","authBase","loginUrl","href","signOut","signOutAll","refresh","isReady"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuth.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_OxyContext","_useWebSSO","useAuth","user","isAuthenticated","isLoading","isTokenReady","error","signIn","oxySignIn","handlePopupSession","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","openAvatarPicker","useOxy","useCallback","publicKey","authWebUrl","config","idpHostname","URL","hostname","isIdentityProvider","isWebBrowser","window","location","popupSession","signInWithPopup","sessionWithUser","Error","popupError","message","includes","hasExisting","existingKey","Promise","_","reject","authBase","loginUrl","href","signOut","signOutAll","refresh","isReady"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuth.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/hooks/useAvatarPicker.js

@@ -6,16 +6,34 @@ Object.defineProperty(exports, "__esModule", {
 exports.useAvatarPicker = useAvatarPicker;
 var _react = require("react");
 var _core = require("@oxyhq/core");
-var _sonner = require("../../lib/sonner");
+var _bloom = require("@oxyhq/bloom");
 var _avatarUtils = require("../utils/avatarUtils.js");
 /**
  * Avatar Picker Hook
  *
  * Extracts avatar selection logic from OxyContext for better modularity.
- * Opens the FileManagement bottom sheet in select mode for image files,
- * then updates the user's profile avatar.
+ *
+ * Flow:
+ *   1. Open the FileManagement bottom sheet in select mode for image files.
+ *   2. After the user picks an image, route to the AvatarCrop screen so they
+ *      can square-crop + zoom before the avatar is set.
+ *   3. The cropped JPEG is uploaded as a NEW file via `oxyServices.assetUpload`
+ *      and that file becomes the user's avatar.
+ *
+ * `expo-image-manipulator` is required for the crop step (declared as an
+ * optional peer in the consuming app) — see AvatarCropScreen.
  */
 
+/** Upload result shape returned by oxyServices.assetUpload (single-file path). */
+
+function extractUploadedFileId(result) {
+  if (!result) return undefined;
+  if (typeof result.id === 'string') return result.id;
+  if (result.file?.id) return result.file.id;
+  const first = result.files?.[0];
+  if (first?.id) return first.id;
+  return undefined;
+}
 function useAvatarPicker({
   oxyServices,
   currentLanguage,
@@ -23,6 +41,54 @@ function useAvatarPicker({
   queryClient,
   showBottomSheet
 }) {
+  /**
+   * Final step: take the cropped JPEG, upload it as a new public file, then
+   * set it as the user's avatar. Fires success/error toasts.
+   */
+  const finalizeCroppedAvatar = (0, _react.useCallback)(async cropped => {
+    try {
+      const uploadResult = await oxyServices.assetUpload({
+        uri: cropped.uri,
+        type: cropped.mime,
+        name: `avatar-${Date.now()}.jpg`
+      }, 'public');
+      const newFileId = extractUploadedFileId(uploadResult);
+      if (!newFileId) {
+        throw new Error('Avatar upload succeeded but no file ID was returned');
+      }
+      await (0, _core.updateAvatarVisibility)(newFileId, oxyServices, 'useAvatarPicker');
+      await (0, _avatarUtils.updateProfileWithAvatar)({
+        avatar: newFileId
+      }, oxyServices, activeSessionId, queryClient);
+      _bloom.toast.success((0, _core.translate)(currentLanguage ?? undefined, 'editProfile.toasts.avatarUpdated') || 'Avatar updated');
+    } catch (e) {
+      const message = e instanceof Error ? e.message : undefined;
+      _bloom.toast.error(message || (0, _core.translate)(currentLanguage ?? undefined, 'editProfile.toasts.updateAvatarFailed') || 'Failed to update avatar');
+    }
+  }, [activeSessionId, currentLanguage, oxyServices, queryClient]);
+
+  /**
+   * After the user picks a file in the FileManagement sheet, route to the
+   * crop screen with the file's download URL as the source image.
+   */
+  const handleFilePicked = (0, _react.useCallback)(file => {
+    if (!file.contentType?.startsWith('image/')) {
+      _bloom.toast.error((0, _core.translate)(currentLanguage ?? undefined, 'editProfile.toasts.selectImage') || 'Please select an image file');
+      return;
+    }
+
+    // Use the public download URL of the picked file as the crop source.
+    // The OxyServices file URL endpoints accept image variants, but for
+    // cropping we want the original — passing no variant returns it.
+    const sourceUri = oxyServices.getFileDownloadUrl(file.id);
+    showBottomSheet({
+      screen: 'AvatarCrop',
+      props: {
+        imageUri: sourceUri,
+        onConfirm: finalizeCroppedAvatar
+      }
+    });
+  }, [currentLanguage, finalizeCroppedAvatar, oxyServices, showBottomSheet]);
   const openAvatarPicker = (0, _react.useCallback)(() => {
     showBottomSheet({
       screen: 'FileManagement',
@@ -31,25 +97,10 @@ function useAvatarPicker({
         multiSelect: false,
         disabledMimeTypes: ['video/', 'audio/', 'application/pdf'],
         afterSelect: 'none',
-        onSelect: async file => {
-          if (!file.contentType.startsWith('image/')) {
-            _sonner.toast.error((0, _core.translate)(currentLanguage ?? undefined, 'editProfile.toasts.selectImage') || 'Please select an image file');
-            return;
-          }
-          try {
-            await (0, _core.updateAvatarVisibility)(file.id, oxyServices, 'OxyContext');
-            await (0, _avatarUtils.updateProfileWithAvatar)({
-              avatar: file.id
-            }, oxyServices, activeSessionId, queryClient);
-            _sonner.toast.success((0, _core.translate)(currentLanguage ?? undefined, 'editProfile.toasts.avatarUpdated') || 'Avatar updated');
-          } catch (e) {
-            const message = e instanceof Error ? e.message : undefined;
-            _sonner.toast.error(message || (0, _core.translate)(currentLanguage ?? undefined, 'editProfile.toasts.updateAvatarFailed') || 'Failed to update avatar');
-          }
-        }
+        onSelect: handleFilePicked
       }
     });
-  }, [oxyServices, currentLanguage, showBottomSheet, activeSessionId, queryClient]);
+  }, [handleFilePicked, showBottomSheet]);
   return {
     openAvatarPicker
   };

package/lib/commonjs/ui/hooks/useAvatarPicker.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_core","_sonner","_avatarUtils","useAvatarPicker","oxyServices","currentLanguage","activeSessionId","queryClient","showBottomSheet","openAvatarPicker","useCallback","screen","props","selectMode","multiSelect","disabledMimeTypes","afterSelect","onSelect","file","contentType","startsWith","toast","error","translate","undefined","updateAvatarVisibility","id","updateProfileWithAvatar","avatar","success","e","message","Error"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAvatarPicker.ts"],"mappings":";;;;;;AAQA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AAEA,IAAAE,OAAA,GAAAF,OAAA;AAGA,IAAAG,YAAA,GAAAH,OAAA;AAfA;AACA;AACA;AACA;AACA;AACA;AACA;;AAmBO,SAASI,eAAeA,CAAC;EAC9BC,WAAW;EACXC,eAAe;EACfC,eAAe;EACfC,WAAW;EACXC;AACsB,CAAC,EAAE;EACzB,MAAMC,gBAAgB,GAAG,IAAAC,kBAAW,EAAC,MAAM;IACzCF,eAAe,CAAC;MACdG,MAAM,EAAE,gBAA6B;MACrCC,KAAK,EAAE;QACLC,UAAU,EAAE,IAAI;QAChBC,WAAW,EAAE,KAAK;QAClBC,iBAAiB,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,CAAC;QAC1DC,WAAW,EAAE,MAAM;QACnBC,QAAQ,EAAE,MAAOC,IAAS,IAAK;UAC7B,IAAI,CAACA,IAAI,CAACC,WAAW,CAACC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC1CC,aAAK,CAACC,KAAK,CAAC,IAAAC,eAAS,EAAClB,eAAe,IAAImB,SAAS,EAAE,gCAAgC,CAAC,IAAI,6BAA6B,CAAC;YACvH;UACF;UACA,IAAI;YACF,MAAM,IAAAC,4BAAsB,EAACP,IAAI,CAACQ,EAAE,EAAEtB,WAAW,EAAE,YAAY,CAAC;YAChE,MAAM,IAAAuB,oCAAuB,EAC3B;cAAEC,MAAM,EAAEV,IAAI,CAACQ;YAAG,CAAC,EACnBtB,WAAW,EACXE,eAAe,EACfC,WACF,CAAC;YACDc,aAAK,CAACQ,OAAO,CAAC,IAAAN,eAAS,EAAClB,eAAe,IAAImB,SAAS,EAAE,kCAAkC,CAAC,IAAI,gBAAgB,CAAC;UAChH,CAAC,CAAC,OAAOM,CAAU,EAAE;YACnB,MAAMC,OAAO,GAAGD,CAAC,YAAYE,KAAK,GAAGF,CAAC,CAACC,OAAO,GAAGP,SAAS;YAC1DH,aAAK,CAACC,KAAK,CAACS,OAAO,IAAI,IAAAR,eAAS,EAAClB,eAAe,IAAImB,SAAS,EAAE,uCAAuC,CAAC,IAAI,yBAAyB,CAAC;UACvI;QACF;MACF;IACF,CAAC,CAAC;EACJ,CAAC,EAAE,CAACpB,WAAW,EAAEC,eAAe,EAAEG,eAAe,EAAEF,eAAe,EAAEC,WAAW,CAAC,CAAC;EAEjF,OAAO;IAAEE;EAAiB,CAAC;AAC7B","ignoreList":[]}
+{"version":3,"names":["_react","require","_core","_bloom","_avatarUtils","extractUploadedFileId","result","undefined","id","file","first","files","useAvatarPicker","oxyServices","currentLanguage","activeSessionId","queryClient","showBottomSheet","finalizeCroppedAvatar","useCallback","cropped","uploadResult","assetUpload","uri","type","mime","name","Date","now","newFileId","Error","updateAvatarVisibility","updateProfileWithAvatar","avatar","toast","success","translate","e","message","error","handleFilePicked","contentType","startsWith","sourceUri","getFileDownloadUrl","screen","props","imageUri","onConfirm","openAvatarPicker","selectMode","multiSelect","disabledMimeTypes","afterSelect","onSelect"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAvatarPicker.ts"],"mappings":"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","ignoreList":[]}