changes from testing scripts in local environment

Author: thehabes

cache/__tests__/cache-metrics-worst-case.sh

@@ -850,9 +850,18 @@ test_history_endpoint() {
     # Wait for object to be available
     sleep 2
 
+    # Extract just the ID portion for the history endpoint
+    local obj_id=$(echo "$test_id" | sed 's|.*/||')
+    
+    # Skip history test if object creation failed
+    if [ -z "$obj_id" ] || [ "$obj_id" == "null" ]; then
+        log_warning "Skipping history test - object creation failed"
+        return
+    fi
+    
     # Get the full object and update to create history
     local full_object=$(curl -s "$test_id" 2>/dev/null)
-    local update_body=$(echo "$full_object" | jq '.version = 2' 2>/dev/null)
+    local update_body=$(echo "$full_object" | jq '. + {version: 2}' 2>/dev/null)
 
     curl -s -X PUT "${API_BASE}/api/update" \
         -H "Content-Type: application/json" \
@@ -862,9 +871,6 @@ test_history_endpoint() {
     sleep 2
     clear_cache
 
-    # Extract just the ID portion for the history endpoint
-    local obj_id=$(echo "$test_id" | sed 's|.*/||')
-    
     # Test history with cold cache
     log_info "Testing history with cold cache..."
     local result=$(measure_endpoint "${API_BASE}/history/${obj_id}" "GET" "" "Get object history")

cache/__tests__/cache-metrics.sh

@@ -869,9 +869,18 @@ test_history_endpoint() {
     # Wait for object to be available
     sleep 2
 
+    # Extract just the ID portion for the history endpoint
+    local obj_id=$(echo "$test_id" | sed 's|.*/||')
+    
+    # Skip history test if object creation failed
+    if [ -z "$obj_id" ] || [ "$obj_id" == "null" ]; then
+        log_warning "Skipping history test - object creation failed"
+        return
+    fi
+    
     # Get the full object and update to create history
     local full_object=$(curl -s "$test_id" 2>/dev/null)
-    local update_body=$(echo "$full_object" | jq '.version = 2' 2>/dev/null)
+    local update_body=$(echo "$full_object" | jq '. + {version: 2}' 2>/dev/null)
 
     curl -s -X PUT "${API_BASE}/api/update" \
         -H "Content-Type: application/json" \
@@ -881,9 +890,6 @@ test_history_endpoint() {
     sleep 2
     clear_cache
 
-    # Extract just the ID portion for the history endpoint
-    local obj_id=$(echo "$test_id" | sed 's|.*/||')
-    
     # Test history with cold cache
     log_info "Testing history with cold cache..."
     local result=$(measure_endpoint "${API_BASE}/history/${obj_id}" "GET" "" "Get object history")

cache/middleware.js

@@ -267,8 +267,6 @@ const cacheSince = (req, res, next) => {
  * Invalidates cache entries when objects are created, updated, or deleted
  */
 const invalidateCache = (req, res, next) => {
-    console.log(`[CACHE INVALIDATE] Middleware triggered for ${req.method} ${req.path}`)
-    
     // Store original response methods
     const originalJson = res.json.bind(res)
     const originalSend = res.send.bind(res)
@@ -281,23 +279,18 @@ const invalidateCache = (req, res, next) => {
     const performInvalidation = (data) => {
         // Prevent duplicate invalidation
         if (invalidationPerformed) {
-            console.log('[CACHE INVALIDATE] Skipping duplicate invalidation')
             return
         }
         invalidationPerformed = true
 
-        console.log(`[CACHE INVALIDATE] Response handler called with status ${res.statusCode}`)
-        
         // Only invalidate on successful write operations
         if (res.statusCode >= 200 && res.statusCode < 300) {
             // Use originalUrl to get the full path (req.path only shows the path within the mounted router)
             const path = req.originalUrl || req.path
-            console.log(`[CACHE INVALIDATE] Processing path: ${path} (originalUrl: ${req.originalUrl}, path: ${req.path})`)
 
             // Determine what to invalidate based on the operation
             if (path.includes('/create') || path.includes('/bulkCreate')) {
                 // For creates, use smart invalidation based on the created object's properties
-                console.log('[CACHE INVALIDATE] Create operation detected - using smart cache invalidation')
 
                 // Extract the created object(s)
                 const createdObjects = path.includes('/bulkCreate') 
@@ -314,17 +307,11 @@ const invalidateCache = (req, res, next) => {
                     // This ensures queries matching this object will be refreshed
                     cache.invalidateByObject(obj, invalidatedKeys)
                 }
-                
-                console.log(`[CACHE INVALIDATE] Invalidated ${invalidatedKeys.size} cache entries using smart invalidation`)
-                if (invalidatedKeys.size > 0) {
-                    console.log(`[CACHE INVALIDATE] Invalidated keys: ${Array.from(invalidatedKeys).slice(0, 5).join(', ')}${invalidatedKeys.size > 5 ? '...' : ''}`)
-                }
             } 
             else if (path.includes('/update') || path.includes('/patch') || 
                      path.includes('/set') || path.includes('/unset') ||
                      path.includes('/overwrite') || path.includes('/bulkUpdate')) {
                 // For updates, use smart invalidation based on the updated object
-                console.log('[CACHE INVALIDATE] Update operation detected - using smart cache invalidation')
 
                 // Extract updated object (response may contain new_obj_state or the object directly)
                 const updatedObject = data?.new_obj_state ?? data
@@ -360,20 +347,13 @@ const invalidateCache = (req, res, next) => {
                     const versionIds = [objIdShort, previousId, primeId].filter(id => id && id !== 'root').join('|')
                     const historyPattern = new RegExp(`^(history|since):(${versionIds})`)
                     const historyCount = cache.invalidate(historyPattern)
-                    
-                    console.log(`[CACHE INVALIDATE] Invalidated ${invalidatedKeys.size} cache entries (${historyCount} history/since for chain: ${versionIds})`)
-                    if (invalidatedKeys.size > 0) {
-                        console.log(`[CACHE INVALIDATE] Invalidated keys: ${Array.from(invalidatedKeys).slice(0, 5).join(', ')}${invalidatedKeys.size > 5 ? '...' : ''}`)
-                    }
                 } else {
                     // Fallback to broad invalidation if we can't extract the object
-                    console.log('[CACHE INVALIDATE] Update operation (fallback - no object data)')
                     cache.invalidate(/^(query|search|searchPhrase|id|history|since):/)
                 }
             }
             else if (path.includes('/delete')) {
                 // For deletes, use smart invalidation based on the deleted object
-                console.log('[CACHE INVALIDATE] Delete operation detected - using smart cache invalidation')
 
                 // Get the deleted object from res.locals (set by delete controller before deletion)
                 const deletedObject = res.locals.deletedObject
@@ -408,20 +388,13 @@ const invalidateCache = (req, res, next) => {
                     const versionIds = [objIdShort, previousId, primeId].filter(id => id && id !== 'root').join('|')
                     const historyPattern = new RegExp(`^(history|since):(${versionIds})`)
                     const historyCount = cache.invalidate(historyPattern)
-                    
-                    console.log(`[CACHE INVALIDATE] Invalidated ${invalidatedKeys.size} cache entries (${historyCount} history/since for chain: ${versionIds})`)
-                    if (invalidatedKeys.size > 0) {
-                        console.log(`[CACHE INVALIDATE] Invalidated keys: ${Array.from(invalidatedKeys).slice(0, 5).join(', ')}${invalidatedKeys.size > 5 ? '...' : ''}`)
-                    }
                 } else {
                     // Fallback to broad invalidation if we can't extract the object
-                    console.log('[CACHE INVALIDATE] Delete operation (fallback - no object data from res.locals)')
                     cache.invalidate(/^(query|search|searchPhrase|id|history|since):/)
                 }
             }
             else if (path.includes('/release')) {
                 // Release creates a new version, invalidate all including history/since
-                console.log('[CACHE INVALIDATE] Cache INVALIDATE: release operation')
                 cache.invalidate(/^(query|search|searchPhrase|id|history|since):/)
             }
         }