@oxyhq/services 5.13.25 → 5.13.26

package/lib/module/core/HttpService.js

@@ -0,0 +1,476 @@
+"use strict";
+
+/**
+ * Unified HTTP Service
+ * 
+ * Consolidates HttpClient + RequestManager into a single efficient class.
+ * Uses native fetch instead of axios for smaller bundle size.
+ * 
+ * Handles:
+ * - Authentication (token management, auto-refresh)
+ * - Caching (TTL-based)
+ * - Deduplication (concurrent requests)
+ * - Retry logic
+ * - Error handling
+ * - Request queuing
+ */
+
+import { TTLCache, registerCacheForCleanup } from '../utils/cache';
+import { RequestDeduplicator, RequestQueue, SimpleLogger } from '../utils/requestUtils';
+import { retryAsync } from '../utils/asyncUtils';
+import { handleHttpError } from '../utils/errorUtils';
+import { jwtDecode } from 'jwt-decode';
+/**
+ * Token store for authentication (singleton)
+ */
+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;
+  }
+}
+
+/**
+ * Unified HTTP Service
+ * 
+ * Consolidates HttpClient + RequestManager into a single efficient class.
+ * Uses native fetch instead of axios for smaller bundle size.
+ */
+export class HttpService {
+  // Performance monitoring
+  requestMetrics = {
+    totalRequests: 0,
+    successfulRequests: 0,
+    failedRequests: 0,
+    cacheHits: 0,
+    cacheMisses: 0,
+    averageResponseTime: 0
+  };
+  constructor(config) {
+    this.config = config;
+    this.baseURL = config.baseURL;
+    this.tokenStore = TokenStore.getInstance();
+    this.logger = new SimpleLogger(config.enableLogging || false, config.logLevel || 'error', 'HttpService');
+
+    // Initialize performance infrastructure
+    this.cache = new TTLCache(config.cacheTTL || 5 * 60 * 1000);
+    registerCacheForCleanup(this.cache);
+    this.deduplicator = new RequestDeduplicator();
+    this.requestQueue = new RequestQueue(config.maxConcurrentRequests || 10, config.requestQueueSize || 100);
+  }
+
+  /**
+   * Main request method - handles everything in one place
+   */
+  async request(config) {
+    const {
+      method,
+      url,
+      data,
+      params,
+      timeout = this.config.requestTimeout || 5000,
+      signal,
+      cache = method === 'GET',
+      cacheTTL,
+      deduplicate = true,
+      retry = this.config.enableRetry !== false,
+      maxRetries = this.config.maxRetries || 3
+    } = config;
+
+    // Generate cache key (optimized for large objects)
+    const cacheKey = cache ? this.generateCacheKey(method, url, data || params) : null;
+
+    // Check cache first
+    if (cache && cacheKey) {
+      const cached = this.cache.get(cacheKey);
+      if (cached !== null) {
+        this.requestMetrics.cacheHits++;
+        this.logger.debug('Cache hit:', url);
+        return cached;
+      }
+      this.requestMetrics.cacheMisses++;
+    }
+
+    // Request function
+    const requestFn = async () => {
+      const startTime = Date.now();
+      try {
+        // Build URL with params
+        const fullUrl = this.buildURL(url, params);
+
+        // Get auth token (with auto-refresh)
+        const authHeader = await this.getAuthHeader();
+
+        // Determine if data is FormData
+        const isFormData = data instanceof FormData;
+
+        // Make fetch request
+        const controller = new AbortController();
+        const timeoutId = timeout ? setTimeout(() => controller.abort(), timeout) : null;
+        if (signal) {
+          signal.addEventListener('abort', () => controller.abort());
+        }
+
+        // Build headers
+        const headers = {
+          'Accept': 'application/json'
+        };
+
+        // Only set Content-Type for non-FormData requests (FormData sets it automatically with boundary)
+        if (!isFormData) {
+          headers['Content-Type'] = 'application/json';
+        }
+        if (authHeader) {
+          headers['Authorization'] = authHeader;
+        }
+        const response = await fetch(fullUrl, {
+          method,
+          headers,
+          body: method !== 'GET' && data ? isFormData ? data : JSON.stringify(data) : undefined,
+          signal: controller.signal
+        });
+        if (timeoutId) clearTimeout(timeoutId);
+
+        // Handle response
+        if (!response.ok) {
+          if (response.status === 401) {
+            this.tokenStore.clearTokens();
+          }
+
+          // Try to parse error response (handle empty/malformed JSON)
+          let errorMessage = `HTTP ${response.status}: ${response.statusText}`;
+          const contentType = response.headers.get('content-type');
+          if (contentType && contentType.includes('application/json')) {
+            try {
+              const errorData = await response.json();
+              if (errorData?.message) {
+                errorMessage = errorData.message;
+              }
+            } catch (parseError) {
+              // Malformed JSON or empty response - use status text
+              this.logger.warn('Failed to parse error response JSON:', parseError);
+            }
+          }
+          const error = new Error(errorMessage);
+          error.status = response.status;
+          error.response = {
+            status: response.status,
+            statusText: response.statusText
+          };
+          throw error;
+        }
+
+        // Handle different response types (optimized - read response once)
+        const contentType = response.headers.get('content-type');
+        let responseData;
+        if (contentType && contentType.includes('application/json')) {
+          // Use response.json() directly for better performance
+          try {
+            responseData = await response.json();
+            // Handle null/undefined responses
+            if (responseData === null || responseData === undefined) {
+              responseData = null;
+            } else {
+              // Unwrap standardized API response format for JSON
+              responseData = this.unwrapResponse(responseData);
+            }
+          } catch (parseError) {
+            // Handle malformed JSON or empty responses gracefully
+            // Note: Once response.json() is called, the body is consumed and cannot be read again
+            // So we check the error type to determine if it's empty or malformed
+            if (parseError instanceof SyntaxError) {
+              this.logger.warn('Failed to parse JSON response (malformed or empty):', parseError);
+              // SyntaxError typically means empty or malformed JSON
+              // For empty responses, return null; for malformed JSON, throw descriptive error
+              responseData = null; // Treat as empty response for safety
+            } else {
+              this.logger.warn('Failed to read response:', parseError);
+              throw new Error('Failed to read response from server');
+            }
+          }
+        } else if (contentType && (contentType.includes('application/octet-stream') || contentType.includes('image/') || contentType.includes('video/') || contentType.includes('audio/'))) {
+          // For binary responses (blobs), return the blob directly without unwrapping
+          responseData = await response.blob();
+        } else {
+          // For other responses, return as text
+          const text = await response.text();
+          responseData = text || null;
+        }
+        const duration = Date.now() - startTime;
+        this.updateMetrics(true, duration);
+        this.config.onRequestEnd?.(url, method, duration, true);
+        return responseData;
+      } catch (error) {
+        const duration = Date.now() - startTime;
+        this.updateMetrics(false, duration);
+        this.config.onRequestEnd?.(url, method, duration, false);
+        this.config.onRequestError?.(url, method, error instanceof Error ? error : new Error(String(error)));
+
+        // Handle AbortError specifically for better error messages
+        if (error instanceof Error && error.name === 'AbortError') {
+          throw handleHttpError(error);
+        }
+        throw handleHttpError(error);
+      }
+    };
+
+    // Wrap with retry if enabled
+    const requestWithRetry = retry ? () => retryAsync(requestFn, maxRetries, this.config.retryDelay || 1000) : requestFn;
+
+    // Wrap with deduplication if enabled (use optimized key generation)
+    const dedupeKey = deduplicate ? this.generateCacheKey(method, url, data || params) : null;
+    const finalRequest = dedupeKey ? () => this.deduplicator.deduplicate(dedupeKey, requestWithRetry) : requestWithRetry;
+
+    // Execute request (with queue if needed)
+    const result = await this.requestQueue.enqueue(finalRequest);
+
+    // Cache the result if caching is enabled
+    if (cache && cacheKey && result) {
+      this.cache.set(cacheKey, result, cacheTTL);
+    }
+    return result;
+  }
+
+  /**
+   * Generate cache key efficiently
+   * Uses simple hash for large objects to avoid expensive JSON.stringify
+   */
+  generateCacheKey(method, url, data) {
+    if (!data || typeof data === 'object' && Object.keys(data).length === 0) {
+      return `${method}:${url}`;
+    }
+
+    // For small objects, use JSON.stringify
+    const dataStr = JSON.stringify(data);
+    if (dataStr.length < 1000) {
+      return `${method}:${url}:${dataStr}`;
+    }
+
+    // For large objects, use a simple hash based on keys and values length
+    // This avoids expensive serialization while still being unique enough
+    const hash = typeof data === 'object' && data !== null ? Object.keys(data).sort().join(',') + ':' + dataStr.length : String(data).substring(0, 100);
+    return `${method}:${url}:${hash}`;
+  }
+
+  /**
+   * Build full URL with query params
+   */
+  buildURL(url, params) {
+    const base = url.startsWith('http') ? url : `${this.baseURL}${url}`;
+    if (!params || Object.keys(params).length === 0) {
+      return base;
+    }
+    const searchParams = new URLSearchParams();
+    Object.entries(params).forEach(([key, value]) => {
+      if (value !== undefined && value !== null) {
+        searchParams.append(key, String(value));
+      }
+    });
+    const queryString = searchParams.toString();
+    return queryString ? `${base}${base.includes('?') ? '&' : '?'}${queryString}` : base;
+  }
+
+  /**
+   * Get auth header with automatic token refresh
+   */
+  async getAuthHeader() {
+    const accessToken = this.tokenStore.getAccessToken();
+    if (!accessToken) {
+      return null;
+    }
+    try {
+      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 && decoded.sessionId) {
+        try {
+          const refreshUrl = `${this.baseURL}/api/session/token/${decoded.sessionId}`;
+
+          // Use AbortSignal.timeout for consistent timeout handling
+          const response = await fetch(refreshUrl, {
+            method: 'GET',
+            headers: {
+              'Accept': 'application/json'
+            },
+            signal: AbortSignal.timeout(5000)
+          });
+          if (response.ok) {
+            const {
+              accessToken: newToken
+            } = await response.json();
+            this.tokenStore.setTokens(newToken);
+            this.logger.debug('Token refreshed');
+            return `Bearer ${newToken}`;
+          }
+        } catch (refreshError) {
+          this.logger.warn('Token refresh failed, using current token');
+        }
+      }
+      return `Bearer ${accessToken}`;
+    } catch (error) {
+      this.logger.error('Error processing token:', error);
+      return `Bearer ${accessToken}`;
+    }
+  }
+
+  /**
+   * Unwrap standardized API response format
+   */
+  unwrapResponse(responseData) {
+    // Handle paginated responses: { data: [...], pagination: {...} }
+    if (responseData && typeof responseData === 'object' && 'data' in responseData && 'pagination' in responseData) {
+      return responseData;
+    }
+
+    // Handle regular success responses: { data: ... }
+    if (responseData && typeof responseData === 'object' && 'data' in responseData && !Array.isArray(responseData)) {
+      return responseData.data;
+    }
+
+    // Return as-is for responses that don't use sendSuccess wrapper
+    return responseData;
+  }
+
+  /**
+   * Update request metrics
+   */
+  updateMetrics(success, duration) {
+    this.requestMetrics.totalRequests++;
+    if (success) {
+      this.requestMetrics.successfulRequests++;
+    } else {
+      this.requestMetrics.failedRequests++;
+    }
+    const alpha = 0.1;
+    this.requestMetrics.averageResponseTime = this.requestMetrics.averageResponseTime * (1 - alpha) + duration * alpha;
+  }
+
+  // Convenience methods (for backward compatibility)
+  async get(url, config) {
+    const result = await this.request({
+      method: 'GET',
+      url,
+      ...config
+    });
+    return {
+      data: result
+    };
+  }
+  async post(url, data, config) {
+    const result = await this.request({
+      method: 'POST',
+      url,
+      data,
+      ...config
+    });
+    return {
+      data: result
+    };
+  }
+  async put(url, data, config) {
+    const result = await this.request({
+      method: 'PUT',
+      url,
+      data,
+      ...config
+    });
+    return {
+      data: result
+    };
+  }
+  async patch(url, data, config) {
+    const result = await this.request({
+      method: 'PATCH',
+      url,
+      data,
+      ...config
+    });
+    return {
+      data: result
+    };
+  }
+  async delete(url, config) {
+    const result = await this.request({
+      method: 'DELETE',
+      url,
+      ...config
+    });
+    return {
+      data: result
+    };
+  }
+
+  // Token management
+  setTokens(accessToken, refreshToken = '') {
+    this.tokenStore.setTokens(accessToken, refreshToken);
+  }
+  clearTokens() {
+    this.tokenStore.clearTokens();
+  }
+  getAccessToken() {
+    return this.tokenStore.getAccessToken();
+  }
+  hasAccessToken() {
+    return this.tokenStore.hasAccessToken();
+  }
+  getBaseURL() {
+    return this.baseURL;
+  }
+
+  // Cache management
+  clearCache() {
+    this.cache.clear();
+  }
+  clearCacheEntry(key) {
+    this.cache.delete(key);
+  }
+  getCacheStats() {
+    const cacheStats = this.cache.getStats();
+    const total = this.requestMetrics.cacheHits + this.requestMetrics.cacheMisses;
+    return {
+      size: cacheStats.size,
+      hits: this.requestMetrics.cacheHits,
+      misses: this.requestMetrics.cacheMisses,
+      hitRate: total > 0 ? this.requestMetrics.cacheHits / total : 0
+    };
+  }
+  getMetrics() {
+    return {
+      ...this.requestMetrics
+    };
+  }
+
+  // Test-only utility
+  static __resetTokensForTests() {
+    try {
+      TokenStore.getInstance().clearTokens();
+    } catch (error) {
+      // Silently fail in test cleanup - this is expected behavior
+      // TokenStore might not be initialized in some test scenarios
+    }
+  }
+}
+//# sourceMappingURL=HttpService.js.map

