@oxyhq/services 5.13.1 → 5.13.2

package/src/utils/languageUtils.ts

@@ -0,0 +1,174 @@
+/**
+ * Language utilities for OxyServices
+ * Provides access to supported languages and language metadata
+ */
+
+export interface LanguageMetadata {
+  id: string;
+  name: string;
+  nativeName: string;
+  flag: string;
+  icon: string;
+  color: string;
+}
+
+// Supported languages with their metadata
+export const SUPPORTED_LANGUAGES: LanguageMetadata[] = [
+  {
+    id: 'en-US',
+    name: 'English',
+    nativeName: 'English',
+    flag: '🇺🇸',
+    icon: 'language-outline',
+    color: '#007AFF',
+  },
+  {
+    id: 'es-ES',
+    name: 'Spanish',
+    nativeName: 'Español',
+    flag: '🇪🇸',
+    icon: 'language-outline',
+    color: '#FF3B30',
+  },
+  {
+    id: 'ca-ES',
+    name: 'Catalan',
+    nativeName: 'Català',
+    flag: '🇪🇸',
+    icon: 'language-outline',
+    color: '#0CA678',
+  },
+  {
+    id: 'fr-FR',
+    name: 'French',
+    nativeName: 'Français',
+    flag: '🇫🇷',
+    icon: 'language-outline',
+    color: '#5856D6',
+  },
+  {
+    id: 'de-DE',
+    name: 'German',
+    nativeName: 'Deutsch',
+    flag: '🇩🇪',
+    icon: 'language-outline',
+    color: '#FF9500',
+  },
+  {
+    id: 'it-IT',
+    name: 'Italian',
+    nativeName: 'Italiano',
+    flag: '🇮🇹',
+    icon: 'language-outline',
+    color: '#34C759',
+  },
+  {
+    id: 'pt-PT',
+    name: 'Portuguese',
+    nativeName: 'Português',
+    flag: '🇵🇹',
+    icon: 'language-outline',
+    color: '#AF52DE',
+  },
+  {
+    id: 'ja-JP',
+    name: 'Japanese',
+    nativeName: '日本語',
+    flag: '🇯🇵',
+    icon: 'language-outline',
+    color: '#FF2D92',
+  },
+  {
+    id: 'ko-KR',
+    name: 'Korean',
+    nativeName: '한국어',
+    flag: '🇰🇷',
+    icon: 'language-outline',
+    color: '#32D74B',
+  },
+  {
+    id: 'zh-CN',
+    name: 'Chinese',
+    nativeName: '中文',
+    flag: '🇨🇳',
+    icon: 'language-outline',
+    color: '#FF9F0A',
+  },
+  {
+    id: 'ar-SA',
+    name: 'Arabic',
+    nativeName: 'العربية',
+    flag: '🇸🇦',
+    icon: 'language-outline',
+    color: '#30B0C7',
+  },
+];
+
+const FALLBACK_LANGUAGE = 'en-US';
+
+/**
+ * Get language metadata by language code
+ * @param languageCode - BCP-47 language code (e.g., 'en-US', 'es-ES')
+ * @returns Language metadata or null if not found
+ */
+export function getLanguageMetadata(languageCode: string | null | undefined): LanguageMetadata | null {
+  if (!languageCode) return null;
+  
+  // Direct match
+  const exactMatch = SUPPORTED_LANGUAGES.find(lang => lang.id === languageCode);
+  if (exactMatch) return exactMatch;
+  
+  // Try to match base language code (e.g., 'en' matches 'en-US')
+  const baseCode = languageCode.split('-')[0];
+  const baseMatch = SUPPORTED_LANGUAGES.find(lang => lang.id.startsWith(baseCode + '-'));
+  if (baseMatch) return baseMatch;
+  
+  return null;
+}
+
+/**
+ * Get language name by language code
+ * @param languageCode - BCP-47 language code (e.g., 'en-US', 'es-ES')
+ * @returns Language name (e.g., 'English') or the code if not found
+ */
+export function getLanguageName(languageCode: string | null | undefined): string {
+  const metadata = getLanguageMetadata(languageCode);
+  return metadata?.name || languageCode || FALLBACK_LANGUAGE;
+}
+
+/**
+ * Get native language name by language code
+ * @param languageCode - BCP-47 language code (e.g., 'en-US', 'es-ES')
+ * @returns Native language name (e.g., 'Español') or the code if not found
+ */
+export function getNativeLanguageName(languageCode: string | null | undefined): string {
+  const metadata = getLanguageMetadata(languageCode);
+  return metadata?.nativeName || languageCode || FALLBACK_LANGUAGE;
+}
+
+/**
+ * Normalize language code to BCP-47 format
+ * @param lang - Language code (may be short like 'en' or full like 'en-US')
+ * @returns Normalized BCP-47 language code
+ */
+export function normalizeLanguageCode(lang?: string | null): string {
+  if (!lang) return FALLBACK_LANGUAGE;
+  if (lang.includes('-')) return lang;
+  
+  const map: Record<string, string> = {
+    en: 'en-US',
+    es: 'es-ES',
+    ca: 'ca-ES',
+    fr: 'fr-FR',
+    de: 'de-DE',
+    it: 'it-IT',
+    pt: 'pt-PT',
+    ja: 'ja-JP',
+    ko: 'ko-KR',
+    zh: 'zh-CN',
+    ar: 'ar-SA',
+  };
+  
+  return map[lang] || lang;
+}
+

