@oxyhq/services 5.17.1 → 5.17.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "5.17.1",
+  "version": "5.17.3",
   "description": "Reusable OxyHQ module to handle authentication, user management, karma system, device-based session management and more 🚀",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/src/ui/components/OxyProvider.tsx

@@ -35,21 +35,18 @@ const OxyProvider: FC<OxyProviderProps> = ({
 
     // Initialize React Query Client (in-memory; persistence handled separately if needed)
     const queryClientRef = useRef<ReturnType<typeof createQueryClient> | null>(null);
-    const [queryClient, setQueryClient] = useState<ReturnType<typeof createQueryClient> | null>(null);
+    const [queryClient, setQueryClient] = useState<ReturnType<typeof createQueryClient>>(
+        () => providedQueryClient ?? createQueryClient(),
+    );
 
     useEffect(() => {
-        if (providedQueryClient) {
+        if (providedQueryClient && queryClientRef.current !== providedQueryClient) {
             queryClientRef.current = providedQueryClient;
             setQueryClient(providedQueryClient);
-            return;
-        }
-
-        if (!queryClientRef.current) {
-            const client = createQueryClient();
-            queryClientRef.current = client;
-            setQueryClient(client);
+        } else if (!queryClientRef.current) {
+            queryClientRef.current = queryClient;
         }
-    }, [providedQueryClient]);
+    }, [providedQueryClient, queryClient]);
 
     // Hook React Query focus manager into React Native AppState
     useEffect(() => {
@@ -110,9 +107,6 @@ const OxyProvider: FC<OxyProviderProps> = ({
         };
     }, []);
 
-    // Ensure we have a valid QueryClient
-    if (!queryClient) return null;
-
     return (
         <SafeAreaProvider>
             <GestureHandlerRootView style={{ flex: 1 }}>

package/src/ui/context/OxyContext.tsx

@@ -1,17 +1,14 @@
 import type React from 'react';
 import {
-  createContext,
   useCallback,
-  useContext,
   useEffect,
   useMemo,
   useRef,
   useState,
-  type ReactNode,
 } from 'react';
 import { Platform } from 'react-native';
 import { OxyServices } from '../../core';
-import type { User, ApiError } from '../../models/interfaces';
+import type { User } from '../../models/interfaces';
 import type { ClientSession } from '../../models/session';
 import { toast } from '../../lib/sonner';
 import { useAuthStore, type AuthState } from '../stores/authStore';
@@ -27,88 +24,25 @@ import { getStorageKeys } from '../utils/storageHelpers';
 import { isInvalidSessionError, isTimeoutOrNetworkError } from '../utils/errorHandlers';
 import type { RouteName } from '../navigation/routes';
 import { showBottomSheet as globalShowBottomSheet } from '../navigation/bottomSheetManager';
-import { useQueryClient } from '@tanstack/react-query';
-import { useCurrentUser } from '../hooks/queries';
+import { useQueryClient, useQuery } from '@tanstack/react-query';
 import { clearQueryCache } from '../hooks/queryClient';
+import { queryKeys } from '../hooks/queries/queryKeys';
 import { KeyManager, type BackupData } from '../../crypto';
 import { translate } from '../../i18n';
 import { updateAvatarVisibility, updateProfileWithAvatar } from '../utils/avatarUtils';
 import { useAccountStore } from '../stores/accountStore';
 import { logger as loggerUtil } from '../../utils/loggerUtils';
 
-export interface OxyContextState {
-  user: User | null;
-  sessions: ClientSession[];
-  activeSessionId: string | null;
-  currentDeviceId: string | null;
-  isAuthenticated: boolean;
-  isLoading: boolean;
-  isTokenReady: boolean;
-  isStorageReady: boolean;
-  error: string | null;
-  currentLanguage: string;
-  currentLanguageMetadata: ReturnType<typeof useLanguageManagement>['metadata'];
-  currentLanguageName: string;
-  currentNativeLanguageName: string;
-
-  // Identity management (public key authentication - offline-first)
-  createIdentity: () => Promise<{ synced: boolean }>;
-  importIdentity: (backupData: BackupData, password: string) => Promise<{ synced: boolean }>;
-  signIn: (deviceName?: string) => Promise<User>;
-  hasIdentity: () => Promise<boolean>;
-  getPublicKey: () => Promise<string | null>;
-  isIdentitySynced: () => Promise<boolean>;
-  syncIdentity: () => Promise<User>;
-  deleteIdentityAndClearAccount: (skipBackup?: boolean, force?: boolean, userConfirmed?: boolean) => Promise<void>;
-  storeTransferCode: (transferId: string, code: string, sourceDeviceId: string | null, publicKey: string) => Promise<void>;
-  getTransferCode: (transferId: string) => { code: string; sourceDeviceId: string | null; publicKey: string; timestamp: number; state: 'pending' | 'completed' | 'failed' } | null;
-  clearTransferCode: (transferId: string) => Promise<void>;
-  getAllPendingTransfers: () => Array<{ transferId: string; data: { code: string; sourceDeviceId: string | null; publicKey: string; timestamp: number; state: 'pending' | 'completed' | 'failed' } }>;
-  getActiveTransferId: () => string | null;
-  updateTransferState: (transferId: string, state: 'pending' | 'completed' | 'failed') => Promise<void>;
-
-  // Identity sync state (reactive, from Zustand store)
-  identitySyncState: {
-    isSynced: boolean;
-    isSyncing: boolean;
-  };
-
-  // Session management
-  logout: (targetSessionId?: string) => Promise<void>;
-  logoutAll: () => Promise<void>;
-  switchSession: (sessionId: string) => Promise<void>;
-  removeSession: (sessionId: string) => Promise<void>;
-  refreshSessions: () => Promise<void>;
-  setLanguage: (languageId: string) => Promise<void>;
-  getDeviceSessions: () => Promise<
-    Array<{
-      sessionId: string;
-      deviceId: string;
-      deviceName?: string;
-      lastActive?: string;
-      expiresAt?: string;
-    }>
-  >;
-  logoutAllDeviceSessions: () => Promise<void>;
-  updateDeviceName: (deviceName: string) => Promise<void>;
-  clearSessionState: () => Promise<void>;
-  clearAllAccountData: () => Promise<void>;
-  oxyServices: OxyServices;
-  useFollow?: UseFollowHook;
-  showBottomSheet?: (screenOrConfig: RouteName | { screen: RouteName; props?: Record<string, unknown> }) => void;
-  openAvatarPicker: () => void;
-}
-
-const OxyContext = createContext<OxyContextState | null>(null);
-
-export interface OxyContextProviderProps {
-  children: ReactNode;
-  oxyServices?: OxyServices;
-  baseURL?: string;
-  storageKeyPrefix?: string;
-  onAuthStateChange?: (user: User | null) => void;
-  onError?: (error: ApiError) => void;
-}
+// Import context, types and useOxy from base file to avoid circular dependencies
+import {
+  OxyContext,
+  useOxy,
+  type OxyContextState,
+  type OxyContextProviderProps,
+} from './OxyContextBase';
+
+// Re-export for backwards compatibility
+export { OxyContext, useOxy, type OxyContextState, type OxyContextProviderProps };
 
 let cachedUseFollowHook: UseFollowHook | null = null;
 
@@ -297,7 +231,20 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
 
   // Get current user from query (no persistent cache - always fetch fresh)
   // Services never caches profile - always fetch from backend
-  const { data: userData } = useCurrentUser({ enabled: isAuthenticated && !!activeSessionId });
+  // Note: We use useQuery directly here instead of useCurrentUser to avoid
+  // circular dependency (useCurrentUser calls useOxy, but we're inside the provider)
+  const { data: userData } = useQuery({
+    queryKey: queryKeys.accounts.current(),
+    queryFn: async () => {
+      if (!activeSessionId) {
+        throw new Error('No active session');
+      }
+      return await oxyServices.getUserBySession(activeSessionId);
+    },
+    enabled: isAuthenticated && !!activeSessionId,
+    staleTime: 0, // Always fetch fresh - Services never caches profile
+    gcTime: 0, // No garbage collection time - always fetch fresh
+  });
   const user = userData ?? null;
 
   const {
@@ -1206,12 +1153,4 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
 
 export const OxyContextProvider = OxyProvider;
 
-export const useOxy = (): OxyContextState => {
-  const context = useContext(OxyContext);
-  if (!context) {
-    throw new Error('useOxy must be used within an OxyContextProvider');
-  }
-  return context;
-};
-
 export default OxyContext;

package/src/ui/context/OxyContextBase.tsx

@@ -0,0 +1,95 @@
+import { createContext, useContext } from 'react';
+import type { ReactNode } from 'react';
+import type { OxyServices } from '../../core';
+import type { User, ApiError } from '../../models/interfaces';
+import type { ClientSession } from '../../models/session';
+import type { UseFollowHook } from '../hooks/useFollow.types';
+import type { useLanguageManagement } from '../hooks/useLanguageManagement';
+import type { RouteName } from '../navigation/routes';
+import type { BackupData } from '../../crypto';
+
+export interface OxyContextState {
+  user: User | null;
+  sessions: ClientSession[];
+  activeSessionId: string | null;
+  currentDeviceId: string | null;
+  isAuthenticated: boolean;
+  isLoading: boolean;
+  isTokenReady: boolean;
+  isStorageReady: boolean;
+  error: string | null;
+  currentLanguage: string;
+  currentLanguageMetadata: ReturnType<typeof useLanguageManagement>['metadata'];
+  currentLanguageName: string;
+  currentNativeLanguageName: string;
+
+  // Identity management (public key authentication - offline-first)
+  createIdentity: () => Promise<{ synced: boolean }>;
+  importIdentity: (backupData: BackupData, password: string) => Promise<{ synced: boolean }>;
+  signIn: (deviceName?: string) => Promise<User>;
+  hasIdentity: () => Promise<boolean>;
+  getPublicKey: () => Promise<string | null>;
+  isIdentitySynced: () => Promise<boolean>;
+  syncIdentity: () => Promise<User>;
+  deleteIdentityAndClearAccount: (skipBackup?: boolean, force?: boolean, userConfirmed?: boolean) => Promise<void>;
+  storeTransferCode: (transferId: string, code: string, sourceDeviceId: string | null, publicKey: string) => Promise<void>;
+  getTransferCode: (transferId: string) => { code: string; sourceDeviceId: string | null; publicKey: string; timestamp: number; state: 'pending' | 'completed' | 'failed' } | null;
+  clearTransferCode: (transferId: string) => Promise<void>;
+  getAllPendingTransfers: () => Array<{ transferId: string; data: { code: string; sourceDeviceId: string | null; publicKey: string; timestamp: number; state: 'pending' | 'completed' | 'failed' } }>;
+  getActiveTransferId: () => string | null;
+  updateTransferState: (transferId: string, state: 'pending' | 'completed' | 'failed') => Promise<void>;
+
+  // Identity sync state (reactive, from Zustand store)
+  identitySyncState: {
+    isSynced: boolean;
+    isSyncing: boolean;
+  };
+
+  // Session management
+  logout: (targetSessionId?: string) => Promise<void>;
+  logoutAll: () => Promise<void>;
+  switchSession: (sessionId: string) => Promise<void>;
+  removeSession: (sessionId: string) => Promise<void>;
+  refreshSessions: () => Promise<void>;
+  setLanguage: (languageId: string) => Promise<void>;
+  getDeviceSessions: () => Promise<
+    Array<{
+      sessionId: string;
+      deviceId: string;
+      deviceName?: string;
+      lastActive?: string;
+      expiresAt?: string;
+    }>
+  >;
+  logoutAllDeviceSessions: () => Promise<void>;
+  updateDeviceName: (deviceName: string) => Promise<void>;
+  clearSessionState: () => Promise<void>;
+  clearAllAccountData: () => Promise<void>;
+  oxyServices: OxyServices;
+  useFollow?: UseFollowHook;
+  showBottomSheet?: (screenOrConfig: RouteName | { screen: RouteName; props?: Record<string, unknown> }) => void;
+  openAvatarPicker: () => void;
+}
+
+export const OxyContext = createContext<OxyContextState | null>(null);
+
+export interface OxyContextProviderProps {
+  children: ReactNode;
+  oxyServices?: OxyServices;
+  baseURL?: string;
+  storageKeyPrefix?: string;
+  onAuthStateChange?: (user: User | null) => void;
+  onError?: (error: ApiError) => void;
+}
+
+/**
+ * Hook to access the Oxy context.
+ * Must be used within an OxyContextProvider.
+ */
+export const useOxy = (): OxyContextState => {
+  const context = useContext(OxyContext);
+  if (!context) {
+    throw new Error('useOxy must be used within an OxyContextProvider');
+  }
+  return context;
+};

package/src/ui/hooks/queries/useAccountQueries.ts

@@ -2,7 +2,7 @@ import { useQuery, useQueries } from '@tanstack/react-query';
 import type { User } from '../../../models/interfaces';
 import type { OxyServices } from '../../../core';
 import { queryKeys } from './queryKeys';
-import { useOxy } from '../../context/OxyContext';
+import { useOxy } from '../../context/OxyContextBase';
 
 /**
  * Get user profile by session ID

package/src/ui/hooks/queries/useSecurityQueries.ts

@@ -1,6 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import { queryKeys } from './queryKeys';
-import { useOxy } from '../../context/OxyContext';
+import { useOxy } from '../../context/OxyContextBase';
 import type { SecurityActivity, SecurityEventType } from '../../../models/interfaces';
 
 /**

package/src/ui/hooks/queries/useServicesQueries.ts

@@ -1,7 +1,7 @@
 import { useQuery } from '@tanstack/react-query';
 import type { ClientSession } from '../../../models/session';
 import { queryKeys } from './queryKeys';
-import { useOxy } from '../../context/OxyContext';
+import { useOxy } from '../../context/OxyContextBase';
 import { fetchSessionsWithFallback, mapSessionsToClient } from '../../utils/sessionHelpers';
 
 /**