package/lib/module/core/HttpService.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["TTLCache","registerCacheForCleanup","RequestDeduplicator","RequestQueue","SimpleLogger","retryAsync","handleHttpError","jwtDecode","TokenStore","accessToken","refreshToken","constructor","getInstance","instance","setTokens","getAccessToken","getRefreshToken","clearTokens","hasAccessToken","HttpService","requestMetrics","totalRequests","successfulRequests","failedRequests","cacheHits","cacheMisses","averageResponseTime","config","baseURL","tokenStore","logger","enableLogging","logLevel","cache","cacheTTL","deduplicator","requestQueue","maxConcurrentRequests","requestQueueSize","request","method","url","data","params","timeout","requestTimeout","signal","deduplicate","retry","enableRetry","maxRetries","cacheKey","generateCacheKey","cached","get","debug","requestFn","startTime","Date","now","fullUrl","buildURL","authHeader","getAuthHeader","isFormData","FormData","controller","AbortController","timeoutId","setTimeout","abort","addEventListener","headers","response","fetch","body","JSON","stringify","undefined","clearTimeout","ok","status","errorMessage","statusText","contentType","includes","errorData","json","message","parseError","warn","error","Error","responseData","unwrapResponse","SyntaxError","blob","text","duration","updateMetrics","onRequestEnd","onRequestError","String","name","requestWithRetry","retryDelay","dedupeKey","finalRequest","result","enqueue","set","Object","keys","length","dataStr","hash","sort","join","substring","base","startsWith","searchParams","URLSearchParams","entries","forEach","key","value","append","queryString","toString","decoded","currentTime","Math","floor","exp","sessionId","refreshUrl","AbortSignal","newToken","refreshError","Array","isArray","success","alpha","post","put","patch","delete","getBaseURL","clearCache","clear","clearCacheEntry","getCacheStats","cacheStats","getStats","total","size","hits","misses","hitRate","getMetrics","__resetTokensForTests"],"sourceRoot":"../../../src","sources":["core/HttpService.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/core/OxyServices.base.js

@@ -7,8 +7,7 @@
  */
 import { jwtDecode } from 'jwt-decode';
 import { handleHttpError } from '../utils/errorUtils';
-import { HttpClient } from './HttpClient';
-import { RequestManager } from './RequestManager';
+import { HttpService } from './HttpService';
 import { OxyAuthenticationError, OxyAuthenticationTimeoutError } from './OxyServices.errors';
 /**
  * Base class for OxyServices with core infrastructure
@@ -22,16 +21,13 @@ export class OxyServicesBase {
     this.config = config;
     this.cloudURL = config.cloudURL || 'https://cloud.oxy.so';
 
-    // 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);
+    // Initialize unified HTTP service (handles auth, caching, deduplication, queuing, retry)
+    this.httpService = new HttpService(config);
   }
 
   // Test-only utility to reset global tokens between jest tests
   static __resetTokensForTests() {
-    HttpClient.__resetTokensForTests();
+    HttpService.__resetTokensForTests();
   }
 
   /**
@@ -39,7 +35,13 @@ export class OxyServicesBase {
    * This is the main method for all API calls - ensures authentication and performance features
    */
   async makeRequest(method, url, data, options = {}) {
-    return this.requestManager.request(method, url, data, options);
+    return this.httpService.request({
+      method,
+      url,
+      data: method !== 'GET' ? data : undefined,
+      params: method === 'GET' ? data : undefined,
+      ...options
+    });
   }
 
   // ============================================================================
@@ -50,43 +52,43 @@ export class OxyServicesBase {
    * Get the configured Oxy API base URL
    */
   getBaseURL() {
-    return this.httpClient.getBaseURL();
+    return this.httpService.getBaseURL();
   }
 
   /**
-   * Get the HTTP client instance
-   * Useful for advanced use cases where direct access to the HTTP client is needed
+   * Get the HTTP service instance
+   * Useful for advanced use cases where direct access to the HTTP service is needed
    */
   getClient() {
-    return this.httpClient;
+    return this.httpService;
   }
 
   /**
    * Get performance metrics
    */
   getMetrics() {
-    return this.requestManager.getMetrics();
+    return this.httpService.getMetrics();
   }
 
   /**
    * Clear request cache
    */
   clearCache() {
-    this.requestManager.clearCache();
+    this.httpService.clearCache();
   }
 
   /**
    * Clear specific cache entry
    */
   clearCacheEntry(key) {
-    this.requestManager.clearCacheEntry(key);
+    this.httpService.clearCacheEntry(key);
   }
 
   /**
    * Get cache statistics
    */
   getCacheStats() {
-    return this.requestManager.getCacheStats();
+    return this.httpService.getCacheStats();
   }
 
   /**
@@ -100,21 +102,21 @@ export class OxyServicesBase {
    * Set authentication tokens
    */
   setTokens(accessToken, refreshToken = '') {
-    this.httpClient.setTokens(accessToken, refreshToken);
+    this.httpService.setTokens(accessToken, refreshToken);
   }
 
   /**
    * Clear stored authentication tokens
    */
   clearTokens() {
-    this.httpClient.clearTokens();
+    this.httpService.clearTokens();
   }
 
   /**
    * Get the current user ID from the access token
    */
   getCurrentUserId() {
-    const accessToken = this.httpClient.getAccessToken();
+    const accessToken = this.httpService.getAccessToken();
     if (!accessToken) {
       return null;
     }
@@ -130,14 +132,14 @@ export class OxyServicesBase {
    * Check if the client has a valid access token (public method)
    */
   hasValidToken() {
-    return this.httpClient.hasAccessToken();
+    return this.httpService.hasAccessToken();
   }
 
   /**
    * Get the raw access token (for constructing anchor URLs when needed)
    */
   getAccessToken() {
-    return this.httpClient.getAccessToken();
+    return this.httpService.getAccessToken();
   }
 
   /**
@@ -160,7 +162,7 @@ export class OxyServicesBase {
    */
   async waitForAuth(timeoutMs = 5000) {
     // Immediate synchronous check - no delay if token is ready
-    if (this.httpClient.hasAccessToken()) {
+    if (this.httpService.hasAccessToken()) {
       return true;
     }
     const startTime = performance.now();
@@ -171,7 +173,7 @@ export class OxyServicesBase {
 
     while (performance.now() < maxTime) {
       await new Promise(resolve => setTimeout(resolve, pollInterval));
-      if (this.httpClient.hasAccessToken()) {
+      if (this.httpService.hasAccessToken()) {
         return true;
       }
 
@@ -197,7 +199,7 @@ export class OxyServicesBase {
     for (let attempt = 0; attempt <= maxRetries; attempt++) {
       try {
         // First attempt: check if we have a token
-        if (!this.httpClient.hasAccessToken()) {
+        if (!this.httpService.hasAccessToken()) {
           if (attempt === 0) {
             // On first attempt, wait briefly for authentication to complete
             const authReady = await this.waitForAuth(authTimeoutMs);
@@ -214,7 +216,8 @@ export class OxyServicesBase {
         return await operation();
       } catch (error) {
         const isLastAttempt = attempt === maxRetries;
-        const isAuthError = error?.response?.status === 401 || error?.code === 'MISSING_TOKEN' || error?.message?.includes('Authentication') || error instanceof OxyAuthenticationError;
+        const errorObj = error && typeof error === 'object' ? error : null;
+        const isAuthError = errorObj?.response?.status === 401 || errorObj?.code === 'MISSING_TOKEN' || errorObj?.message?.includes('Authentication') || error instanceof OxyAuthenticationError;
         if (isAuthError && !isLastAttempt && !(error instanceof OxyAuthenticationTimeoutError)) {
           await new Promise(resolve => setTimeout(resolve, retryDelay));
           continue;