@oxyhq/services 5.13.1 → 5.13.3

package/lib/module/core/OxyServices.js

@@ -58,8 +58,8 @@
  *
  * See method JSDoc for more details and options.
  */
-import axios from 'axios';
 import { jwtDecode } from 'jwt-decode';
+import { normalizeLanguageCode, getLanguageMetadata, getLanguageName, getNativeLanguageName } from '../utils/languageUtils';
 
 /**
  * OxyConfig - Configuration for OxyServices
@@ -69,6 +69,8 @@ import { jwtDecode } from 'jwt-decode';
 
 import { handleHttpError } from '../utils/errorUtils';
 import { buildSearchParams, buildPaginationParams } from '../utils/apiUtils';
+import { HttpClient } from './HttpClient';
+import { RequestManager } from './RequestManager';
 /**
  * Custom error types for better error handling
  */
@@ -91,42 +93,12 @@ export class OxyAuthenticationTimeoutError extends OxyAuthenticationError {
  * OxyServices - Unified client library for interacting with the Oxy API
  * 
  * This class provides all API functionality in one simple, easy-to-use interface.
- * No need to manage multiple service instances - everything is available directly.
+ * Architecture:
+ * - HttpClient: Handles HTTP communication and authentication
+ * - RequestManager: Handles caching, deduplication, queuing, and retry
+ * - OxyServices: Provides high-level API methods
  */
-// Centralized token store
-class TokenStore {
-  accessToken = null;
-  refreshToken = null;
-  constructor() {}
-  static getInstance() {
-    if (!TokenStore.instance) {
-      TokenStore.instance = new TokenStore();
-    }
-    return TokenStore.instance;
-  }
-  setTokens(accessToken, refreshToken = '') {
-    this.accessToken = accessToken;
-    this.refreshToken = refreshToken;
-  }
-  getAccessToken() {
-    return this.accessToken;
-  }
-  getRefreshToken() {
-    return this.refreshToken;
-  }
-  clearTokens() {
-    this.accessToken = null;
-    this.refreshToken = null;
-  }
-  hasAccessToken() {
-    return !!this.accessToken;
-  }
-}
 export class OxyServices {
-  /**
-   * Creates a new instance of the OxyServices client
-   * @param config - Configuration for the client
-   */
   /**
    * Creates a new instance of the OxyServices client
    * @param config - Configuration for the client
@@ -134,89 +106,27 @@ export class OxyServices {
    *   config.cloudURL: Oxy Cloud URL (e.g., https://cloud.oxy.so)
    */
   constructor(config) {
-    this.client = axios.create({
-      baseURL: config.baseURL,
-      timeout: 5000 // 5 second timeout
-    });
+    this.config = config;
     this.cloudURL = config.cloudURL || OXY_CLOUD_URL;
-    this.tokenStore = TokenStore.getInstance();
-    this.setupInterceptors();
+
+    // Initialize HTTP client (handles authentication and interceptors)
+    this.httpClient = new HttpClient(config);
+
+    // Initialize request manager (handles caching, deduplication, queuing, retry)
+    this.requestManager = new RequestManager(this.httpClient, config);
   }
 
   // Test-only utility to reset global tokens between jest tests
   static __resetTokensForTests() {
-    try {
-      TokenStore.getInstance().clearTokens();
-    } catch {}
+    HttpClient.__resetTokensForTests();
   }
 
   /**
-   * Setup axios interceptors for authentication and error handling
+   * Make a request with all performance optimizations
+   * This is the main method for all API calls - ensures authentication and performance features
    */
-  setupInterceptors() {
-    // Request interceptor for adding auth header and handling token refresh
-    this.client.interceptors.request.use(async req => {
-      console.log('🔍 Interceptor - URL:', req.url);
-      console.log('🔍 Interceptor - Has token:', this.tokenStore.hasAccessToken());
-      const accessToken = this.tokenStore.getAccessToken();
-      if (!accessToken) {
-        console.log('❌ Interceptor - No token available');
-        return req;
-      }
-      try {
-        console.log('✅ Interceptor - Adding Authorization header');
-        const decoded = jwtDecode(accessToken);
-        const currentTime = Math.floor(Date.now() / 1000);
-
-        // If token expires in less than 60 seconds, refresh it
-        if (decoded.exp && decoded.exp - currentTime < 60) {
-          // For session-based tokens, get a new token from the session
-          if (decoded.sessionId) {
-            try {
-              // Create a new axios instance to avoid interceptor recursion
-              const refreshClient = axios.create({
-                baseURL: this.client.defaults.baseURL,
-                timeout: this.client.defaults.timeout
-              });
-              const res = await refreshClient.get(`/api/session/token/${decoded.sessionId}`);
-              this.tokenStore.setTokens(res.data.accessToken);
-              req.headers.Authorization = `Bearer ${res.data.accessToken}`;
-              console.log('✅ Interceptor - Token refreshed and Authorization header set');
-            } catch (refreshError) {
-              // If refresh fails, use current token anyway
-              req.headers.Authorization = `Bearer ${accessToken}`;
-              console.log('❌ Interceptor - Token refresh failed, using current token');
-            }
-          } else {
-            // No session ID, use current token
-            req.headers.Authorization = `Bearer ${accessToken}`;
-            console.log('✅ Interceptor - No session ID, using current token');
-          }
-        } else {
-          // Add authorization header with current token
-          req.headers.Authorization = `Bearer ${accessToken}`;
-          console.log('✅ Interceptor - Authorization header set with current token');
-        }
-      } catch (error) {
-        console.log('❌ Interceptor - Error processing token:', error);
-        // Even if there's an error, still try to use the token
-        req.headers.Authorization = `Bearer ${accessToken}`;
-        console.log('⚠️ Interceptor - Using token despite error');
-      }
-      return req;
-    }, error => {
-      console.log('❌ Interceptor - Request error:', error);
-      return Promise.reject(error);
-    });
-
-    // Response interceptor for handling auth errors
-    this.client.interceptors.response.use(response => response, error => {
-      if (error.response?.status === 401) {
-        console.log('❌ Response interceptor - 401 Unauthorized, clearing tokens');
-        this.clearTokens();
-      }
-      return Promise.reject(error);
-    });
+  async makeRequest(method, url, data, options = {}) {
+    return this.requestManager.request(method, url, data, options);
   }
 
   // ============================================================================
@@ -227,7 +137,35 @@ export class OxyServices {
    * Get the configured Oxy API base URL
    */
   getBaseURL() {
-    return this.client.defaults.baseURL || '';
+    return this.httpClient.getBaseURL();
+  }
+
+  /**
+   * Get performance metrics
+   */
+  getMetrics() {
+    return this.requestManager.getMetrics();
+  }
+
+  /**
+   * Clear request cache
+   */
+  clearCache() {
+    this.requestManager.clearCache();
+  }
+
+  /**
+   * Clear specific cache entry
+   */
+  clearCacheEntry(key) {
+    this.requestManager.clearCacheEntry(key);
+  }
+
+  /**
+   * Get cache statistics
+   */
+  getCacheStats() {
+    return this.requestManager.getCacheStats();
   }
 
   /**
@@ -237,25 +175,33 @@ export class OxyServices {
     return this.cloudURL;
   }
 
+  /**
+   * Get the underlying HTTP client instance
+   * Useful for advanced use cases that need direct access to the HttpClient
+   */
+  getClient() {
+    return this.httpClient;
+  }
+
   /**
    * Set authentication tokens
    */
   setTokens(accessToken, refreshToken = '') {
-    this.tokenStore.setTokens(accessToken, refreshToken);
+    this.httpClient.setTokens(accessToken, refreshToken);
   }
 
   /**
    * Clear stored authentication tokens
    */
   clearTokens() {
-    this.tokenStore.clearTokens();
+    this.httpClient.clearTokens();
   }
 
   /**
    * Get the current user ID from the access token
    */
   getCurrentUserId() {
-    const accessToken = this.tokenStore.getAccessToken();
+    const accessToken = this.httpClient.getAccessToken();
     if (!accessToken) {
       return null;
     }
@@ -271,21 +217,21 @@ export class OxyServices {
    * Check if the client has a valid access token
    */
   hasAccessToken() {
-    return this.tokenStore.hasAccessToken();
+    return this.httpClient.hasAccessToken();
   }
 
   /**
    * Check if the client has a valid access token (public method)
    */
   hasValidToken() {
-    return this.tokenStore.hasAccessToken();
+    return this.httpClient.hasAccessToken();
   }
 
   /**
    * Get the raw access token (for constructing anchor URLs when needed)
    */
   getAccessToken() {
-    return this.tokenStore.getAccessToken();
+    return this.httpClient.getAccessToken();
   }
 
   /**
@@ -304,7 +250,7 @@ export class OxyServices {
     const checkInterval = 100; // Check every 100ms
 
     while (Date.now() - startTime < timeoutMs) {
-      if (this.tokenStore.hasAccessToken()) {
+      if (this.httpClient.hasAccessToken()) {
         return true;
       }
       await new Promise(resolve => setTimeout(resolve, checkInterval));
@@ -325,15 +271,13 @@ export class OxyServices {
     for (let attempt = 0; attempt <= maxRetries; attempt++) {
       try {
         // First attempt: check if we have a token
-        if (!this.tokenStore.hasAccessToken()) {
+        if (!this.httpClient.hasAccessToken()) {
           if (attempt === 0) {
             // On first attempt, wait briefly for authentication to complete
-            console.log(`🔄 ${operationName} - Waiting for authentication...`);
             const authReady = await this.waitForAuthentication(authTimeoutMs);
             if (!authReady) {
               throw new OxyAuthenticationTimeoutError(operationName, authTimeoutMs);
             }
-            console.log(`✅ ${operationName} - Authentication ready, proceeding...`);
           } else {
             // On retry attempts, fail immediately if no token
             throw new OxyAuthenticationError(`Authentication required: ${operationName} requires a valid access token.`, 'AUTH_REQUIRED');
@@ -346,7 +290,6 @@ export class OxyServices {
         const isLastAttempt = attempt === maxRetries;
         const isAuthError = error?.response?.status === 401 || error?.code === 'MISSING_TOKEN' || error?.message?.includes('Authentication') || error instanceof OxyAuthenticationError;
         if (isAuthError && !isLastAttempt && !(error instanceof OxyAuthenticationTimeoutError)) {
-          console.log(`🔄 ${operationName} - Auth error on attempt ${attempt + 1}, retrying in ${retryDelay}ms...`);
           await new Promise(resolve => setTimeout(resolve, retryDelay));
           continue;
         }
@@ -371,20 +314,16 @@ export class OxyServices {
       return false;
     }
     try {
-      const res = await this.client.get('/api/auth/validate');
-      return res.data.valid === true;
+      const res = await this.makeRequest('GET', '/api/auth/validate', undefined, {
+        cache: false,
+        retry: false
+      });
+      return res.valid === true;
     } catch (error) {
       return false;
     }
   }
 
-  /**
-   * Get the HTTP client instance (public for external use)
-   */
-  getClient() {
-    return this.client;
-  }
-
   /**
    * Centralized error handling
    */
@@ -402,8 +341,9 @@ export class OxyServices {
    */
   async healthCheck() {
     try {
-      const res = await this.client.get('/health');
-      return res.data;
+      return await this.makeRequest('GET', '/health', undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -418,15 +358,17 @@ export class OxyServices {
    */
   async signUp(username, email, password) {
     try {
-      const res = await this.client.post('/api/auth/signup', {
+      const res = await this.makeRequest('POST', '/api/auth/signup', {
         username,
         email,
         password
+      }, {
+        cache: false
       });
-      if (!res || !res.data || typeof res.data === 'object' && Object.keys(res.data).length === 0) {
+      if (!res || typeof res === 'object' && Object.keys(res).length === 0) {
         throw new OxyAuthenticationError('Sign up failed', 'SIGNUP_FAILED', 400);
       }
-      return res.data;
+      return res;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -437,10 +379,11 @@ export class OxyServices {
    */
   async requestRecovery(identifier) {
     try {
-      const res = await this.client.post('/api/auth/recover/request', {
+      return await this.makeRequest('POST', '/api/auth/recover/request', {
         identifier
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -451,11 +394,12 @@ export class OxyServices {
    */
   async verifyRecoveryCode(identifier, code) {
     try {
-      const res = await this.client.post('/api/auth/recover/verify', {
+      return await this.makeRequest('POST', '/api/auth/recover/verify', {
         identifier,
         code
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -466,12 +410,13 @@ export class OxyServices {
    */
   async resetPassword(identifier, code, newPassword) {
     try {
-      const res = await this.client.post('/api/auth/recover/reset', {
+      return await this.makeRequest('POST', '/api/auth/recover/reset', {
         identifier,
         code,
         newPassword
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -482,36 +427,39 @@ export class OxyServices {
    */
   async resetPasswordWithTotp(identifier, code, newPassword) {
     try {
-      const res = await this.client.post('/api/auth/recover/totp/reset', {
+      return await this.makeRequest('POST', '/api/auth/recover/totp/reset', {
         identifier,
         code,
         newPassword
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
   }
   async resetPasswordWithBackupCode(identifier, backupCode, newPassword) {
     try {
-      const res = await this.client.post('/api/auth/recover/backup/reset', {
+      return await this.makeRequest('POST', '/api/auth/recover/backup/reset', {
         identifier,
         backupCode,
         newPassword
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
   }
   async resetPasswordWithRecoveryKey(identifier, recoveryKey, newPassword) {
     try {
-      const res = await this.client.post('/api/auth/recover/recovery-key/reset', {
+      return await this.makeRequest('POST', '/api/auth/recover/recovery-key/reset', {
         identifier,
         recoveryKey,
         newPassword
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -522,13 +470,14 @@ export class OxyServices {
    */
   async signIn(username, password, deviceName, deviceFingerprint) {
     try {
-      const res = await this.client.post('/api/auth/login', {
+      return await this.makeRequest('POST', '/api/auth/login', {
         username,
         password,
         deviceName,
         deviceFingerprint
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -539,11 +488,12 @@ export class OxyServices {
    */
   async verifyTotpLogin(mfaToken, code) {
     try {
-      const res = await this.client.post('/api/auth/totp/verify-login', {
+      return await this.makeRequest('POST', '/api/auth/totp/verify-login', {
         mfaToken,
         code
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -554,8 +504,35 @@ export class OxyServices {
    */
   async getUserBySession(sessionId) {
     try {
-      const res = await this.client.get(`/api/session/user/${sessionId}`);
-      return res.data;
+      return await this.makeRequest('GET', `/api/session/user/${sessionId}`, undefined, {
+        cache: true,
+        cacheTTL: 2 * 60 * 1000 // 2 minutes cache for user data
+      });
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Batch get multiple user profiles by session IDs (optimized for account switching)
+   * Returns array of { sessionId, user } objects
+   */
+  async getUsersBySessions(sessionIds) {
+    try {
+      if (!Array.isArray(sessionIds) || sessionIds.length === 0) {
+        return [];
+      }
+
+      // Deduplicate and sort sessionIds for consistent cache keys
+      const uniqueSessionIds = Array.from(new Set(sessionIds)).sort();
+      return await this.makeRequest('POST', '/api/session/users/batch', {
+        sessionIds: uniqueSessionIds
+      }, {
+        cache: true,
+        cacheTTL: 2 * 60 * 1000,
+        // 2 minutes cache
+        deduplicate: true // Important for batch requests
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -566,19 +543,15 @@ export class OxyServices {
    */
   async getTokenBySession(sessionId) {
     try {
-      console.log('🔑 getTokenBySession - Fetching token for session:', sessionId);
-      const res = await this.client.get(`/api/session/token/${sessionId}`);
-      const {
-        accessToken
-      } = res.data;
-      console.log('🔑 getTokenBySession - Token received:', !!accessToken);
+      const res = await this.makeRequest('GET', `/api/session/token/${sessionId}`, undefined, {
+        cache: false,
+        retry: false
+      });
 
       // Set the token in the centralized token store
-      this.setTokens(accessToken);
-      console.log('🔑 getTokenBySession - Token set in store');
-      return res.data;
+      this.setTokens(res.accessToken);
+      return res;
     } catch (error) {
-      console.log('❌ getTokenBySession - Error:', error);
       throw this.handleError(error);
     }
   }
@@ -588,8 +561,9 @@ export class OxyServices {
    */
   async getSessionsBySessionId(sessionId) {
     try {
-      const res = await this.client.get(`/api/session/sessions/${sessionId}`);
-      return res.data;
+      return await this.makeRequest('GET', `/api/session/sessions/${sessionId}`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -601,7 +575,9 @@ export class OxyServices {
   async logoutSession(sessionId, targetSessionId) {
     try {
       const url = targetSessionId ? `/api/session/logout/${sessionId}/${targetSessionId}` : `/api/session/logout/${sessionId}`;
-      await this.client.post(url);
+      await this.makeRequest('POST', url, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -612,7 +588,9 @@ export class OxyServices {
    */
   async logoutAllSessions(sessionId) {
     try {
-      await this.client.post(`/api/session/logout-all/${sessionId}`);
+      await this.makeRequest('POST', `/api/session/logout-all/${sessionId}`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -630,9 +608,13 @@ export class OxyServices {
       if (options.useHeaderValidation) {
         params.append('useHeaderValidation', 'true');
       }
-      const url = `/api/session/validate/${sessionId}?${params.toString()}`;
-      const res = await this.client.get(url);
-      return res.data;
+      const url = `/api/session/validate/${sessionId}`;
+      const urlParams = {};
+      if (options.deviceFingerprint) urlParams.deviceFingerprint = options.deviceFingerprint;
+      if (options.useHeaderValidation) urlParams.useHeaderValidation = 'true';
+      return await this.makeRequest('GET', url, urlParams, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -643,8 +625,9 @@ export class OxyServices {
    */
   async checkUsernameAvailability(username) {
     try {
-      const res = await this.client.get(`/api/auth/check-username/${username}`);
-      return res.data;
+      return await this.makeRequest('GET', `/api/auth/check-username/${username}`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -655,8 +638,9 @@ export class OxyServices {
    */
   async checkEmailAvailability(email) {
     try {
-      const res = await this.client.get(`/api/auth/check-email/${email}`);
-      return res.data;
+      return await this.makeRequest('GET', `/api/auth/check-email/${email}`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -671,8 +655,10 @@ export class OxyServices {
    */
   async getProfileByUsername(username) {
     try {
-      const res = await this.client.get(`/api/profiles/username/${username}`);
-      return res.data;
+      return await this.makeRequest('GET', `/api/profiles/username/${username}`, undefined, {
+        cache: true,
+        cacheTTL: 5 * 60 * 1000 // 5 minutes cache for profiles
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -684,44 +670,36 @@ export class OxyServices {
 
   async startTotpEnrollment(sessionId) {
     try {
-      const res = await this.client.post('/api/auth/totp/enroll/start', {
+      // Note: x-session-id header is handled by HttpClient interceptors if needed
+      return await this.makeRequest('POST', '/api/auth/totp/enroll/start', {
         sessionId
       }, {
-        headers: {
-          'x-session-id': sessionId
-        }
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
   }
   async verifyTotpEnrollment(sessionId, code) {
     try {
-      const res = await this.client.post('/api/auth/totp/enroll/verify', {
+      return await this.makeRequest('POST', '/api/auth/totp/enroll/verify', {
         sessionId,
         code
       }, {
-        headers: {
-          'x-session-id': sessionId
-        }
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
   }
   async disableTotp(sessionId, code) {
     try {
-      const res = await this.client.post('/api/auth/totp/disable', {
+      return await this.makeRequest('POST', '/api/auth/totp/disable', {
         sessionId,
         code
       }, {
-        headers: {
-          'x-session-id': sessionId
-        }
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -737,8 +715,14 @@ export class OxyServices {
         ...pagination
       };
       const searchParams = buildSearchParams(params);
-      const res = await this.client.get(`/api/profiles/search?${searchParams.toString()}`);
-      return res.data;
+      const paramsObj = {};
+      searchParams.forEach((value, key) => {
+        paramsObj[key] = value;
+      });
+      return await this.makeRequest('GET', '/api/profiles/search', paramsObj, {
+        cache: true,
+        cacheTTL: 2 * 60 * 1000 // 2 minutes cache
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -749,8 +733,9 @@ export class OxyServices {
    */
   async getProfileRecommendations() {
     return this.withAuthRetry(async () => {
-      const res = await this.client.get('/api/profiles/recommendations');
-      return res.data;
+      return await this.makeRequest('GET', '/api/profiles/recommendations', undefined, {
+        cache: true
+      });
     }, 'getProfileRecommendations');
   }
 
@@ -759,8 +744,10 @@ export class OxyServices {
    */
   async getUserById(userId) {
     try {
-      const res = await this.client.get(`/api/users/${userId}`);
-      return res.data;
+      return await this.makeRequest('GET', `/api/users/${userId}`, undefined, {
+        cache: true,
+        cacheTTL: 5 * 60 * 1000 // 5 minutes cache
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -771,8 +758,10 @@ export class OxyServices {
    */
   async getCurrentUser() {
     return this.withAuthRetry(async () => {
-      const res = await this.client.get('/api/users/me');
-      return res.data;
+      return await this.makeRequest('GET', '/api/users/me', undefined, {
+        cache: true,
+        cacheTTL: 1 * 60 * 1000 // 1 minute cache for current user
+      });
     }, 'getCurrentUser');
   }
 
@@ -781,20 +770,134 @@ export class OxyServices {
    */
   async updateProfile(updates) {
     try {
-      const res = await this.client.put('/api/users/me', updates);
-      return res.data;
+      return await this.makeRequest('PUT', '/api/users/me', updates, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
   }
 
+  // ============================================================================
+  // LANGUAGE METHODS
+  // ============================================================================
+
+  /**
+   * Get the current language from storage or user profile
+   * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')
+   * @returns The current language code (e.g., 'en-US') or null if not set
+   */
+  async getCurrentLanguage(storageKeyPrefix = 'oxy_session') {
+    try {
+      // First try to get from user profile if authenticated
+      try {
+        const user = await this.getCurrentUser();
+        const userLanguage = user?.language;
+        if (userLanguage) {
+          return normalizeLanguageCode(userLanguage) || userLanguage;
+        }
+      } catch (e) {
+        // User not authenticated or error, continue to storage
+      }
+
+      // Fall back to storage
+      const storage = await this.getStorage();
+      const storageKey = `${storageKeyPrefix}_language`;
+      const storedLanguage = await storage.getItem(storageKey);
+      if (storedLanguage) {
+        return normalizeLanguageCode(storedLanguage) || storedLanguage;
+      }
+      return null;
+    } catch (error) {
+      if (__DEV__) {
+        console.warn('Failed to get current language:', error);
+      }
+      return null;
+    }
+  }
+
+  /**
+   * Get the current language with metadata (name, nativeName, etc.)
+   * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')
+   * @returns Language metadata object or null if not set
+   */
+  async getCurrentLanguageMetadata(storageKeyPrefix = 'oxy_session') {
+    const languageCode = await this.getCurrentLanguage(storageKeyPrefix);
+    return getLanguageMetadata(languageCode);
+  }
+
+  /**
+   * Get the current language name (e.g., 'English')
+   * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')
+   * @returns Language name or null if not set
+   */
+  async getCurrentLanguageName(storageKeyPrefix = 'oxy_session') {
+    const languageCode = await this.getCurrentLanguage(storageKeyPrefix);
+    if (!languageCode) return null;
+    return getLanguageName(languageCode);
+  }
+
+  /**
+   * Get the current native language name (e.g., 'Español')
+   * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')
+   * @returns Native language name or null if not set
+   */
+  async getCurrentNativeLanguageName(storageKeyPrefix = 'oxy_session') {
+    const languageCode = await this.getCurrentLanguage(storageKeyPrefix);
+    if (!languageCode) return null;
+    return getNativeLanguageName(languageCode);
+  }
+
+  /**
+   * Get appropriate storage for the platform (similar to DeviceManager)
+   * @private
+   */
+  async getStorage() {
+    const isReactNative = typeof navigator !== 'undefined' && navigator.product === 'ReactNative';
+    if (isReactNative) {
+      try {
+        const asyncStorageModule = await import('@react-native-async-storage/async-storage');
+        const storage = asyncStorageModule.default;
+        return {
+          getItem: storage.getItem.bind(storage),
+          setItem: storage.setItem.bind(storage),
+          removeItem: storage.removeItem.bind(storage)
+        };
+      } catch (error) {
+        console.error('AsyncStorage not available in React Native:', error);
+        throw new Error('AsyncStorage is required in React Native environment');
+      }
+    } else {
+      // Use localStorage for web
+      return {
+        getItem: async key => {
+          if (typeof window !== 'undefined' && window.localStorage) {
+            return localStorage.getItem(key);
+          }
+          return null;
+        },
+        setItem: async (key, value) => {
+          if (typeof window !== 'undefined' && window.localStorage) {
+            localStorage.setItem(key, value);
+          }
+        },
+        removeItem: async key => {
+          if (typeof window !== 'undefined' && window.localStorage) {
+            localStorage.removeItem(key);
+          }
+        }
+      };
+    }
+  }
+
   /**
    * Update user by ID (admin function)
    */
   async updateUser(userId, updates) {
     try {
-      const res = await this.client.put(`/api/users/${userId}`, updates);
-      return res.data;
+      return await this.makeRequest('PUT', `/api/users/${userId}`, updates, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -805,8 +908,9 @@ export class OxyServices {
    */
   async followUser(userId) {
     try {
-      const res = await this.client.post(`/api/users/${userId}/follow`);
-      return res.data;
+      return await this.makeRequest('POST', `/api/users/${userId}/follow`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -817,8 +921,9 @@ export class OxyServices {
    */
   async unfollowUser(userId) {
     try {
-      const res = await this.client.delete(`/api/users/${userId}/follow`);
-      return res.data;
+      return await this.makeRequest('DELETE', `/api/users/${userId}/follow`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -829,8 +934,10 @@ export class OxyServices {
    */
   async getFollowStatus(userId) {
     try {
-      const res = await this.client.get(`/api/users/${userId}/follow-status`);
-      return res.data;
+      return await this.makeRequest('GET', `/api/users/${userId}/follow-status`, undefined, {
+        cache: true,
+        cacheTTL: 1 * 60 * 1000 // 1 minute cache
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -842,8 +949,15 @@ export class OxyServices {
   async getUserFollowers(userId, pagination) {
     try {
       const params = buildPaginationParams(pagination || {});
-      const res = await this.client.get(`/api/users/${userId}/followers?${params.toString()}`);
-      return res.data;
+      const response = await this.makeRequest('GET', `/api/users/${userId}/followers`, params, {
+        cache: true,
+        cacheTTL: 2 * 60 * 1000 // 2 minutes cache
+      });
+      return {
+        followers: response.data || [],
+        total: response.pagination.total,
+        hasMore: response.pagination.hasMore
+      };
     } catch (error) {
       throw this.handleError(error);
     }
@@ -855,8 +969,15 @@ export class OxyServices {
   async getUserFollowing(userId, pagination) {
     try {
       const params = buildPaginationParams(pagination || {});
-      const res = await this.client.get(`/api/users/${userId}/following?${params.toString()}`);
-      return res.data;
+      const response = await this.makeRequest('GET', `/api/users/${userId}/following`, params, {
+        cache: true,
+        cacheTTL: 2 * 60 * 1000 // 2 minutes cache
+      });
+      return {
+        following: response.data || [],
+        total: response.pagination.total,
+        hasMore: response.pagination.hasMore
+      };
     } catch (error) {
       throw this.handleError(error);
     }
@@ -867,8 +988,9 @@ export class OxyServices {
    */
   async getNotifications() {
     return this.withAuthRetry(async () => {
-      const res = await this.client.get('/api/notifications');
-      return res.data;
+      return await this.makeRequest('GET', '/api/notifications', undefined, {
+        cache: false // Don't cache notifications - always get fresh data
+      });
     }, 'getNotifications');
   }
 
@@ -877,8 +999,10 @@ export class OxyServices {
    */
   async getUnreadCount() {
     try {
-      const res = await this.client.get('/api/notifications/unread-count');
-      return res.data.count;
+      const res = await this.makeRequest('GET', '/api/notifications/unread-count', undefined, {
+        cache: false // Don't cache unread count - always get fresh data
+      });
+      return res.count;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -889,8 +1013,9 @@ export class OxyServices {
    */
   async createNotification(data) {
     try {
-      const res = await this.client.post('/api/notifications', data);
-      return res.data;
+      return await this.makeRequest('POST', '/api/notifications', data, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -901,7 +1026,9 @@ export class OxyServices {
    */
   async markNotificationAsRead(notificationId) {
     try {
-      await this.client.put(`/api/notifications/${notificationId}/read`);
+      await this.makeRequest('PUT', `/api/notifications/${notificationId}/read`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -912,7 +1039,9 @@ export class OxyServices {
    */
   async markAllNotificationsAsRead() {
     try {
-      await this.client.put('/api/notifications/read-all');
+      await this.makeRequest('PUT', '/api/notifications/read-all', undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -923,7 +1052,9 @@ export class OxyServices {
    */
   async deleteNotification(notificationId) {
     try {
-      await this.client.delete(`/api/notifications/${notificationId}`);
+      await this.makeRequest('DELETE', `/api/notifications/${notificationId}`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -938,8 +1069,9 @@ export class OxyServices {
    */
   async createPayment(data) {
     try {
-      const res = await this.client.post('/api/payments', data);
-      return res.data;
+      return await this.makeRequest('POST', '/api/payments', data, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -950,8 +1082,10 @@ export class OxyServices {
    */
   async getPayment(paymentId) {
     try {
-      const res = await this.client.get(`/api/payments/${paymentId}`);
-      return res.data;
+      return await this.makeRequest('GET', `/api/payments/${paymentId}`, undefined, {
+        cache: true,
+        cacheTTL: 5 * 60 * 1000 // 5 minutes cache
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -962,8 +1096,9 @@ export class OxyServices {
    */
   async getUserPayments() {
     try {
-      const res = await this.client.get('/api/payments/user');
-      return res.data;
+      return await this.makeRequest('GET', '/api/payments/user', undefined, {
+        cache: false // Don't cache user payments - always get fresh data
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -978,8 +1113,10 @@ export class OxyServices {
    */
   async getUserKarma(userId) {
     try {
-      const res = await this.client.get(`/api/karma/${userId}`);
-      return res.data;
+      return await this.makeRequest('GET', `/api/karma/${userId}`, undefined, {
+        cache: true,
+        cacheTTL: 2 * 60 * 1000 // 2 minutes cache
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -990,11 +1127,12 @@ export class OxyServices {
    */
   async giveKarma(userId, amount, reason) {
     try {
-      const res = await this.client.post(`/api/karma/${userId}/give`, {
+      return await this.makeRequest('POST', `/api/karma/${userId}/give`, {
         amount,
         reason
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1005,8 +1143,10 @@ export class OxyServices {
    */
   async getUserKarmaTotal(userId) {
     try {
-      const res = await this.client.get(`/api/karma/${userId}/total`);
-      return res.data;
+      return await this.makeRequest('GET', `/api/karma/${userId}/total`, undefined, {
+        cache: true,
+        cacheTTL: 2 * 60 * 1000 // 2 minutes cache
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1017,11 +1157,13 @@ export class OxyServices {
    */
   async getUserKarmaHistory(userId, limit, offset) {
     try {
-      const params = new URLSearchParams();
-      if (limit) params.append('limit', limit.toString());
-      if (offset) params.append('offset', offset.toString());
-      const res = await this.client.get(`/api/karma/${userId}/history?${params.toString()}`);
-      return res.data;
+      const params = {};
+      if (limit) params.limit = limit;
+      if (offset) params.offset = offset;
+      return await this.makeRequest('GET', `/api/karma/${userId}/history`, params, {
+        cache: true,
+        cacheTTL: 2 * 60 * 1000 // 2 minutes cache
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1032,8 +1174,10 @@ export class OxyServices {
    */
   async getKarmaLeaderboard() {
     try {
-      const res = await this.client.get('/api/karma/leaderboard');
-      return res.data;
+      return await this.makeRequest('GET', '/api/karma/leaderboard', undefined, {
+        cache: true,
+        cacheTTL: 5 * 60 * 1000 // 5 minutes cache
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1044,8 +1188,10 @@ export class OxyServices {
    */
   async getKarmaRules() {
     try {
-      const res = await this.client.get('/api/karma/rules');
-      return res.data;
+      return await this.makeRequest('GET', '/api/karma/rules', undefined, {
+        cache: true,
+        cacheTTL: 30 * 60 * 1000 // 30 minutes cache (rules don't change often)
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1061,8 +1207,9 @@ export class OxyServices {
   async deleteFile(fileId) {
     try {
       // Central Asset Service delete with force=true behavior controlled by caller via assetDelete
-      const res = await this.client.delete(`/api/assets/${encodeURIComponent(fileId)}`);
-      return res.data;
+      return await this.makeRequest('DELETE', `/api/assets/${encodeURIComponent(fileId)}`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1077,7 +1224,7 @@ export class OxyServices {
     if (variant) params.set('variant', variant);
     if (expiresIn) params.set('expiresIn', String(expiresIn));
     params.set('fallback', 'placeholderVisible');
-    const token = this.tokenStore.getAccessToken();
+    const token = this.httpClient.getAccessToken();
     if (token) params.set('token', token);
 
     // Use params.toString() to detect whether there are query params.
@@ -1103,12 +1250,12 @@ export class OxyServices {
    */
   async listUserFiles(limit, offset) {
     try {
-      const params = new URLSearchParams();
-      if (limit) params.append('limit', String(limit));
-      if (offset) params.append('offset', String(offset));
-      const qs = params.toString();
-      const res = await this.client.get(`/api/assets${qs ? `?${qs}` : ''}`);
-      return res.data;
+      const paramsObj = {};
+      if (limit) paramsObj.limit = limit;
+      if (offset) paramsObj.offset = offset;
+      return await this.makeRequest('GET', '/api/assets', paramsObj, {
+        cache: false // Don't cache file lists - always get fresh data
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1121,8 +1268,14 @@ export class OxyServices {
    */
   async getFileContentAsText(fileId, variant) {
     try {
-      const urlRes = await this.client.get(`/api/assets/${encodeURIComponent(fileId)}/url${variant ? `?variant=${encodeURIComponent(variant)}` : ''}`);
-      const downloadUrl = urlRes.data?.url;
+      const params = variant ? {
+        variant
+      } : undefined;
+      const urlRes = await this.makeRequest('GET', `/api/assets/${encodeURIComponent(fileId)}/url`, params, {
+        cache: true,
+        cacheTTL: 10 * 60 * 1000 // 10 minutes cache for URLs
+      });
+      const downloadUrl = urlRes?.url;
       const response = await fetch(downloadUrl);
       return await response.text();
     } catch (error) {
@@ -1135,8 +1288,14 @@ export class OxyServices {
    */
   async getFileContentAsBlob(fileId, variant) {
     try {
-      const urlRes = await this.client.get(`/api/assets/${encodeURIComponent(fileId)}/url${variant ? `?variant=${encodeURIComponent(variant)}` : ''}`);
-      const downloadUrl = urlRes.data?.url;
+      const params = variant ? {
+        variant
+      } : undefined;
+      const urlRes = await this.makeRequest('GET', `/api/assets/${encodeURIComponent(fileId)}/url`, params, {
+        cache: true,
+        cacheTTL: 10 * 60 * 1000 // 10 minutes cache for URLs
+      });
+      const downloadUrl = urlRes?.url;
       const response = await fetch(downloadUrl);
       return await response.blob();
     } catch (error) {
@@ -1171,12 +1330,13 @@ export class OxyServices {
    */
   async assetInit(sha256, size, mime) {
     try {
-      const res = await this.client.post('/api/assets/init', {
+      return await this.makeRequest('POST', '/api/assets/init', {
         sha256,
         size,
         mime
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1187,15 +1347,16 @@ export class OxyServices {
    */
   async assetComplete(fileId, originalName, size, mime, visibility, metadata) {
     try {
-      const res = await this.client.post('/api/assets/complete', {
+      return await this.makeRequest('POST', '/api/assets/complete', {
         fileId,
         originalName,
         size,
         mime,
         visibility,
         metadata
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1219,10 +1380,11 @@ export class OxyServices {
         // Fallback: direct upload via API to avoid CORS issues
         const fd = new FormData();
         fd.append('file', file);
-        await this.client.post(`/api/assets/${encodeURIComponent(initResponse.fileId)}/upload-direct`, fd, {
-          headers: {
-            'Content-Type': 'multipart/form-data'
-          }
+        // Use httpClient directly for FormData uploads (bypasses RequestManager for special handling)
+        await this.httpClient.request({
+          method: 'POST',
+          url: `/api/assets/${encodeURIComponent(initResponse.fileId)}/upload-direct`,
+          data: fd
         });
       }
 
@@ -1273,8 +1435,9 @@ export class OxyServices {
       };
       if (visibility) body.visibility = visibility;
       if (webhookUrl) body.webhookUrl = webhookUrl;
-      const res = await this.client.post(`/api/assets/${fileId}/links`, body);
-      return res.data;
+      return await this.makeRequest('POST', `/api/assets/${fileId}/links`, body, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1285,14 +1448,13 @@ export class OxyServices {
    */
   async assetUnlink(fileId, app, entityType, entityId) {
     try {
-      const res = await this.client.delete(`/api/assets/${fileId}/links`, {
-        data: {
-          app,
-          entityType,
-          entityId
-        }
+      return await this.makeRequest('DELETE', `/api/assets/${fileId}/links`, {
+        app,
+        entityType,
+        entityId
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1303,8 +1465,10 @@ export class OxyServices {
    */
   async assetGet(fileId) {
     try {
-      const res = await this.client.get(`/api/assets/${fileId}`);
-      return res.data;
+      return await this.makeRequest('GET', `/api/assets/${fileId}`, undefined, {
+        cache: true,
+        cacheTTL: 5 * 60 * 1000 // 5 minutes cache
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1315,13 +1479,13 @@ export class OxyServices {
    */
   async assetGetUrl(fileId, variant, expiresIn) {
     try {
-      const params = new URLSearchParams();
-      if (variant) params.set('variant', variant);
-      if (expiresIn) params.set('expiresIn', expiresIn.toString());
-      const queryString = params.toString();
-      const url = `/api/assets/${fileId}/url${queryString ? `?${queryString}` : ''}`;
-      const res = await this.client.get(url);
-      return res.data;
+      const params = {};
+      if (variant) params.variant = variant;
+      if (expiresIn) params.expiresIn = expiresIn;
+      return await this.makeRequest('GET', `/api/assets/${fileId}/url`, params, {
+        cache: true,
+        cacheTTL: 10 * 60 * 1000 // 10 minutes cache for URLs
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1332,8 +1496,9 @@ export class OxyServices {
    */
   async assetRestore(fileId) {
     try {
-      const res = await this.client.post(`/api/assets/${fileId}/restore`);
-      return res.data;
+      return await this.makeRequest('POST', `/api/assets/${fileId}/restore`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1344,9 +1509,12 @@ export class OxyServices {
    */
   async assetDelete(fileId, force = false) {
     try {
-      const params = force ? '?force=true' : '';
-      const res = await this.client.delete(`/api/assets/${fileId}${params}`);
-      return res.data;
+      const params = force ? {
+        force: 'true'
+      } : undefined;
+      return await this.makeRequest('DELETE', `/api/assets/${fileId}`, params, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1372,10 +1540,11 @@ export class OxyServices {
    */
   async assetUpdateVisibility(fileId, visibility) {
     try {
-      const res = await this.client.patch(`/api/assets/${fileId}/visibility`, {
+      return await this.makeRequest('PATCH', `/api/assets/${fileId}/visibility`, {
         visibility
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1430,8 +1599,11 @@ export class OxyServices {
    */
   async getDeveloperApps() {
     try {
-      const res = await this.client.get('/api/developer/apps');
-      return res.data.apps || [];
+      const res = await this.makeRequest('GET', '/api/developer/apps', undefined, {
+        cache: true,
+        cacheTTL: 2 * 60 * 1000 // 2 minutes cache
+      });
+      return res.apps || [];
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1442,8 +1614,10 @@ export class OxyServices {
    */
   async createDeveloperApp(data) {
     try {
-      const res = await this.client.post('/api/developer/apps', data);
-      return res.data.app;
+      const res = await this.makeRequest('POST', '/api/developer/apps', data, {
+        cache: false
+      });
+      return res.app;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1454,8 +1628,11 @@ export class OxyServices {
    */
   async getDeveloperApp(appId) {
     try {
-      const res = await this.client.get(`/api/developer/apps/${appId}`);
-      return res.data.app;
+      const res = await this.makeRequest('GET', `/api/developer/apps/${appId}`, undefined, {
+        cache: true,
+        cacheTTL: 5 * 60 * 1000 // 5 minutes cache
+      });
+      return res.app;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1466,8 +1643,10 @@ export class OxyServices {
    */
   async updateDeveloperApp(appId, data) {
     try {
-      const res = await this.client.patch(`/api/developer/apps/${appId}`, data);
-      return res.data.app;
+      const res = await this.makeRequest('PATCH', `/api/developer/apps/${appId}`, data, {
+        cache: false
+      });
+      return res.app;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1478,8 +1657,9 @@ export class OxyServices {
    */
   async regenerateDeveloperAppSecret(appId) {
     try {
-      const res = await this.client.post(`/api/developer/apps/${appId}/regenerate-secret`);
-      return res.data;
+      return await this.makeRequest('POST', `/api/developer/apps/${appId}/regenerate-secret`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1490,8 +1670,9 @@ export class OxyServices {
    */
   async deleteDeveloperApp(appId) {
     try {
-      const res = await this.client.delete(`/api/developer/apps/${appId}`);
-      return res.data;
+      return await this.makeRequest('DELETE', `/api/developer/apps/${appId}`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1506,11 +1687,12 @@ export class OxyServices {
    */
   async updateLocation(latitude, longitude) {
     try {
-      const res = await this.client.post('/api/location', {
+      return await this.makeRequest('POST', '/api/location', {
         latitude,
         longitude
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1521,9 +1703,12 @@ export class OxyServices {
    */
   async getNearbyUsers(radius) {
     try {
-      const params = radius ? `?radius=${radius}` : '';
-      const res = await this.client.get(`/api/location/nearby${params}`);
-      return res.data;
+      const params = radius ? {
+        radius
+      } : undefined;
+      return await this.makeRequest('GET', '/api/location/nearby', params, {
+        cache: false // Don't cache location data - always get fresh data
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1538,10 +1723,13 @@ export class OxyServices {
    */
   async trackEvent(eventName, properties) {
     try {
-      await this.client.post('/api/analytics/events', {
+      await this.makeRequest('POST', '/api/analytics/events', {
         event: eventName,
         properties
-      });
+      }, {
+        cache: false,
+        retry: false
+      }); // Don't retry analytics events
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1552,11 +1740,13 @@ export class OxyServices {
    */
   async getAnalytics(startDate, endDate) {
     try {
-      const params = new URLSearchParams();
-      if (startDate) params.append('startDate', startDate);
-      if (endDate) params.append('endDate', endDate);
-      const res = await this.client.get(`/api/analytics?${params.toString()}`);
-      return res.data;
+      const params = {};
+      if (startDate) params.startDate = startDate;
+      if (endDate) params.endDate = endDate;
+      return await this.makeRequest('GET', '/api/analytics', params, {
+        cache: true,
+        cacheTTL: 5 * 60 * 1000 // 5 minutes cache
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1571,8 +1761,9 @@ export class OxyServices {
    */
   async registerDevice(deviceData) {
     try {
-      const res = await this.client.post('/api/devices', deviceData);
-      return res.data;
+      return await this.makeRequest('POST', '/api/devices', deviceData, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1583,8 +1774,9 @@ export class OxyServices {
    */
   async getUserDevices() {
     try {
-      const res = await this.client.get('/api/devices');
-      return res.data;
+      return await this.makeRequest('GET', '/api/devices', undefined, {
+        cache: false // Don't cache device list - always get fresh data
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1595,7 +1787,9 @@ export class OxyServices {
    */
   async removeDevice(deviceId) {
     try {
-      await this.client.delete(`/api/devices/${deviceId}`);
+      await this.makeRequest('DELETE', `/api/devices/${deviceId}`, undefined, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1603,11 +1797,17 @@ export class OxyServices {
 
   /**
    * Get device sessions
+   * Note: Not cached by default to ensure fresh data, but can be cached via makeRequest if needed
    */
   async getDeviceSessions(sessionId) {
     try {
-      const res = await this.client.get(`/api/session/device/sessions/${sessionId}`);
-      return res.data;
+      // Use makeRequest for consistent error handling and optional caching
+      // Cache disabled by default to ensure fresh session data
+      return await this.makeRequest('GET', `/api/session/device/sessions/${sessionId}`, undefined, {
+        cache: false,
+        // Don't cache sessions - always get fresh data
+        deduplicate: true // Deduplicate concurrent requests for same sessionId
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1621,8 +1821,13 @@ export class OxyServices {
       const params = new URLSearchParams();
       if (deviceId) params.append('deviceId', deviceId);
       if (excludeCurrent) params.append('excludeCurrent', 'true');
-      const res = await this.client.post(`/api/session/device/logout-all/${sessionId}?${params.toString()}`);
-      return res.data;
+      const urlParams = {};
+      params.forEach((value, key) => {
+        urlParams[key] = value;
+      });
+      return await this.makeRequest('POST', `/api/session/device/logout-all/${sessionId}`, urlParams, {
+        cache: false
+      });
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1633,10 +1838,11 @@ export class OxyServices {
    */
   async updateDeviceName(sessionId, deviceName) {
     try {
-      const res = await this.client.put(`/api/session/device/name/${sessionId}`, {
+      return await this.makeRequest('PUT', `/api/session/device/name/${sessionId}`, {
         deviceName
+      }, {
+        cache: false
       });
-      return res.data;
     } catch (error) {
       throw this.handleError(error);
     }
@@ -1651,8 +1857,12 @@ export class OxyServices {
    */
   async fetchLinkMetadata(url) {
     try {
-      const res = await this.client.get(`/api/link-metadata?url=${encodeURIComponent(url)}`);
-      return res.data;
+      return await this.makeRequest('GET', '/api/link-metadata', {
+        url
+      }, {
+        cache: true,
+        cacheTTL: 30 * 60 * 1000 // 30 minutes cache for link metadata
+      });
     } catch (error) {
       throw this.handleError(error);
     }