package/src/utils/requestUtils.ts

@@ -0,0 +1,234 @@
+/**
+ * Request utilities for HTTP clients
+ * 
+ * Provides reusable components for request deduplication, queuing, and logging
+ */
+
+/**
+ * Request deduplication - prevents duplicate concurrent requests
+ * 
+ * When multiple requests with the same key are made simultaneously,
+ * only one request is executed and all callers receive the same result.
+ * 
+ * @example
+ * ```typescript
+ * const deduplicator = new RequestDeduplicator();
+ * 
+ * // Multiple calls with same key will share the same promise
+ * const promise1 = deduplicator.deduplicate('user-123', () => fetchUser('123'));
+ * const promise2 = deduplicator.deduplicate('user-123', () => fetchUser('123'));
+ * // promise1 === promise2, only one API call is made
+ * ```
+ */
+export class RequestDeduplicator {
+  private pendingRequests = new Map<string, Promise<any>>();
+
+  /**
+   * Deduplicate a request by key
+   * @param key Unique key for the request
+   * @param requestFn Function that returns a promise
+   * @returns Promise that will be shared if key already exists
+   */
+  async deduplicate<T>(
+    key: string,
+    requestFn: () => Promise<T>
+  ): Promise<T> {
+    const existing = this.pendingRequests.get(key);
+    if (existing) {
+      return existing;
+    }
+
+    const promise = requestFn()
+      .finally(() => {
+        this.pendingRequests.delete(key);
+      });
+
+    this.pendingRequests.set(key, promise);
+    return promise;
+  }
+
+  /**
+   * Clear all pending requests
+   */
+  clear(): void {
+    this.pendingRequests.clear();
+  }
+
+  /**
+   * Get number of pending requests
+   */
+  size(): number {
+    return this.pendingRequests.size;
+  }
+}
+
+/**
+ * Request queue with concurrency control
+ * 
+ * Limits the number of concurrent requests and queues excess requests.
+ * Useful for rate limiting and preventing request flooding.
+ * 
+ * @example
+ * ```typescript
+ * const queue = new RequestQueue(5, 100); // Max 5 concurrent, queue up to 100
+ * 
+ * // All requests will be queued and processed with max 5 concurrent
+ * await queue.enqueue(() => fetchUser('1'));
+ * await queue.enqueue(() => fetchUser('2'));
+ * // ...
+ * ```
+ */
+export class RequestQueue {
+  private queue: Array<() => Promise<any>> = [];
+  private running = 0;
+  private maxConcurrent: number;
+  private maxQueueSize: number;
+
+  /**
+   * Create a new request queue
+   * @param maxConcurrent Maximum number of concurrent requests (default: 10)
+   * @param maxQueueSize Maximum queue size (default: 100)
+   */
+  constructor(maxConcurrent: number = 10, maxQueueSize: number = 100) {
+    this.maxConcurrent = maxConcurrent;
+    this.maxQueueSize = maxQueueSize;
+  }
+
+  /**
+   * Enqueue a request
+   * @param requestFn Function that returns a promise
+   * @returns Promise that resolves when request completes
+   */
+  async enqueue<T>(requestFn: () => Promise<T>): Promise<T> {
+    if (this.queue.length >= this.maxQueueSize) {
+      throw new Error('Request queue is full');
+    }
+
+    return new Promise<T>((resolve, reject) => {
+      this.queue.push(async () => {
+        try {
+          const result = await requestFn();
+          resolve(result);
+        } catch (error) {
+          reject(error);
+        }
+      });
+
+      this.process();
+    });
+  }
+
+  /**
+   * Process queued requests
+   */
+  private async process(): Promise<void> {
+    if (this.running >= this.maxConcurrent || this.queue.length === 0) {
+      return;
+    }
+
+    this.running++;
+    const requestFn = this.queue.shift();
+    if (requestFn) {
+      try {
+        await requestFn();
+      } finally {
+        this.running--;
+        this.process();
+      }
+    } else {
+      this.running--;
+    }
+  }
+
+  /**
+   * Clear all queued requests
+   */
+  clear(): void {
+    this.queue = [];
+  }
+
+  /**
+   * Get queue size
+   */
+  size(): number {
+    return this.queue.length;
+  }
+
+  /**
+   * Get number of currently running requests
+   */
+  runningCount(): number {
+    return this.running;
+  }
+}
+
+/**
+ * Simple logger with level support
+ * 
+ * Lightweight logger for HTTP clients and utilities.
+ * For more advanced logging, use loggerUtils.ts
+ * 
+ * @example
+ * ```typescript
+ * const logger = new SimpleLogger(true, 'debug');
+ * logger.debug('Debug message');
+ * logger.info('Info message');
+ * logger.error('Error message');
+ * ```
+ */
+export class SimpleLogger {
+  private enabled: boolean;
+  private level: 'none' | 'error' | 'warn' | 'info' | 'debug';
+  private prefix: string;
+
+  /**
+   * Create a new simple logger
+   * @param enabled Whether logging is enabled
+   * @param level Minimum log level
+   * @param prefix Prefix for log messages (default: '')
+   */
+  constructor(
+    enabled: boolean = false,
+    level: string = 'error',
+    prefix: string = ''
+  ) {
+    this.enabled = enabled;
+    this.level = level as any;
+    this.prefix = prefix;
+  }
+
+  private shouldLog(level: string): boolean {
+    if (!this.enabled || this.level === 'none') return false;
+    const levels = ['none', 'error', 'warn', 'info', 'debug'];
+    return levels.indexOf(level) <= levels.indexOf(this.level);
+  }
+
+  private formatMessage(...args: any[]): any[] {
+    return this.prefix ? [`[${this.prefix}]`, ...args] : args;
+  }
+
+  error(...args: any[]): void {
+    if (this.shouldLog('error')) {
+      console.error(...this.formatMessage(...args));
+    }
+  }
+
+  warn(...args: any[]): void {
+    if (this.shouldLog('warn')) {
+      console.warn(...this.formatMessage(...args));
+    }
+  }
+
+  info(...args: any[]): void {
+    if (this.shouldLog('info')) {
+      console.info(...this.formatMessage(...args));
+    }
+  }
+
+  debug(...args: any[]): void {
+    if (this.shouldLog('debug')) {
+      console.log(...this.formatMessage(...args));
+    }
+  }
+}
+

