s3db.js 7.4.2 → 8.0.0

package/src/plugins/audit.plugin.js

@@ -1,5 +1,5 @@
 import Plugin from "./plugin.class.js";
-import tryFn, { tryFnSync } from "../concerns/try-fn.js";
+import tryFn from "../concerns/try-fn.js";
 
 export class AuditPlugin extends Plugin {
   constructor(options = {}) {
@@ -8,14 +8,13 @@ export class AuditPlugin extends Plugin {
     this.config = {
       includeData: options.includeData !== false,
       includePartitions: options.includePartitions !== false,
-      maxDataSize: options.maxDataSize || 10000, // 10KB limit
+      maxDataSize: options.maxDataSize || 10000,
       ...options
     };
   }
 
   async onSetup() {
-
-    // Create audit resource if it doesn't exist
+    // Create audit resource
     const [ok, err, auditResource] = await tryFn(() => this.database.createResource({
       name: 'audits',
       attributes: {
@@ -32,237 +31,155 @@ export class AuditPlugin extends Plugin {
         metadata: 'string|optional'
       },
       behavior: 'body-overflow'
-      // keyPrefix removido
     }));
     this.auditResource = ok ? auditResource : (this.database.resources.audits || null);
     if (!ok && !this.auditResource) return;
 
-    this.installDatabaseProxy();
-    this.installEventListeners();
-  }
-
-  async onStart() {
-    // Plugin is ready
-  }
-
-  async onStop() {
-    // Cleanup if needed
-  }
-
-  installDatabaseProxy() {
-    if (this.database._auditProxyInstalled) {
-      return; // Already installed
-    }
-    
-    const installEventListenersForResource = this.installEventListenersForResource.bind(this);
-    
-    // Store original method
-    this.database._originalCreateResource = this.database.createResource;
-    
-    // Create new method that doesn't call itself
-    this.database.createResource = async function (...args) {
-      const resource = await this._originalCreateResource(...args);
-      if (resource.name !== 'audits') {
-        installEventListenersForResource(resource);
+    // Hook into database for new resources
+    this.database.addHook('afterCreateResource', (context) => {
+      if (context.resource.name !== 'audits') {
+        this.setupResourceAuditing(context.resource);
       }
-      return resource;
-    };
-    
-    // Mark as installed
-    this.database._auditProxyInstalled = true;
-  }
+    });
 
-  installEventListeners() {
+    // Setup existing resources
     for (const resource of Object.values(this.database.resources)) {
-      if (resource.name === 'audits') {
-        continue; // Don't audit the audit resource
+      if (resource.name !== 'audits') {
+        this.setupResourceAuditing(resource);
       }
-      
-      this.installEventListenersForResource(resource);
     }
   }
 
-  installEventListenersForResource(resource) {
-    // Store original data for update operations
-    const originalDataMap = new Map();
+  async onStart() {
+    // Ready
+  }
+
+  async onStop() {
+    // No cleanup needed
+  }
 
-    // Insert event
+  setupResourceAuditing(resource) {
+    // Insert
     resource.on('insert', async (data) => {
-      const recordId = data.id || 'auto-generated';
-      
-      const partitionValues = this.config.includePartitions ? this.getPartitionValues(data, resource) : null;
-      
-      const auditRecord = {
-        id: `audit-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
+      await this.logAudit({
         resourceName: resource.name,
         operation: 'insert',
-        recordId,
-        userId: this.getCurrentUserId?.() || 'system',
-        timestamp: new Date().toISOString(),
+        recordId: data.id || 'auto-generated',
         oldData: null,
-        newData: this.config.includeData === false ? null : JSON.stringify(this.truncateData(data)),
-        partition: this.config.includePartitions ? this.getPrimaryPartition(partitionValues) : null,
-        partitionValues: this.config.includePartitions ? (partitionValues ? (Object.keys(partitionValues).length > 0 ? JSON.stringify(partitionValues) : null) : null) : null,
-        metadata: JSON.stringify({
-          source: 'audit-plugin',
-          version: '2.0'
-        })
-      };
-
-      // Log audit asynchronously to avoid blocking
-      this.logAudit(auditRecord).catch(() => {});
+        newData: this.config.includeData ? JSON.stringify(this.truncateData(data)) : null,
+        partition: this.config.includePartitions && this.getPartitionValues(data, resource) ? this.getPrimaryPartition(this.getPartitionValues(data, resource)) : null,
+        partitionValues: this.config.includePartitions && this.getPartitionValues(data, resource) ? JSON.stringify(this.getPartitionValues(data, resource)) : null
+      });
     });
 
-    // Update event
+    // Update
     resource.on('update', async (data) => {
-      const recordId = data.id;
       let oldData = data.$before;
-      
       if (this.config.includeData && !oldData) {
-        const [ok, err, fetched] = await tryFn(() => resource.get(recordId));
+        const [ok, err, fetched] = await tryFn(() => resource.get(data.id));
         if (ok) oldData = fetched;
       }
 
-      const partitionValues = this.config.includePartitions ? this.getPartitionValues(data, resource) : null;
-
-      const auditRecord = {
-        id: `audit-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
+      await this.logAudit({
         resourceName: resource.name,
         operation: 'update',
-        recordId,
-        userId: this.getCurrentUserId?.() || 'system',
-        timestamp: new Date().toISOString(),
-        oldData: oldData && this.config.includeData === false ? null : (oldData ? JSON.stringify(this.truncateData(oldData)) : null),
-        newData: this.config.includeData === false ? null : JSON.stringify(this.truncateData(data)),
-        partition: this.config.includePartitions ? this.getPrimaryPartition(partitionValues) : null,
-        partitionValues: this.config.includePartitions ? (partitionValues ? (Object.keys(partitionValues).length > 0 ? JSON.stringify(partitionValues) : null) : null) : null,
-        metadata: JSON.stringify({
-          source: 'audit-plugin',
-          version: '2.0'
-        })
-      };
-
-      // Log audit asynchronously
-      this.logAudit(auditRecord).catch(() => {});
+        recordId: data.id,
+        oldData: oldData && this.config.includeData ? JSON.stringify(this.truncateData(oldData)) : null,
+        newData: this.config.includeData ? JSON.stringify(this.truncateData(data)) : null,
+        partition: this.config.includePartitions && this.getPartitionValues(data, resource) ? this.getPrimaryPartition(this.getPartitionValues(data, resource)) : null,
+        partitionValues: this.config.includePartitions && this.getPartitionValues(data, resource) ? JSON.stringify(this.getPartitionValues(data, resource)) : null
+      });
     });
 
-    // Delete event
+    // Delete
     resource.on('delete', async (data) => {
-      const recordId = data.id;
       let oldData = data;
-      
       if (this.config.includeData && !oldData) {
-        const [ok, err, fetched] = await tryFn(() => resource.get(recordId));
+        const [ok, err, fetched] = await tryFn(() => resource.get(data.id));
         if (ok) oldData = fetched;
       }
 
-      const partitionValues = oldData && this.config.includePartitions ? this.getPartitionValues(oldData, resource) : null;
-
-      const auditRecord = {
-        id: `audit-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
+      await this.logAudit({
         resourceName: resource.name,
         operation: 'delete',
-        recordId,
-        userId: this.getCurrentUserId?.() || 'system',
-        timestamp: new Date().toISOString(),
-        oldData: oldData && this.config.includeData === false ? null : (oldData ? JSON.stringify(this.truncateData(oldData)) : null),
+        recordId: data.id,
+        oldData: oldData && this.config.includeData ? JSON.stringify(this.truncateData(oldData)) : null,
         newData: null,
-        partition: this.config.includePartitions ? this.getPrimaryPartition(partitionValues) : null,
-        partitionValues: this.config.includePartitions ? (partitionValues ? (Object.keys(partitionValues).length > 0 ? JSON.stringify(partitionValues) : null) : null) : null,
-        metadata: JSON.stringify({
-          source: 'audit-plugin',
-          version: '2.0'
-        })
-      };
-
-      // Log audit asynchronously
-      this.logAudit(auditRecord).catch(() => {});
+        partition: oldData && this.config.includePartitions && this.getPartitionValues(oldData, resource) ? this.getPrimaryPartition(this.getPartitionValues(oldData, resource)) : null,
+        partitionValues: oldData && this.config.includePartitions && this.getPartitionValues(oldData, resource) ? JSON.stringify(this.getPartitionValues(oldData, resource)) : null
+      });
     });
+  }
 
-    // Remover monkey patch de deleteMany
-    // Adicionar middleware para deleteMany
-    resource.useMiddleware('deleteMany', async (ctx, next) => {
-      const ids = ctx.args[0];
-      // Capture data before deletion
-      const oldDataMap = {};
-      if (this.config.includeData) {
-        for (const id of ids) {
-          const [ok, err, data] = await tryFn(() => resource.get(id));
-          oldDataMap[id] = ok ? data : null;
-        }
-      }
-      const result = await next();
-      // Auditar depois
-      if (result && result.length > 0 && this.config.includeData) {
-        for (const id of ids) {
-          const oldData = oldDataMap[id];
-          const partitionValues = oldData ? (this.config.includePartitions ? this.getPartitionValues(oldData, resource) : null) : null;
-          const auditRecord = {
-            id: `audit-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
-            resourceName: resource.name,
-            operation: 'delete',
-            recordId: id,
-            userId: this.getCurrentUserId?.() || 'system',
-            timestamp: new Date().toISOString(),
-            oldData: this.config.includeData === false ? null : JSON.stringify(this.truncateData(oldData)),
-            newData: null,
-            partition: this.config.includePartitions ? this.getPrimaryPartition(partitionValues) : null,
-            partitionValues: this.config.includePartitions ? (partitionValues ? (Object.keys(partitionValues).length > 0 ? JSON.stringify(partitionValues) : null) : null) : null,
-            metadata: JSON.stringify({
-              source: 'audit-plugin',
-              version: '2.0',
-              batchOperation: true
-            })
-          };
-          this.logAudit(auditRecord).catch(() => {});
-        }
-      }
-      return result;
-    });
+  // Backward compatibility for tests
+  installEventListenersForResource(resource) {
+    return this.setupResourceAuditing(resource);
+  }
+
+  async logAudit(auditData) {
+    if (!this.auditResource) {
+      return;
+    }
+
+    const auditRecord = {
+      id: `audit-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
+      userId: this.getCurrentUserId?.() || 'system',
+      timestamp: new Date().toISOString(),
+      metadata: JSON.stringify({ source: 'audit-plugin', version: '2.0' }),
+      resourceName: auditData.resourceName,
+      operation: auditData.operation,
+      recordId: auditData.recordId
+    };
+
+    // Only add fields that are not null
+    if (auditData.oldData !== null) {
+      auditRecord.oldData = auditData.oldData;
+    }
+    if (auditData.newData !== null) {
+      auditRecord.newData = auditData.newData;
+    }
+    if (auditData.partition !== null) {
+      auditRecord.partition = auditData.partition;
+    }
+    if (auditData.partitionValues !== null) {
+      auditRecord.partitionValues = auditData.partitionValues;
+    }
+
+    try {
+      await this.auditResource.insert(auditRecord);
+    } catch (error) {
+      // Silently fail to avoid breaking operations
+      console.warn('Audit logging failed:', error.message);
+    }
   }
 
   getPartitionValues(data, resource) {
-    if (!data) return null;
-    const partitions = resource.config?.partitions || {};
-    const partitionValues = {};
+    if (!this.config.includePartitions || !resource.partitions) return null;
     
-    for (const [partitionName, partitionDef] of Object.entries(partitions)) {
-      if (partitionDef.fields) {
-        const partitionData = {};
-        for (const [fieldName, fieldRule] of Object.entries(partitionDef.fields)) {
-          // Handle nested fields using dot notation
-          const fieldValue = this.getNestedFieldValue(data, fieldName);
-          if (fieldValue !== undefined && fieldValue !== null) {
-            partitionData[fieldName] = fieldValue;
-          }
-        }
-        if (Object.keys(partitionData).length > 0) {
-          partitionValues[partitionName] = partitionData;
-        }
+    const partitionValues = {};
+    for (const [partitionName, partitionConfig] of Object.entries(resource.partitions)) {
+      const values = {};
+      for (const field of Object.keys(partitionConfig.fields)) {
+        values[field] = this.getNestedFieldValue(data, field);
+      }
+      if (Object.values(values).some(v => v !== undefined && v !== null)) {
+        partitionValues[partitionName] = values;
       }
     }
-    
-    return partitionValues;
+    return Object.keys(partitionValues).length > 0 ? partitionValues : null;
   }
 
   getNestedFieldValue(data, fieldPath) {
-    // Handle simple field names (no dots)
-    if (!fieldPath.includes('.')) {
-      return data[fieldPath];
-    }
-
-    // Handle nested field names using dot notation
-    const keys = fieldPath.split('.');
-    let currentLevel = data;
-    
-    for (const key of keys) {
-      if (!currentLevel || typeof currentLevel !== 'object' || !(key in currentLevel)) {
+    const parts = fieldPath.split('.');
+    let value = data;
+    for (const part of parts) {
+      if (value && typeof value === 'object' && part in value) {
+        value = value[part];
+      } else {
         return undefined;
       }
-      currentLevel = currentLevel[key];
     }
-    
-    return currentLevel;
+    return value;
   }
 
   getPrimaryPartition(partitionValues) {
@@ -271,172 +188,88 @@ export class AuditPlugin extends Plugin {
     return partitionNames.length > 0 ? partitionNames[0] : null;
   }
 
-  async logAudit(auditRecord) {
-    if (!auditRecord.id) {
-      auditRecord.id = `audit-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-    }
-    const result = await this.auditResource.insert(auditRecord);
-    return result;
-  }
-
   truncateData(data) {
-    if (!data) return data;
-    
-    // Filter out internal S3DB fields (those starting with _)
-    const filteredData = {};
-    for (const [key, value] of Object.entries(data)) {
-      if (!key.startsWith('_') && key !== '$overflow') {
-        filteredData[key] = value;
-      }
-    }
+    if (!this.config.includeData) return null;
     
-    const dataStr = JSON.stringify(filteredData);
+    const dataStr = JSON.stringify(data);
     if (dataStr.length <= this.config.maxDataSize) {
-      return filteredData;
-    }
-    
-    // Need to actually truncate the data to fit within maxDataSize
-    let truncatedData = { ...filteredData };
-    let currentSize = JSON.stringify(truncatedData).length;
-    
-    // Reserve space for truncation metadata
-    const metadataOverhead = JSON.stringify({
-      _truncated: true,
-      _originalSize: dataStr.length,
-      _truncatedAt: new Date().toISOString()
-    }).length;
-    
-    const targetSize = this.config.maxDataSize - metadataOverhead;
-    
-    // Truncate string fields until we fit within the limit
-    for (const [key, value] of Object.entries(truncatedData)) {
-      if (typeof value === 'string' && currentSize > targetSize) {
-        const excess = currentSize - targetSize;
-        const newLength = Math.max(0, value.length - excess - 3); // -3 for "..."
-        if (newLength < value.length) {
-          truncatedData[key] = value.substring(0, newLength) + '...';
-          currentSize = JSON.stringify(truncatedData).length;
-        }
-      }
+      return data;
     }
-    
+
     return {
-      ...truncatedData,
+      ...data,
       _truncated: true,
       _originalSize: dataStr.length,
       _truncatedAt: new Date().toISOString()
     };
   }
 
-  // Utility methods for querying audit logs
   async getAuditLogs(options = {}) {
     if (!this.auditResource) return [];
-    const [ok, err, result] = await tryFn(async () => {
-      const {
-        resourceName,
-        operation,
-        recordId,
-        userId,
-        partition,
-        startDate,
-        endDate,
-        limit = 100,
-        offset = 0
-      } = options;
-
-      const allAudits = await this.auditResource.getAll();
-      let filtered = allAudits.filter(audit => {
-        if (resourceName && audit.resourceName !== resourceName) return false;
-        if (operation && audit.operation !== operation) return false;
-        if (recordId && audit.recordId !== recordId) return false;
-        if (userId && audit.userId !== userId) return false;
-        if (partition && audit.partition !== partition) return false;
-        if (startDate && new Date(audit.timestamp) < new Date(startDate)) return false;
-        if (endDate && new Date(audit.timestamp) > new Date(endDate)) return false;
-        return true;
-      });
-      filtered.sort((a, b) => new Date(b.timestamp) - new Date(a.timestamp));
-      const deserialized = filtered.slice(offset, offset + limit).map(audit => {
-        const [okOld, , oldData] = typeof audit.oldData === 'string' ? tryFnSync(() => JSON.parse(audit.oldData)) : [true, null, audit.oldData];
-        const [okNew, , newData] = typeof audit.newData === 'string' ? tryFnSync(() => JSON.parse(audit.newData)) : [true, null, audit.newData];
-        const [okPart, , partitionValues] = audit.partitionValues && typeof audit.partitionValues === 'string' ? tryFnSync(() => JSON.parse(audit.partitionValues)) : [true, null, audit.partitionValues];
-        const [okMeta, , metadata] = audit.metadata && typeof audit.metadata === 'string' ? tryFnSync(() => JSON.parse(audit.metadata)) : [true, null, audit.metadata];
-        return {
-          ...audit,
-          oldData: audit.oldData === null || audit.oldData === undefined || audit.oldData === 'null' ? null : (okOld ? oldData : null),
-          newData: audit.newData === null || audit.newData === undefined || audit.newData === 'null' ? null : (okNew ? newData : null),
-          partitionValues: okPart ? partitionValues : audit.partitionValues,
-          metadata: okMeta ? metadata : audit.metadata
-        };
-      });
-      return deserialized;
-    });
-    return ok ? result : [];
+    
+    const { resourceName, operation, recordId, partition, startDate, endDate, limit = 100 } = options;
+    
+    let query = {};
+    
+    if (resourceName) query.resourceName = resourceName;
+    if (operation) query.operation = operation;
+    if (recordId) query.recordId = recordId;
+    if (partition) query.partition = partition;
+    
+    if (startDate || endDate) {
+      query.timestamp = {};
+      if (startDate) query.timestamp.$gte = startDate;
+      if (endDate) query.timestamp.$lte = endDate;
+    }
+    
+    const result = await this.auditResource.page({ query, limit });
+    return result.items || [];
   }
 
   async getRecordHistory(resourceName, recordId) {
-    return this.getAuditLogs({
-      resourceName,
-      recordId,
-      limit: 1000
-    });
+    return await this.getAuditLogs({ resourceName, recordId });
   }
 
   async getPartitionHistory(resourceName, partitionName, partitionValues) {
-    return this.getAuditLogs({
-      resourceName,
+    return await this.getAuditLogs({ 
+      resourceName, 
       partition: partitionName,
-      limit: 1000
+      partitionValues: JSON.stringify(partitionValues)
     });
   }
 
   async getAuditStats(options = {}) {
-    const {
-      resourceName,
-      startDate,
-      endDate
-    } = options;
-
-    const allAudits = await this.getAuditLogs({
-      resourceName,
-      startDate,
-      endDate,
-      limit: 10000
-    });
-
+    const logs = await this.getAuditLogs(options);
+    
     const stats = {
-      total: allAudits.length,
+      total: logs.length,
       byOperation: {},
       byResource: {},
       byPartition: {},
       byUser: {},
       timeline: {}
     };
-
-    for (const audit of allAudits) {
+    
+    for (const log of logs) {
       // Count by operation
-      stats.byOperation[audit.operation] = (stats.byOperation[audit.operation] || 0) + 1;
+      stats.byOperation[log.operation] = (stats.byOperation[log.operation] || 0) + 1;
       
       // Count by resource
-      stats.byResource[audit.resourceName] = (stats.byResource[audit.resourceName] || 0) + 1;
+      stats.byResource[log.resourceName] = (stats.byResource[log.resourceName] || 0) + 1;
       
       // Count by partition
-      if (audit.partition) {
-        stats.byPartition[audit.partition] = (stats.byPartition[audit.partition] || 0) + 1;
+      if (log.partition) {
+        stats.byPartition[log.partition] = (stats.byPartition[log.partition] || 0) + 1;
       }
       
       // Count by user
-      stats.byUser[audit.userId] = (stats.byUser[audit.userId] || 0) + 1;
+      stats.byUser[log.userId] = (stats.byUser[log.userId] || 0) + 1;
       
-      // Count by day
-      if (audit.timestamp) {
-        const day = audit.timestamp.split('T')[0];
-        stats.timeline[day] = (stats.timeline[day] || 0) + 1;
-      }
+      // Timeline by date
+      const date = log.timestamp.split('T')[0];
+      stats.timeline[date] = (stats.timeline[date] || 0) + 1;
     }
-
+    
     return stats;
   }
-}
-
-export default AuditPlugin; 
+} 

package/src/plugins/cache/filesystem-cache.class.js

@@ -455,24 +455,45 @@ export class FilesystemCache extends Cache {
       for (const file of cacheFiles) {
         const filePath = path.join(this.directory, file);
         
-        // Delete main file
-        if (await this._fileExists(filePath)) {
-          await unlink(filePath);
+        // Delete main file (handle ENOENT gracefully)
+        try {
+          if (await this._fileExists(filePath)) {
+            await unlink(filePath);
+          }
+        } catch (error) {
+          if (error.code !== 'ENOENT') {
+            throw error; // Re-throw non-ENOENT errors
+          }
+          // ENOENT means file is already gone, which is what we wanted
         }
         
-        // Delete metadata file
+        // Delete metadata file (handle ENOENT gracefully)
         if (this.enableMetadata) {
-          const metadataPath = this._getMetadataPath(filePath);
-          if (await this._fileExists(metadataPath)) {
-            await unlink(metadataPath);
+          try {
+            const metadataPath = this._getMetadataPath(filePath);
+            if (await this._fileExists(metadataPath)) {
+              await unlink(metadataPath);
+            }
+          } catch (error) {
+            if (error.code !== 'ENOENT') {
+              throw error; // Re-throw non-ENOENT errors
+            }
+            // ENOENT means file is already gone, which is what we wanted
           }
         }
         
-        // Delete backup file
+        // Delete backup file (handle ENOENT gracefully)
         if (this.enableBackup) {
-          const backupPath = filePath + this.backupSuffix;
-          if (await this._fileExists(backupPath)) {
-            await unlink(backupPath);
+          try {
+            const backupPath = filePath + this.backupSuffix;
+            if (await this._fileExists(backupPath)) {
+              await unlink(backupPath);
+            }
+          } catch (error) {
+            if (error.code !== 'ENOENT') {
+              throw error; // Re-throw non-ENOENT errors
+            }
+            // ENOENT means file is already gone, which is what we wanted
           }
         }
       }
@@ -490,6 +511,14 @@ export class FilesystemCache extends Cache {
       return true;
       
     } catch (error) {
+      // Handle ENOENT errors at the top level too (e.g., directory doesn't exist)
+      if (error.code === 'ENOENT') {
+        if (this.enableStats) {
+          this.stats.clears++;
+        }
+        return true; // Already cleared!
+      }
+      
       if (this.enableStats) {
         this.stats.errors++;
       }