@oxyhq/services 5.9.2 → 5.9.3

package/src/core/index.ts

@@ -1,1777 +1,39 @@
-import axios, { AxiosInstance, AxiosError, AxiosRequestConfig, InternalAxiosRequestConfig } from 'axios';
-import { jwtDecode } from 'jwt-decode';
-
-// Remove all FormData, form-data, and polyfill logic. Delete uploadFile and uploadFiles methods. Add a comment to use the new raw upload approach instead.
-
-import {
-  OxyConfig, 
-  User, 
-  LoginResponse, 
-  Notification,
-  Wallet,
-  Transaction,
-  TransferFundsRequest,
-  PurchaseRequest,
-  WithdrawalRequest,
-  TransactionResponse,
-  KarmaRule,
-  KarmaHistory,
-  KarmaLeaderboardEntry,
-  KarmaAwardRequest,
-  ApiError,
-  PaymentMethod,
-  PaymentRequest,
-  PaymentResponse,
-  AnalyticsData,
-  FollowerDetails,
-  ContentViewer,
-  // File management interfaces
-  FileMetadata,
-  FileUploadResponse,
-  FileListResponse,
-  FileUpdateRequest,
-  FileDeleteResponse,
-  // Device session interfaces
-  DeviceSession,
-  DeviceSessionsResponse,
-  DeviceSessionLogoutResponse,
-  UpdateDeviceNameResponse
-} from '../models/interfaces';
-
-// Import secure session types
-import { SecureLoginResponse, SecureClientSession } from '../models/secureSession';
-
 /**
- * Default cloud URL for Oxy services, cloud is where the user files are. (e.g. images, videos, etc.). Not the API.
- */
-export const OXY_CLOUD_URL = 'https://cloud.oxy.so';
-
-// Export device management utilities
-export { DeviceManager } from '../utils/deviceManager';
-export type { DeviceFingerprint, StoredDeviceInfo } from '../utils/deviceManager';
-
-interface JwtPayload {
-  exp: number;
-  userId: string;
-  [key: string]: any;
-}
-
-/**
- * OxyServices - Client library for interacting with the Oxy API
+ * OxyServices Core Module - Modular Architecture
  * 
- * Note: For authentication status in UI components, use `isAuthenticated` from useOxy() context
- * instead of checking token status directly on this service.
+ * This module exports the main OxyServices class and all individual service modules
+ * for a clean, maintainable, and focused architecture.
  */