package/src/utils/sessionUtils.ts

@@ -0,0 +1,206 @@
+/**
+ * Session management utilities
+ * 
+ * Provides consistent session normalization, deduplication, and sorting
+ * to ensure sessions are always displayed in a predictable order.
+ */
+
+import type { ClientSession } from '../models/session';
+
+/**
+ * Normalize a session to ensure all required fields are present
+ */
+export function normalizeSession(session: Partial<ClientSession> & { sessionId: string }): ClientSession {
+  const now = new Date().toISOString();
+  return {
+    sessionId: session.sessionId,
+    deviceId: session.deviceId || '',
+    expiresAt: session.expiresAt || now,
+    lastActive: session.lastActive || now,
+    userId: session.userId || '',
+  };
+}
+
+/**
+ * Compare two sessions for equality
+ */
+export function sessionsEqual(a: ClientSession, b: ClientSession): boolean {
+  return a.sessionId === b.sessionId;
+}
+
+/**
+ * Sort sessions by lastActive (most recent first), then by sessionId for stability
+ */
+export function sortSessions(sessions: ClientSession[]): ClientSession[] {
+  return [...sessions].sort((a, b) => {
+    // Sort by lastActive descending (most recent first)
+    const timeA = new Date(a.lastActive).getTime();
+    const timeB = new Date(b.lastActive).getTime();
+    if (timeA !== timeB) {
+      return timeB - timeA; // Descending order
+    }
+    // If lastActive is the same, sort by sessionId for stability
+    return a.sessionId.localeCompare(b.sessionId);
+  });
+}
+
+/**
+ * Deduplicate sessions by sessionId, keeping the most recent version
+ */
+export function deduplicateSessions(sessions: ClientSession[]): ClientSession[] {
+  const sessionMap = new Map<string, ClientSession>();
+  
+  for (const session of sessions) {
+    const existing = sessionMap.get(session.sessionId);
+    if (!existing) {
+      sessionMap.set(session.sessionId, session);
+    } else {
+      // Keep the one with more recent lastActive
+      const existingTime = new Date(existing.lastActive).getTime();
+      const currentTime = new Date(session.lastActive).getTime();
+      if (currentTime > existingTime) {
+        sessionMap.set(session.sessionId, session);
+      }
+    }
+  }
+  
+  return Array.from(sessionMap.values());
+}
+
+/**
+ * Deduplicate sessions by userId, keeping only one session per user
+ * Priority: 1) Active session (if provided), 2) Most recent session
+ * This prevents showing duplicate accounts for the same user
+ */
+export function deduplicateSessionsByUserId(
+  sessions: ClientSession[],
+  activeSessionId?: string | null
+): ClientSession[] {
+  if (!sessions.length) return [];
+  
+  const userSessionMap = new Map<string, ClientSession>();
+  
+  for (const session of sessions) {
+    if (!session.userId) continue; // Skip sessions without userId
+    
+    const existing = userSessionMap.get(session.userId);
+    if (!existing) {
+      userSessionMap.set(session.userId, session);
+    } else {
+      // Prioritize active session
+      const isCurrentActive = activeSessionId && session.sessionId === activeSessionId;
+      const isExistingActive = activeSessionId && existing.sessionId === activeSessionId;
+      
+      if (isCurrentActive && !isExistingActive) {
+        userSessionMap.set(session.userId, session);
+      } else if (!isCurrentActive && isExistingActive) {
+        // Keep existing (active) session
+        continue;
+      } else {
+        // Neither is active, keep the one with more recent lastActive
+        const existingTime = new Date(existing.lastActive).getTime();
+        const currentTime = new Date(session.lastActive).getTime();
+        if (currentTime > existingTime) {
+          userSessionMap.set(session.userId, session);
+        }
+      }
+    }
+  }
+  
+  return Array.from(userSessionMap.values());
+}
+
+/**
+ * Normalize, deduplicate, and sort sessions
+ * This ensures consistent session ordering across the application
+ * 
+ * @param sessions - Array of sessions to normalize
+ * @param activeSessionId - Optional active session ID to prioritize
+ * @param deduplicateByUserId - If true, deduplicate by userId (one account per user). Default: true
+ */
+export function normalizeAndSortSessions(
+  sessions: ClientSession[],
+  activeSessionId?: string | null,
+  deduplicateByUserId: boolean = true
+): ClientSession[] {
+  if (!sessions.length) return [];
+  
+  // Normalize all sessions
+  const normalized = sessions.map(normalizeSession);
+  
+  // First deduplicate by sessionId (exact duplicates)
+  const deduplicatedBySessionId = deduplicateSessions(normalized);
+  
+  // Then deduplicate by userId if requested (one account per user)
+  const finalSessions = deduplicateByUserId
+    ? deduplicateSessionsByUserId(deduplicatedBySessionId, activeSessionId)
+    : deduplicatedBySessionId;
+  
+  // Sort consistently
+  return sortSessions(finalSessions);
+}
+
+/**
+ * Merge two session arrays, prioritizing newer data
+ * Returns normalized, deduplicated, and sorted sessions
+ * 
+ * @param existing - Existing sessions array
+ * @param incoming - New sessions to merge in
+ * @param activeSessionId - Optional active session ID to prioritize
+ * @param deduplicateByUserId - If true, deduplicate by userId (one account per user). Default: true
+ */
+export function mergeSessions(
+  existing: ClientSession[],
+  incoming: ClientSession[],
+  activeSessionId?: string | null,
+  deduplicateByUserId: boolean = true
+): ClientSession[] {
+  if (!existing.length && !incoming.length) return [];
+  if (!existing.length) return normalizeAndSortSessions(incoming, activeSessionId, deduplicateByUserId);
+  if (!incoming.length) return normalizeAndSortSessions(existing, activeSessionId, deduplicateByUserId);
+  
+  // Normalize both arrays
+  const normalizedExisting = existing.map(normalizeSession);
+  const normalizedIncoming = incoming.map(normalizeSession);
+  
+  // Create a map with existing sessions (by sessionId)
+  const sessionMap = new Map<string, ClientSession>();
+  
+  // Add existing sessions first
+  for (const session of normalizedExisting) {
+    sessionMap.set(session.sessionId, session);
+  }
+  
+  // Merge incoming sessions - backend data always replaces existing
+  for (const session of normalizedIncoming) {
+    sessionMap.set(session.sessionId, session);
+  }
+  
+  // Convert to array
+  const merged = Array.from(sessionMap.values());
+  
+  // Apply userId deduplication if requested
+  const finalSessions = deduplicateByUserId
+    ? deduplicateSessionsByUserId(merged, activeSessionId)
+    : merged;
+  
+  // Sort consistently
+  return sortSessions(finalSessions);
+}
+
+/**
+ * Check if two session arrays are equal (same sessionIds in same order)
+ */
+export function sessionsArraysEqual(a: ClientSession[], b: ClientSession[]): boolean {
+  if (a.length !== b.length) {
+    return false;
+  }
+  
+  const sortedA = sortSessions(a);
+  const sortedB = sortSessions(b);
+  
+  return sortedA.every((session, index) => 
+    sessionsEqual(session, sortedB[index])
+  );
+}
+