myavana-bot-test-core 2.1.9 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "myavana-bot-test-core",
-    "version": "2.1.9",
+    "version": "2.2.0",
     "description": "Shared bot functionality with enhanced features",
     "main": "index.js",
     "scripts": {

package/src/cacheManager.js

@@ -1,4 +1,4 @@
-// cacheManager.js - OPTIMIZED VERSION
+// cacheManager.js - PRODUCTION VERSION WITH MULTI-LAYER FALLBACK
 
 const ai = require('./ai');
 const { googleAI } = require('@genkit-ai/google-genai');
@@ -7,48 +7,75 @@ const { GoogleGenAI } = require("@google/genai");
 const config = require('./config');
 
 /**
- * Cache Manager for Gemini API
- * Handles creation, retrieval, and expiration of cached system instructions
- * OPTIMIZED: Check cache validity before expensive prompt construction
+ * Cache Manager for Gemini API with Multi-Layer Storage
+ * Storage Layers (in order of preference):
+ * 1. PostgreSQL (persistent, shared across instances)
+ * 2. Redis (fast, shared across instances)
+ * 3. Memory (fastest, single instance only)
  */
 const cacheAi = new GoogleGenAI({ apiKey: config.genkitApiKey });
 
 class CacheManager {
     constructor() {
         this.CACHE_TTL_HOURS = 24;
-        this.CACHE_TTL_SECONDS = this.CACHE_TTL_HOURS * 60 * 60; // 24 hours in seconds
-        this.CACHE_REFRESH_THRESHOLD_HOURS = 1; // Refresh if cache expires in < 1 hour
+        this.CACHE_TTL_SECONDS = this.CACHE_TTL_HOURS * 60 * 60;
+        this.CACHE_REFRESH_THRESHOLD_HOURS = 1;
+        
+        // In-memory fallback (last resort)
+        this.memoryCache = new Map();
+        
+        console.log('🔧 Cache Manager initialized with multi-layer storage');
     }
 
     /**
-     * NEW: Check if user has a valid cache WITHOUT constructing prompt
-     * This is fast and should be called BEFORE expensive prompt construction
-     * @param {string} userId - User identifier
-     * @returns {Promise<{hasValidCache: boolean, cacheName: string|null, needsRefresh: boolean}>}
+     * Check cache validity across all storage layers
      */
     async checkCacheValidity(userId) {
         console.log('🔍 Quick cache check for user:', userId);
+        const checkStart = performance.now();
         
         try {
-            const existingCache = await this.getUserCache(userId);
+            // Try all layers in order of preference
+            let existingCache = null;
+            let source = 'none';
+            
+            // Layer 1: PostgreSQL (preferred)
+            existingCache = await this.getUserCache(userId);
+            if (existingCache) {
+                source = 'postgresql';
+            }
+            
+            // Layer 2: Redis (if PostgreSQL failed)
+            if (!existingCache && redisClient) {
+                existingCache = await this.getUserCacheFromRedis(userId);
+                if (existingCache) source = 'redis';
+            }
+            
+            // Layer 3: Memory (if both failed)
+            if (!existingCache) {
+                existingCache = this.getUserCacheFromMemory(userId);
+                if (existingCache) source = 'memory';
+            }
             
             if (!existingCache) {
-                console.log('📭 No cache exists - will need to create one');
+                console.log('📭 No cache exists (checked:', (performance.now() - checkStart).toFixed(0), 'ms)');
                 return {
                     hasValidCache: false,
                     cacheName: null,
                     needsRefresh: false,
-                    reason: 'no_cache'
+                    reason: 'no_cache',
+                    source: 'none'
                 };
             }
             
             if (this.isCacheExpired(existingCache)) {
-                console.log('⏰ Cache expired - will need to create new one');
+                console.log('⏰ Cache expired (from:', source, ')');
                 return {
                     hasValidCache: false,
                     cacheName: null,
                     needsRefresh: true,
-                    reason: 'expired'
+                    reason: 'expired',
+                    source: source
                 };
             }
             
@@ -56,9 +83,11 @@ class CacheManager {
             const needsRefresh = remainingHours < this.CACHE_REFRESH_THRESHOLD_HOURS;
             
             console.log('✅ Valid cache found:', {
+                source: source,
                 cacheName: existingCache.cache_name,
                 remainingHours: remainingHours,
-                needsRefresh: needsRefresh
+                needsRefresh: needsRefresh,
+                checkTime: (performance.now() - checkStart).toFixed(0) + 'ms'
             });
             
             return {
@@ -66,7 +95,8 @@ class CacheManager {
                 cacheName: existingCache.cache_name,
                 needsRefresh: needsRefresh,
                 remainingHours: remainingHours,
-                reason: 'valid'
+                reason: 'valid',
+                source: source
             };
             
         } catch (error) {
@@ -75,17 +105,14 @@ class CacheManager {
                 hasValidCache: false,
                 cacheName: null,
                 needsRefresh: false,
-                reason: 'error'
+                reason: 'error',
+                source: 'none'
             };
         }
     }
 
     /**
-     * Get or create a cache for a user's system prompt
-     * NOW: Can be called conditionally based on checkCacheValidity result
-     * @param {string} userId - User identifier
-     * @param {string} systemPrompt - The large system instruction to cache
-     * @returns {Promise<{cacheName: string, isNewCache: boolean}>}
+     * Get or create cache
      */
     async getOrCreateCache(userId, systemPrompt) {
         console.log('🔍 ===== CACHE MANAGER: GET OR CREATE =====');
@@ -97,18 +124,11 @@ class CacheManager {
         });
 
         try {
-            // Try to get existing cache for user
-            const existingCache = await this.getUserCache(userId);
+            // Quick check across all layers
+            const existingCache = await this.getUserCacheFromAnyLayer(userId);
             
             if (existingCache && !this.isCacheExpired(existingCache)) {
-                console.log('✅ Using existing cache:', {
-                    cacheName: existingCache.cache_name,
-                    createdAt: existingCache.created_at,
-                    expiresAt: existingCache.expires_at,
-                    ageHours: this.getCacheAgeHours(existingCache),
-                    remainingHours: this.getCacheRemainingHours(existingCache)
-                });
-                
+                console.log('✅ Using existing cache:', existingCache.cache_name);
                 return {
                     cacheName: existingCache.cache_name,
                     isNewCache: false
@@ -116,7 +136,7 @@ class CacheManager {
             }
 
             // Create new cache
-            console.log('🆕 Creating new cache for user:', userId);
+            console.log('🆕 Creating new Gemini cache...');
             const cacheStartTime = performance.now();
             const modelName = "gemini-3-flash-preview";
             
@@ -129,17 +149,18 @@ class CacheManager {
             });
 
             const cacheCreationTime = performance.now() - cacheStartTime;
-            console.log('✅ Cache created successfully:', {
+            console.log('✅ Gemini cache created:', {
                 cacheName: cache.name,
                 creationTime: cacheCreationTime.toFixed(2) + 'ms',
                 ttlHours: this.CACHE_TTL_HOURS,
                 expiresAt: new Date(Date.now() + this.CACHE_TTL_SECONDS * 1000).toISOString()
             });
 
-            // Save cache info to database
-            await this.saveUserCache(userId, cache.name);
+            // Save to all available storage layers
+            const saveStart = performance.now();
+            await this.saveUserCacheMultiLayer(userId, cache.name);
+            console.log('💾 Multi-layer save completed:', (performance.now() - saveStart).toFixed(0), 'ms');
             
-            console.log('💾 Cache info saved to database');
             console.log('🔍 ===== CACHE MANAGER: COMPLETE =====');
 
             return {
@@ -154,7 +175,6 @@ class CacheManager {
                 timestamp: new Date().toISOString()
             });
             
-            // Return null to indicate cache unavailable - caller should proceed without cache
             return {
                 cacheName: null,
                 isNewCache: false,
@@ -164,14 +184,172 @@ class CacheManager {
     }
 
     /**
-     * Get user's cache info from database
-     * FIXED: Using correct PostgreSQL syntax (not MySQL)
-     * @param {string} userId 
-     * @returns {Promise<object|null>}
+     * Try to get cache from any available layer
      */
-    async getUserCache(userId) {
-        console.log('📂 Fetching cache info from database for user:', userId);
+    async getUserCacheFromAnyLayer(userId) {
+        // Try PostgreSQL
+        let cache = await this.getUserCache(userId);
+        if (cache) return cache;
+        
+        // Try Redis
+        if (redisClient) {
+            cache = await this.getUserCacheFromRedis(userId);
+            if (cache) return cache;
+        }
+        
+        // Try Memory
+        return this.getUserCacheFromMemory(userId);
+    }
+
+    /**
+     * Save cache to all available layers (don't fail if one fails)
+     */
+    async saveUserCacheMultiLayer(userId, cacheName) {
+        const expiresAt = new Date(Date.now() + this.CACHE_TTL_SECONDS * 1000);
+        const cacheData = {
+            cache_name: cacheName,
+            created_at: new Date(),
+            expires_at: expiresAt
+        };
+        
+        const results = {
+            postgresql: false,
+            redis: false,
+            memory: false
+        };
+        
+        // Layer 1: PostgreSQL (primary)
+        try {
+            await this.saveUserCacheToPostgres(userId, cacheName, expiresAt);
+            results.postgresql = true;
+        } catch (error) {
+            console.error('❌ PostgreSQL save failed:', error.message);
+        }
+        
+        // Layer 2: Redis (fast fallback)
+        if (redisClient) {
+            try {
+                await this.saveUserCacheToRedis(userId, cacheData);
+                results.redis = true;
+            } catch (error) {
+                console.error('❌ Redis save failed:', error.message);
+            }
+        }
+        
+        // Layer 3: Memory (always succeeds)
+        try {
+            this.saveUserCacheToMemory(userId, cacheData);
+            results.memory = true;
+        } catch (error) {
+            console.error('❌ Memory save failed:', error.message);
+        }
+        
+        console.log('💾 Multi-layer save results:', results);
+        
+        // At least one layer must succeed
+        if (!results.postgresql && !results.redis && !results.memory) {
+            throw new Error('All cache storage layers failed');
+        }
+    }
+
+    /**
+     * Save to PostgreSQL with automatic fallback to DELETE+INSERT
+     */
+    async saveUserCacheToPostgres(userId, cacheName, expiresAt) {
+        console.log('💾 Saving to PostgreSQL...');
+        
+        try {
+            // First try UPSERT (requires PRIMARY KEY or UNIQUE constraint)
+            try {
+                const query = `
+                    INSERT INTO user_gemini_caches (user_id, cache_name, created_at, expires_at) 
+                    VALUES ($1, $2, NOW(), $3)
+                    ON CONFLICT (user_id) 
+                    DO UPDATE SET 
+                        cache_name = EXCLUDED.cache_name,
+                        created_at = NOW(),
+                        expires_at = EXCLUDED.expires_at
+                `;
+                
+                await pgClient.query(query, [userId, cacheName, expiresAt]);
+                console.log('✅ PostgreSQL save successful (UPSERT)');
+                return true;
+                
+            } catch (upsertError) {
+                // If UPSERT fails (error code 42P10 = no constraint), use DELETE + INSERT
+                if (upsertError.code === '42P10') {
+                    console.log('⚠️ No constraint found, using DELETE+INSERT fallback');
+                    
+                    // Delete old record
+                    await pgClient.query(
+                        `DELETE FROM user_gemini_caches WHERE user_id = $1`,
+                        [userId]
+                    );
+                    
+                    // Insert new record
+                    await pgClient.query(
+                        `INSERT INTO user_gemini_caches (user_id, cache_name, created_at, expires_at) 
+                         VALUES ($1, $2, NOW(), $3)`,
+                        [userId, cacheName, expiresAt]
+                    );
+                    
+                    console.log('✅ PostgreSQL save successful (DELETE+INSERT)');
+                    return true;
+                } else {
+                    throw upsertError; // Re-throw if it's a different error
+                }
+            }
+            
+        } catch (error) {
+            console.error('❌ PostgreSQL save completely failed:', error.message);
+            throw error;
+        }
+    }
+
+    /**
+     * Save to Redis
+     */
+    async saveUserCacheToRedis(userId, cacheData) {
+        console.log('💾 Saving to Redis...');
+        
+        try {
+            const key = `gemini_cache:${userId}`;
+            await redisClient.setex(
+                key, 
+                this.CACHE_TTL_SECONDS, 
+                JSON.stringify(cacheData)
+            );
+            console.log('✅ Redis save successful');
+            return true;
+        } catch (error) {
+            console.error('❌ Redis save failed:', error.message);
+            throw error;
+        }
+    }
+
+    /**
+     * Save to Memory (always succeeds)
+     */
+    saveUserCacheToMemory(userId, cacheData) {
+        console.log('💾 Saving to memory...');
+        this.memoryCache.set(userId, cacheData);
+        console.log('✅ Memory save successful');
+        
+        // Auto-cleanup after TTL
+        setTimeout(() => {
+            if (this.memoryCache.has(userId)) {
+                this.memoryCache.delete(userId);
+                console.log('🧹 Auto-removed expired cache from memory:', userId);
+            }
+        }, this.CACHE_TTL_SECONDS * 1000);
         
+        return true;
+    }
+
+    /**
+     * Get from PostgreSQL
+     */
+    async getUserCache(userId) {
         try {
             const query = `
                 SELECT cache_name, created_at, expires_at 
@@ -184,87 +362,57 @@ class CacheManager {
             const result = await pgClient.query(query, [userId]);
             
             if (result && result.rows && result.rows.length > 0) {
-                console.log('✅ Found existing cache record:', {
-                    cacheName: result.rows[0].cache_name,
-                    createdAt: result.rows[0].created_at,
-                    expiresAt: result.rows[0].expires_at
-                });
                 return result.rows[0];
             }
             
-            console.log('📭 No existing cache found for user');
             return null;
             
         } catch (error) {
-            console.error('❌ Database query failed:', error.message);
+            console.error('❌ PostgreSQL fetch failed:', error.message);
             return null;
         }
     }
 
     /**
-     * Save cache info to database
-     * FIXED: Using PostgreSQL syntax instead of MySQL
-     * @param {string} userId 
-     * @param {string} cacheName 
+     * Get from Redis
      */
-    async saveUserCache(userId, cacheName) {
-        console.log('💾 Saving cache info to database:', {
-            userId: userId,
-            cacheName: cacheName
-        });
-
+    async getUserCacheFromRedis(userId) {
+        if (!redisClient) return null;
+        
         try {
-            const expiresAt = new Date(Date.now() + this.CACHE_TTL_SECONDS * 1000);
+            const key = `gemini_cache:${userId}`;
+            const data = await redisClient.get(key);
             
-            // PostgreSQL syntax with UPSERT (ON CONFLICT)
-            const query = `
-                INSERT INTO user_gemini_caches 
-                    (user_id, cache_name, created_at, expires_at) 
-                VALUES ($1, $2, NOW(), $3)
-                ON CONFLICT (user_id) 
-                DO UPDATE SET 
-                    cache_name = EXCLUDED.cache_name,
-                    created_at = NOW(),
-                    expires_at = EXCLUDED.expires_at
-            `;
-            
-            await pgClient.query(query, [userId, cacheName, expiresAt]);
+            if (data) {
+                return JSON.parse(data);
+            }
             
-            console.log('✅ Cache info saved successfully');
+            return null;
             
         } catch (error) {
-            console.error('❌ Failed to save cache info:', error.message);
-            console.error('❌ Error details:', error);
-            // Don't throw - cache creation succeeded, DB save is secondary
+            console.error('❌ Redis fetch failed:', error.message);
+            return null;
         }
     }
 
+    /**
+     * Get from Memory
+     */
+    getUserCacheFromMemory(userId) {
+        return this.memoryCache.get(userId) || null;
+    }
+
     /**
      * Check if cache is expired
-     * @param {object} cacheRecord 
-     * @returns {boolean}
      */
     isCacheExpired(cacheRecord) {
         const now = new Date();
         const expiresAt = new Date(cacheRecord.expires_at);
-        
-        const isExpired = now >= expiresAt;
-        
-        if (isExpired) {
-            console.log('⏰ Cache expired:', {
-                expiresAt: expiresAt.toISOString(),
-                now: now.toISOString(),
-                expiredBy: ((now - expiresAt) / (1000 * 60)).toFixed(2) + ' minutes'
-            });
-        }
-        
-        return isExpired;
+        return now >= expiresAt;
     }
 
     /**
      * Get cache age in hours
-     * @param {object} cacheRecord 
-     * @returns {number}
      */
     getCacheAgeHours(cacheRecord) {
         const now = new Date();
@@ -275,8 +423,6 @@ class CacheManager {
 
     /**
      * Get remaining cache lifetime in hours
-     * @param {object} cacheRecord 
-     * @returns {number}
      */
     getCacheRemainingHours(cacheRecord) {
         const now = new Date();
@@ -286,34 +432,52 @@ class CacheManager {
     }
 
     /**
-     * Clean up expired caches from database (maintenance task)
-     * FIXED: PostgreSQL syntax
+     * Clean up expired caches from all layers
      */
     async cleanupExpiredCaches() {
-        console.log('🧹 Cleaning up expired caches...');
+        console.log('🧹 Cleaning up expired caches from all layers...');
+        
+        const results = {
+            postgresql: 0,
+            redis: 0,
+            memory: 0
+        };
         
+        // PostgreSQL cleanup
         try {
-            const query = `
-                DELETE FROM user_gemini_caches 
-                WHERE expires_at < NOW()
-            `;
-            
+            const query = `DELETE FROM user_gemini_caches WHERE expires_at < NOW()`;
             const result = await pgClient.query(query);
-            
-            console.log('✅ Cleanup complete:', {
-                deletedRecords: result.rowCount || 0
-            });
-            
+            results.postgresql = result.rowCount || 0;
         } catch (error) {
-            console.error('❌ Cleanup failed:', error.message);
+            console.error('❌ PostgreSQL cleanup failed:', error.message);
+        }
+        
+        // Redis cleanup (would need to scan all keys - expensive, skip for now)
+        // Redis auto-expires with TTL, so not critical
+        
+        // Memory cleanup
+        for (const [userId, cacheData] of this.memoryCache.entries()) {
+            if (this.isCacheExpired(cacheData)) {
+                this.memoryCache.delete(userId);
+                results.memory++;
+            }
         }
+        
+        console.log('✅ Cleanup results:', results);
+        return results;
     }
 
     /**
-     * Get cache statistics for monitoring
-     * FIXED: PostgreSQL syntax with EXTRACT instead of TIMESTAMPDIFF
+     * Get cache statistics
      */
     async getCacheStats() {
+        const stats = {
+            memory_caches: this.memoryCache.size,
+            postgresql: null,
+            redis: null
+        };
+        
+        // PostgreSQL stats
         try {
             const query = `
                 SELECT 
@@ -325,37 +489,22 @@ class CacheManager {
             `;
             
             const result = await pgClient.query(query);
-            return result.rows[0];
-            
+            stats.postgresql = result.rows[0];
         } catch (error) {
-            console.error('❌ Failed to get cache stats:', error.message);
-            return null;
+            console.error('❌ PostgreSQL stats failed:', error.message);
         }
-    }
-
-    /**
-     * NEW: Proactively refresh cache in background if it's about to expire
-     * This ensures users always have a fresh cache without waiting
-     * @param {string} userId 
-     * @param {function} getSystemPromptFn - Function that returns the system prompt
-     */
-    async refreshCacheIfNeeded(userId, getSystemPromptFn) {
-        const cacheStatus = await this.checkCacheValidity(userId);
         
-        if (cacheStatus.needsRefresh) {
-            console.log('🔄 Cache needs refresh - starting background refresh');
-            
-            // Do this asynchronously - don't wait
-            setImmediate(async () => {
-                try {
-                    const systemPrompt = await getSystemPromptFn();
-                    await this.getOrCreateCache(userId, systemPrompt);
-                    console.log('✅ Background cache refresh completed');
-                } catch (error) {
-                    console.error('❌ Background cache refresh failed:', error.message);
-                }
-            });
+        // Redis stats (would need dbsize command)
+        if (redisClient) {
+            try {
+                const keys = await redisClient.keys('gemini_cache:*');
+                stats.redis = { total_keys: keys.length };
+            } catch (error) {
+                console.error('❌ Redis stats failed:', error.message);
+            }
         }
+        
+        return stats;
     }
 }