-export class OxyServices {
-  private client: AxiosInstance;
-  private accessToken: string | null = null;
-  private refreshToken: string | null = null;
-
-  /**
-   * Creates a new instance of the OxyServices client
-   * @param config - Configuration for the client
-   */
-  constructor(config: OxyConfig) {
-    this.client = axios.create({ 
-      baseURL: config.baseURL,
-      timeout: 10000 // 10 second timeout
-    });
-    
-    // Interceptor for adding auth header and handling token refresh
-    this.client.interceptors.request.use(async (req: InternalAxiosRequestConfig) => {
-      if (!this.accessToken) {
-        return req;
-      }
-      
-      // Check if token is expired and refresh if needed
-      try {
-        const decoded = jwtDecode<JwtPayload>(this.accessToken);
-        const currentTime = Math.floor(Date.now() / 1000);
-      
-        // If token expires in less than 60 seconds, refresh it
-        if (decoded.exp - currentTime < 60) {
-          // For session-based tokens, get a new token from the session
-          if (decoded.sessionId) {
-            try {
-              const res = await this.client.get(`/secure-session/token/${decoded.sessionId}`);
-              this.accessToken = res.data.accessToken;
-            } catch (refreshError) {
-              // If refresh fails, clear tokens
-              this.clearTokens();
-            }
-          }
-        }
-      } catch (error) {
-        // If token can't be decoded, continue with request and let server handle it
-        console.warn('Error decoding JWT token', error);
-      }
-      
-      req.headers = req.headers || {};
-      req.headers.Authorization = `Bearer ${this.accessToken}`;
-      return req;
-    });
-    
-    // Response interceptor for handling errors
-    this.client.interceptors.response.use(
-      response => response,
-      async (error: AxiosError) => {
-        const originalRequest = error.config;
-        // If the error is due to an expired token and we haven't tried refreshing yet
-        if (
-          error.response?.status === 401 &&
-          this.accessToken &&
-          originalRequest &&
-          !originalRequest.headers?.['X-Retry-After-Refresh']
-        ) {
-          try {
-            // Check if token is session-based and try to refresh
-            const decoded = jwtDecode<JwtPayload>(this.accessToken);
-            if (decoded.sessionId) {
-              const res = await this.client.get(`/secure-session/token/${decoded.sessionId}`);
-              this.accessToken = res.data.accessToken;
-              
-              // Retry the original request with new token
-              const newRequest = { ...originalRequest };
-              if (newRequest.headers) {
-                newRequest.headers.Authorization = `Bearer ${this.accessToken}`;
-                newRequest.headers['X-Retry-After-Refresh'] = 'true';
-              }
-              return this.client(newRequest);
-            }
-          } catch (refreshError) {
-            // If refresh fails, force user to login again
-            this.clearTokens();
-            return Promise.reject(refreshError);
-          }
-        }
-
-        // Format error response
-        const apiError: ApiError = {
-          message: (error.response?.data as any)?.error || (error.response?.data as any)?.message || 'An unknown error occurred',
-          code: (error.response?.data as any)?.code || 'UNKNOWN_ERROR',
-          status: error.response?.status || 500,
-          details: error.response?.data
-        };
-
-        // If the error is an invalid session, clear tokens
-        if (apiError.code === 'INVALID_SESSION' || apiError.message === 'Invalid session') {
-          this.clearTokens();
-        }
-
-        return Promise.reject(apiError);
-      }
-    );
-  }
-
-  /**
-   * Gets the base URL configured for this OxyServices instance
-   * @returns The base URL
-   */
-  public getBaseURL(): string {
-    return this.client.defaults.baseURL || '';
-  }
-
-  /**
-   * Set authentication tokens manually
-   * @param accessToken - The access token
-   * @param refreshToken - The refresh token (optional for session-based auth)
-   */
-  public setTokens(accessToken: string, refreshToken: string = ''): void {
-    this.accessToken = accessToken;
-    this.refreshToken = refreshToken;
-  }
-
-  /**
-   * Clear stored authentication tokens
-   */
-  public clearTokens(): void {
-    this.accessToken = null;
-    this.refreshToken = null;
-  }
-
-  /**
-   * Get the current user ID from the stored token
-   * @returns User ID or null if not authenticated
-   */
-  public getCurrentUserId(): string | null {
-    if (!this.accessToken) return null;
-    
-    try {
-      const decoded = jwtDecode<JwtPayload>(this.accessToken);
-      return decoded.userId || decoded.id || null;
-    } catch (error) {
-      return null;
-    }
-  }
-  
-  /**
-   * Internal method to check if we have an access token
-   * @private
-   * @returns Boolean indicating if access token exists
-   * @internal - Use `isAuthenticated` from useOxy() context in UI components instead
-   */
-  private hasAccessToken(): boolean {
-    return this.accessToken !== null;
-  }
-
-  /**
-   * Validate current access token
-   * @returns Boolean indicating if the token is valid
-   */
-  async validate(): Promise<boolean> {
-    try {
-      // Check if token contains sessionId (new session-based system)
-      if (this.accessToken) {
-        try {
-          const decoded = jwtDecode<JwtPayload>(this.accessToken);
-          if (decoded.sessionId) {
-            // Use session-based validation
-            const res = await this.client.get(`/secure-session/validate/${decoded.sessionId}`);
-            return res.data.valid;
-          }
-        } catch (decodeError) {
-          // If token can't be decoded, fall back to old validation
-          console.warn('Error decoding JWT token for session validation:', decodeError);
-        }
-      }
-      
-      // Fall back to old validation method
-      const res = await this.client.get('/auth/validate');
-      return res.data.valid;
-    } catch (error) {
-      return false;
-    }
-  }
-
-  /* Session Management Methods */
-
-  /**
-   * Get device sessions for a specific session ID
-   * @param sessionId - The session ID to get device sessions for
-   * @param deviceId - Optional device ID filter
-   * @returns Array of device sessions
-   */
-  async getDeviceSessions(sessionId: string, deviceId?: string): Promise<DeviceSession[]> {
-    try {
-      const params = deviceId ? { deviceId } : {};
-      const res = await this.client.get(`/secure-session/device/sessions/${sessionId}`, { params });
-      
-      // Map backend response to frontend interface
-      return (res.data.sessions || []).map((session: any) => ({
-        sessionId: session.sessionId,
-        deviceId: res.data.deviceId || '',
-        deviceName: session.deviceInfo?.deviceName || 'Unknown Device',
-        isActive: true, // All returned sessions are active
-        lastActive: session.lastActive,
-        expiresAt: session.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
-        isCurrent: session.sessionId === sessionId,
-        user: session.user,
-        createdAt: session.createdAt
-      }));
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Logout all device sessions for a specific device
-   * @param sessionId - The session ID
-   * @param deviceId - Optional device ID (uses current session's device if not provided)
-   * @param excludeCurrent - Whether to exclude the current session from logout
-   * @returns Logout response
-   */
-  async logoutAllDeviceSessions(sessionId: string, deviceId?: string, excludeCurrent?: boolean): Promise<DeviceSessionLogoutResponse> {
-    try {
-      const data: any = {};
-      if (deviceId) data.deviceId = deviceId;
-      if (excludeCurrent !== undefined) data.excludeCurrent = excludeCurrent;
-      
-      const res = await this.client.post(`/secure-session/device/logout-all/${sessionId}`, data);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Update device name for a session
-   * @param sessionId - The session ID
-   * @param deviceName - The new device name
-   * @returns Update response
-   */
-  async updateDeviceName(sessionId: string, deviceName: string): Promise<UpdateDeviceNameResponse> {
-    try {
-      const res = await this.client.put(`/secure-session/device/name/${sessionId}`, { deviceName });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /* Profile Methods */
-
-  /**
-   * Fetch profile by username
-   * @param username - The username to look up
-   * @returns User profile data
-   */
-  async getProfileByUsername(username: string): Promise<User> {
-    try {
-      const res = await this.client.get(`/profiles/username/${username}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Search profiles
-   * @param query - Search query string
-   * @param limit - Maximum number of results to return
-   * @param offset - Number of results to skip for pagination
-   * @returns Array of matching user profiles
-   */
-  async searchProfiles(query: string, limit?: number, offset?: number): Promise<User[]> {
-    try {
-      const params: Record<string, any> = { query };
-      if (limit !== undefined) params.limit = limit;
-      if (offset !== undefined) params.offset = offset;
-      const res = await this.client.get('/profiles/search', { params });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get recommended profiles for the authenticated user
-   * @returns Array of recommended profiles
-   */
-  async getProfileRecommendations(): Promise<Array<{
-    id: string;
-    username: string;
-    name?: { first?: string; last?: string; full?: string };
-    description?: string;
-    _count?: { followers: number; following: number };
-    [key: string]: any;
-  }>> {
-    try {
-      const res = await this.client.get('/profiles/recommendations');
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /* User Methods */
-
-  /**
-   * Get general user by ID
-   * @param userId - The user ID to look up
-   * @returns User data
-   */
-  async getUserById(userId: string): Promise<User> {
-    try {
-      const res = await this.client.get(`/users/${userId}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get the currently authenticated user's profile
-   * @returns User data for the current user
-   */
-  async getCurrentUser(): Promise<User> {
-    try {
-      console.log('OxyServices: Fetching current user...');
-      const res = await this.client.get('/users/me');
-      console.log('OxyServices: Current user response:', {
-        hasUser: !!res.data,
-        userLinksMetadata: res.data?.linksMetadata,
-        userLinks: res.data?.links,
-        userWebsite: res.data?.website
-      });
-      return res.data;
-    } catch (error) {
-      console.error('OxyServices: Error fetching current user:', error);
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Update the authenticated user's profile
-   * @param updates - Object containing fields to update
-   * @returns Updated user data
-   */
-  async updateProfile(updates: Record<string, any>): Promise<User> {
-    try {
-      console.log('OxyServices: Updating profile with:', updates);
-      const res = await this.client.put('/users/me', updates);
-      console.log('OxyServices: Profile update response:', res.data);
-      return res.data;
-    } catch (error) {
-      console.error('OxyServices: Error updating profile:', error);
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Update user profile (requires auth)
-   * @param userId - User ID to update (must match authenticated user or have admin rights)
-   * @param updates - Object containing fields to update
-   * @returns Updated user data
-   */
-  async updateUser(userId: string, updates: Record<string, any>): Promise<User> {
-    try {
-      const res = await this.client.put(`/users/${userId}`, updates);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Follow a user
-   * @param userId - User ID to follow
-   * @returns Status of the follow operation
-   */
-  async followUser(userId: string): Promise<{ success: boolean; message: string }> {
-    try {
-      const res = await this.client.post(`/users/${userId}/follow`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Unfollow a user
-   * @param userId - User ID to unfollow
-   * @returns Status of the unfollow operation
-   */
-  async unfollowUser(userId: string): Promise<{ success: boolean; message: string }> {
-    try {
-      const res = await this.client.delete(`/users/${userId}/follow`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get follow status for a user
-   * @param userId - User ID to check follow status for
-   * @returns Whether the current user is following the specified user
-   */
-  async getFollowStatus(userId: string): Promise<{ isFollowing: boolean }> {
-    try {
-      const res = await this.client.get(`/users/${userId}/following-status`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get all followers of a user
-   * @param userId - User ID to get followers for
-   * @param limit - Maximum number of followers to return
-   * @param offset - Number of followers to skip for pagination
-   * @returns Array of users who follow the specified user and pagination info
-   */
-  async getUserFollowers(
-    userId: string,
-    limit?: number,
-    offset?: number
-  ): Promise<{ followers: User[]; total: number; hasMore: boolean }> {
-    try {
-      const params: Record<string, any> = {};
-      if (limit !== undefined) params.limit = limit;
-      if (offset !== undefined) params.offset = offset;
-      const res = await this.client.get(`/users/${userId}/followers`, { params });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get all users that a user is following
-   * @param userId - User ID to get following list for
-   * @param limit - Maximum number of users to return
-   * @param offset - Number of users to skip for pagination
-   * @returns Array of users the specified user follows and pagination info
-   */
-  async getUserFollowing(
-    userId: string,
-    limit?: number,
-    offset?: number
-  ): Promise<{ following: User[]; total: number; hasMore: boolean }> {
-    try {
-      const params: Record<string, any> = {};
-      if (limit !== undefined) params.limit = limit;
-      if (offset !== undefined) params.offset = offset;
-      const res = await this.client.get(`/users/${userId}/following`, { params });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /* Notification Methods */
-
-  /**
-   * Fetch all notifications for the authenticated user
-   * @returns Array of notifications
-   */
-  async getNotifications(): Promise<Notification[]> {
-    try {
-      const res = await this.client.get('/notifications');
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get count of unread notifications
-   * @returns Number of unread notifications
-   */
-  async getUnreadCount(): Promise<number> {
-    try {
-      const res = await this.client.get('/notifications/unread-count');
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Create a new notification (admin use)
-   * @param data - Notification data
-   * @returns Created notification
-   */
-  async createNotification(data: Partial<Notification>): Promise<Notification> {
-    try {
-      const res = await this.client.post('/notifications', data);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Mark a single notification as read
-   * @param notificationId - ID of notification to mark as read
-   */
-  async markNotificationAsRead(notificationId: string): Promise<void> {
-    try {
-      await this.client.put(`/notifications/${notificationId}/read`);
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Mark all notifications as read
-   */
-  async markAllNotificationsAsRead(): Promise<void> {
-    try {
-      await this.client.put('/notifications/read-all');
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Delete a notification
-   * @param notificationId - ID of notification to delete
-   */
-  async deleteNotification(notificationId: string): Promise<void> {
-    try {
-      await this.client.delete(`/notifications/${notificationId}`);
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /* Payment Methods */
-
-  /**
-   * Process a payment
-   * @param data - Payment data including user ID, plan, and payment method
-   * @returns Payment result with transaction ID
-   */
-  async processPayment(data: PaymentRequest): Promise<PaymentResponse> {
-    try {
-      const res = await this.client.post('/payments/process', data);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Validate a payment method
-   * @param paymentMethod - Payment method to validate
-   * @returns Object indicating if the payment method is valid
-   */
-  async validatePaymentMethod(paymentMethod: any): Promise<{ valid: boolean }> {
-    try {
-      const res = await this.client.post('/payments/validate', { paymentMethod });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get saved payment methods for a user
-   * @param userId - User ID to get payment methods for
-   * @returns Array of payment methods
-   */
-  async getPaymentMethods(userId: string): Promise<PaymentMethod[]> {
-    try {
-      const res = await this.client.get(`/payments/methods/${userId}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /* Analytics Methods */
-
-  /**
-   * Get analytics data
-   * @param userId - User ID to get analytics for
-   * @param period - Time period for analytics (e.g., "day", "week", "month")
-   * @returns Analytics data
-   */
-  async getAnalytics(userId: string, period?: string): Promise<AnalyticsData> {
-    try {
-      const params: Record<string, any> = { userID: userId };
-      if (period) params.period = period;
-      const res = await this.client.get('/analytics', { params });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Update analytics (internal use)
-   * @param userId - User ID to update analytics for
-   * @param type - Type of analytics to update
-   * @param data - Analytics data to update
-   * @returns Message indicating success
-   */
-  async updateAnalytics(userId: string, type: string, data: Record<string, any>): Promise<{ message: string }> {
-    try {
-      const res = await this.client.post('/analytics/update', { userID: userId, type, data });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get content viewers analytics
-   * @param userId - User ID to get viewer data for
-   * @param period - Time period for analytics
-   * @returns Array of content viewer data
-   */
-  async getContentViewers(userId: string, period?: string): Promise<ContentViewer[]> {
-    try {
-      const params: Record<string, any> = { userID: userId };
-      if (period) params.period = period;
-      const res = await this.client.get('/analytics/viewers', { params });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get follower analytics details
-   * @param userId - User ID to get follower data for
-   * @param period - Time period for follower data
-   * @returns Follower details
-   */
-  async getFollowerDetails(userId: string, period?: string): Promise<FollowerDetails> {
-    try {
-      const params: Record<string, any> = { userID: userId };
-      if (period) params.period = period;
-      const res = await this.client.get('/analytics/followers', { params });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /* Wallet Methods */
-
-  /**
-   * Get wallet info
-   * @param userId - User ID to get wallet for
-   * @returns Wallet data
-   */
-  async getWallet(userId: string): Promise<Wallet> {
-    try {
-      const res = await this.client.get(`/wallet/${userId}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
 
-  /**
-   * Get transaction history
-   * @param userId - User ID to get transactions for
-   * @param limit - Maximum number of transactions to return
-   * @param offset - Number of transactions to skip for pagination
-   * @returns Array of transactions and pagination info
-   */
-  async getTransactionHistory(
-    userId: string, 
-    limit?: number, 
-    offset?: number
-  ): Promise<{ transactions: Transaction[]; total: number; hasMore: boolean }> {
-    try {
-      const params: Record<string, any> = {};
-      if (limit !== undefined) params.limit = limit;
-      if (offset !== undefined) params.offset = offset;
-      const res = await this.client.get(`/wallet/transactions/${userId}`, { params });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
+// Main OxyServices class (backward compatible)
+export { OxyServicesMain as OxyServices } from './OxyServicesMain';
 
-  /**
-   * Get a specific transaction
-   * @param transactionId - ID of transaction to retrieve
-   * @returns Transaction data
-   */
-  async getTransaction(transactionId: string): Promise<Transaction> {
-    try {
-      const res = await this.client.get(`/wallet/transaction/${transactionId}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
+// Individual service classes for focused usage
+export { AuthService } from './auth/AuthService';
+export { UserService } from './users/UserService';
+export { PaymentService } from './payments/PaymentService';
+export { KarmaService } from './karma/KarmaService';
+export { FileService } from './files/FileService';
+export { LocationService } from './locations/LocationService';
+export { AnalyticsService } from './analytics/AnalyticsService';
+export { DeviceService } from './devices/DeviceService';
 
-  /**
-   * Transfer funds between users
-   * @param data - Transfer details including source, destination, and amount
-   * @returns Transaction response
-   */
-  async transferFunds(data: TransferFundsRequest): Promise<TransactionResponse> {
-    try {
-      const res = await this.client.post('/wallet/transfer', data);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
+// Base class for custom service extensions
+export { OxyServices as BaseOxyServices } from './OxyServices';
 
-  /**
-   * Process a purchase
-   * @param data - Purchase details including user, item, and amount
-   * @returns Transaction response
-   */
-  async processPurchase(data: PurchaseRequest): Promise<TransactionResponse> {
-    try {
-      const res = await this.client.post('/wallet/purchase', data);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Request a withdrawal
-   * @param data - Withdrawal details including user, amount, and address
-   * @returns Transaction response
-   */
-  async requestWithdrawal(data: WithdrawalRequest): Promise<TransactionResponse> {
-    try {
-      const res = await this.client.post('/wallet/withdraw', data);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /* Karma Methods */
-
-  /**
-   * Get karma leaderboard
-   * @returns Array of karma leaderboard entries
-   */
-  async getKarmaLeaderboard(): Promise<KarmaLeaderboardEntry[]> {
-    try {
-      const res = await this.client.get('/karma/leaderboard');
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get karma rules
-   * @returns Array of karma rules
-   */
-  async getKarmaRules(): Promise<KarmaRule[]> {
-    try {
-      const res = await this.client.get('/karma/rules');
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get total karma for a user
-   * @param userId - User ID to get karma for
-   * @returns Object with total karma points
-   */
-  async getUserKarmaTotal(userId: string): Promise<{ total: number }> {
-    try {
-      const res = await this.client.get(`/karma/${userId}/total`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get karma history for a user
-   * @param userId - User ID to get karma history for
-   * @param limit - Maximum number of history entries to return
-   * @param offset - Number of entries to skip for pagination
-   * @returns Karma history entries and pagination info
-   */
-  async getUserKarmaHistory(
-    userId: string, 
-    limit?: number, 
-    offset?: number
-  ): Promise<{ history: KarmaHistory[]; total: number; hasMore: boolean }> {
-    try {
-      const params: Record<string, any> = {};
-      if (limit !== undefined) params.limit = limit;
-      if (offset !== undefined) params.offset = offset;
-      const res = await this.client.get(`/karma/${userId}/history`, { params });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Award karma points to a user
-   * @param data - Karma award details
-   * @returns Karma award response
-   */
-  async awardKarma(data: KarmaAwardRequest): Promise<{ success: boolean; message: string; history: KarmaHistory }> {
-    try {
-      const res = await this.client.post('/karma/award', data);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Deduct karma points from a user
-   * @param data - Karma deduction details
-   * @returns Karma deduction response
-   */
-  async deductKarma(data: KarmaAwardRequest): Promise<{ success: boolean; message: string; history: KarmaHistory }> {
-    try {
-      const res = await this.client.post('/karma/deduct', data);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Create or update karma rule (admin)
-   * @param data - Karma rule data
-   * @returns Created or updated karma rule
-   */
-  async createOrUpdateKarmaRule(data: Partial<KarmaRule>): Promise<KarmaRule> {
-    try {
-      const res = await this.client.post('/karma/rules', data);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /* File Management Methods */
-
-  /**
-   * Upload a file using GridFS
-   * @param file - The file to upload (File or Blob in browser, Buffer in Node.js)
-   * @param filename - The name of the file
-   * @param metadata - Optional metadata to associate with the file
-   * @returns File metadata including ID and download URL
-   */
-  async uploadFile(
-    file: File | Blob | any, // Use 'any' to handle Buffer type in cross-platform scenarios
-    filename: string, 
-    metadata?: Record<string, any>
-  ): Promise<FileMetadata> {
-    // This method is deprecated. Use uploadFilesRaw instead.
-    // For now, we'll throw an error as the underlying logic is removed.
-    throw new Error('uploadFile is deprecated. Use uploadFilesRaw instead.');
-  }
-
-  /**
-   * Upload multiple files using GridFS
-   * @param files - Array of files to upload
-   * @param filenames - Array of filenames (must match files array length)
-   * @param metadata - Optional metadata to associate with all files
-   * @returns Array of file metadata
-   */
-  async uploadFiles(
-    files: (File | Blob | any)[], 
-    filenames: string[], 
-    metadata?: Record<string, any>
-  ): Promise<FileUploadResponse> {
-    // This method is deprecated. Use uploadFilesRaw instead.
-    // For now, we'll throw an error as the underlying logic is removed.
-    throw new Error('uploadFiles is deprecated. Use uploadFilesRaw instead.');
-  }
-
-  /**
-   * Get file metadata by ID
-   * @param fileId - ID of the file to retrieve metadata for
-   * @returns File metadata
-   */
-  async getFileMetadata(fileId: string): Promise<FileMetadata> {
-    try {
-      const res = await this.client.get(`/files/${fileId}/metadata`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Update file metadata
-   * @param fileId - ID of the file to update
-   * @param updates - Metadata updates to apply
-   * @returns Updated file metadata
-   */
-  async updateFileMetadata(fileId: string, updates: FileUpdateRequest): Promise<FileMetadata> {
-    try {
-      const res = await this.client.put(`/files/${fileId}/metadata`, updates);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Delete a file by ID
-   * @param fileId - ID of the file to delete
-   * @returns Status of the delete operation
-   */
-  async deleteFile(fileId: string): Promise<FileDeleteResponse> {
-    try {
-      console.log('Deleting file with ID:', fileId);
-      const res = await this.client.delete(`/files/${fileId}`);
-      console.log('Delete response:', res.data);
-      return res.data;
-    } catch (error: any) {
-      console.error('Delete file error:', error);
-      console.error('Error response:', error.response?.data);
-      console.error('Error status:', error.response?.status);
-      
-      // Provide more specific error messages based on status code
-      if (error.response?.status === 404) {
-        throw new Error('File not found or already deleted');
-      } else if (error.response?.status === 403) {
-        throw new Error('You do not have permission to delete this file');
-      } else if (error.response?.status === 400) {
-        throw new Error('Invalid file ID format');
-      }
-      
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get download URL for a file
-   * @param fileId - ID of the file to get download URL for
-   * @returns Full URL to download the file
-   */
-  getFileDownloadUrl(fileId: string): string {
-    return `${this.client.defaults.baseURL}/files/${fileId}`;
-  }
-
-  /**
-   * Stream a file (useful for playing audio/video without full download)
-   * @param fileId - ID of the file to stream
-   * @returns Full URL to stream the file
-   */
-  getFileStreamUrl(fileId: string): string {
-    return `${this.client.defaults.baseURL}/files/${fileId}`;
-  }
-
-  /**
-   * List files for a specific user
-   * @param userId - User ID to list files for
-   * @param limit - Maximum number of files to return
-   * @param offset - Number of files to skip for pagination
-   * @param filters - Optional filters for the file list (e.g., contentType)
-   * @returns Array of file metadata and pagination info
-   */
-  async listUserFiles(
-    userId: string,
-    limit?: number,
-    offset?: number,
-    filters?: Record<string, any>
-  ): Promise<FileListResponse> {
-    try {
-      const params: Record<string, any> = {};
-      if (limit !== undefined) params.limit = limit;
-      if (offset !== undefined) params.offset = offset;
-      if (filters) Object.assign(params, filters);
-      
-      const res = await this.client.get(`/files/list/${userId}`, { params });
-      
-      // Handle backend response format: backend returns FileMetadata[] directly
-      // but interface expects { files: FileMetadata[], total: number, hasMore: boolean }
-      const rawFiles = Array.isArray(res.data) ? res.data : res.data.files || [];
-      
-      // Transform GridFS files to match FileMetadata interface (map _id to id)
-      const filesArray = rawFiles.map((file: any) => ({
-        ...file,
-        id: file._id?.toString() || file.id,
-        uploadDate: file.uploadDate?.toISOString ? file.uploadDate.toISOString() : file.uploadDate
-      }));
-      
-      return {
-        files: filesArray,
-        total: filesArray.length,
-        hasMore: false // No pagination in current backend implementation
-      };
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Sign up a new user and create a session
-   * @param username - Desired username
-   * @param email - User's email address
-   * @param password - User's password
-   * @returns Object containing the message, token and user data
-   */
-  async signUp(username: string, email: string, password: string): Promise<{ message: string; token: string; user: User }> {
-    try {
-      // First, create the user account
-      const res = await this.client.post('/secure-session/register', { username, email, password });
-      const { message, user } = res.data;
-      
-      // Then log them in to create a session
-      const loginRes = await this.secureLogin(username, password);
-      
-      // Get the access token for the session
-      const tokenRes = await this.getTokenBySession(loginRes.sessionId);
-      
-      return { 
-        message, 
-        token: tokenRes.accessToken, 
-        user: loginRes.user as User
-      };
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Secure login that creates a device-based session
-   * @param username - User's username or email
-   * @param password - User's password
-   * @param deviceName - Optional device name
-   * @param deviceFingerprint - Optional device fingerprint
-   * @returns Login response with session data
-   */
-  async secureLogin(username: string, password: string, deviceName?: string, deviceFingerprint?: any): Promise<SecureLoginResponse> {
-    try {
-      const payload: any = { 
-        username, 
-        password, 
-        deviceName 
-      };
-      
-      if (deviceFingerprint) {
-        payload.deviceFingerprint = deviceFingerprint;
-      }
-      
-      const res = await this.client.post('/secure-session/login', payload);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get full user data by session ID
-   * @param sessionId - The session ID
-   * @returns Full user data
-   */
-  async getUserBySession(sessionId: string): Promise<User> {
-    try {
-      const res = await this.client.get(`/secure-session/user/${sessionId}`);
-      return res.data.user;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get access token by session ID (for API calls)
-   * @param sessionId - The session ID
-   * @returns Access token and expiry info
-   */
-  async getTokenBySession(sessionId: string): Promise<{ accessToken: string; expiresAt: string }> {
-    try {
-      const res = await this.client.get(`/secure-session/token/${sessionId}`);
-      // Set the token for subsequent API calls
-      this.accessToken = res.data.accessToken;
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get all active sessions for current user
-   * @param sessionId - Current session ID
-   * @returns Array of user sessions
-   */
-  async getSessionsBySessionId(sessionId: string): Promise<any[]> {
-    console.log('getSessionsBySessionId called with sessionId:', sessionId);
-    try {
-      const res = await this.client.get(`/secure-session/sessions/${sessionId}`);
-      console.log('getSessionsBySessionId response:', res.data);
-      return res.data.sessions;
-    } catch (error) {
-      console.error('getSessionsBySessionId error:', error);
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Logout specific session
-   * @param sessionId - Current session ID
-   * @param targetSessionId - Optional target session to logout (defaults to current)
-   */
-  async logoutSecureSession(sessionId: string, targetSessionId?: string): Promise<void> {
-    try {
-      await this.client.post(`/secure-session/logout/${sessionId}`, { 
-        targetSessionId 
-      });
-      
-      // If we're logging out the current session, clear the access token
-      if (!targetSessionId || targetSessionId === sessionId) {
-        this.accessToken = null;
-        this.refreshToken = null;
-      }
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Logout all sessions for current user
-   * @param sessionId - Current session ID
-   */
-  async logoutAllSecureSessions(sessionId: string): Promise<void> {
-    console.log('logoutAllSecureSessions called with sessionId:', sessionId);
-    console.log('API client defaults:', this.client.defaults);
-    
-    try {
-      const response = await this.client.post(`/secure-session/logout-all/${sessionId}`);
-      console.log('logoutAllSecureSessions response:', response.status, response.data);
-      
-      // Clear tokens since all sessions are logged out
-      this.accessToken = null;
-      this.refreshToken = null;
-      console.log('Tokens cleared successfully');
-    } catch (error) {
-      console.error('logoutAllSecureSessions error:', error);
-      if (error && typeof error === 'object' && 'response' in error) {
-        const axiosError = error as any;
-        console.error('Error response data:', axiosError.response?.data);
-        console.error('Error response status:', axiosError.response?.status);
-      }
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Validate session
-   * @param sessionId - The session ID to validate
-   * @returns Session validation status with user data
-   */
-  async validateSession(sessionId: string): Promise<{ valid: boolean; expiresAt: string; lastActivity: string; user: User }> {
-    try {
-      const res = await this.client.get(`/secure-session/validate/${sessionId}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Validate session using x-session-id header
-   * @param sessionId - The session ID to validate (sent as header)
-   * @param deviceFingerprint - Optional device fingerprint for enhanced security
-   * @returns Session validation status with user data
-   */
-  async validateSessionFromHeader(sessionId: string, deviceFingerprint?: string): Promise<{ valid: boolean; expiresAt: string; lastActivity: string; user: User; sessionId?: string }> {
-    try {
-      const headers: any = {
-        'x-session-id': sessionId
-      };
-      
-      if (deviceFingerprint) {
-        headers['x-device-fingerprint'] = deviceFingerprint;
-      }
-
-      const res = await this.client.get('/secure-session/validate-header', { headers });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Validate session using automatic header detection
-   * The validateSession endpoint will automatically read from x-session-id header
-   * @param sessionId - The session ID to validate (sent as header)
-   * @param deviceFingerprint - Optional device fingerprint for enhanced security
-   * @returns Session validation status with user data
-   */
-  async validateSessionAuto(sessionId: string, deviceFingerprint?: string): Promise<{ valid: boolean; expiresAt: string; lastActivity: string; user: User; source?: string }> {
-    try {
-      const headers: any = {
-        'x-session-id': sessionId
-      };
-      
-      if (deviceFingerprint) {
-        headers['x-device-fingerprint'] = deviceFingerprint;
-      }
-
-      // Call the regular validateSession endpoint which now auto-reads from headers
-      // Use 'auto' as placeholder since the controller reads from header
-      const res = await this.client.get('/secure-session/validate/auto', { headers });
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Create authentication middleware for Express.js applications
-   * This is the recommended way to protect routes in server applications
-   * @returns Express middleware function
-   */
-  public createAuthMiddleware() {
-    return async (req: any, res: any, next: any) => {
-      try {
-        const authHeader = req.headers.authorization;
-        
-        if (!authHeader?.startsWith('Bearer ')) {
-          return res.status(401).json({
-            error: 'Authentication required',
-            message: 'Invalid or missing authorization header'
-          });
-        }
-
-        const token = authHeader.split(' ')[1];
-        
-        // Use the authenticateToken method
-        const result = await this.authenticateToken(token);
-        
-        if (!result.valid) {
-          return res.status(401).json({
-            error: 'Invalid token',
-            message: result.error || 'The provided authentication token is invalid'
-          });
-        }
-        
-        // Set user information on request object
-        req.userId = result.userId || undefined;
-        req.accessToken = token;
-        
-        if (result.user) {
-          req.user = result.user;
-        } else if (result.userId) {
-          req.user = { id: result.userId };
-        }
-        
-        next();
-      } catch (error) {
-        console.error('Auth middleware error:', error);
-        return res.status(500).json({
-          error: 'Server error',
-          message: 'An error occurred while authenticating your request'
-        });
-      }
-    };
-  }
-
-  /**
-   * Helper method for validating tokens without Express middleware
-   * Useful for standalone token validation in various contexts
-   * @param token - The access token to validate
-   * @returns Object with validation result and user information
-   */
-  public async authenticateToken(token: string): Promise<{
-    valid: boolean;
-    userId?: string;
-    user?: any;
-    error?: string;
-  }> {
-    try {
-      if (!token) {
-        return {
-          valid: false,
-          error: 'Token is required'
-        };
-      }
-      
-      // Check if token contains sessionId (new session-based system)
-      try {
-        const decoded = jwtDecode<JwtPayload>(token);
-        const userId = decoded.userId || decoded.id;
-        
-        if (decoded.sessionId) {
-          // Use session-based validation
-          const tempOxyServices = new OxyServices({
-            baseURL: this.client.defaults.baseURL || ''
-          });
-          tempOxyServices.setTokens(token, '');
-          
-          const validation = await tempOxyServices.validateSession(decoded.sessionId);
-          
-          if (validation.valid) {
-            return {
-              valid: true,
-              userId,
-              user: validation.user
-            };
-          } else {
-            return {
-              valid: false,
-              error: 'Invalid or expired session'
-            };
-          }
-        } else {
-          // Use old validation method
-          const tempOxyServices = new OxyServices({
-            baseURL: this.client.defaults.baseURL || ''
-          });
-          tempOxyServices.setTokens(token, '');
-          
-          const isValid = await tempOxyServices.validate();
-          
-          if (!isValid) {
-            return {
-              valid: false,
-              error: 'Invalid or expired token'
-            };
-          }
-          
-          if (!userId) {
-            return {
-              valid: false,
-              error: 'Invalid token payload'
-            };
-          }
-          
-          // Try to get user profile
-          let user;
-          try {
-            user = await tempOxyServices.getUserById(userId);
-          } catch (error) {
-            // Continue without full user data
-            user = { id: userId };
-          }
-          
-          return {
-            valid: true,
-            userId,
-            user
-          };
-        }
-      } catch (decodeError) {
-        return {
-          valid: false,
-          error: 'Invalid token payload'
-        };
-      }
-    } catch (error) {
-      return {
-        valid: false,
-        error: error instanceof Error ? error.message : 'Token validation failed'
-      };
-    }
-  }
-
-  /**
-   * Centralized error handling
-   * @private
-   * @param error - Error object from API call
-   * @returns Formatted API error
-   */
-  private handleError(error: any): ApiError {
-    if (error && error.code && error.status) {
-      // Already formatted as ApiError
-      return error as ApiError;
-    }
-    
-    const apiError: ApiError = {
-      message: error?.message || (error?.response?.data as any)?.message || 'Unknown error occurred',
-      code: (error?.response?.data as any)?.code || 'UNKNOWN_ERROR',
-      status: error?.response?.status || 500,
-      details: error?.response?.data
-    };
-    
-    return apiError;
-  }
-
-  /**
-   * Check if a username is available
-   * @param username - The username to check
-   * @returns Promise with availability status
-   */
-  async checkUsernameAvailability(username: string): Promise<{ available: boolean; message: string }> {
-    try {
-      const res = await this.client.get(`/auth/check-username/${username}`);
-      return res.data;
-    } catch (error: any) {
-      // If the endpoint doesn't exist, fall back to basic validation
-      if (error.response?.status === 404) {
-        console.warn('Username validation endpoint not found, using fallback validation');
-        return { available: true, message: 'Username validation not available' };
-      }
-      
-      // If it's a validation error (400), return the error message
-      if (error.response?.status === 400) {
-        return error.response.data;
-      }
-      
-      // For other errors, log and return a fallback
-      console.error('Username validation error:', error);
-      return { available: true, message: 'Unable to validate username' };
-    }
-  }
-
-  /**
-   * Check if an email is available
-   * @param email - The email to check
-   * @returns Promise with availability status
-   */
-  async checkEmailAvailability(email: string): Promise<{ available: boolean; message: string }> {
-    try {
-      const res = await this.client.post('/auth/check-email', { email });
-      return res.data;
-    } catch (error: any) {
-      // If the endpoint doesn't exist, fall back to basic validation
-      if (error.response?.status === 404) {
-        console.warn('Email validation endpoint not found, using fallback validation');
-        return { available: true, message: 'Email validation not available' };
-      }
-      
-      // If it's a validation error (400), return the error message
-      if (error.response?.status === 400) {
-        return error.response.data;
-      }
-      
-      // For other errors, log and return a fallback
-      console.error('Email validation error:', error);
-      return { available: true, message: 'Unable to validate email' };
-    }
-  }
-
-  /**
-   * Get user profile by username
-   * @param username - The username to look up
-   * @returns Promise with user profile
-   */
-  async getUserProfileByUsername(username: string): Promise<User> {
-    try {
-      const res = await this.client.get(`/profiles/username/${username}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Health check endpoint to verify API connectivity
-   * @returns Health status and basic server info
-   */
-  async healthCheck(): Promise<{ 
-    status: string; 
-    users?: number; 
-    timestamp?: string; 
-    [key: string]: any 
-  }> {
-    try {
-      const res = await this.client.get('/');
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Download file content using authenticated request
-   * @param fileId - The file ID to download
-   * @returns Response object for further processing
-   */
-  async downloadFileContent(fileId: string): Promise<Response> {
-    try {
-      const downloadUrl = this.getFileDownloadUrl(fileId);
-      const response = await fetch(downloadUrl);
-      
-      if (!response.ok) {
-        throw new Error(`Download failed: ${response.status} ${response.statusText}`);
-      }
-      
-      return response;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get file content as text using authenticated request
-   * @param fileId - The file ID to get content for
-   * @returns File content as string
-   */
-  async getFileContentAsText(fileId: string): Promise<string> {
-    try {
-      const response = await this.downloadFileContent(fileId);
-      return await response.text();
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get file content as blob using authenticated request  
-   * @param fileId - The file ID to get content for
-   * @returns File content as blob
-   */
-  async getFileContentAsBlob(fileId: string): Promise<Blob> {
-    try {
-      const response = await this.downloadFileContent(fileId);
-      return await response.blob();
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Fetch metadata for a URL (title, description, image)
-   * @param url - The URL to fetch metadata for
-   * @returns Promise with metadata object
-   */
-  async fetchLinkMetadata(url: string): Promise<{
-    url: string;
-    title: string;
-    description: string;
-    image?: string;
-  }> {
-    try {
-      const response = await this.client.post('/link-metadata/fetch-metadata', { url });
-      return response.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Search for locations using the enhanced location search API
-   * @param query - Search query string
-   * @param limit - Maximum number of results (default: 5)
-   * @param countrycodes - Optional country codes filter (e.g., "us,ca")
-   * @returns Promise with array of location results
-   */
-  async searchLocations(query: string, limit: number = 5, countrycodes?: string): Promise<any[]> {
-    try {
-      const params = new URLSearchParams({
-        query,
-        limit: limit.toString()
-      });
-      if (countrycodes) {
-        params.append('countrycodes', countrycodes);
-      }
-      const res = await this.client.get(`/location-search/search?${params.toString()}`);
-      return res.data.results;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get detailed information about a specific location by coordinates
-   * @param lat - Latitude
-   * @param lon - Longitude
-   * @returns Promise with detailed location information
-   */
-  async getLocationDetails(lat: number, lon: number): Promise<any> {
-    try {
-      const res = await this.client.get(`/location-search/details?lat=${lat}&lon=${lon}`);
-      return res.data.result;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Find locations near a point using geospatial queries
-   * @param lat - Latitude
-   * @param lon - Longitude
-   * @param maxDistance - Maximum distance in meters (default: 10000)
-   * @param limit - Maximum number of results (default: 10)
-   * @param skip - Number of results to skip (default: 0)
-   * @returns Promise with nearby locations
-   */
-  async findLocationsNear(
-    lat: number, 
-    lon: number, 
-    maxDistance: number = 10000,
-    limit: number = 10,
-    skip: number = 0
-  ): Promise<any> {
-    try {
-      const params = new URLSearchParams({
-        lat: lat.toString(),
-        lon: lon.toString(),
-        maxDistance: maxDistance.toString(),
-        limit: limit.toString(),
-        skip: skip.toString()
-      });
-      const res = await this.client.get(`/location-search/near?${params.toString()}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Search locations in database by text
-   * @param query - Search query
-   * @param limit - Maximum number of results (default: 10)
-   * @param skip - Number of results to skip (default: 0)
-   * @param type - Filter by location type
-   * @param country - Filter by country
-   * @param city - Filter by city
-   * @returns Promise with search results
-   */
-  async searchLocationsInDB(
-    query: string,
-    limit: number = 10,
-    skip: number = 0,
-    type?: string,
-    country?: string,
-    city?: string
-  ): Promise<any> {
-    try {
-      const params = new URLSearchParams({
-        query,
-        limit: limit.toString(),
-        skip: skip.toString()
-      });
-      if (type) params.append('type', type);
-      if (country) params.append('country', country);
-      if (city) params.append('city', city);
-      
-      const res = await this.client.get(`/location-search/db-search?${params.toString()}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get location statistics
-   * @returns Promise with location statistics
-   */
-  async getLocationStats(): Promise<any> {
-    try {
-      const res = await this.client.get('/location-search/stats');
-      return res.data.stats;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get cache statistics
-   * @returns Promise with cache statistics
-   */
-  async getLocationCacheStats(): Promise<any> {
-    try {
-      const res = await this.client.get('/location-search/cache/stats');
-      return res.data.stats;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Clear location cache
-   * @returns Promise with success status
-   */
-  async clearLocationCache(): Promise<any> {
-    try {
-      const res = await this.client.delete('/location-search/cache');
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get performance statistics
-   * @returns Promise with performance statistics
-   */
-  async getLocationPerformanceStats(): Promise<any> {
-    try {
-      const res = await this.client.get('/location-search/performance');
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-}
-
-// Default export for backward compatibility
-export default OxyServices;
+// Constants
+export { OXY_CLOUD_URL } from './files/FileService';
 
 // Re-export all models and types for convenience
 export * from '../models/interfaces';
-export * from '../models/secureSession';
+export * from '../models/session';
 
-// Clean middleware exports - these will be available for server-side use
-// Note: These require Express.js and are only for server-side applications
-export type { AuthRequest, SimpleAuthRequest } from '../types/middleware';
+// Export device management utilities
+export { DeviceManager } from '../utils/deviceManager';
+export type { DeviceFingerprint, StoredDeviceInfo } from '../utils/deviceManager';
+
+// Import the main class for default export
+import { OxyServicesMain } from './OxyServicesMain';
 
-if (typeof FormData === 'undefined') {
-  console.warn('[OxyHQ/Services] FormData is not available. If you are using Hermes, add "import \'react-native-url-polyfill/auto\'" at the top of your app entry file.');
-}
+// Default export for backward compatibility
+export default OxyServicesMain;